Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before in...

licp

2024-07-03 57e76b55709e8ea88a83ab6c3f665fd9ee7fd64c

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

@@ -1,5 +1,5 @@
<style scoped>
   ins-order-plan-main .title {
   .ins-order-plan-main .title {
      font-size: 20px;
      color: #3A7BFA
   }
@@ -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>
@@ -132,7 +137,7 @@
                  <el-col :span="21">
                     <div style="display: flex;align-items: center;margin-bottom: 10px;">
                        <ul class="tab">
                           <li v-for="(m,i) in tabList" :key="i" :class="{active:i==tabIndex}" @click="handleTab(m,i)">{{m.label}}
                           <li v-for="(m,i) in tabList" :key="i" :class="{active:i==tabIndex}" @click="handleTab(m,i)">{{m.label.replace('试验室','')}}
                           </li>
                        </ul>
                        <div>
@@ -165,7 +170,7 @@
         <div class="search_thing">
        <div class="search_label" style="width:90px">交接人员：</div>
        <div class="search_input">
          <el-select v-model="connectPerson" placeholder="请选择" style="width: 100%;">
          <el-select v-model="connectPerson" placeholder="请选择" style="width: 100%;" filterable>
            <el-option
              v-for="item in personList"
              :key="item.value"
@@ -189,7 +194,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'
@@ -229,19 +234,25 @@
                     type: 'text',
                     method: 'handleInspection',
                     disabFun: (row, index) => {
                        return row.userId == null
                        return row.userId == null || row.insState == 3 || row.insState == 5
                     }
                  }, {
                     id: '',
                     font: '交接',
                     type: 'text',
                     method: 'handleConnect'
                     method: 'handleConnect',
                     disabFun: (row, index) => {
                        return row.userId == null || row.orderUserId == null || row.insState == 5  || row.insState == 3
                     }
                  },
                  {
                     id: '',
                     font: '复核',
                     type: 'text',
                     method: 'handleReview',
                     disabFun: (row, index) => {
                        return row.userId == null || row.insState != 3 || row.verifyUser != 1
                     }
                  }, {
                     id: '',
                     font: '认领',
@@ -280,10 +291,6 @@
                     }]
                  }
               },
          spanConfig:{
            rows:'entrustCode',//合并行,通常涉及一个字段
            cols:[],//合并列,通常涉及几个字段
          },
               selectField: {},
               requiredAdd: [],
               requiredUp: []
@@ -300,6 +307,7 @@
        connectVisible:false,
        connectPerson:'',
        loading:false,
        currentTime: null
         }
      },
      created() {
@@ -307,6 +315,7 @@
         this.getTypeDicts()
         this.getInsStateDicts()
      this.getAuthorizedPerson()
      this.currentTime = getYearAndMonthAndDays()
      },
      mounted() {
         this.entityCopy = this.HaveJson(this.componentData.entity)
@@ -393,10 +402,9 @@
            row,
            rowIndex
         }) {
            let currentTime = getYearAndMonthAndDays()
            if (currentTime === row.appointed) {
            if (this.currentTime == row.appointed) {
               return 'highlight-warning-row-border'
            } else if (currentTime > row.appointed) {
            } else if (this.currentTime > row.appointed) {
               return 'highlight-danger-row-border'
            }
            return ''
@@ -499,17 +507,13 @@
          this.$axios.post(this.$api.insOrderPlan.upPlanUser, {
            orderId:this.orderId,
            userId:this.connectPerson
          }, {
               headers: {
                  'Content-Type': 'application/json'
               }
            }).then(res => {
               if (res.code === 200 && res.data) {
          }).then(res => {
               if (res.code === 200) {
            this.loading = false;
                  this.$message.success("交接成功")
                  this.connectVisible = false
                  this.$message.success("操作成功")
                  this.refreshTable()
               }
          this.connectVisible = false
            }).catch(error => {
               console.error(error)
          this.loading = false;