修改了项目进度显示

pages/soil-alone-sample-manage/storehouse-sample-manage/storehouseSampleIndex.vue

@@ -3,8 +3,8 @@
     <div class="layout-content-padding">
       <div class="layout-content-main">
         <el-tabs v-model="activeName" @tab-click="_changeTabs">
-          <el-tab-pane label="待完成" name="wait"></el-tab-pane>
-          <el-tab-pane label="历史记录" name="his"></el-tab-pane>
+          <el-tab-pane label="收样样品查询" name="wait"></el-tab-pane>
+          <el-tab-pane label="检测样品查询" name="his"></el-tab-pane>
         </el-tabs>
         <keep-alive>
           <!-- eslint-disable-next-line vue/require-component-is -->

pages/workbench/ItemFlow.vue

 <template>
   <div>
+    <Form id="search-form-sample-progress" :label-width="80" inline onsubmit="return false">
+      <Form-item label="委托编号:" class="search-item">
+        <Input v-model="formObj.entrustCode" @on-enter="_search" name="entrustCode" placeholder="请输入委托编号" style="width:100%" clearable></Input>
+      </Form-item>
+      <Form-item label="钻孔名称:" class="search-item">
+        <Input v-model="formObj.boreholeName" @on-enter="_search" name="boreholeName" placeholder="请输入钻孔名称" style="width:100%" clearable></Input>
+      </Form-item>
+      <Form-item class="search-item">
+        <Button @click="_search" type="primary" class="width-80">搜索</Button>
+      </Form-item>
+    </Form>
     <div v-for="(itemInfo, index) in entrustList" :key="index" class="contract-box">
       <Row>
         <!--样品信息-->
@@ -82,7 +93,11 @@ export default {
   data() {
     return {
       progressList: [],
-      entrustList: []
+      entrustList: [],
+      formObj: {
+        client: undefined,
+        boreholeName: undefined
+      }
     }
   },
   watch: {
@@ -94,8 +109,13 @@ export default {
     this._getData()
   },
   methods: {
+    _search() {
+      this._getData()
+    },
     _getData: async function() {
-      const result = await soilEntrust.listSummaryQuery()
+      const result = await soilEntrust.listSummaryQuery(
+        this.$serializeForm(this.formObj)
+      )
       if (result) {
         this.entrustList = result
         console.log('this.entrustList', this.entrustList)

pages/workbench/flowIndex.vue

@@ -162,6 +162,12 @@ export default {
           case 'wuxingZiJiaoCheck':
             this.$set(allArray[i], 'num', this.nodeObj.wuxingZiJiao)
             break
+          case 'lixueZiJiaoCheck':
+            this.$set(allArray[i], 'num', this.nodeObj.lixueZiJiao)
+            break
+          case 'gaojiZiJiaoCheck':
+            this.$set(allArray[i], 'num', this.nodeObj.gaojiZiJiao)
+            break
         }
         // if (allArray[i].key === 'wuxingEnd') {
         //   this.$set(allArray[i], 'per', this.nodeObj.wuxingEndRate)