Merge remote-tracking branch 'origin/master'

itdmWeb/src/api/api.js

@@ -80,7 +80,7 @@ const delBaojing = (params)=>deleteAction("/itdm/voice/delete",params);
 // 大屏设备维护密码验证
 const confirmPa = (params)=>getAction("/itdmMima/itdmMima/panduan",params);
 // 折线图初始化
-const listGraph = (params)=>getAction("/second/screen/chushihua",params);
+const listGraph = (params)=>getAction("/second/screen/chushihua/{id}",params);
 
 
 //日志管理

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" values="123"  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">
+           <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="create" icon="sengch" style="margin-left: 8px">生成</a-button>
               <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
@@ -47,14 +48,14 @@
     <!-- 查询区域-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>
@@ -131,13 +132,13 @@
 </template>
 
 <script>
-
-  import '@/assets/less/TableExpand.less'
+  import { httpAction, getAction } from '@/api/manage'
+  import '@assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ItdmGongdanShujuModal from './modules/ItdmGongdanShujuModal'
-  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-
+  import {filterMultiDictText} from '@comp/dict/JDictSelectUtil'
+  
   export default {
     name: 'ItdmGongdanShujuList',
     mixins:[JeecgListMixin, mixinDevice],
@@ -146,53 +147,77 @@
     },
     data () {
       return {
+        // queryParam:{
+        //   woId:"1660195756643786754",
+        //   shiyanType:"0,1",
+        //   shiyanKaishitime:"00:00",
+        //   shiyanJieshutime:"23:59",
+        //   pinci:"90"
+        // },
         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,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'工单id',
-            align:"center",
-            dataIndex: 'woId'
-          },
-          {
-            title:'试验类型',
+            title:'生成的时间',
             align:"center",
-            dataIndex: 'shiyanType_dictText'
+            dataIndex: 'shiyanTime'
           },
           {
-            title:'试验时间',
+            title:'试验数据温度',
             align:"center",
-            dataIndex: 'shiyanTime',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
+            dataIndex: 'shiyanWendu'
           },
           {
-            title:'试验数据',
+            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,12 +228,13 @@
           }
         ],
         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: "/itdmgomgongdanshuju/ItdmGongdanShuju/delete",
+          deleteBatch: "/itdmgomgongdanshuju/ItdmGongdanshuju/deleteBatch",
+          exportXlsUrl: "/itdmgongdanshuju/itdmGongdanShuju/exportXls",
+          importExcelUrl: "itdmgongdanshuju/itdmGongdanShuju/importExcel",
+          add: "/itdmgomgongdanshuju/ItdmGongdanshuju/add",
+      
         },
         dictOptions:{},
         superFieldList:[],
@@ -227,13 +253,29 @@
       },
       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
+      },
+      create(){
+        httpAction("/itdmgomgongdanshuju/ItdmGongdanshuju/create",this.queryParam,"post").then((res)=>{
+          if(res.success){
+            that.$message.success(res.message);
+            that.$emit('ok');
+          }else{
+            that.$message.warning(res.message);
+          }
+           this.searchReset();
+        })
+       
       }
     }
   }

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);

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

@@ -3,7 +3,7 @@
     <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"
@@ -15,8 +15,8 @@
                 @input="popupCallback"
                 />
             </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
+          </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="请选择试验类型" />
             </a-form-model-item>
@@ -30,7 +30,17 @@
             <a-form-model-item label="试验数据" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shiyanData">
               <a-input v-model="model.shiyanData" placeholder="请输入试验数据"  ></a-input>
             </a-form-model-item>
-          </a-col>
+          </a-col> -->
+             <a-col :span="24">
+            <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="shiyanWendu">
+              <a-input v-model="model.shiyanShidu" placeholder="请输入试验数据"  ></a-input>
+            </a-form-model-item>
+          </a-col> 
           <a-col :span="24">
             <a-form-model-item label="试验图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="extraPic">
               <j-image-upload isMultiple  v-model="model.extraPic" ></j-image-upload>
@@ -92,9 +102,9 @@
            ],
         },
         url: {
-          add: "/Itdmgongdanshuju/itdmGongdanShuju/add",
-          edit: "/Itdmgongdanshuju/itdmGongdanShuju/edit",
-          queryById: "/Itdmgongdanshuju/itdmGongdanShuju/queryById"
+          add: "/itdmgomgongdanshuju/ItdmGongdanshuju/add",
+          edit: "/itdmgomgongdanshuju/ItdmGongdanshuju/edit",
+          queryById: "/itdmgomgongdanshuju/ItdmGongdanShuju/queryById"
         }
       }
     },

itdmWeb/src/views/module-iTDM/itdmShiyanxiangmu/ItdmShiyanxiangmuList.vue

@@ -0,0 +1,350 @@
+<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.newkehu"></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.kehuHangye"></a-input>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="客户名称">
+                <a-input placeholder="请输入客户名称" v-model="queryParam.kehuMingcheng"></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.shuruLeixing"></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.kehuName"></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.kehuPhone"></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.hetongBianhao"></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.shiyanYaoqiu"></a-input>
+              </a-form-item>
+            </a-col>
+          </template>
+          <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>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <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>
+      <!-- 高级查询区域 -->
+      <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>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <itdm-shiyanxiangmu-modal ref="modalForm" @ok="modalFormOk"></itdm-shiyanxiangmu-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ItdmShiyanxiangmuModal from './modules/ItdmShiyanxiangmuModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'ItdmShiyanxiangmuList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ItdmShiyanxiangmuModal
+    },
+    data () {
+      return {
+        description: '试验项目输入管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'是否新客户',
+            align:"center",
+            dataIndex: 'newkehu'
+          },
+          {
+            title:'客户行业',
+            align:"center",
+            dataIndex: 'kehuHangye'
+          },
+          {
+            title:'客户名称',
+            align:"center",
+            dataIndex: 'kehuMingcheng'
+          },
+          {
+            title:'输入类型',
+            align:"center",
+            dataIndex: 'shuruLeixing'
+          },
+          {
+            title:'试验信息',
+            align:"center",
+            dataIndex: 'shiyanXinxi'
+          },
+          {
+            title:'方案设计',
+            align:"center",
+            dataIndex: 'fanganSheji_dictText'
+          },
+          {
+            title:'试验评审',
+            align:"center",
+            dataIndex: 'shiyanPingshen_dictText'
+          },
+          {
+            title:'用车安排',
+            align:"center",
+            dataIndex: 'yongcheAnpai_dictText'
+          },
+          {
+            title:'工装设计',
+            align:"center",
+            dataIndex: 'gongzhuangSheji_dictText'
+          },
+          {
+            title:'用餐安排',
+            align:"center",
+            dataIndex: 'yongcanAnpai_dictText'
+          },
+          {
+            title:'住宿安排',
+            align:"center",
+            dataIndex: 'zhusuAnpai_dictText'
+          },
+          {
+            title:'报告确认',
+            align:"center",
+            dataIndex: 'baogaoQueren_dictText'
+          },
+          {
+            title:'客户姓名',
+            align:"center",
+            dataIndex: 'kehuName'
+          },
+          {
+            title:'客户电话',
+            align:"center",
+            dataIndex: 'kehuPhone'
+          },
+          {
+            title:'合同编号',
+            align:"center",
+            dataIndex: 'hetongBianhao'
+          },
+          {
+            title:'试验要求',
+            align:"center",
+            dataIndex: 'shiyanYaoqiu'
+          },
+          {
+            title:'报告体系',
+            align:"center",
+            dataIndex: 'baogaoTixi_dictText'
+          },
+          {
+            title:'资质要求',
+            align:"center",
+            dataIndex: 'zizhiYaoqiu_dictText'
+          },
+          {
+            title:'预计报价',
+            align:"center",
+            dataIndex: 'yujiBaojia'
+          },
+          {
+            title:'评审结论',
+            align:"center",
+            dataIndex: 'pingshenJielun'
+          },
+          {
+            title:'主审人',
+            align:"center",
+            dataIndex: 'zhushenRen'
+          },
+          {
+            title:'主审时间',
+            align:"center",
+            dataIndex: 'zhushenShijian'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/itdmShiYanXiangMu/itdmShiyanxiangmu/list",
+          delete: "/itdmShiYanXiangMu/itdmShiyanxiangmu/delete",
+          deleteBatch: "/itdmShiYanXiangMu/itdmShiyanxiangmu/deleteBatch",
+          exportXlsUrl: "/itdmShiYanXiangMu/itdmShiyanxiangmu/exportXls",
+          importExcelUrl: "itdmShiYanXiangMu/itdmShiyanxiangmu/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'newkehu',text:'是否新客户',dictCode:''})
+        fieldList.push({type:'string',value:'kehuHangye',text:'客户行业',dictCode:''})
+        fieldList.push({type:'string',value:'kehuMingcheng',text:'客户名称',dictCode:''})
+        fieldList.push({type:'string',value:'shuruLeixing',text:'输入类型',dictCode:''})
+        fieldList.push({type:'string',value:'shiyanXinxi',text:'试验信息',dictCode:''})
+        fieldList.push({type:'string',value:'fanganSheji',text:'方案设计',dictCode:'fangan_sheji'})
+        fieldList.push({type:'string',value:'shiyanPingshen',text:'试验评审',dictCode:'shiyan_pingshen'})
+        fieldList.push({type:'string',value:'yongcheAnpai',text:'用车安排',dictCode:'yongche_anpai'})
+        fieldList.push({type:'string',value:'gongzhuangSheji',text:'工装设计',dictCode:'gongzhuang_sheji'})
+        fieldList.push({type:'string',value:'yongcanAnpai',text:'用餐安排',dictCode:'yongcan_anpai'})
+        fieldList.push({type:'string',value:'zhusuAnpai',text:'住宿安排',dictCode:'zhusu_anpai'})
+        fieldList.push({type:'string',value:'baogaoQueren',text:'报告确认',dictCode:'baogao_queren'})
+        fieldList.push({type:'string',value:'kehuName',text:'客户姓名',dictCode:''})
+        fieldList.push({type:'string',value:'kehuPhone',text:'客户电话',dictCode:''})
+        fieldList.push({type:'string',value:'hetongBianhao',text:'合同编号',dictCode:''})
+        fieldList.push({type:'string',value:'shiyanYaoqiu',text:'试验要求',dictCode:''})
+        fieldList.push({type:'string',value:'baogaoTixi',text:'报告体系',dictCode:'baogao_tixi'})
+        fieldList.push({type:'string',value:'zizhiYaoqiu',text:'资质要求',dictCode:'zizhi_yaoqiu'})
+        fieldList.push({type:'string',value:'yujiBaojia',text:'预计报价',dictCode:''})
+        fieldList.push({type:'string',value:'pingshenJielun',text:'评审结论',dictCode:''})
+        fieldList.push({type:'string',value:'zhushenRen',text:'主审人',dictCode:''})
+        fieldList.push({type:'string',value:'zhushenShijian',text:'主审时间',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

itdmWeb/src/views/module-iTDM/itdmShiyanxiangmu/ItdmShiyanxiangmu_menu_insert.sql

@@ -0,0 +1,26 @@
+-- 注意：该页面对应的前台目录为views/itdmShiYanXiangMu文件夹下
+-- 如果你想更改到其他目录，请修改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 ('2023053010346830390', NULL, '试验项目输入', '/itdmShiYanXiangMu/itdmShiyanxiangmuList', 'module-iTDM/itdmShiYanXiangMu/ItdmShiyanxiangmuList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 1, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-05-30 10:34:39', 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 ('2023053010346840391', '2023053010346830390', '新增', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:itdm_shiyanxiangmu:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-30 10:34:39', 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 ('2023053010346840392', '2023053010346830390', '编辑', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:itdm_shiyanxiangmu:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-30 10:34:39', 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 ('2023053010346840393', '2023053010346830390', '删除', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:itdm_shiyanxiangmu:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-30 10:34:39', 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 ('2023053010346840394', '2023053010346830390', '批量删除', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:itdm_shiyanxiangmu:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-30 10:34:39', 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 ('2023053010346840395', '2023053010346830390', '导出excel', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:itdm_shiyanxiangmu:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-30 10:34:39', 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 ('2023053010346840396', '2023053010346830390', '导入excel', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:itdm_shiyanxiangmu:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-05-30 10:34:39', NULL, NULL, 0, 0, '1', 0);

itdmWeb/src/views/module-iTDM/itdmShiyanxiangmu/modules/ItdmShiyanxiangmuForm.vue

@@ -0,0 +1,218 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="是否新客户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="newkehu">
+              <a-input v-model="model.newkehu" placeholder="请输入是否新客户"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="客户行业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="kehuHangye">
+              <a-input v-model="model.kehuHangye" placeholder="请输入客户行业"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="客户名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="kehuMingcheng">
+              <a-input v-model="model.kehuMingcheng" placeholder="请输入客户名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="输入类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shuruLeixing">
+              <a-input v-model="model.shuruLeixing" placeholder="请输入输入类型"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="试验信息" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shiyanXinxi">
+              <a-input v-model="model.shiyanXinxi" placeholder="请输入试验信息"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="方案设计" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fanganSheji">
+              <j-dict-select-tag type="radio" v-model="model.fanganSheji" dictCode="fangan_sheji" placeholder="请选择方案设计" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="试验评审" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shiyanPingshen">
+              <j-dict-select-tag type="radio" v-model="model.shiyanPingshen" dictCode="shiyan_pingshen" placeholder="请选择试验评审" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用车安排" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yongcheAnpai">
+              <j-dict-select-tag type="radio" v-model="model.yongcheAnpai" dictCode="yongche_anpai" placeholder="请选择用车安排" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="工装设计" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="gongzhuangSheji">
+              <j-dict-select-tag type="radio" v-model="model.gongzhuangSheji" dictCode="gongzhuang_sheji" placeholder="请选择工装设计" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用餐安排" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yongcanAnpai">
+              <j-dict-select-tag type="radio" v-model="model.yongcanAnpai" dictCode="yongcan_anpai" placeholder="请选择用餐安排" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="住宿安排" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zhusuAnpai">
+              <j-dict-select-tag type="radio" v-model="model.zhusuAnpai" dictCode="zhusu_anpai" placeholder="请选择住宿安排" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="报告确认" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="baogaoQueren">
+              <j-dict-select-tag type="radio" v-model="model.baogaoQueren" dictCode="baogao_queren" placeholder="请选择报告确认" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="客户姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="kehuName">
+              <a-input v-model="model.kehuName" placeholder="请输入客户姓名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="客户电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="kehuPhone">
+              <a-input v-model="model.kehuPhone" placeholder="请输入客户电话"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="合同编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="hetongBianhao">
+              <a-input v-model="model.hetongBianhao" placeholder="请输入合同编号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="试验要求" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shiyanYaoqiu">
+              <a-input v-model="model.shiyanYaoqiu" placeholder="请输入试验要求"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="报告体系" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="baogaoTixi">
+              <j-dict-select-tag type="radio" v-model="model.baogaoTixi" dictCode="baogao_tixi" placeholder="请选择报告体系" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="资质要求" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zizhiYaoqiu">
+              <j-dict-select-tag type="radio" v-model="model.zizhiYaoqiu" dictCode="zizhi_yaoqiu" placeholder="请选择资质要求" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="预计报价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yujiBaojia">
+              <a-input v-model="model.yujiBaojia" placeholder="请输入预计报价"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="评审结论" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pingshenJielun">
+              <a-input v-model="model.pingshenJielun" placeholder="请输入评审结论"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="主审人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zhushenRen">
+              <a-input v-model="model.zhushenRen" placeholder="请输入主审人"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="主审时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zhushenShijian">
+              <a-input v-model="model.zhushenShijian" placeholder="请输入主审时间"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'ItdmShiyanxiangmuForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+            fanganSheji:"1",
+            shiyanPingshen:"1",
+            yongcheAnpai:"1",
+            gongzhuangSheji:"1",
+            yongcanAnpai:"1",
+            zhusuAnpai:"1",
+            baogaoQueren:"1",
+            baogaoTixi:"0",
+            zizhiYaoqiu:"0",
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/itdmShiYanXiangMu/itdmShiyanxiangmu/add",
+          edit: "/itdmShiYanXiangMu/itdmShiyanxiangmu/edit",
+          queryById: "/itdmShiYanXiangMu/itdmShiyanxiangmu/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

itdmWeb/src/views/module-iTDM/itdmShiyanxiangmu/modules/ItdmShiyanxiangmuModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <itdm-shiyanxiangmu-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></itdm-shiyanxiangmu-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import ItdmShiyanxiangmuForm from './ItdmShiyanxiangmuForm'
+
+  export default {
+    name: 'ItdmShiyanxiangmuModal',
+    components: {
+      ItdmShiyanxiangmuForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

itdmWeb/src/views/module-iTDM/itdmShiyanxiangmu/modules/ItdmShiyanxiangmuModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <itdm-shiyanxiangmu-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></itdm-shiyanxiangmu-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ItdmShiyanxiangmuForm from './ItdmShiyanxiangmuForm'
+  export default {
+    name: 'ItdmShiyanxiangmuModal',
+    components: {
+      ItdmShiyanxiangmuForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

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],

itdmWeb/src/views/module-iTDM/weituochaxun/ItdmWeituoYangpinList.vue

@@ -1,17 +1,35 @@
 <template>
   <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
+<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="委托单id">
+              <a-input placeholder="请输入委托id" v-model="queryParam.weituoId"></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>
     <!-- 查询区域-END -->
-
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <!-- <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>

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",
@@ -163,6 +164,11 @@ export default {
         //   align:"center",
         //   dataIndex: 'weituoPhone'
         // },
+            {
+            title:'委托编号',
+            align:"center",
+            dataIndex: 'weituoNo'
+          },
         // {
         //   title:'委托邮箱',
         //   align:"center",
@@ -191,7 +197,7 @@ export default {
           dataIndex: 'shenheTime'
         },
            {
-          title:'审核错误原因',
+          title:'审核拒绝原因',
           align:"center",
           dataIndex: 'shenheMsg'
         },