设备新增bug修改

zss

2024-08-29 ef408d6a8bbef12d1df69fd5b0ca61849ff25853

 src/components/view/b1-inspect-order-plan.vue

@@ -181,7 +181,7 @@
          </el-select>
        </div>
      </div>
      <div class="search_thing">
      <!-- <div class="search_thing">
        <div class="search_label" style="width:90px"><span class="required-span">* </span>试验室：</div>
        <div class="search_input">
          <el-select v-model="connect.sonLaboratory" placeholder="请选择" style="width: 100%;" filterable>
@@ -193,19 +193,19 @@
            </el-option>
          </el-select>
        </div>
      </div>
      </div> -->
         <span slot="footer" class="dialog-footer">
            <el-button @click="connectVisible = false">取 消</el-button>
            <el-button type="primary" @click="confirmConnect" :loading="loading">确 定</el-button>
         </span>
      </el-dialog>
      <div style="width: 100%;height: 100%;" v-if="activeFace >0">
         <Add :active="activeFace" :currentId="currentId"/>
         <Add :active="activeFace" :currentId="currentId" :examine="examine"/>
      </div>
    <Inspection v-if="state>0" @goback="goback" :orderId="orderId" :sonLaboratory="componentData.entity.sonLaboratory" :state="state"/>
    <Inspection v-if="state>0" @goback="goback" :orderId="orderId" :inspectorList="inspectorList" :sonLaboratory="componentData.entity.sonLaboratory" :state="state"/>
      <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>
@@ -228,6 +228,8 @@
      },
      data() {
         return {
            examine: null,
        inspectorList: [],//检验人员列表
            alone: false,
            sampleUserForm: {
               entrustCode: null,
@@ -263,6 +265,10 @@
                        value: 0,
                        label: '不合格',
                        type: 'danger'
                     },{
                        value: 3,
                        label: '不判定',
                        type: ''
                     }]
                  }
               },
@@ -303,21 +309,21 @@
                  font: '数据查看',
                  type: 'text',
                  method: 'handleDataLook',
            disabFun: (row, index) => {
              const user = JSON.parse(localStorage.getItem('user'))
              let currentUserName = ''
              if(user){
                currentUserName = user.name
              }
                     return row.userName!=currentUserName || row.checkName!=currentUserName
                  }
            //disabFun: (row, index) => {
              //const user = JSON.parse(localStorage.getItem('user'))
             // let currentUserName = ''
             // if(user){
              //  currentUserName = user.name
              //}
                     //return row.userName.indexOf(currentUserName)<0 && row.checkName.indexOf(currentUserName)<0
                  //}
               },{
                     id: '',
                     font: '检验',
                     type: 'text',
                     method: 'handleInspection',
                     disabFun: (row, index) => {
                        return row.userName == null || row.insState == 3 || row.insState == 5||(row.userName&&!row.userName.includes(JSON.parse(localStorage.getItem("user")).name))
                        return row.userName == null || row.insState == 3 || row.insState == 5||row.insState == 6||(row.userName&&!row.userName.includes(JSON.parse(localStorage.getItem("user")).name))
                     }
              // disabFun: (row, index) => {
                     //    return row.userId == null || row.insState == 3 || row.insState == 5
@@ -328,7 +334,7 @@
                     type: 'text',
                     method: 'handleConnect',
                     disabFun: (row, index) => {
                        return row.userName == null || row.insState == 5  || row.insState == 3||(row.userName&&!row.userName.includes(JSON.parse(localStorage.getItem("user")).name))
                        return row.userName == null || row.insState == 5  || row.insState == 3||row.insState == 6||(row.userName&&!row.userName.includes(JSON.parse(localStorage.getItem("user")).name))
                     }
                  },
                  {
@@ -345,7 +351,7 @@
                     type: 'text',
                     method: 'claimFun',
                     disabFun: (row, index) => {
                        return row.userName != null||(row.userName&&!row.userName.includes(JSON.parse(localStorage.getItem("user")).name))
                        return row.userName != null || row.checkName!=null
                     }
                  }
               ],
@@ -393,7 +399,7 @@
        connectVisible:false,
        connect:{
          connectPerson:'',
          sonLaboratory:''
          // sonLaboratory:''
        },
        loading:false,
        currentTime: null,
@@ -468,7 +474,7 @@
               this.sampleUserForm = {
                  entrustCode: row.entrustCode,
                  insSampleId: row.id,
            sonLaboratory: row.sonLaboratory,
                     sonLaboratory: row.sonLaboratory,
               }
               this.claimVisible = true
            }
@@ -485,6 +491,8 @@
                  this.$message.success("认领成功")
                  this.claimVisible = false
                  this.refreshTable('page')
               } else {
                  this.loading = false;
               }
            }).catch(error => {
               console.error(error)
@@ -580,6 +588,7 @@
         },
         selectAllByOne(row) {
            this.activeFace = 2;
            this.examine = 1;
            this.currentId = parseInt(row.id)
         },
         playOrder(num) {
@@ -590,6 +599,16 @@
            this.refreshTable('page')
         },
      handleInspection(row){
        //当前检验任务的检验人列表
        let inspectorList = []
        if(row.userName){
          inspectorList = row.userName.split(',')
        }
        let user = JSON.parse(localStorage.getItem('user'))
        if(user){
          inspectorList.push(user.name)
        }
        this.inspectorList = inspectorList
        this.state = 1;
            this.orderId = row.id
      },
@@ -597,35 +616,35 @@
        this.orderId = row.id
        this.connect = {}
        this.connectVisible=true;
        this.$axios.post(this.$api.insOrderPlan.upPlanUser2, {
            orderId:this.orderId,
          }).then(res => {
               if (res.code === 200&&res.data.length>0) {
            this.sonLaboratoryList = [];
            res.data.forEach(m=>{
              this.sonLaboratoryList.push({
                value:m,
                label:m
              })
            })
            this.connect.sonLaboratory = this.sonLaboratoryList[0].value
               }
            })
        // this.$axios.post(this.$api.insOrderPlan.upPlanUser2, {
        //     orderId:this.orderId,
        //   }).then(res => {
            //    if (res.code === 200&&res.data.length>0) {
        //     this.sonLaboratoryList = [];
        //     res.data.forEach(m=>{
        //       this.sonLaboratoryList.push({
        //         value:m,
        //         label:m
        //       })
        //     })
        //     // this.connect.sonLaboratory = this.sonLaboratoryList[0].value
            //    }
            // })
      },
      confirmConnect(){
        if(this.connect.connectPerson==null||this.connect.connectPerson==''||this.connect.connectPerson==undefined){
          this.$message.error('未选择交接人员')
          return
        }
        if(this.connect.sonLaboratory==null||this.connect.sonLaboratory==''||this.connect.sonLaboratory==undefined){
          this.$message.error('未选择试验室')
          return
        }
        // if(this.connect.sonLaboratory==null||this.connect.sonLaboratory==''||this.connect.sonLaboratory==undefined){
        //   this.$message.error('未选择试验室')
        //   return
        // }
        this.loading = true;
          this.$axios.post(this.$api.insOrderPlan.upPlanUser, {
            orderId:this.orderId,
            userId:this.connect.connectPerson,
            sonLaboratory:this.connect.sonLaboratory,
            sonLaboratory:this.componentData.entity.sonLaboratory,
          }).then(res => {
               if (res.code === 200) {
            this.loading = false;