Merge remote-tracking branch 'origin/master'

zss

2024-08-09 dd6aa18a74f7c47d816ae57be4667274a48ebee3

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

@@ -182,7 +182,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.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>
@@ -234,12 +234,11 @@
         </div>
         <div class="table">
            <ul class="tab">
               <li v-for="(m,i) in tabList" :key="i" :class="{active:i==tabIndex}" @click="handleTab(m,i)">{{m.label}}</li>
               <li v-for="(m,i) in tabList" :key="i+'afgh'" :class="{active:i==tabIndex}" @click="handleTab(m,i)">{{m.label}}</li>
            </ul>
            <ValueTable :style="getStyle()" ref="ValueTable"
                    :isColumnWidth="true"
                    :url="$api.insOrder.selectInsOrderParameter" :componentData="componentData"
               :key="'b'+upIndex"  />
                    :upIndex="upIndex"  />
         </div>
         <!-- 审核 -->
         <el-dialog title="下单审核" :visible.sync="verifyDialogVisible" width="30%" :before-close="handleClose">
@@ -297,7 +296,7 @@
                     <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 @change="changeUser">
                           <el-option v-for="(item,i) in personList" :key="i" :label="item.label" :value="item.value">
                           <el-option v-for="(item,i) in personList" :key="i+'gbnm.'" :label="item.label" :value="item.value">
                           </el-option>
                        </el-select>
                     </div>
@@ -306,7 +305,7 @@
                     <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 v-for="(item,i) in sonLaboratoryList" :key="i+'oooo'" :label="item.label" :value="item.value">
                           </el-option>
                        </el-select>
                     </div>
@@ -340,7 +339,7 @@
         </el-dialog>
      </div>
      <div style="width: 100%;height: 100%;" v-if="active >0">
         <Add :active="active" :currentId="currentId" v-if="active<4" />
         <Add :active="active" :currentId="currentId" v-if="active<4" :examine = "examine" />
      </div>
    <el-dialog title="标签打印" :visible.sync="printDialogVisible" width="40%" top="5vh">
      <div style="width:100%;height: 400px;overflow-y: auto;" v-loading="loadPint">
@@ -351,7 +350,7 @@
          v-model="checkAll"
          @change="handleCheckAllChange">全选</el-checkbox>
          <el-checkbox-group @change="changePrintCode()" v-model="checkIndexList">
            <el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 15px; font-size: 16px !important;">
            <el-card class="box-card" v-for="(item, i) in qrData" :key="i+'wwwww'" style="margin-bottom: 15px; font-size: 16px !important;">
                  <el-checkbox :label="i" :key="i" style="position: relative;top:-20px;left:5px"><br></el-checkbox>
                   <div>
                    <el-row style="font-size: 14px;padding-left: 20px;">
@@ -402,7 +401,7 @@
    </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" 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;">
          <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i+'uuuuu'" 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">
@@ -461,6 +460,7 @@
      data() {
         return {
        deleteTilte:'撤销',
        examine: null,
        deleteList:[],
        loadPint:false,
        checkAll: false,
@@ -952,6 +952,7 @@
            // this.verifyDialogVisible = true;
            this.active = 3;
            this.currentId = row.id
        this.examine = 1
         },
         // 撤销
         handlEquash(row) {
@@ -1112,12 +1113,14 @@
         // 下单
         playOrder(num) {
            this.active = num
        this.examine = 0
        this.refreshTable('page')
         },
         handleTab(m, i) {
            this.tabIndex = i;
            this.componentData.entity.state = m.value
            this.refreshTable()
            this.refreshTable('page')
        this.upIndex++
         },
         getUserMenu() {
            this.$axios.get(this.$api.user.getUserMenu).then(res => {