优化报告生成、修改电路下单传参

licp

2024-09-10 cb57bc6b4abf45dbb0605c94359c63e3b31b4b87

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

@@ -282,7 +282,7 @@
         </el-dialog>
         <!-- 下发 -->
         <el-dialog title="检验分配" :visible.sync="issuedDialogVisible" width="400px" :before-close="handleClose">
            <div class="body" style="max-height: 60vh;">
            <div class="body" style="max-height: 60vh;" v-if="issuedDialogVisible">
               <el-row>
                  <el-col class="search_thing" style="width: 95%;">
                     <div class="search_label"><span class="required-span">* </span>约定时间：</div>
@@ -293,7 +293,7 @@
                     </div>
                  </el-col>
                  <el-col class="search_thing" style="width: 95%;">
                     <div class="search_label"><span class="required-span" v-show="distributeData.type==2">* </span>指派人员：</div>
                     <div class="search_label">指派人员：</div>
                     <div class="search_input">
                        <el-select v-model="distributeData.userId" placeholder="请选择" size="small" style="width: 100%;" clearable filterable @change="changeUser">
                           <el-option v-for="(item,i) in personList" :key="i+'gbnm.'" :label="item.label" :value="item.value">
@@ -301,7 +301,7 @@
                        </el-select>
                     </div>
                  </el-col>
            <el-col class="search_thing" style="width: 95%;" v-if="distributeData.userId">
            <el-col class="search_thing" style="width: 95%;">
                     <div class="search_label"><span class="required-span" >* </span>试验室：</div>
                     <div class="search_input">
                        <el-select v-model="distributeData.sonLaboratory" placeholder="请选择" size="small" style="width: 100%;" clearable filterable>
@@ -321,7 +321,7 @@
         </el-dialog>
         <el-dialog title="数据查看" :visible.sync="dataDialogVisible" width="80%">
            <div style="height: 70vh;overflow-y: auto;" v-if="dataDialogVisible">
               <ValueTable ref="ValueTableDataLook" :url="$api.insOrder.selectSampleAndProductByOrderId"
               <ValueTable ref="ValueTableDataLook" :rowKey="'insProductId'" :url="$api.insOrder.selectSampleAndProductByOrderId"
                  :componentData="componentDataDataLook"/>
            </div>
         </el-dialog>
@@ -554,7 +554,8 @@
                  type: 'text',
                  method: 'handleIssued',
                  disabFun: (row, index) => {
                     return row.state != 1 || !!row.assign
                     // return row.state != 1 || !!row.assign
              return row.appointed || row.state != 1
                  }
               }],
               linkEvent: {
@@ -644,6 +645,10 @@
                        value: 0,
                        label: '不合格',
                        type: 'danger'
                     },{
                        value: 3,
                        label: '不判定',
                        type: ''
                     }]
                  }
               },
@@ -884,7 +889,7 @@
          if (power[i].menuMethod == 'updateStatus') {
             revoke = true
          }
          if (power[i].menuMethod == 'upInsOrderOfState') {
          if (power[i].menuMethod == 'upInsOrderOfState2') {
             check = true
          }
          if (power[i].menuMethod == 'checkUpdate') {
@@ -1053,12 +1058,7 @@
               this.$message.error('约定时间未填写')
               return
            }
        //
        if(this.distributeData.type==2&&(this.distributeData.userId==null||this.distributeData.userId=='')){
               this.$message.error('指派人员未填写')
               return
            }
        if(this.distributeData.userId&&(this.distributeData.sonLaboratory==null||this.distributeData.sonLaboratory=='')){
        if(this.distributeData.sonLaboratory==null||this.distributeData.sonLaboratory==''){
               this.$message.error('试验室未填写')
               return
            }