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

zouyu

2024-08-08 c263fb316fc23d9db98ce711fda30d81c28d2d9c

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

@@ -175,9 +175,14 @@
                  v-model="componentData.entity.entrustCode" @keyup.enter.native="refreshTable()"></el-input></div>
            </div>
            <div class="search_thing" style="width: 20%;">
              <div class="search_label" style="width: 120px;">外部委托编号：</div>
              <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                  v-model="componentData.entity.outEntrustCode" @keyup.enter.native="refreshTable()"></el-input></div>
            </div>
            <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.sample" @keyup.enter.native="refreshTable()"></el-input></div>
                  v-model="componentData.entity.sampleName" @keyup.enter.native="refreshTable()"></el-input></div>
            </div>
            <div class="search_thing" style="width: 20%;">
              <div class="search_label">样品型号：</div>
@@ -189,7 +194,7 @@
              <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="width: 20%;">
            <div class="search_thing" style="width: 20%;" v-if="more">
              <div class="search_label">下单时间：</div>
              <div class="search_input">
                <el-date-picker style="width:100%" v-model="componentData.entity.createTime"
@@ -321,6 +326,18 @@
                  :componentData="componentDataDataLook"/>
            </div>
         </el-dialog>
      <el-dialog :title="deleteTilte" :visible.sync="deleteDialogVisible" width="80%">
            <div style="height: 70vh;overflow-y: auto;" v-if="deleteDialogVisible">
               <ValueTable ref="ValueTableDataDelete" :url="$api.insOrder.selectNoProducts+'?orderId='+orderId+'&ids='+this.revocationInsProductIds"
                  :componentData="componentDataDelete" :isColumnWidth="true"/>
            </div>
        <span slot="footer" class="dialog-footer">
        <el-row>
          <el-button @click="handleNo">{{deleteTilte=='撤销'?'取 消':'不通过'}}</el-button>
          <el-button type="primary" @click="submitDelete" :loading="printLoading">{{deleteTilte=='撤销'?'确 定':'通 过'}}</el-button>
        </el-row>
      </span>
         </el-dialog>
      </div>
      <div style="width: 100%;height: 100%;" v-if="active >0">
         <Add :active="active" :currentId="currentId" v-if="active<4" />
@@ -357,7 +374,7 @@
                          <el-col  style="font-weight: bold;"><span>规格型号:&nbsp; </span>{{ item.model }}</el-col>
                        </el-row>
                        <el-row style="margin-top: 1px;font-size: 14px;">
                          <el-col  style="font-weight: bold;"><span>样品名称:&nbsp; </span>{{ item.sampleName }}</el-col>
                          <el-col  style="font-weight: bold;"><span>样品名称:&nbsp; </span>{{ item.sample }}</el-col>
                        </el-row>
                        <el-row style="margin-top: 1px;font-size: 14px;" class="ellipsis-multiline">
                          <el-col  style="font-weight: bold;"><span>检测项目:&nbsp; </span>{{ item.item }}</el-col>
@@ -384,31 +401,31 @@
      </span>
    </el-dialog>
    <div class="el-dialog__body" style="overflow-y: auto;margin-top: 0;position: fixed;top: 999px;z-index: 99999;display: none;">
        <div id="printMOrder">
          <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 0.21cm !important;page-break-after: always;color: #000;box-shadow: none;" >
        <div id="printMOrder" class="printMOrder" ref="printMOrder">
          <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 0.20cm !important;page-break-after: always;color: #000;box-shadow: none;margin: 0 !important;padding: 0 !important;">
            <div style="display: flex;">
              <div>
                <el-col :span="10" :offset="2">
                  <vueQr :text="JSON.stringify(item.sampleCode)" :size="78" :margin="2"></vueQr>
                  <vueQr :text="JSON.stringify(item.sampleCode)" :size="60" :margin="2"></vueQr>
                </el-col>
              </div>
              <div style="margin-left: 0.32cm;line-height: 0.25cm;">
              <div style="margin-left: 0.32cm;line-height: 0.22cm;">
                <el-row>
                  <el-col  style="font-size: 0.21cm;"><span>样品编号:&nbsp; </span>{{ item.sampleCode }}</el-col>
                  <el-col  style="font-size: 0.20cm;width: 4cm;" class="single-line-ellipsis"><span>样品编号:&nbsp; </span>{{ item.sampleCode }}</el-col>
                </el-row>
                <el-row style="font-size: 0.21cm;">
                <el-row style="font-size: 0.20cm;">
                  <el-col><span>委托单号:&nbsp; </span>{{ item.code }}</el-col>
                </el-row>
                <el-row style="font-size: 0.21cm;">
                <el-row style="font-size: 0.20cm;">
                  <el-col><span>规格型号:&nbsp; </span>{{ item.model }}</el-col>
                </el-row>
                <el-row style="font-size: 0.21cm;">
                  <el-col ><span>样品名称:&nbsp; </span>{{ item.sampleName }}</el-col>
                <el-row style="font-size: 0.20cm;">
                  <el-col ><span>样品名称:&nbsp; </span>{{ item.sample }}</el-col>
                </el-row>
                <el-row style="font-size: 0.21cm;width: 4.77cm;">
                <el-row style="font-size: 0.20cm;width: 4cm;">
                  <el-col class="ellipsis-multiline"><span>检测项目:&nbsp; </span>{{ item.item }}</el-col>
                </el-row>
                <el-row style="margin-top: 0.01cm;font-size: 0.21cm;">
                <el-row style="margin-top: 0.01cm;font-size: 0.20cm;">
                  <el-col  style="display: flex;align-items: center;"><span>样品状态:&nbsp;
                  </span>
                    <span style="white-space: nowrap;"><span v-if="item.insState==0">√</span><span class="scor" v-if="item.insState!=0"></span>待检
@@ -443,6 +460,8 @@
      },
      data() {
         return {
        deleteTilte:'撤销',
        deleteList:[],
        loadPint:false,
        checkAll: false,
        isIndeterminate: true,
@@ -475,14 +494,15 @@
            sampleName: null,
            sampleModel: null,
            sampleCode: null,
            outEntrustCode: null,
                  state: 0,
            name:null,
            engineering:null,
            production:null,
                  orderBy: {
                     field: 'id',
                     order: 'asc'
                  }
                  // orderBy: {
                  //    field: '',
                  //    order: ''
                  // }
               },
               isIndex: true,
               showSelect: true,
@@ -520,12 +540,21 @@
                  disabFun: (row, index) => {
                     return row.state != 1 && row.state != 0
                  }
               },
          {
                  id: 'quashCheck',
                  font: '撤销审核',
                  type: 'text',
                  method: 'handlEquashCheck',
                  disabFun: (row, index) => {
                     return (row.state != 1 && row.state != 0)||(this.tabIndex!=1)||row.isRevocation!=1
                  }
               }, {
                  font: '分配',
                  type: 'text',
                  method: 'handleIssued',
                  disabFun: (row, index) => {
                     return row.state != 1 || row.sendTime != null
                     return row.state != 1 || !!row.assign
                  }
               }],
               linkEvent: {
@@ -588,6 +617,8 @@
               requiredUp: [],
          needSort: ['createTime', 'sendTime', 'type', 'appointed']
            },
        orderId:'',
        revocationInsProductIds:'',
            componentDataDataLook: {
               entity: {
                  id: 0,
@@ -629,13 +660,49 @@
              },
              {
                name:'model',
                index:2
                index:5
              }
            ]
          },
               requiredAdd: [],
               requiredUp: []
            },
        componentDataDelete: {
               entity: {
                  // orderId: '',
                  // orderBy: {
                  //    field: 'sampleCode',
                  //    order: 'asc'
                  // }
               },
          isPage:false,
               isIndex: false,
               showSelect: true,
               select: true,
          selectMethod: 'selectDelete',
               do: [],
               tagField: {
                  insState: {
                     select: []
                  },
                  insResult: {
                     select: [{
                        value: 1,
                        label: '合格',
                        type: 'success'
                     },{
                        value: 0,
                        label: '不合格',
                        type: 'danger'
                     }]
                  }
               },
               selectField: {},
          spanConfig:{},
               requiredAdd: [],
               requiredUp: []
            },
        deleteDialogVisible:false,
            entityCopy: {},
            upIndex: 0,
            addPower: true,
@@ -751,19 +818,23 @@
              targetStyles:['*'],
              style: `@page {
                margin:0;
                size: 360px 175px collapse;
                size: 400px 75px collapse;
                margin-top:3px;
                &:first-of-type{
                  margin-top:0 !important;
                }
              }
              html{
                zoom:100%;
              }
              @media print{
                width: 360px;
                height: 175px;
                width: 400px;
                height: 75px;
                margin:0;
              }`,
              onPrintDialogClose: this.erexcel=false,
              targetStyles: ["*"], // 使用dom的所有样式，很重要
              font_size: '0.21cm',
              font_size: '0.20cm',
        });
      },
      print(){
@@ -802,6 +873,7 @@
            let add = false
        let revoke = false
        let check = false
        let checkUpdate = false
            for (var i = 0; i < power.length; i++) {
               if (power[i].menuMethod == 'upInsOrder') {
                  up = true
@@ -815,8 +887,14 @@
          if (power[i].menuMethod == 'upInsOrderOfState') {
             check = true
          }
          if (power[i].menuMethod == 'checkUpdate') {
             checkUpdate = true
          }
            }
            if (!up) {
               this.componentData.do.splice(5, 1)
            }
        if (!checkUpdate) {
               this.componentData.do.splice(4, 1)
            }
        if (!revoke) {
@@ -877,9 +955,72 @@
         },
         // 撤销
         handlEquash(row) {
            this.quashDialogVisible = true;
        this.insOrderRow=row
        if(this.tabIndex!=1){
          this.quashDialogVisible = true;
          this.insOrderRow=row
        }else{
          // this.componentDataDelete.entity.orderId = row.id
          this.orderId = row.id
          this.revocationInsProductIds = ''
          this.componentDataDelete.showSelect= true
          this.componentDataDelete.select= true
          this.deleteTilte = '撤销'
          this.deleteDialogVisible = true;
        }
         },
      selectDelete(arr){
        this.deleteList = arr;
      },
      submitDelete(){
        if(this.deleteTilte=='撤销'){
          if(this.deleteList.length==0){
            this.$message.error('请选择要撤销的项')
            return
          }
          let ids = this.deleteList.map(m=>m.id).join(',')
          this.printLoading = true;
          this.axios.put(this.$api.insOrder.updateInspected+"?ids="+ids+'&orderId='+this.orderId).then(res=>{
            if (res.code===200){
              this.printLoading=false
              this.deleteDialogVisible=false
              this.refreshTable('page')
              this.$message.success("更新成功")
            }
          })
        }else{
          this.axios.post(this.$api.insOrder.checkUpdate+'?orderId='+this.orderId+'&state='+1).then(res=>{
            if (res.code===200){
              this.printLoading=false
              this.deleteDialogVisible=false
              this.refreshTable('page')
              this.$message.success("更新成功")
            }
          })
        }
      },
      handlEquashCheck(row){
        // this.componentDataDelete.entity.orderId = row.id
        this.orderId = row.id
        this.revocationInsProductIds = row.revocationInsProductIds
        this.componentDataDelete.showSelect= false
        this.componentDataDelete.select= false
        this.deleteTilte = '撤销审核'
        this.deleteDialogVisible = true;
      },
      handleNo(){
        if(this.deleteTilte=='撤销'){
          this.deleteDialogVisible=false
        }else{
          this.axios.post(this.$api.insOrder.checkUpdate+'?orderId='+this.orderId+'&state='+0).then(res=>{
            if (res.code===200){
              this.printLoading=false
              this.deleteDialogVisible=false
              this.refreshTable('page')
              this.$message.success("更新成功")
            }
          })
        }
      },
         // 下发
         handleIssued(row) {
            this.issuedDialogVisible = true;
@@ -1007,6 +1148,7 @@
                  }
               })
               this.componentDataDataLook.tagField.insState.select = data
          this.componentDataDelete.tagField.insState.select = data
            })
         },
      selectEnumByCategoryForOrderType() {