gantt对接itdm

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

@@ -1,18 +1,52 @@
 <template>
-  <div>
+  <div class="container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="70px">
+        <el-form-item label="委托单位" prop="weituoClient">
+          <el-select v-model="queryParams.weituoClient" clearable placeholder="请选择委托单位" @change="getWeituoClientOptions">
+            <el-option
+              v-for="item in weituoClientOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="委托编号" prop="weituoNo">
+          <el-select v-model="queryParams.weituoNo" clearable placeholder="请选择委托编号" @change="getWeituoNoOptions">
+            <el-option
+              v-for="item in weituoNoOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+              >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="getHjlist">搜索</el-button>
+        </el-form-item>
+      </el-form>
     <uGantt :configColumns="configColumns" :taskLists="taskLists" ref="uGantt" @dbclick="rowDblclick" @addRow="addRow">
       <!-- 其他需要自定义的弹窗数据 -->
       <!-- 双击事件弹窗 -->
-      <el-dialog title="修改" :visible.sync="dialogVisible" width="40%">
-        <div>
+      <el-dialog :title="title" :visible.sync="dialogVisible" width="40%">
+        <el-form ref="currentDbEdit" :model="currentDbEdit" :rules="rules" label-width="80px">
+          <el-form-item label="开始" prop="start_date">
+            <el-date-picker v-model="currentDbEdit.start_date" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
+          </el-form-item>
+          <el-form-item label="结束" prop="end_date">
+            <el-date-picker v-model="currentDbEdit.end_date" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
+          </el-form-item>
+        </el-form>
+        <!-- <div> -->
           <!-- 参数设定是固定格式，千万别改 -->
-          开始：<el-date-picker v-model="currentDbEdit.start_date" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
+          <!-- 开始：<el-date-picker v-model="currentDbEdit.start_date" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
         </div>
         <div>
           结束：<el-date-picker v-model="currentDbEdit.end_date" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
-        </div>
+        </div> -->
         <!-- 其他需要自定义的弹窗数据 -->
-        <slot/>
+        <!-- <slot/> -->
         <span slot="footer" class="dialog-footer">
           <el-button @click="cancel">取 消</el-button>
           <el-button type="primary" @click="submit">确 定</el-button>
@@ -24,6 +58,7 @@
 
 <script>
 import uGantt from '@/components/module-iTDM/uGantt/index.vue'
+import {getWeituoClientList, getWeituoInfoListByClient, getDeviceList, getXmjlList, getManagerList, getCgqList, saveProject, ajaxGetDictItems, saveProjectJl, delProjectJl} from '@/api/api'
 export default {
   name: '',
   components: { uGantt },
@@ -46,115 +81,211 @@ export default {
       // 注意：start_date（开始日期）和end_date（结束日期）和add（添加按钮）是固定死的参数名，不能更改
       // 注意：id和pid也是固定死的参数名，如果需要可以改组件
       // id、content: 也是固定死的，如果需要可以改组件
-      taskLists: [{
-          id: 0,
-          testItems: 'ceshi',
-          sampleName: 'ceshi',
-          start_date: '2023-07-03',
-          end_date: '2023-07-04',
-          statusC: '0',
-          content: '111'
-        }, {
-          id: 1,
-          testItems: '测试',
-          sampleName: '测试',
-          start_date: '',
-          end_date: '',
-          statusC: '0',
-        }, {
-          id: 2,
-          testItems: 'ceshi',
-          sampleName: 'ceshi',
-          start_date: '2023-07-06',
-          end_date: '2023-07-10',
-          statusC: '1',
-        }, {
-          id: 3,
-          testItems: '测试',
-          sampleName: '测试',
-          start_date: '',
-          end_date: '',
-          statusC: '1',
-        },{
-          id: 4,
-          testItems: '测试',
-          sampleName: '测试',
-          start_date: '',
-          end_date: '',
-          statusC: '1',
-        },
-        {
-          id: 5,
-          testItems: '测试',
-          sampleName: '测试',
-          start_date: '',
-          end_date: '',
-          statusC: '1',
-        },
-        {
-          id: 6,
-          testItems: '测试',
-          sampleName: '测试',
-          start_date: '',
-          end_date: '',
-          statusC: '1',
-        },
-        {
-          id: 7,
-          testItems: '测试',
-          sampleName: '测试',
-          start_date: '',
-          end_date: '',
-          statusC: '1',
-        },
-        {
-          id: 8,
-          testItems: '测试',
-          sampleName: '测试',
-          start_date: '',
-          end_date: '',
-          statusC: '1',
-        },
-        {
-          id: 21,
-          testItems: 'ceshi1',
-          sampleName: 'ceshi',
-          start_date: '2023-07-05',
-          end_date: '2023-07-08',
-          statusC: '1',
-          pid: 2
-        }, {
-          id: 23,
-          testItems: 'ceshi3',
-          sampleName: 'ceshi',
-          start_date: '2023-07-02',
-          end_date: '2023-07-04',
-          statusC: '1',
-          pid: 2
-        },
-        {
-          id: 22,
-          testItems: 'ceshi2',
-          sampleName: 'ceshi',
-          start_date: '2023-07-06',
-          end_date: '2023-07-10',
-          statusC: '1',
-          pid: 2
-        }
-      ],
+      taskLists: [],
+      // taskLists: [{
+      //     id: 0,
+      //     testItems: 'ceshi',
+      //     sampleName: 'ceshi',
+      //     start_date: '2023-07-03',
+      //     end_date: '2023-07-04',
+      //     statusC: '0',
+      //     content: '111'
+      //   }, {
+      //     id: 1,
+      //     testItems: '测试',
+      //     sampleName: '测试',
+      //     start_date: '',
+      //     end_date: '',
+      //     statusC: '0',
+      //   }, {
+      //     id: 2,
+      //     testItems: 'ceshi',
+      //     sampleName: 'ceshi',
+      //     start_date: '2023-07-06',
+      //     end_date: '2023-07-10',
+      //     statusC: '1',
+      //   }, {
+      //     id: 3,
+      //     testItems: '测试',
+      //     sampleName: '测试',
+      //     start_date: '',
+      //     end_date: '',
+      //     statusC: '1',
+      //   },{
+      //     id: 4,
+      //     testItems: '测试',
+      //     sampleName: '测试',
+      //     start_date: '',
+      //     end_date: '',
+      //     statusC: '1',
+      //   },
+      //   {
+      //     id: 5,
+      //     testItems: '测试',
+      //     sampleName: '测试',
+      //     start_date: '',
+      //     end_date: '',
+      //     statusC: '1',
+      //   },
+      //   {
+      //     id: 6,
+      //     testItems: '测试',
+      //     sampleName: '测试',
+      //     start_date: '',
+      //     end_date: '',
+      //     statusC: '1',
+      //   },
+      //   {
+      //     id: 7,
+      //     testItems: '测试',
+      //     sampleName: '测试',
+      //     start_date: '',
+      //     end_date: '',
+      //     statusC: '1',
+      //   },
+      //   {
+      //     id: 8,
+      //     testItems: '测试',
+      //     sampleName: '测试',
+      //     start_date: '',
+      //     end_date: '',
+      //     statusC: '1',
+      //   },
+      //   {
+      //     id: 21,
+      //     testItems: 'ceshi1',
+      //     sampleName: 'ceshi',
+      //     start_date: '2023-07-05',
+      //     end_date: '2023-07-08',
+      //     statusC: '1',
+      //     pid: 2
+      //   }, {
+      //     id: 23,
+      //     testItems: 'ceshi3',
+      //     sampleName: 'ceshi',
+      //     start_date: '2023-07-02',
+      //     end_date: '2023-07-04',
+      //     statusC: '1',
+      //     pid: 2
+      //   },
+      //   {
+      //     id: 22,
+      //     testItems: 'ceshi2',
+      //     sampleName: 'ceshi',
+      //     start_date: '2023-07-06',
+      //     end_date: '2023-07-10',
+      //     statusC: '1',
+      //     pid: 2
+      //   }
+      // ],
+      // 查询条件
+      queryParams: {},
+      // 委托单位下拉列表
+      weituoClientOptions: [],
+      // 委托编号下拉列表
+      weituoNoOptions: [],
       // 弹窗
       dialogVisible: false,
+      title: '',
       // 弹窗内容
       currentDbEdit: {},
       // 数组中的第几个
-      currentIndex: null
+      currentIndex: null,
+      // 表单校验
+      rules: {
+      },
     }
   },
   created () {
+    this.getClientList()
   },
   mounted () {
   },
   methods: {
+    // 获取委托单位下拉列表
+    getClientList(){
+      getWeituoClientList().then((res) =>{
+        console.log(res)
+        this.weituoClientOptions = res.result.map( res => {
+          return{
+            value: res,
+            label: res
+          }
+        })
+      })
+    },
+    // 监听委托单位，获取对应委托编号列表
+    getWeituoClientOptions(value){
+      console.log(value)
+      this.weituoNoOptions = []
+      this.queryParams.weituoNo = ''
+      getWeituoInfoListByClient(this.queryParams).then((res) =>{
+        this.weituoNoOptions = res.result.map( res => {
+          return{
+            value: res.weituoNo,  //传的值
+            label: res.weituoNo,  //展示
+          }
+        })
+      })
+    },
+    // 监听委托编号赋值
+    getWeituoNoOptions(value){
+      // 方法1：this.$forceUpdate() 强制刷新
+      // this.$forceUpdate()
+      // 方法2：
+      this.queryParams = {...this.queryParams}
+    },
+    // 通过委托编号查询检测项目
+    getHjlist(){
+      let that = this
+      var queryParam = that.queryParams
+      console.log(22,queryParam)
+      getXmjlList(queryParam).then((res) => {
+        console.log(17,res)
+        that.taskLists = []
+        if (res.result.length > 0 ) {
+          that.taskLists = res.result.map(res => {
+            return {
+              id: res.id,
+              pid: res.parent,
+
+              weituoId: res.weituoId,
+              testItemsId: res.testItemsId,
+              yangpinId:res.yangpinId,
+              shebeiId:res.shebeiId,
+              pm: res.pm,
+              reportNo: res.reportNo,
+              chuanganqiArray:res.chuanganqiArray,
+              testPlanId:res.testPlanId,
+              status:res.status,
+              pm: res.pm,
+
+              weituoNo: res.weituoNo,
+              neirong: res.neirong,
+              start_date: res.jihuaStartDate,
+              end_date: res.jihuaEndDate,
+              shiiyanTypeArray: res.shiiyanTypeArray,
+              shijiStartDate: res.shijiStartDate,
+              worker: res.worker,
+              yangpinCount:res.yangpinCount,
+
+              duration: res.lastTime,
+              sampleName: res.sampleName,
+              testItems: res.testItems,
+              deviceName: res.deviceName,
+              statusC: res.statusC
+            }
+          })
+          console.log(that.taskLists)
+        }
+        // else {
+        //   notification.open({
+        //     message: '注意',
+        //     description: '该委托编号不存在',
+        //   });
+        // }
+      })
+    },
     // 双击事件
     rowDblclick(current){
       console.log(current)
@@ -175,7 +306,7 @@ export default {
       this.taskLists[this.currentIndex].end_date = this.currentDbEdit.end_date
       this.dialogVisible = false
       this.currentDbEdit = {}
-    }
+    },
   }
 }
 </script>