Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-before into m...

licp

2024-10-28 3845f43c43252185a134566a63670de9d1c2d253

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

@@ -385,7 +385,7 @@
      <div style="width: 100%;height: 100%;" v-if="active >0">
         <Add :active="active" :currentId="currentId" v-if="active<4" :examine = "examine" />
      </div>
    <el-dialog title="标签打印" :visible.sync="printDialogVisible" width="40%" top="5vh">
    <el-dialog title="标签打印" :visible.sync="printDialogVisible" width="38%" top="5vh">
      <div style="width:100%;height: 400px;overflow-y: auto;" v-loading="loadPint">
        <div class="dia_body">
          <el-checkbox
@@ -395,46 +395,29 @@
          @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+'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;">
                        <el-col  style="font-weight: bold;">{{ item.pName }}</el-col>
              <el-checkbox :label="i" :key="i" style="position: relative;top:-10px;left:5px"><br></el-checkbox>
              <div>
                <p style="text-align: center;font-size: 18px;font-weight: 700;">{{ item.sample }}</p>
                <barcode :value="item.sampleCode" :height="34" :width="2" :displayValue="false" style="display: flex;justify-content: center;width: 100%;"></barcode>
                <div>
                  <div style="width: 100%;line-height: 30px;">
                    <el-row style="font-size: 16px;">
                      <el-col :span="16"><span>&nbsp;&nbsp;&nbsp;&nbsp;样品编号:&nbsp; </span>{{ item.sampleCode }}</el-col>
                      <el-col :span="8"><span>&nbsp;&nbsp;&nbsp;&nbsp;规格型号:&nbsp; </span>{{ item.model }}</el-col>
                    </el-row>
                    <div style="display: flex;">
                      <div>
                        <el-col :span="8" :offset="4">
                          <vueQr :text="JSON.stringify(item.sampleCode)" :size="140" :margin="2"></vueQr>
                        </el-col>
                      </div>
                      <div style="margin-left: 50px;width: 100%;">
                        <el-row>
                          <el-col  style="font-weight: bold;font-size: 14px;"><span>样品编号:&nbsp; </span>{{ item.sampleCode }}</el-col>
                        </el-row>
                        <el-row style="margin-top: 1px;font-size: 14px;">
                          <el-col  style="font-weight: bold;"><span>委托单号:&nbsp; </span>{{ item.code }}</el-col>
                        </el-row>
                        <el-row style="margin-top: 1px;font-size: 14px;">
                          <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.sample }}</el-col>
                        </el-row>
                        <el-row style="margin-top: 1px;font-size: 14px;">
                          <el-col  style="font-weight: bold;"><span>电机编号:&nbsp; </span>{{ item.motorNumber }}</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>
                        </el-row>
                        <el-row style="margin-top: 3px;font-size: 14px;">
                          <el-col  style="font-weight: bold;display: flex;align-items: center;"><span>样品状态:&nbsp; </span><el-radio-group :value="item.insState" style="margin-top: 7px;margin-left: 4px;" disabled>
                            <el-radio :label="0" style="font-weight: bold;margin-right: 7px;">待检</el-radio>
                            <el-radio :label="1" style="font-weight: bold;margin-right: 7px;">在检</el-radio>
                            <el-radio :label="2" style="font-weight: bold;margin-right: 7px;">已检</el-radio>
                          </el-radio-group><el-radio :label="1" style="font-weight: bold;margin-top: 7px;" v-model="item.isLeave" disabled>留样</el-radio></el-col>
                        </el-row>
                      </div>
                    <el-row style="margin-top: 1px;font-size: 16px;">
                      <el-col :span="16"><span>&nbsp;&nbsp;&nbsp;&nbsp;委托单号:&nbsp; </span>{{ item.code }}</el-col>
                      <el-col :span="8"><span>&nbsp;&nbsp;&nbsp;&nbsp;电机编号:&nbsp; </span>{{ item.motorNumber }}</el-col>
                    </el-row>
                    <el-row style="margin-top: 1px;font-size: 16px;">
                      <el-col><span>&nbsp;&nbsp;&nbsp;&nbsp;样机完成时间:&nbsp; </span>{{ item.issueTime }}</el-col>
                    </el-row>
                    <el-row style="margin-top: 1px;font-size: 16px;" class="ellipsis-multiline">
                      <el-col><span>&nbsp;&nbsp;&nbsp;&nbsp;检测项目:&nbsp; </span>{{ item.item }}</el-col>
                    </el-row>
                  </div>
                  </div>
                </div>
              </div>
            </el-card>
          </el-checkbox-group>
        </div>
@@ -446,48 +429,29 @@
        </el-row>
      </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 class="el-dialog__body" style="overflow-y: auto;position: fixed;top:60px;right: 20px;z-index: 9999;display: none;">
        <div id="printMOrder" class="printMOrder" ref="printMOrder">
          <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;">
          <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i+'uuuuu'" style="font-size: 16px !important;page-break-after: always;color: #000;box-shadow: none;margin: 0 !important;padding: 0 !important;">
            <div>
              <p style="text-align: center;font-size: 18px;font-weight: 500;margin-top: 10px;">{{ item.sample }}</p>
              <barcode :value="item.sampleCode" :height="34" :width="2" :displayValue="false" style="display: flex;justify-content: center;width: 100%;"></barcode>
              <div>
                <el-col :span="10" :offset="2">
                  <vueQr :text="JSON.stringify(item.sampleCode)" :size="60" :margin="2"></vueQr>
                </el-col>
              </div>
              <div style="margin-left: 0.32cm;line-height: 0.22cm;">
                <el-row>
                  <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.20cm;">
                  <el-col><span>委托单号:&nbsp; </span>{{ item.code }}</el-col>
                </el-row>
                <el-row style="font-size: 0.20cm;">
                  <el-col><span>规格型号:&nbsp; </span>{{ item.model }}</el-col>
                </el-row>
                <el-row style="font-size: 0.20cm;">
                  <el-col ><span>样品名称:&nbsp; </span>{{ item.sample }}</el-col>
                </el-row>
                <el-row style="font-size: 0.20cm;">
                  <el-col ><span>电机编号:&nbsp; </span>{{ item.motorNumber }}</el-col>
                </el-row>
                <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.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>待检
                    <span v-if="item.insState==1">√</span><span class="scor" v-if="item.insState!=1"></span>在检
                    <span v-if="item.insState==2">√</span><span class="scor" v-if="item.insState!=2"></span>已检
                    <span v-if="item.isLeave==1">√</span><span class="scor" v-if="item.isLeave!=1"></span>留样</span>
                    <!-- <el-radio-group :value="item.insState" style="margin-top: 3px;margin-left: 1px;" disabled>
                    <el-radio :label="0" style="margin-right: 3px;font-size: 6px;">待检</el-radio>
                    <el-radio :label="1" style="margin-right: 3px;font-size: 6px;">在检</el-radio>
                    <el-radio :label="2" style="margin-right: 3px;font-size: 6px;">已检</el-radio>
                  </el-radio-group><el-radio :label="1" style="margin-top: 3px;font-size: 8px;" v-model="item.isLeave" disabled>留样</el-radio> -->
                </el-col>
                </el-row>
                <div style="width: 100%;line-height: 30px;">
                  <el-row style="font-size: 16px;">
                    <el-col :span="16"><span>样品编号:&nbsp; </span>{{ item.sampleCode }}</el-col>
                    <el-col :span="7"><span>规格型号:&nbsp; </span>{{ item.model }}</el-col>
                  </el-row>
                  <el-row style="margin-top: 1px;font-size: 16px;">
                    <el-col :span="16"><span>委托单号:&nbsp; </span>{{ item.code }}</el-col>
                    <el-col :span="7"><span>电机编号:&nbsp; </span>{{ item.motorNumber }}</el-col>
                  </el-row>
                  <el-row style="margin-top: 1px;font-size: 16px;">
                    <el-col><span>样机完成时间:&nbsp; </span>{{ item.issueTime }}</el-col>
                  </el-row>
                  <el-row style="margin-top: 1px;font-size: 16px;" class="ellipsis-multiline">
                    <el-col><span>检测项目:&nbsp; </span>{{ item.item }}</el-col>
                  </el-row>
                </div>
              </div>
            </div>
          </el-card>
@@ -522,7 +486,7 @@
                  <el-button type="primary" @click="submitForm3" :loading="upLoad">确 定</el-button>
               </el-row>
            </span>
         </el-dialog>
      </el-dialog>
   </div>
</template>

@@ -531,7 +495,6 @@
   import Add from '../do/b1-ins-order/add.vue'
  import vueQr from 'vue-qr'
  import PrintJS from 'print-js'
import { Header } from 'iview';
   export default {
      components: {
         ValueTable,
@@ -838,11 +801,7 @@
        more:false,
        insOrderRow:{},
        checkIndexList:[],
        checkDataList:[
          {
            sampleCode:'11111'
          }
        ],
        checkDataList:[],
        qrData:[],
        multipleSelection:[],
        sonLaboratoryList:[],
@@ -949,7 +908,7 @@
            a.item = [...new Set(arr1)].join(',')
          })
          this.qrData = arr
          console.log(this.qrData)
          // console.log(this.qrData)
            })
      },
      //选择要打印的二维码
@@ -979,31 +938,31 @@
          this.$message.warning("请选择要打印的二维码")
          return
        }
        this.printDialogVisible = false;
        PrintJS({
            printable: 'printMOrder',//页面
            type: "html",//文档类型
              maxWidth:360,
              targetStyles:['*'],
              style: `@page {
                margin:0;
                size: 400px 75px collapse;
                margin-top:3px;
                &:first-of-type{
                  margin-top:0 !important;
                }
              }
              html{
                zoom:100%;
              }
              @media print{
                width: 400px;
                height: 75px;
                margin:0;
              }`,
              onPrintDialogClose: this.erexcel=false,
              targetStyles: ["*"], // 使用dom的所有样式，很重要
              font_size: '0.20cm',
          targetStyles: ["*"], // 使用dom的所有样式，很重要
          printable: 'printMOrder',//页面
          type: "html",//文档类型
          maxWidth:720,
          header: '',
          style:
            `@page {
              margin: 0.4cm;
              margin-right: 0.4cm;
              margin-top: 0.4cm;
              margin-bottom: 0.4cm;
              padding-bottom: 0px;
              size: 800px 600px collapse;
            }
            html{
              zoom:100%;

            }
            @media print{
              width: 800px;
              height: 600px;
              margin:0;
            }`,
          font_size: '16px',
        });
      },
      async print(){
@@ -1039,7 +998,10 @@
            this.$refs['ValueTable'].selectList(e)
         },
         refresh() {
        let state = this.componentData.entity.state
            this.componentData.entity = this.HaveJson(this.entityCopy)
        this.componentData.entity.state = state
        this.refreshTable()
            this.upIndex++
         },
         // 权限分配