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

@@ -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">
@@ -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',
@@ -447,6 +450,7 @@
               this.distributeData.orderId = row.id
               this.distributeData.sampleId = row.sampleId
               this.distributeData.appointed = res.data
          this.distributeData.type = row.type
            })
         },
         submitForm2() {
@@ -454,6 +458,10 @@
               this.$message.error('约定时间未填写')
               return
            }
        if(this.distributeData.type==2&&(this.distributeData.userId==null||this.distributeData.userId=='')){
               this.$message.error('指派人员未填写')
               return
            }
            this.upLoad = true;
            this.$axios.post(this.$api.insOrder.upInsOrder, {
               orderId: this.distributeData.orderId,