完成检验下单、检验任务、报告生成变更

licp

2024-11-26 e6c3fccc9e412e79964a6dc2dae4c3da0c80095c

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

@@ -144,6 +144,13 @@
                  </el-select>
               </div>
            </div>
        <div class="search_thing">
               <div class="search_label">样品编号：</div>
               <div class="search_input">
                  <el-input size="small" placeholder="请输入" clearable
                     v-model="componentData.entity.sampleCOde" @keyup.enter.native="refreshTable()"></el-input>
               </div>
            </div>
            <div class="search_thing" style="padding-left: 30px;">
               <el-button size="small" @click="refresh()">重 置</el-button>
               <el-button size="small" type="primary" @click="refreshTable()">查 询</el-button>
@@ -166,8 +173,8 @@
                  </el-col>
                  <el-col :span="6">
                     <div class="center-title">
                <el-button size="small" type="primary" @click="qrCodeVisible=true">扫码报检</el-button>
                <el-button size="small" type="primary" @click="exportVisible=true" style="margin-right: 16px;">出库</el-button>
                <el-button size="small" type="primary" @click="qrCodeVisible=true" v-if="selectWarehouse">扫码报检</el-button>
                <el-button size="small" type="primary" @click="exportVisible=true" style="margin-right: 16px;" v-if="selectWarehouse">出库</el-button>
                        <span>总计任务数量:</span>
                        <span>{{total}}</span>
                     </div>
@@ -203,12 +210,17 @@
            width="100px"
          ></el-table-column>
          <el-table-column
            prop="sampleCode"
            label="样品编号"
            width="170px"
          ></el-table-column>
          <el-table-column
            prop="type"
            label="紧急程度"
            width="100px"
          >
            <template slot-scope="scope">
              <el-tag :type="typeList.find(m=>m.value==scope.row.type).type" size="small">{{ typeList.find(m=>m.value==scope.row.type).label }}</el-tag>
              <el-tag :type="typeList.find(m=>m.value==scope.row.type)?typeList.find(m=>m.value==scope.row.type).type:''" size="small">{{ typeList.find(m=>m.value==scope.row.type)?typeList.find(m=>m.value==scope.row.type).label:'' }}</el-tag>
            </template>
          </el-table-column>
          <el-table-column
@@ -245,6 +257,11 @@
            width="160px"
          ></el-table-column>
          <el-table-column
            prop="submitTime"
            label="检验结束时间"
            width="160px"
          ></el-table-column>
          <el-table-column
            prop="verifyTell"
            label="理由"
            width="150px"
@@ -260,7 +277,7 @@
            <el-button @click="handleConnect(scope.row)" type="text" size="small" :disabled="scope.row.userName == null || scope.row.insState == 5  || scope.row.insState == 3||scope.row.insState == 6||(scope.row.userName&&!scope.row.userName.includes(userName))" v-if="connect">交接</el-button>
            <el-button @click="handleReview(scope.row)" type="text" size="small" :disabled="scope.row.userName == null || scope.row.insState != 3 ||(scope.row.checkName&&!scope.row.checkName.includes(userName))" v-if="review">复核</el-button>
            <el-button @click="claimFun(scope.row)" type="text" size="small" :disabled="scope.row.userName != null || scope.row.checkName!=null" v-if="claim">认领</el-button>
            <el-button @click="lookHistory0(scope.row)" type="text" size="small" :disabled="!scope.row.num1 || scope.row.num1<1">查看记录</el-button>
            <el-button @click="lookHistory0(scope.row)" type="text" size="small">查看记录</el-button>
          </template>
          </el-table-column>
        </el-table>
@@ -315,7 +332,7 @@
      <div style="width: 100%;height: 100%;" v-if="activeFace >0">
         <Add :active="activeFace" :currentId="currentId" :examine="examine"/>
      </div>
    <Inspection v-if="state>0" @goback="goback" :orderId="orderId" :inspectorList="inspectorList" :sonLaboratory="componentData.entity.sonLaboratory" :state="state" :orderStateId="orderStateId" :version="version" :isLook="isLook" :num1="num1"/>
    <Inspection v-if="state>0" @goback="goback" :orderId="orderId" :inspectorList="inspectorList" :sonLaboratory="componentData.entity.sonLaboratory" :state="state" :orderStateId="orderStateId" :version="version" :isLook="isLook" :num1="num1" :orderId0="orderId0" :userInfo="userInfo" />
      <el-dialog title="数据查看" :visible.sync="dataDialogVisible" width="80%">
            <div style="height: 70vh;overflow-y: auto;" v-if="dataDialogVisible">
               <ValueTable ref="ValueTableDataLook" :rowKey="'insProductId'" :url="$api.insOrder.selectSampleAndProductByOrderId"
@@ -330,45 +347,44 @@
          <el-table-column
            prop="submitTime"
            label="提交日期"
            width="150">
            min-width="150">
          </el-table-column>
          <el-table-column
            prop="submitUserName"
            label="提交人"
            width="90">
            min-width="90">
          </el-table-column>
          <el-table-column
            prop="term"
            label="实验阶段"
            width="120">
            min-width="120">
          </el-table-column>
          <el-table-column
            prop="note"
            label="实验操作"
            width="120">
            min-width="120">
          </el-table-column>
          <el-table-column
            prop="tell"
            label="再次检验原因"
            width="120">
            min-width="120">
          </el-table-column>
          <el-table-column
            fixed="right"
            label="操作"
            width="100">
            min-width="100">
            <template slot-scope="scope">
              <el-button @click="lookHistory(scope.row)" type="text" size="small">查看</el-button>
            </template>
          </el-table-column>
        </el-table>
         </el-dialog>
      <input type="text" id="ScanCodeInfo" v-model="codeInfo" @keyup.enter="keyup" style="opacity: 0;height: 0px;margin: 0px;padding: 0px;position: absolute;top: 0;"  autocomplete="off"></input>
    <el-dialog title="扫码检验" :visible.sync="qrCodeVisible" width="350px">
      <el-row>
        <el-col class="search_thing" :span="24">
          <div class="search_label" style="width: 90px"><span class="required-span">* </span>样品编号：</div>
          <div class="search_input">
            <el-input v-model="sampleCode" size="small"></el-input>
            <el-input v-model="sampleCode" size="small" clearable></el-input>
          </div>
        </el-col>
      </el-row>
@@ -396,7 +412,7 @@
        <el-col class="search_thing" :span="24">
          <div class="search_label" style="width: 90px"><span class="required-span">* </span>样品编号：</div>
          <div class="search_input">
            <el-input v-model="sampleCode" size="small"></el-input>
            <el-input v-model="sampleCode" size="small" clearable></el-input>
          </div>
        </el-col>
      </el-row>
@@ -498,7 +514,8 @@
               entity: {
                  sonLaboratory: null,
                  insState: null,
                  userId: null
                  userId: null,
            sampleCode:null,
               },
          sortable:true,
               isIndex: true,
@@ -605,7 +622,8 @@
            activeFace: 0, //1：下单，2：查看，3：审核，默认为0
            currentId: null,
            entityCopy: {},
            orderId: 0,
            orderId: null,
        orderId0:null,
        personList:[],
        connectVisible:false,
        connect:{
@@ -655,6 +673,11 @@
        upLoadStorage: false,
        exportVisible: false,
        upLoadExport: false,
        selectWarehouse:false,
        userInfo:{
          name:[],
          ids:[]
        }
         }
      },
      created() {
@@ -662,7 +685,6 @@
         this.getTypeDicts()
         this.getInsStateDicts()
      this.getAuthorizedPerson()
      this.selectList()
      this.currentTime = getYearAndMonthAndDays()
      },
      mounted() {
@@ -672,36 +694,6 @@
        this.initializeSortable();
      }
      },
    watch:{
      qrCodeVisible(newVal){
        if(newVal){
          // this.$message.success('扫码：打开')
          let input = document.getElementById('ScanCodeInfo');
          input.focus();
          this.startTime = setInterval(()=>{
            input.focus()
          },1000)
        }else{
          // this.$message.warning('扫码：关闭')
          clearInterval(this.startTime)
          this.sampleCode = ''
        }
      },
      exportVisible(newVal){
        if(newVal){
          // this.$message.success('扫码：打开')
          let input = document.getElementById('ScanCodeInfo');
          input.focus();
          this.startTime = setInterval(()=>{
            input.focus()
          },1000)
        }else{
          // this.$message.warning('扫码：关闭')
          clearInterval(this.startTime)
          this.sampleCode = ''
        }
      },
    },
      methods: {
      selectList () {
        this.$axios.get(this.$api.warehouse.selectWarehouse).then(res => {
@@ -798,14 +790,16 @@
      keyup(e){
        var code = ''
        try{
          code = JSON.parse(this.codeInfo)
          // console.log(2222,this.codeInfo)
          code = this.codeInfo.substring()
          if(code==null||code==undefined||code==''){
            this.$message.error('该二维码有误')
          }else{
            this.sampleCode = code
          }
        }catch(e){
          this.$message.error('该二维码有误')
          this.$message.error('请调至英文键盘')
          console.log(e)
        }
        this.codeInfo = null
      },
@@ -885,6 +879,10 @@
          if (power[i].menuMethod == 'scanInsOrderState') {
                  this.scanInsOrderState = true
               }
          if (power[i].menuMethod == 'scanInsOrderState') {
                  this.selectWarehouse = true
            this.selectList()
               }
            }
        // if (!getInsProduct2) {
            //    this.componentData.do.splice(5, 1)
@@ -924,7 +922,7 @@
            if (row) {
               this.sampleUserForm = {
                  entrustCode: row.entrustCode,
                  insSampleId: row.id,
                  insSampleId: row.sampleId,
            sonLaboratory: row.sonLaboratory,
               }
               this.claimVisible = true
@@ -932,11 +930,13 @@
         },
         confirmClaim() {
        this.loading = true;
        // this.sampleUserForm.insSampleId = this.orderId
            this.$axios.post(this.$api.insOrderPlan.claimInsOrderPlan, this.sampleUserForm, {
               headers: {
                  'Content-Type': 'application/json'
               }
            }).then(res => {
               },
          noQs:true
            },).then(res => {
               if (res.code === 200 && res.data) {
            this.loading = false;
                  this.$message.success("认领成功")
@@ -1074,14 +1074,18 @@
          inspectorList.push(user.name)
        }
        this.inspectorList = inspectorList
            this.orderId = row.id
            this.orderId = row.sampleId
        this.orderId0 = row.id
        this.version = row.version
        this.orderStateId = row.orderStateId
        this.state = 1;
        this.userInfo.name = row.userName.split(',')
        this.userInfo.ids = row.userNameId.split(',')
        this.isLook = false
      },
      handleConnect(row){
        this.orderId = row.id
        this.orderId = row.sampleId
        this.orderId0 = row.id
        this.connect = {}
        this.connectVisible=true;
        // this.$axios.post(this.$api.insOrderPlan.upPlanUser2, {
@@ -1110,7 +1114,7 @@
        // }
        this.loading = true;
          this.$axios.post(this.$api.insOrderPlan.upPlanUser, {
            orderId:this.orderId,
            sampleId:this.orderId,
            userId:this.connect.connectPerson,
            sonLaboratory:this.componentData.entity.sonLaboratory,
          }).then(res => {
@@ -1127,7 +1131,8 @@
      },
      handleReview(row){
        this.state = 2;
            this.orderId = row.id
            this.orderId = row.sampleId
        this.orderId0 = row.id
        this.version = row.version
        this.orderStateId = row.orderStateId
        this.isLook = false
@@ -1156,7 +1161,8 @@
      lookHistory(row){
        this.isLook = true
        this.state = 2;
        this.orderId = this.currentHistory.id
        this.orderId = this.currentHistory.sampleId
        this.orderId0 = this.currentHistory.id
        this.version = this.currentHistory.version
        this.orderStateId = this.currentHistory.orderStateId
        this.num1 = row.num