Merge remote-tracking branch 'origin/master'

gaoluyang

2024-07-31 38e6f27a8082e1173e3c02a33da5da39b6c6872c

 src/components/view/b1-inspection-order.vue

@@ -120,10 +120,13 @@
    height: 8px !important;
  }
  .el-dialog__body >>>.el-radio__label{
    padding-left: 2px !important;
     padding-left: 2px !important;
  }
  .el-dialog__body >>>.el-card__body{
    padding: 0 !important;
  }
  .el-dialog__body >>>.el-card {
    border: none;
  }
  .el-dialog__body >>>.el-radio__input.is-disabled .el-radio__inner{
    border-color: #000 !important;
@@ -153,7 +156,7 @@

<template>
   <div class="inspection_order">
      <div style="width: 100%;height: 100%;" v-if="active == 0">
      <div style="width: 100%;height: 100%;" v-show="active == 0">
         <div>
            <el-row class="title">
               <el-col :span="12" style="padding-left: 20px;text-align: left;">检验下单</el-col>
@@ -174,7 +177,7 @@
            <div class="search_thing" style="width: 20%;">
              <div class="search_label">样品名称：</div>
              <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                  v-model="componentData.entity.sampleType" @keyup.enter.native="refreshTable()"></el-input></div>
                  v-model="componentData.entity.sample" @keyup.enter.native="refreshTable()"></el-input></div>
            </div>
            <div class="search_thing" style="width: 20%;">
              <div class="search_label">样品型号：</div>
@@ -286,8 +289,17 @@
                  <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_input">
                        <el-select v-model="distributeData.userId" placeholder="请选择" size="small" style="width: 100%;" clearable filterable>
                        <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" :label="item.label" :value="item.value">
                           </el-option>
                        </el-select>
                     </div>
                  </el-col>
            <el-col class="search_thing" style="width: 95%;" v-if="distributeData.userId">
                     <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>
                           <el-option v-for="(item,i) in sonLaboratoryList" :key="i" :label="item.label" :value="item.value">
                           </el-option>
                        </el-select>
                     </div>
@@ -369,16 +381,16 @@
        </el-row>
      </span>
    </el-dialog>
    <div class="el-dialog__body" style="overflow-y: auto;position: absolute;margin-top: 0;position: fixed;top: 0;z-index: 99999;">
    <div class="el-dialog__body" style="display:none;overflow-y: auto;margin-top: 0;position: fixed;top: 999px;z-index: 99999;">
        <div id="printMOrder">
          <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 8px !important;page-break-before:always;page-break-after: always;color: #000;box-shadow: none;margin-bottom: 6px;padding-left: 160px;" >
          <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 8px !important;page-break-after: always;color: #000;box-shadow: none;" >
            <div style="display: flex;">
              <div>
                <el-col :span="8" :offset="4">
                <el-col :span="10" :offset="2">
                  <vueQr :text="JSON.stringify(item.sampleCode)" :size="78" :margin="2"></vueQr>
                </el-col>
              </div>
              <div style="margin-left: 40px;line-height: 9px;">
              <div style="margin-left: 12px;line-height: 9px;">
                <el-row>
                  <el-col  style="font-size: 8px;"><span>样品编号:&nbsp; </span>{{ item.sampleCode }}</el-col>
                </el-row>
@@ -449,14 +461,15 @@
               orderId: '',
               sampleId: '',
               appointed: '',
               userId: ''
               userId: '',
          sonLaboratory:''
            },
            // 人员列表
            personList: [],
            componentData: {
               entity: {
                  entrustCode: null,
                  sampleType: null,
                  sample: null,
            sampleName: null,
            sampleModel: null,
            sampleCode: null,
@@ -570,7 +583,8 @@
               },
               selectField: {},
               requiredAdd: [],
               requiredUp: []
               requiredUp: [],
          needSort: ['createTime', 'sendTime', 'type', 'appointed']
            },
            componentDataDataLook: {
               entity: {
@@ -656,7 +670,8 @@
          }
        ],
        qrData:[],
        multipleSelection:[]
        multipleSelection:[],
        sonLaboratoryList:[]
         }
      },
    watch:{
@@ -770,8 +785,8 @@
               this.personList = data
            })
         },
         refreshTable() {
            this.$refs['ValueTable'].selectList()
         refreshTable(e) {
            this.$refs['ValueTable'].selectList(e)
         },
         refresh() {
            this.componentData.entity = this.HaveJson(this.entityCopy)
@@ -874,14 +889,32 @@
               this.distributeData.appointed = res.data
          this.distributeData.type = row.type
            })
        this.$axios.post(this.$api.insOrderPlan.upPlanUser2, {
            orderId:row.id,
          }).then(res => {
               if (res.code === 200&&res.data.length>0) {
            this.sonLaboratoryList = [];
            res.data.forEach(m=>{
              this.sonLaboratoryList.push({
                value:m,
                label:m
              })
            })
               }
            })
         },
         submitForm2() {
            if (this.distributeData.appointed == null || this.distributeData.appointed == '') {
               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=='')){
               this.$message.error('试验室未填写')
               return
            }
            this.upLoad = true;
@@ -889,7 +922,8 @@
               orderId: this.distributeData.orderId,
               sampleId: this.distributeData.sampleId,
               appointed: this.distributeData.appointed,
               userId: this.distributeData.userId
               userId: this.distributeData.userId,
          sonLaboratory:this.distributeData.sonLaboratory,
            }).then(res => {
               if (res.code === 201) {
                  this.upLoad = false
@@ -898,7 +932,7 @@
               this.$message.success('修改成功')
               this.upLoad = false
               this.issuedDialogVisible = false
               this.refreshTable()
               this.refreshTable('page')
            }).catch(e => {
               this.$message.error('修改失败')
               this.upLoad = false
@@ -911,7 +945,7 @@
            if (res.code===200){
              this.upLoad=false
              this.quashDialogVisible=false
              this.refreshTable()
              this.refreshTable('page')
              this.$message.success("更新成功")
            }
          })
@@ -920,7 +954,7 @@
            if (res.code===200){
              this.upLoad = false
              this.quashDialogVisible = false
              this.refreshTable()
              this.refreshTable('page')
              this.$message.success("更新成功")
            }
          })
@@ -935,6 +969,7 @@
         // 下单
         playOrder(num) {
            this.active = num
        this.refreshTable('page')
         },
         handleTab(m, i) {
            this.tabIndex = i;
@@ -981,6 +1016,11 @@
      },
      getStyle(){
        return 'height: calc(100% - '+(this.more?'94':'44')+'px)'
      },
      changeUser(){
        if(this.sonLaboratoryList.length>0){
          this.distributeData.sonLaboratory = this.sonLaboratoryList[0].value
        }
      }
      }
   }