110 1 год назад
Родитель
Сommit
f758e3eefc

+ 5 - 3
itdmWeb/src/api/api.js

@@ -67,8 +67,9 @@ const saveProject = (params)=>postAction("/sych/JHYAddOrUpdate",params);
 // 项目经理查询计划列表
 const getXmjlList = (params) => getAction('/sych/XMJLList', params);
 // 项目经理拆单后的提交按钮
-const saveProjectJl = (params)=>postAction("/sych/XMJLAddOrUpdate",params);
-
+const saveProjectJl = (params)=>postAction("/sych/XMJLAddOrUpdate",params)
+//生成
+const created = (params)=>getAction("/itdmgomgongdanshuju/ItdmGongdanshuju/create",params)
 
 //日志管理
 const deleteLog = (params)=>deleteAction("/sys/log/delete",params);
@@ -181,7 +182,8 @@ export {
   getJhList,
   saveProject,
   getXmjlList,
-  saveProjectJl
+  saveProjectJl,
+  created
 }
 
 

+ 76 - 54
itdmWeb/src/views/module-iTDM/gongdanshuju/ItdmGongdanShujuList.vue

@@ -6,28 +6,28 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="工单id">
-              <j-popup placeholder="请选择工单id" v-model="queryParam.woId" code="itdm_gongdan_master" org-fields="shiyan_type,shiyan_data" dest-fields="shiyan_type,shiyan_data" :field="getPopupField('shiyan_type,shiyan_data')" :multi="true"/>
+              <a-input placeholder="请输入工单id" v-model="queryParam.woId"></a-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="试验类型">
-              <j-dict-select-tag placeholder="请选择试验类型" v-model="queryParam.shiyanType" dictCode="shiyan_type"/>
+              <j-multi-select-tag placeholder="请选择试验类型" dictCode="shiiyan_type" v-model="queryParam.shiyanType"/>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="试验时间">
-                <j-date placeholder="请选择试验时间" v-model="queryParam.shiyanTime"></j-date>
+              <a-form-item label="试验开始时间">
+                <a-input placeholder="请输入试验开始时间" v-model="queryParam.shiyanKaishitime"></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="试验数据">
-                <a-input placeholder="请输入试验数据" v-model="queryParam.shiyanData"></a-input>
+              <a-form-item label="试验结束时间">
+                <a-input placeholder="请输入试验结束时间" v-model="queryParam.shiyanJieshutime"></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="试验图片">
-                <a-input placeholder="请输入试验图片" v-model="queryParam.extraPic"></a-input>
+              <a-form-item label="频次">
+                <a-input placeholder="请输入频次" v-model="queryParam.pinci"></a-input>
               </a-form-item>
             </a-col>
           </template>
@@ -35,6 +35,7 @@
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="primary" @click="searchQuery" icon="sengch" style="margin-left: 8px">生成</a-button>
               <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
@@ -105,11 +106,11 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
+          <a @click="handleEdit(record)">上传图片并确认</a>
 
           <a-divider type="vertical" />
           <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <!-- <a class="ant-dropdown-link">确定 <a-icon type="down" /></a> -->
             <a-menu slot="overlay">
               <a-menu-item>
                 <a @click="handleDetail(record)">详情</a>
@@ -149,50 +150,67 @@
         description: '工单数据管理页面',
         // 表头
         columns: [
+          // {
+          //   title: '#',
+          //   dataIndex: '',
+          //   key:'rowIndex',
+          //   width:60,
+          //   align:"center",
+          //   customRender:function (t,r,index) {
+          //     return parseInt(index)+1;
+          //   }
+          // },
+          // {
+          //   title:'工单id',
+          //   align:"center",
+          //   dataIndex: 'woId'
+          // },
+          // {
+          //   title:'试验类型',
+          //   align:"center",
+          //   dataIndex: 'shiyanType_dictText'
+          // },
+          // {
+          //   title:'试验开始时间',
+          //   align:"center",
+          //   dataIndex: 'shiyanKaishitime'
+          // },
+          // {
+          //   title:'试验结束时间',
+          //   align:"center",
+          //   dataIndex: 'shiyanJieshutime'
+          // },
+          // {
+          //   title:'频次',
+          //   align:"center",
+          //   dataIndex: 'pinci'
+          // },
           {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
+            title:'生成的时间',
             align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
+            dataIndex: 'shiyanTime'
           },
           {
-            title:'工单id',
+            title:'试验数据温度',
             align:"center",
-            dataIndex: 'woId'
+            dataIndex: 'shiyanWendu'
           },
           {
-            title:'试验类型',
+            title:'试验数据湿度',
             align:"center",
-            dataIndex: 'shiyanType_dictText'
-          },
-          {
-            title:'试验时间',
-            align:"center",
-            dataIndex: 'shiyanTime',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'试验数据',
-            align:"center",
-            dataIndex: 'shiyanData'
-          },
-          {
-            title:'试验图片',
-            align:"center",
-            dataIndex: 'extraPic',
-            scopedSlots: {customRender: 'imgSlot'}
-          },
-          {
-            title:'备注',
-            align:"center",
-            dataIndex: 'remark'
+            dataIndex: 'shiyanShidu'
           },
+          // {
+          //   title:'试验图片',
+          //   align:"center",
+          //   dataIndex: 'extraPic',
+          //   scopedSlots: {customRender: 'imgSlot'}
+          // },
+          // {
+          //   title:'备注',
+          //   align:"center",
+          //   dataIndex: 'remark'
+          // },
           {
             title: '操作',
             dataIndex: 'action',
@@ -203,11 +221,11 @@
           }
         ],
         url: {
-          list: "/Itdmgongdanshuju/itdmGongdanShuju/list",
-          delete: "/Itdmgongdanshuju/itdmGongdanShuju/delete",
-          deleteBatch: "/Itdmgongdanshuju/itdmGongdanShuju/deleteBatch",
-          exportXlsUrl: "/Itdmgongdanshuju/itdmGongdanShuju/exportXls",
-          importExcelUrl: "Itdmgongdanshuju/itdmGongdanShuju/importExcel",
+          list: "/itdmgomgongdanshuju/ItdmGongdanshuju/list",
+          delete: "/itdmgongdanshuju/itdmGongdanShuju/delete",
+          deleteBatch: "/itdmgongdanshuju/itdmGongdanShuju/deleteBatch",
+          exportXlsUrl: "/itdmgongdanshuju/itdmGongdanShuju/exportXls",
+          importExcelUrl: "itdmgongdanshuju/itdmGongdanShuju/importExcel",
           
         },
         dictOptions:{},
@@ -227,10 +245,14 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'popup',value:'woId',text:'工单id', popup:{code:'itdm_gongdan_master',field:'shiyan_type',orgFields:'shiyan_type',destFields:'shiyan_type'}})
-        fieldList.push({type:'string',value:'shiyanType',text:'试验类型',dictCode:'shiyan_type'})
-        fieldList.push({type:'date',value:'shiyanTime',text:'试验时间'})
-        fieldList.push({type:'string',value:'shiyanData',text:'试验数据',dictCode:''})
+        fieldList.push({type:'string',value:'woId',text:'工单id',dictCode:''})
+        fieldList.push({type:'list_multi',value:'shiyanType',text:'试验类型',dictTable:"", dictText:'', dictCode:'shiiyan_type'})
+        fieldList.push({type:'string',value:'shiyanKaishitime',text:'试验开始时间',dictCode:''})
+        fieldList.push({type:'string',value:'shiyanJieshutime',text:'试验结束时间',dictCode:''})
+        fieldList.push({type:'string',value:'pinci',text:'频次',dictCode:''})
+        fieldList.push({type:'string',value:'shiyanTime',text:'生成的时间',dictCode:''})
+        fieldList.push({type:'string',value:'shiyanWendu',text:'试验数据温度',dictCode:''})
+        fieldList.push({type:'string',value:'shiyanShidu',text:'试验数据湿度',dictCode:''})
         fieldList.push({type:'Text',value:'extraPic',text:'试验图片',dictCode:''})
         fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
         this.superFieldList = fieldList

+ 8 - 7
itdmWeb/src/views/module-iTDM/gongdanshuju/ItdmGongdanShuju_menu_insert.sql

@@ -1,26 +1,26 @@
+-- 注意:该页面对应的前台目录为views/itdmgongdanshuju文件夹下
 -- 如果你想更改到其他目录,请修改sql中component字段对应的值
 
 
 INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external)
-VALUES ('202305210921020180', NULL, '工单数据', '/Itdmgongdanshuju/itdmGongdanShujuList', 'module-iTDM/Itdmgongdanshuju/ItdmGongdanShujuList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 1, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-05-21 21:21:18', NULL, NULL, 0);
+VALUES ('2023052508209910100', NULL, '工单数据', '/itdmgongdanshuju/itdmGongdanShujuList', 'module-iTDM/itdmgongdanshuju/ItdmGongdanShujuList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 1, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-05-25 20:20:10', NULL, NULL, 0);
 
 -- 权限控制sql
 -- 新增
 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('202305210921030181', '202305210921020180', '新增', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:itdm_gongdan_shuju:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-21 21:21:18', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2023052508209910101', '2023052508209910100', '新增', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:itdm_gongdan_shuju:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-25 20:20:10', NULL, NULL, 0, 0, '1', 0);
 -- 编辑
 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('202305210921030182', '202305210921020180', '编辑', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:itdm_gongdan_shuju:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-21 21:21:18', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2023052508209910102', '2023052508209910100', '编辑', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:itdm_gongdan_shuju:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-25 20:20:10', NULL, NULL, 0, 0, '1', 0);
 -- 删除
 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('202305210921030183', '202305210921020180', '删除', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:itdm_gongdan_shuju:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-21 21:21:18', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2023052508209910103', '2023052508209910100', '删除', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:itdm_gongdan_shuju:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-25 20:20:10', NULL, NULL, 0, 0, '1', 0);
 -- 批量删除
 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('202305210921030184', '202305210921020180', '批量删除', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:itdm_gongdan_shuju:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-21 21:21:18', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2023052508209910104', '2023052508209910100', '批量删除', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:itdm_gongdan_shuju:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-25 20:20:10', NULL, NULL, 0, 0, '1', 0);
 -- 导出excel
 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('202305210921030185', '202305210921020180', '导出excel', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:itdm_gongdan_shuju:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-21 21:21:18', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2023052508209910105', '2023052508209910100', '导出excel', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:itdm_gongdan_shuju:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-25 20:20:10', NULL, NULL, 0, 0, '1', 0);
 -- 导入excel
 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('202305210921030186', '202305210921020180', '导入excel', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:itdm_gongdan_shuju:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-21 21:21:18', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2023052508209910106', '2023052508209910100', '导入excel', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:itdm_gongdan_shuju:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-25 20:20:10', NULL, NULL, 0, 0, '1', 0);

+ 32 - 32
itdmWeb/src/views/module-iTDM/gongdanshuju/modules/ItdmGongdanShujuForm.vue

@@ -3,32 +3,44 @@
     <j-form-container :disabled="formDisabled">
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
-          <a-col :span="24">
+          <!-- <a-col :span="24">
             <a-form-model-item label="工单id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="woId">
-              <j-popup
-                v-model="model.woId"
-                field="woId"
-                org-fields="shiyan_type,shiyan_data"
-                dest-fields="shiyanType,shiyanData"
-                code="itdm_gongdan_master"
-                :multi="true"
-                @input="popupCallback"
-                />
+              <a-input v-model="model.woId" placeholder="请输入工单id"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="试验类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shiyanType">
-              <j-dict-select-tag type="list" v-model="model.shiyanType" dictCode="shiyan_type" placeholder="请选择试验类型" />
+              <j-multi-select-tag type="list_multi" v-model="model.shiyanType" dictCode="shiiyan_type" placeholder="请选择试验类型" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="试验开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shiyanKaishitime">
+              <j-time placeholder="请选择试验开始时间"  v-model="model.shiyanKaishitime" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="试验结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shiyanJieshutime">
+              <j-time placeholder="请选择试验结束时间"  v-model="model.shiyanJieshutime" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="频次" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pinci">
+              <a-input v-model="model.pinci" placeholder="请输入频次"  ></a-input>
+            </a-form-model-item>
+          </a-col> -->
+          <a-col :span="24">
+            <a-form-model-item label="生成的时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shiyanTime">
+              <a-input v-model="model.shiyanTime" placeholder="请输入生成的时间"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="试验时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shiyanTime">
-              <j-date placeholder="请选择试验时间" v-model="model.shiyanTime"  style="width: 100%" />
+            <a-form-model-item label="试验数据温度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shiyanWendu">
+              <a-input v-model="model.shiyanWendu" placeholder="请输入试验数据温度"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="试验数据" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shiyanData">
-              <a-input v-model="model.shiyanData" placeholder="请输入试验数据"  ></a-input>
+            <a-form-model-item label="试验数据湿度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shiyanShidu">
+              <a-input v-model="model.shiyanShidu" placeholder="请输入试验数据湿度"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -36,11 +48,11 @@
               <j-image-upload isMultiple  v-model="model.extraPic" ></j-image-upload>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <!-- <a-col :span="24">
             <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
               <a-textarea v-model="model.remark" rows="4" placeholder="请输入备注" />
             </a-form-model-item>
-          </a-col>
+          </a-col> -->
         </a-row>
       </a-form-model>
     </j-form-container>
@@ -81,20 +93,11 @@
            woId: [
               { required: true, message: '请输入工单id!'},
            ],
-           shiyanType: [
-              { required: true, message: '请输入试验类型!'},
-           ],
-           shiyanTime: [
-              { required: true, message: '请输入试验时间!'},
-           ],
-           shiyanData: [
-              { required: true, message: '请输入试验数据!'},
-           ],
         },
         url: {
-          add: "/Itdmgongdanshuju/itdmGongdanShuju/add",
-          edit: "/Itdmgongdanshuju/itdmGongdanShuju/edit",
-          queryById: "/Itdmgongdanshuju/itdmGongdanShuju/queryById"
+          add: "/itdmgongdanshuju/itdmGongdanShuju/add",
+          edit: "/itdmgongdanshuju/itdmGongdanShuju/edit",
+          queryById: "/itdmgongdanshuju/itdmGongdanShuju/queryById"
         }
       }
     },
@@ -144,9 +147,6 @@
          
         })
       },
-      popupCallback(value,row){
-         this.model = Object.assign(this.model, row);
-      },
     }
   }
 </script>

+ 2 - 0
itdmWeb/src/views/module-iTDM/weituo/ItdmWeituoInfoList.vue

@@ -122,6 +122,8 @@ import ItdmWeituoInfoModal from './modules/ItdmWeituoInfoModal'
 import { ajaxGetDictItems, loadCategoryData } from '@/api/api'
 import { filterMultiDictText } from '@comp/dict/JDictSelectUtil'
 
+
+
 export default {
   name: 'ItdmWeituoInfoList',
   mixins:[JeecgListMixin, mixinDevice],

+ 21 - 1
itdmWeb/src/views/module-iTDM/weituochaxun/ItdmWeituoYangpinList.vue

@@ -1,9 +1,29 @@
 <template>
   <a-card :bordered="false">
-    <!-- 查询区域 -->
+ <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="委托单位名称">
+              <a-input placeholder="请输入委托单位名称" v-model="queryParam.weituoClient"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="委托单位地址">
+              <a-input placeholder="请输入委托单位地址" v-model="queryParam.weituoAddress"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>

+ 20 - 14
itdmWeb/src/views/module-iTDM/weituoshenhe/ItdmWeituoshenheInfoList.vue

@@ -30,21 +30,21 @@
     <!-- 查询区域-END -->
 
     <!-- 操作按钮区域 -->
-    <!-- <div class="table-operator">
+    <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('委托信息')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
-      </a-upload> -->
+      </a-upload>
       <!-- 高级查询区域 -->
-      <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
       </a-dropdown>
-    </div> -->
+    </div>
 
     <!-- table区域-begin -->
     <div>
@@ -148,6 +148,7 @@ export default {
           align:"center",
           dataIndex: 'weituoClient'
         },
+        
         // {
         //   title:'委托单位地址',
         //   align:"center",
@@ -158,11 +159,16 @@ export default {
           align:"center",
           dataIndex: 'weituoLxr'
         },
-        // {
-        //   title:'委托电话',
-        //   align:"center",
-        //   dataIndex: 'weituoPhone'
-        // },
+        {
+          title:'委托电话',
+          align:"center",
+          dataIndex: 'weituoPhone'
+        },
+            {
+            title:'委托编号',
+            align:"center",
+            dataIndex: 'weituoNo'
+          },
         // {
         //   title:'委托邮箱',
         //   align:"center",
@@ -190,11 +196,11 @@ export default {
           align:"center",
           dataIndex: 'shenheTime'
         },
-           {
-          title:'审核错误原因',
-          align:"center",
-          dataIndex: 'shenheMsg'
-        },
+        //    {
+        //   title:'审核错误原因',
+        //   align:"center",
+        //   dataIndex: 'shenheMsg'
+        // },
         {
           title:'审核状态',
           align:"center",