样机编号完成40%

licp

2024-09-30 77fad81725d273ad7d515b1d98fa3e7c2b20be06

 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>
@@ -530,7 +530,21 @@
                  type: 'text',
                  method: 'handleVerify',
                  disabFun: (row, index) => {
                     return row.state != 0
              let state0 = false
              if(this.currentRole=='检测中心主任'){
                if(row.checkState1||row.checkState1User){
                  state0 = true
                }
              }else if(this.currentRole=='研发部经理'){
                if(row.checkState2||row.checkState2User){
                  state0 = true
                }
              }else if(this.currentRole=='技术负责人'){
                if(row.checkState3||row.checkState3User){
                  state0 = true
                }
              }
                     return row.state != 0 || state0 ||(this.currentRole!='检测中心主任'&&this.currentRole!='研发部经理'&&this.currentRole!='技术负责人')
                  }
               }, {
                  id: 'quash',
@@ -549,14 +563,17 @@
                  disabFun: (row, index) => {
                     return (row.state != 1 && row.state != 0)||(this.tabIndex!=1)||row.isRevocation!=1
                  }
               }, {
                  font: '分配',
                  type: 'text',
                  method: 'handleIssued',
                  disabFun: (row, index) => {
                     return row.state != 1 || !!row.assign
                  }
               }],
               },
          // {
               //    font: '分配',
               //    type: 'text',
               //    method: 'handleIssued',
               //    disabFun: (row, index) => {
               //       // return row.state != 1 || !!row.assign
          //     return row.appointed || row.state != 1
               //    }
               // }
        ],
               linkEvent: {
                  sampleName: {
                     method: 'selectAllByOne'
@@ -644,6 +661,10 @@
                        value: 0,
                        label: '不合格',
                        type: 'danger'
                     },{
                        value: 3,
                        label: '不判定',
                        type: ''
                     }]
                  }
               },
@@ -740,7 +761,8 @@
        ],
        qrData:[],
        multipleSelection:[],
        sonLaboratoryList:[]
        sonLaboratoryList:[],
        currentRole:''
         }
      },
    watch:{
@@ -753,6 +775,9 @@
        }
      }
    },
    created() {
      this.getAuthorizedPersonRole()
    },
      mounted() {
         this.entityCopy = this.HaveJson(this.componentData.entity)
         this.getPower()
@@ -764,6 +789,12 @@
      methods: {
      selectMethod(val){
        this.multipleSelection = val
      },
      async searchPrint(selection){
        let res = await this.$axios.post(this.$api.insOrder.checkNumber,{
          ids:selection.map(m=>m.id).join(',')
        })
        console.log(1111,res)
      },
      getLabelPrinting(selection){
        this.loadPint = true;
@@ -837,12 +868,13 @@
              font_size: '0.20cm',
        });
      },
      print(){
      async print(){
        if(this.multipleSelection.length==0){
            this.$message.warning('请选择一条数据')
            return
        }
        let selection = this.multipleSelection
        await this.searchPrint(selection)
        this.getLabelPrinting(selection)
        this.printDialogVisible = true
      },
@@ -856,6 +888,11 @@
                  })
               })
               this.personList = data
            })
         },
      getAuthorizedPersonRole() {
            this.$axios.get(this.$api.role.getRole).then(res => {
               this.currentRole = res.message
            })
         },
         refreshTable(e) {
@@ -884,7 +921,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') {
@@ -929,6 +966,7 @@
            // //复制给formData
            // this.formData = this.HaveJson(row);
            this.currentId = row.id
        this.examine = 1
         },
         // 数据查看
         handleDataLook(row) {
@@ -1052,12 +1090,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
            }
@@ -1114,6 +1147,7 @@
         playOrder(num) {
            this.active = num
        this.examine = 0
        this.getAuthorizedPersonRole()
        this.refreshTable('page')
         },
         handleTab(m, i) {