Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before in...

licp

2024-03-19 e9352432fd356691e8322af7a79781983f9932f9

 src/components/view/b1-inspection-order.vue

@@ -16,13 +16,13 @@
      align-items: center;
      height: 50px;
   }
	

   .search_label {
      width: 120px;
      font-size: 14px;
      text-align: right;
   }
	

   .search_input {
      width: calc(100% - 120px);
   }
@@ -155,7 +155,7 @@
                     </div>
                  </el-col>
                  <el-col class="search_thing" :span="22">
                     <div class="search_label"><span class="required-span">* </span>指派人员：</div>
                     <div class="search_label"><span class="required-span" v-show="distributeData.type==2">* </span>指派人员：</div>
                     <div class="search_input">
                        <el-select v-model="distributeData.userId" placeholder="请选择" size="small" style="width: 100%;">
                           <el-option v-for="item in personList" :key="item.value" :label="item.label" :value="item.value">
@@ -179,8 +179,8 @@
            </div>
         </el-dialog>
      </div>
      <div style="width: 100%;height: 100%;" v-if="active == 1">
         <Add />
      <div style="width: 100%;height: 100%;" v-if="active >0">
         <Add :active="active" :currentId="currentId" />
      </div>
   </div>
</template>
@@ -241,7 +241,7 @@
                  type: 'text',
                  method: 'download',
                  disabFun: (row, index) => {
                     return row.state != 1
                     return row.state != 1 || row.reportId == null
                  }
               }, {
                  id: 'verify',
@@ -255,7 +255,10 @@
                  id: 'quash',
                  font: '撤销',
                  type: 'text',
                  method: 'handlEquash'
                  method: 'handlEquash',
                  disabFun: (row, index) => {
                     return row.state == 2 || row.state == 3
                  }
               }, {
                  font: '下发',
                  type: 'text',
@@ -347,7 +350,8 @@
               },
            ],
            tabIndex: 0,
            active: 0
            active: 0,//1：下单，2：查看，3：审核
        currentId:null
         }
      },
      mounted() {
@@ -411,12 +415,14 @@
         },
         // 详情
         selectAllByOne(row) {
            console.log(row);
            //打开弹框
            this.dialogVisible = true;
            //row = 点击对应行值
            //复制给formData
            this.formData = this.HaveJson(row);
        this.active = 2;
            // console.log(row);
            // //打开弹框
            // this.dialogVisible = true;
            // //row = 点击对应行值
            // //复制给formData
            // this.formData = this.HaveJson(row);
        this.currentId = row.id
         },
         // 数据查看
         handleDataLook(row) {
@@ -427,7 +433,9 @@
         },
         // 审核
         handleVerify(row) {
            this.verifyDialogVisible = true;
            // this.verifyDialogVisible = true;
        this.active = 3;
        this.currentId = row.id
         },
         // 撤销
         handlEquash(row) {
@@ -442,11 +450,16 @@
               this.distributeData.orderId = row.id
               this.distributeData.sampleId = row.sampleId
               this.distributeData.appointed = res.data
          this.distributeData.type = row.type
            })
         },
         submitForm2() {
            if(this.distributeData.appointed==null||this.distributeData.appointed==''){
               this.$message.error('约定时间未填写')
               return
            }
        if(this.distributeData.type==2&&(this.distributeData.userId==null||this.distributeData.userId=='')){
               this.$message.error('指派人员未填写')
               return
            }
            this.upLoad = true;
@@ -501,4 +514,4 @@
         }
      }
   }
</script>
</script>