Merge remote-tracking branch 'origin/master'

itdmWeb/src/api/api.js

@@ -67,6 +67,8 @@ const queryDeptRolePermission = (params)=>getAction("/sys/sysDepartPermission/qu
 const saveDeptRolePermission = (params)=>postAction("/sys/sysDepartPermission/saveDeptRolePermission",params);
 const queryMyDepartTreeList = (params)=>getAction("/sys/sysDepart/queryMyDeptTreeList",params);
 
+// 委托完成判断
+const checkWancheng = (params) => putAction('/weituo/itdmWeituoInfo/edit1', params);
 // 设备故障判断
 const checkGuzhang = (params) => putAction('/itdmDevice/itdmDevice/edit1', params);
 // 获取设备下拉列表
@@ -241,6 +243,7 @@ export {
   upload,
   getUpload,
   downWeituo_info,
+  checkWancheng
 }
 
 

itdmWeb/src/components/Gantt.vue

@@ -157,6 +157,7 @@ export default {
           /* grid columns */
           column_text: "计划名称",
           column_sampleName: "样品名称",
+          column_weituoNo: "委托编号",
           column_testItems: "检测项目",
           column_start_date: "开始时间",
           column_duration: "持续时间",
@@ -217,11 +218,13 @@ export default {
 
       gantt.config.columns = [
         // { name: "text", min_width:100,max_width:200, label:"任务", align: "left",resize: true, tree: true },
-        { name: "testItems", label: "检测项目", width: 130, resize: true, align: "left",resize: true, tree: true },
+        { name: "weituoNo", label: "委托编号", width: 140, resize: true, align: "left",resize: true, tree: true },
+        { name: "testItems", label: "检测项目", width: 80, resize: true, align: "center" },
         { name: "sampleName", label: "样品名称", width: 90, resize: true, align: "center" },
         { name: "start_date", label: "开始时间", width: 90, resize: true, align: "center" },
         { name: "end_date", label: "结束时间", width: 90, resize: true, align: "center" },
         { name: "statusC", label: "状态", width: 60, resize: true, align: "center" },
+        // { name: "izShiji", label: "类型", width: 60, resize: true, align: "center" },
         // { name: "status", label: "状态", width: 130, resize: true, align: "center",
         //   // options: [
         //   //   { key: "0", label: gantt.locale.labels.status_0 },
@@ -248,6 +251,21 @@ export default {
         // },
         // { name: "add", label:"", width: 30 }
       ];
+      // 改变任务颜色
+      gantt.templates.task_class=function(start, end, task){
+        console.log("变颜色",start, end, task)
+            switch (task.izShiji){
+              case "实绩":
+                  return "high";
+                  break;
+              // case "2":
+              //     return "medium";
+              //     break;
+              // case "3":
+              //     return "low";
+              //     break;
+          }
+      };
       // 更改左侧显示的结束日期时间
       gantt.templates.task_end_date = function(date){
         return gantt.templates.task_date(new Date(date.valueOf() - 1));
@@ -316,12 +334,24 @@ export default {
       // 重置灯箱
       gantt.attachEvent("onBeforeLightbox", function(task_id) {
         gantt.resetLightbox();
-        gantt.config.lightbox.sections = restricted_lightbox;
-        // 删除灯箱中的删除按钮
-        gantt.config.buttons_right = [];
-        // 保留灯箱的关闭和保存按钮
-        gantt.config.buttons_left = ["gantt_save_btn", "gantt_cancel_btn"];
-        return true;
+        var task = gantt.getTask(task_id);
+        console.log(task)
+        if (task.izShiji == "实绩") {
+          return false;
+        } else {
+          gantt.config.lightbox.sections = restricted_lightbox;
+          // 删除灯箱中的删除按钮
+          gantt.config.buttons_right = [];
+          // 保留灯箱的关闭和保存按钮
+          gantt.config.buttons_left = ["gantt_save_btn", "gantt_cancel_btn"];
+          return true;
+        }
+        // gantt.config.lightbox.sections = restricted_lightbox;
+        // // 删除灯箱中的删除按钮
+        // gantt.config.buttons_right = [];
+        // // 保留灯箱的关闭和保存按钮
+        // gantt.config.buttons_left = ["gantt_save_btn", "gantt_cancel_btn"];
+        // return true;
       });
       //弹出层(灯箱)
       var restricted_lightbox = [
@@ -418,49 +448,57 @@ export default {
     // 通过委托编号查询检测项目
     getinit(queryParam){
       this.tasks.queryParam = queryParam
-      getJhList(queryParam).then((res) => {
-        console.log(17,res)
-        this.tasks.data = []
-        gantt.clearAll();
-        if (res.result.length > 0 ) {
-          this.tasks.data = res.result.map(res => {
-            return {
-              id: res.testItemsId,
+      console.log(23232,queryParam)
+      if (queryParam.weituoClient != undefined && queryParam.weituoNo == undefined) {
+        this.$message.error("请选择委托编号后再进行查询！")
+      } else {
+        getJhList(queryParam).then((res) => {
+          console.log(17,res)
+          this.tasks.data = []
+          gantt.clearAll();
+          if (res.result.length > 0 ) {
+            this.tasks.data = res.result.map(res => {
+              return {
+                id: res.id,
 
-              weituoId: res.weituoId,
-              testItemsId: res.testItemsId,
-              yangpinId:res.yangpinId,
-              shebeiId:res.shebeiId,
-              pm: res.pm,
-              reportNo: res.reportNo,
-              chuanganqi:res.chuanganqiArray,
-              testPlanId:res.testPlanId,
-              status:res.status,
+                weituoId: res.weituoId,
+                testItemsId: res.testItemsId,
+                yangpinId:res.yangpinId,
+                shebeiId:res.shebeiId,
+                pm: res.pm,
+                reportNo: res.reportNo,
+                chuanganqi:res.chuanganqiArray,
+                testPlanId:res.testPlanId,
+                status:res.status,
 
-              // text:res.reportNo,
-              start_date: res.jihuaStartDate,
-              // jihuaEndDate: res.jihuaEndDate,
-              duration: res.lastTime,
-              sampleName: res.sampleName,
-              testItems: res.testItems,
-              deviceName: res.deviceName,
-              statusC: res.statusC
-            }
-          })
+                // text:res.reportNo,
+                start_date: res.jihuaStartDate,
+                // jihuaEndDate: res.jihuaEndDate,
+                weituoNo: res.weituoNo,
+                duration: res.lastTime,
+                sampleName: res.sampleName,
+                testItems: res.testItems,
+                deviceName: res.deviceName,
+                statusC: res.statusC,
+                izShiji: res.izShiji
+              }
+            })
 
-          // gantt.init(this.$refs.gantt);
-          // // gantt.parse(this.$props.tasks);
-          // gantt.parse(this.tasks);
-        } else {
-          notification.open({
-            message: '注意',
-            description: '该委托编号不存在',
-          });
-        }
-        gantt.init(this.$refs.gantt);
-        // gantt.parse(this.$props.tasks);
-        gantt.parse(this.tasks);
-      })
+            // gantt.init(this.$refs.gantt);
+            // // gantt.parse(this.$props.tasks);
+            // gantt.parse(this.tasks);
+          }
+          // } else {
+          //   notification.open({
+          //     message: '注意',
+          //     description: '该委托编号不存在',
+          //   });
+          // }
+          gantt.init(this.$refs.gantt);
+          // gantt.parse(this.$props.tasks);
+          gantt.parse(this.tasks);
+        })
+      }
     },
     // 提交
     searchReset() {
@@ -481,6 +519,7 @@ export default {
             testPlanId:res.testPlanId,
             status:res.status,
             testItems: res.testItems,
+            izShiji: res.izShiji
         }
       })
       console.log(data.length)
@@ -554,4 +593,16 @@ export default {
     .color_bg_3{
       background-color:#78e08f ;
     }
+    .gantt_task_line{
+        border-color: rgba(0, 0, 0, 0.25);
+    }
+    .gantt_task_line .gantt_task_progress {
+        background-color: rgba(0, 0, 0, 0.25);
+    }
+    .gantt_task_line.high {
+        background-color: #78e08f;
+    }
+    .gantt_task_line.high .gantt_task_content {
+        color: #fff;
+    }
 </style>

itdmWeb/src/views/module-iTDM/itdmAlarm/ItdmAlarmList.vue

@@ -176,11 +176,11 @@
             align:"center",
             dataIndex: 'deviceNo'
           },
-          {
-            title:'设备类型',
-            align:"center",
-            dataIndex: 'deviceStatus'
-          },
+          // {
+          //   title:'设备类型',
+          //   align:"center",
+          //   dataIndex: 'deviceStatus'
+          // },
           {
             title:'数据类型',
             align:"center",
@@ -201,11 +201,11 @@
             align:"center",
             dataIndex: 'minValue'
           },
-          {
-            title:'备注',
-            align:"center",
-            dataIndex: 'remark'
-          },
+          // {
+          //   title:'备注',
+          //   align:"center",
+          //   dataIndex: 'remark'
+          // },
           {
             title: '操作',
             dataIndex: 'action',

itdmWeb/src/views/module-iTDM/itdmAlarmTotal/ItdmAlarmTotalList.vue

@@ -38,20 +38,20 @@
 <!--      </a-upload>-->
 <!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
 <!--      <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>
+<!--      <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>
+<!--      <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"
@@ -88,12 +88,12 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-<!--          <a @click="handleEdit(record)">编辑</a>-->
+<!--          <a-menu-item>-->
+<!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
+<!--                  <a>删除</a>-->
+<!--                </a-popconfirm>-->
+<!--              </a-menu-item>-->
+          <a @click="handleEdit(record)">编辑</a>
 
 <!--          <a-divider type="vertical" />-->
 <!--          <a-dropdown>-->
@@ -133,6 +133,11 @@
     },
     data () {
       return {
+        /* 排序参数 */
+        isorter: {
+          column: 'alarmYear,alarmMonth', // 排序字段
+          order: 'desc,desc' // 正序asc  or  倒叙desc
+        },
         description: '历史报警统计管理页面',
         // 表头
         columns: [
@@ -147,11 +152,6 @@
             }
           },
           {
-            title:'更新日期',
-            align:"center",
-            dataIndex: 'updateTime'
-          },
-          {
             title:'年份',
             align:"center",
             dataIndex: 'alarmYear'
@@ -166,11 +166,16 @@
             align:"center",
             dataIndex: 'alarmTotal'
           },
-          {
-            title:'备注',
-            align:"center",
-            dataIndex: 'remark'
-          },
+          // {
+          //   title:'日期',
+          //   align:"center",
+          //   dataIndex: 'createTime'
+          // },
+          // {
+          //   title:'备注',
+          //   align:"center",
+          //   dataIndex: 'remark'
+          // },
           {
             title: '操作',
             dataIndex: 'action',

itdmWeb/src/views/module-iTDM/itdmAlarmTotal/modules/ItdmAlarmTotalForm.vue

@@ -5,12 +5,12 @@
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="年份" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="alarmYear">
-              <a-input-number v-model="model.alarmYear" placeholder="请输入年份" style="width: 100%" />
+              <a-input-number v-model="model.alarmYear" placeholder="请输入年份" style="width: 100%" :disabled="editdisabled"/>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="月份" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="alarmMonth">
-              <a-input-number v-model="model.alarmMonth" placeholder="请输入月份" style="width: 100%" />
+              <a-input-number v-model="model.alarmMonth" placeholder="请输入月份" style="width: 100%" :disabled="editdisabled"/>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -18,11 +18,11 @@
               <a-input-number v-model="model.alarmTotal" placeholder="请输入报警总数" style="width: 100%" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
-              <a-input v-model="model.remark" placeholder="请输入备注"  ></a-input>
-            </a-form-model-item>
-          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">-->
+<!--              <a-input v-model="model.remark" placeholder="请输入备注"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
         </a-row>
       </a-form-model>
     </j-form-container>
@@ -44,6 +44,12 @@
         type: Boolean,
         default: false,
         required: false
+      },
+      //禁止编辑
+      editdisabled: {
+        type: Boolean,
+        default: false,
+        required: false
       }
     },
     data () {

itdmWeb/src/views/module-iTDM/itdmAlarmTotal/modules/ItdmAlarmTotalModal.vue

@@ -8,7 +8,7 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <itdm-alarm-total-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></itdm-alarm-total-form>
+    <itdm-alarm-total-form ref="realForm" @ok="submitCallback" :editdisabled="editdisabled" :disabled="disableSubmit"></itdm-alarm-total-form>
   </j-modal>
 </template>
 
@@ -25,7 +25,8 @@
         title:'',
         width:800,
         visible: false,
-        disableSubmit: false
+        disableSubmit: false,
+        editdisabled:false,
       }
     },
     methods: {
@@ -36,6 +37,7 @@
         })
       },
       edit (record) {
+        this.editdisabled=true
         this.visible=true
         this.$nextTick(()=>{
           this.$refs.realForm.edit(record);

itdmWeb/src/views/module-iTDM/itdmDeviceRun/ItdmDeviceRunList.vue

@@ -9,11 +9,11 @@
               <j-dict-select-tag placeholder="请选择设备" v-model="queryParam.deviceId" dictCode="itdm_device,device_name,id"/>
             </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.deviceType"></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.deviceType"></a-input>-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
           <template v-if="toggleSearchStatus">
             <a-col :xl="10" :lg="11" :md="12" :sm="24">
               <a-form-item label="设备开始运行时间">
@@ -54,20 +54,20 @@
 <!--      </a-upload>-->
 <!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
 <!--      <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>
+<!--      <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>
+<!--      <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"
@@ -103,12 +103,12 @@
           </a-button>
         </template>
 
-        <span slot="action" slot-scope="text, record">
-          <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
+<!--        <span slot="action" slot-scope="text, record">-->
+<!--          <a-menu-item>-->
+<!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
+<!--                  <a>删除</a>-->
+<!--                </a-popconfirm>-->
+<!--              </a-menu-item>-->
 <!--          <a @click="handleEdit(record)">编辑</a>-->
 
 <!--          <a-divider type="vertical" />-->
@@ -125,7 +125,7 @@
 <!--              </a-menu-item>-->
 <!--            </a-menu>-->
 <!--          </a-dropdown>-->
-        </span>
+<!--        </span>-->
 
       </a-table>
     </div>
@@ -150,6 +150,11 @@
     },
     data () {
       return {
+        /* 排序参数 */
+        isorter: {
+          column: 'timeEnd', // 排序字段
+          order: 'desc' // 正序asc  or  倒叙desc
+        },
         description: '设备运行时间表管理页面',
         // 表头
         columns: [
@@ -213,19 +218,19 @@
           //   align:"center",
           //   dataIndex: 'timeSecond'
           // },
-          {
-            title:'创建日期',
-            align:"center",
-            dataIndex: 'createTime'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
+          // {
+          //   title:'创建日期',
+          //   align:"center",
+          //   dataIndex: 'createTime'
+          // },
+          // {
+          //   title: '操作',
+          //   dataIndex: 'action',
+          //   align:"center",
+          //   fixed:"right",
+          //   width:147,
+          //   scopedSlots: { customRender: 'action' }
+          // }
         ],
         url: {
           list: "/itdmDeviceRun/itdmDeviceRun/list",

itdmWeb/src/views/module-iTDM/itdmGongdanDetail/ItdmGongdanDetailList.vue

@@ -276,44 +276,44 @@ export default {
           dataIndex: 'chuanganqi_dictText'
           // dataIndex: 'chuanganqi'
         },
-        {
-          title:'实绩设备',
-          align:"center",
-          dataIndex: 'shijiShebeiId_dictText'
-        },
-        {
-          title:'实绩试验类型',
-          align:"center",
-          dataIndex: 'shijiShiiyanType_dictText'
-        },
-        {
-          title:'实绩任务日期',
-          align:"center",
-          dataIndex: 'shijiWorkDate',
-          customRender:function (text) {
-            return !text?"":(text.length>10?text.substr(0,10):text)
-          }
-        },
-        {
-          title:'实绩试验开始时间',
-          align:"center",
-          dataIndex: 'shijiStartTime'
-        },
-        {
-          title:'实绩试验结束时间',
-          align:"center",
-          dataIndex: 'shijiEndTime'
-        },
-        {
-          title:'工单id',
-          align:"center",
-          dataIndex: 'woId'
-        },
-        {
-          title:'创建时间',
-          align:"center",
-          dataIndex: 'createTime'
-        },
+        // {
+        //   title:'实绩设备',
+        //   align:"center",
+        //   dataIndex: 'shijiShebeiId_dictText'
+        // },
+        // {
+        //   title:'实绩试验类型',
+        //   align:"center",
+        //   dataIndex: 'shijiShiiyanType_dictText'
+        // },
+        // {
+        //   title:'实绩任务日期',
+        //   align:"center",
+        //   dataIndex: 'shijiWorkDate',
+        //   customRender:function (text) {
+        //     return !text?"":(text.length>10?text.substr(0,10):text)
+        //   }
+        // },
+        // {
+        //   title:'实绩试验开始时间',
+        //   align:"center",
+        //   dataIndex: 'shijiStartTime'
+        // },
+        // {
+        //   title:'实绩试验结束时间',
+        //   align:"center",
+        //   dataIndex: 'shijiEndTime'
+        // },
+        // {
+        //   title:'工单id',
+        //   align:"center",
+        //   dataIndex: 'woId'
+        // },
+        // {
+        //   title:'创建时间',
+        //   align:"center",
+        //   dataIndex: 'createTime'
+        // },
         // {
         //   title:'备注',F
         //   align:"center",

itdmWeb/src/views/module-iTDM/itdmGongdanMaster/itdmGongdanMasterList.vue

@@ -226,6 +226,12 @@ export default {
           return gridDateToStr(date);
         }
       }
+      // // 右侧进度条
+      // gantt.templates.progress_text = function (start, end, task) {
+      //   console.log(78787878,start, end, task)
+      //   return "<div style='text-align:left;color:#fff;padding-left:20px'>" + Math.round(task.progress) +
+      //     "% </div>";
+      // };
       // 右侧项目展示
       gantt.templates.task_text = function (start, end, task) {
         console.log("右侧展示",task)

itdmWeb/src/views/module-iTDM/itdmPersonManage/modules/ItdmPersonManageForm.vue

@@ -13,21 +13,21 @@
               <j-dict-select-tag type="list" v-model="model.sex" dictCode="sex" placeholder="请选择人员性别" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="所属部门" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sysOrgCode">
-              <a-input v-model="model.sysOrgCode" placeholder="请输入所属部门"  ></a-input>
-            </a-form-model-item>
-          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="所属部门" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sysOrgCode">-->
+<!--              <a-input v-model="model.sysOrgCode" placeholder="请输入所属部门"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
           <a-col :span="24">
             <a-form-model-item label="职位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="position">
               <a-input v-model="model.position" placeholder="请输入职位"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="工作组" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workGroup">
-              <a-input v-model="model.workGroup" placeholder="请输入工作组"  ></a-input>
-            </a-form-model-item>
-          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="工作组" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workGroup">-->
+<!--              <a-input v-model="model.workGroup" placeholder="请输入工作组"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
           <a-col :span="24">
             <a-form-model-item label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tel">
               <a-input v-model="model.tel" placeholder="请输入手机号"  ></a-input>
@@ -142,7 +142,7 @@
               that.confirmLoading = false;
             })
           }
-         
+
         })
       },
     }

itdmWeb/src/views/module-iTDM/itdmTestPlan/itdmTestPlanList1.vue

@@ -75,6 +75,8 @@ export default {
   },
   created() {
     this.getClientList();
+    // this.getHjlist();
+    this.$nextTick(() => { this.getHjlist() })
   },
 
   methods: {
@@ -95,7 +97,7 @@ export default {
       console.log(value);
       console.log(this.tasks.queryParamNo)
       this.weituoNoOptions = []
-      this.tasks.queryParam.weituoNo = ''
+      this.tasks.queryParam.weituoNo = undefined
       getWeituoInfoListByClient(this.tasks.queryParamNo).then((res) =>{
         this.weituoNoOptions = res.result.map( res => {
           return{
@@ -106,8 +108,10 @@ export default {
       })
     },
     getHjlist(){
+      console.log(1111)
       let that = this
       var queryParam = that.tasks.queryParam
+      queryParam.weituoClient = that.tasks.queryParamNo.weituoClient
       this.$refs.gantt.getinit( queryParam )
 
     },

itdmWeb/src/views/module-iTDM/itdmWenxiang/ItdmWenxiangList.vue

@@ -32,12 +32,12 @@
     <!-- 查询区域-END -->
 
     <!-- 操作按钮区域 -->
-    <!-- <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+    <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 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">
@@ -45,8 +45,8 @@
           <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> -->
+      </a-dropdown> -->
+    </div>
 
     <!-- table区域-begin -->
     <div>
@@ -67,7 +67,7 @@
         :loading="loading"
         class="j-table-force-nowrap"
         @change="handleTableChange">
-        
+
         <!-- 通过判断temperatureAlarm的值，动态渲染temperature这一列单元格的样式 -->
         <div slot="temperature" slot-scope="text, record">
           <span v-if="record.temperatureAlarm ==1" class="y">{{text}}</span>

itdmWeb/src/views/module-iTDM/itdmWenxiangVoltage/ItdmWenxiangVoltageList.vue

@@ -27,10 +27,10 @@
     <!-- 查询区域-END -->
 
     <!-- 操作按钮区域 -->
-    <!-- <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+    <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-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload> -->
       <!-- 高级查询区域 -->
@@ -40,8 +40,8 @@
           <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> -->
+      </a-dropdown> -->
+    </div>
 
     <!-- table区域-begin -->
     <div>
@@ -230,7 +230,7 @@
           deleteBatch: "/itdmDataHistory/itdmWenxiangVoltage/deleteBatch",
           exportXlsUrl: "/itdmDataHistory/itdmWenxiangVoltage/exportXls",
           importExcelUrl: "itdmDataHistory/itdmWenxiangVoltage/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],

itdmWeb/src/views/module-iTDM/weituo/ItdmWeituoInfoWanchengList.vue

@@ -0,0 +1,252 @@
+<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="委托单位名称">
+              <j-search-select-tag placeholder="请选择委托单位名称" v-model="queryParam.weituoClient"  :dictOptions="weituoClientList"/>
+              <!--              <a-input placeholder="请输入委托单位名称" v-model="queryParam.weituoClient"></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>
+            </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>-->
+<!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+<!--      <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-popconfirm :title="record.completeStatus == 0 ? '确定该委托项目已完结吗，完结后不可修改': '该委托项目已完结，不可修改'" @confirm="() => handleWancheng(record)">
+            <a>{{record.completeStatus == 0 ? '未完结': '已完结'}}</a>
+          </a-popconfirm>
+        </span>
+
+      </a-table>
+    </div>
+
+    <itdm-weituo-info-modal ref="modalForm" @ok="modalFormOk"></itdm-weituo-info-modal>
+  </a-card>
+</template>
+
+<script>
+
+import '@/assets/less/TableExpand.less'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import ItdmWeituoInfoModal from './modules/ItdmWeituoInfoModal'
+import { ajaxGetDictItems, loadCategoryData } from '@/api/api'
+import { filterMultiDictText } from '@comp/dict/JDictSelectUtil'
+import { getAction } from '@api/manage'
+import { checkWancheng } from '@/api/api'
+
+
+
+export default {
+  name: 'ItdmWeituoInfoWanchengList',
+  mixins:[JeecgListMixin, mixinDevice],
+  components: {
+    ItdmWeituoInfoModal
+  },
+  data () {
+    return {
+      weituoClientList:[],
+      description: '委托信息管理页面',
+      // 表头
+      columns: [
+        {
+          title: '#',
+          dataIndex: '',
+          key:'rowIndex',
+          width:60,
+          align:"center",
+          customRender:function (t,r,index) {
+            return parseInt(index)+1;
+          }
+        },
+        {
+          title:'委托单位名称',
+          align:"center",
+          dataIndex: 'weituoClient'
+        },
+        {
+          title:'委托单位地址',
+          align:"center",
+          dataIndex: 'weituoAddress'
+        },
+        {
+          title:'委托项目状态',
+          align:"center",
+          dataIndex: 'completeStatus_dictText'
+        },
+        {
+          title:'委托联系人',
+          align:"center",
+          dataIndex: 'weituoLxr'
+        },
+        {
+          title:'委托电话',
+          align:"center",
+          dataIndex: 'weituoPhone'
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          align:"center",
+          fixed:"right",
+          width:147,
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      url: {
+        list: "/weituo/itdmWeituoInfo/list",
+        delete: "/weituo/itdmWeituoInfo/delete",
+        deleteBatch: "/weituo/itdmWeituoInfo/deleteBatch",
+        exportXlsUrl: "/weituo/itdmWeituoInfo/exportXls",
+        importExcelUrl: "weituo/itdmWeituoInfo/importExcel",
+
+      },
+      dictOptions:{},
+      superFieldList:[],
+      weituoInfoForm:{},
+    }
+  },
+  created() {
+    this.getSuperFieldList();
+    this.init()
+  },
+  computed: {
+    importExcelUrl: function(){
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    },
+  },
+  methods: {
+
+    init(){
+
+      getAction('/weituo/itdmWeituoInfo/distinctClientList', {}).then((res) => {
+        if (res.success) {
+          console.log(res.result)
+          this.weituoClientList = res.result.map(i=>{
+            return { value: i, text: i}
+          })
+          console.log(this.weituoClientList)
+        }
+      })
+
+
+    },
+
+
+    initDictConfig(){
+      ajaxGetDictItems('weituo.bgyz').then((res) => {
+        if (res.success) {
+          console.log(res.result)
+          this.$set(this.dictOptions, 'bgyz', res.result)
+        }
+      })
+      ajaxGetDictItems('weituo.bgxs').then((res) => {
+        if (res.success) {
+          console.log(res.result)
+          this.$set(this.dictOptions, 'bgxs', res.result)
+        }
+      })
+    },
+    getSuperFieldList(){
+      let fieldList=[];
+      fieldList.push({type:'string',value:'weituoClient',text:'委托单位名称',dictCode:''})
+      fieldList.push({type:'string',value:'weituoAddress',text:'委托单位地址',dictCode:''})
+      fieldList.push({type:'string',value:'weituoLxr',text:'委托联系人',dictCode:''})
+      fieldList.push({type:'string',value:'weituoPhone',text:'委托电话',dictCode:''})
+      fieldList.push({type:'string',value:'weituoEmail',text:'委托邮箱',dictCode:''})
+      fieldList.push({type:'string',value:'bgyz',text:'报告用章'})
+      fieldList.push({type:'string',value:'bgxs',text:'报告形式'})
+      fieldList.push({type:'string',value:'teshuyaoqiu',text:'特殊要求',dictCode:''})
+      fieldList.push({type:'string',value:'tiaojianFile',text:'试验条件文件地址',dictCode:''})
+      this.superFieldList = fieldList
+    },
+
+    handleWancheng(item){
+      console.log("item",item,item.completeStatus)
+      const _this = this
+      _this.weituoInfoForm = JSON.parse(JSON.stringify(item))
+      // _this.weituoInfoForm = item
+      console.log(_this.weituoInfoForm,_this.weituoInfoForm.completeStatus)
+      if(item.completeStatus == 0){
+        _this.weituoInfoForm.completeStatus = 1
+        // console.log(_this.deviceForm,item)
+        checkWancheng(_this.weituoInfoForm).then((res) => {
+          console.log(res)
+          this.loadData();
+        })
+      }
+    }
+  }
+}
+</script>
+<style scoped>
+@import '~@assets/less/common.less';
+</style>