Merge remote-tracking branch 'origin/master'

gaoluyang

2024-07-31 38e6f27a8082e1173e3c02a33da5da39b6c6872c

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

@@ -102,11 +102,16 @@
   .ins-order-plan-main .el-form-item__label{
      color: #000;
   }

  .ins-order-plan-main .el-table th.el-table__cell>.cell{
    height: 46px;
    line-height: 30px;
  }
</style>
<template>
   <div class="ins-order-plan-main">
      <div v-show="activeFace == 0&&state==0" style="height: 100%;">
         <p style="font-size: 16px;padding:19.5px 0px">检验任务</p>
         <p style="font-size: 16px;padding-left: 20px;text-align: left;height: 60px;line-height: 60px;">检验任务</p>
         <div class="search">
            <div class="search_thing">
               <div class="search_label">委托编号：</div>
@@ -163,11 +168,24 @@
      </el-dialog>
    <el-dialog title="检验交接" :visible.sync="connectVisible" width="400px">
         <div class="search_thing">
        <div class="search_label" style="width:90px">交接人员：</div>
        <div class="search_label" style="width:90px"><span class="required-span">* </span>交接人员：</div>
        <div class="search_input">
          <el-select v-model="connectPerson" placeholder="请选择" style="width: 100%;">
          <el-select v-model="connect.connectPerson" placeholder="请选择" style="width: 100%;" filterable>
            <el-option
              v-for="item in personList"
              :key="item.value"
              :label="item.label"
              :value="item.value">
            </el-option>
          </el-select>
        </div>
      </div>
      <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>
            <el-option
              v-for="item in sonLaboratoryList"
              :key="item.value"
              :label="item.label"
              :value="item.value">
@@ -189,7 +207,7 @@

<script>
   import ValueTable from '../tool/value-table.vue'
  import Inspection from '../do/b1-inspect-order-plan/Inspection.vue'
     import Inspection from '../do/b1-inspect-order-plan/Inspection.vue'
   import {
      getYearAndMonthAndDays
   } from '../../util/date'
@@ -221,23 +239,26 @@
               isIndex: true,
               showSelect: false,
               select: false,
               sort: false,
               init: false,
          needSort: ['createTime', 'sendTime', 'type', 'appointed', 'insState'],
               do: [{
                     id: '',
                     font: '检验',
                     type: 'text',
                     method: 'handleInspection',
                     disabFun: (row, index) => {
                        return row.userId == null || row.insState == 3 || row.insState == 5
                        return row.userId == null || row.insState == 3 || row.insState == 5||JSON.parse(localStorage.getItem("user")).name != row.userName
                     }
              // disabFun: (row, index) => {
                     //    return row.userId == null || row.insState == 3 || row.insState == 5
                     // }
                  }, {
                     id: '',
                     font: '交接',
                     type: 'text',
                     method: 'handleConnect',
                     disabFun: (row, index) => {
                        return row.userId == null || row.orderUserId == null || row.insState == 5  || row.insState == 3
                        return row.userId == null || row.orderUserId == null || row.insState == 5  || row.insState == 3||JSON.parse(localStorage.getItem("user")).name != row.userName
                     }
                  },
                  {
@@ -246,7 +267,7 @@
                     type: 'text',
                     method: 'handleReview',
                     disabFun: (row, index) => {
                        return row.userId == null || row.insState != 3
                        return row.userId == null || row.insState != 3 ||JSON.parse(localStorage.getItem("user")).name != row.userName
                     }
                  }, {
                     id: '',
@@ -300,9 +321,13 @@
            orderId: 0,
        personList:[],
        connectVisible:false,
        connectPerson:'',
        connect:{
          connectPerson:'',
          sonLaboratory:''
        },
        loading:false,
        currentTime: null
        currentTime: null,
        sonLaboratoryList:[]
         }
      },
      created() {
@@ -367,7 +392,8 @@
            if (row) {
               this.sampleUserForm = {
                  entrustCode: row.entrustCode,
                  insSampleId: row.id
                  insSampleId: row.id,
            sonLaboratory: row.sonLaboratory,
               }
               this.claimVisible = true
            }
@@ -383,15 +409,15 @@
            this.loading = false;
                  this.$message.success("认领成功")
                  this.claimVisible = false
                  this.refreshTable()
                  this.refreshTable('page')
               }
            }).catch(error => {
               console.error(error)
          this.loading = false;
            })
         },
         refreshTable() {
            this.$refs.insOrderPlan.selectList()
         refreshTable(e) {
            this.$refs.insOrderPlan.selectList(e)
         },
         changeRowClass({
            row,
@@ -486,7 +512,7 @@
         },
         goback() {
            this.state = 0
            this.refreshTable()
            this.refreshTable('page')
         },
      handleInspection(row){
        this.state = 1;
@@ -494,28 +520,48 @@
      },
      handleConnect(row){
        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
               }
            })
      },
      confirmConnect(){
        if(this.connectPerson){
          this.loading = true;
        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
        }
        this.loading = true;
          this.$axios.post(this.$api.insOrderPlan.upPlanUser, {
            orderId:this.orderId,
            userId:this.connectPerson
            userId:this.connect.connectPerson,
            sonLaboratory:this.connect.sonLaboratory,
          }).then(res => {
               if (res.code === 200) {
            this.loading = false;
                  this.$message.success("操作成功")
                  this.refreshTable()
                  this.refreshTable('page')
               }
          this.connectVisible = false
            }).catch(error => {
               console.error(error)
          this.loading = false;
            })
        }else{
          this.$message.error('未选择交接人员')
        }
      },
      handleReview(row){
        this.state = 2;