gongchunyi
7 小时以前 3a45bd762e14e654f252965adddeee2f9b3efb9d
Merge branch 'dev_ztns' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev_ztns
已修改3个文件
21 ■■■■ 文件已修改
src/views/business/inspectionTask/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/inspectionTask/inspection.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/outsourcingFinishProduct/components/printDialog.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/inspectionTask/index.vue
@@ -19,7 +19,7 @@
            </el-select>
          </el-form-item>
          <el-form-item label="物料属性" prop="materialProp">
          <el-form-item label="物料属性" prop="materialProp" v-if="tabIndex !== 0">
            <el-select clearable size="small" v-model="queryParams.materialProp" style="width: 100%" @change="refreshTable()">
              <el-option v-for="dict in dict.type.material_prop_type" :key="dict.value" :label="dict.label"
                :value="dict.value">
src/views/business/inspectionTask/inspection.vue
@@ -1070,6 +1070,7 @@
        if(res.code==200){
          this.$message.success("保存成功");
          this.ifsMaterialPropsVisible = false;
          this.refreshView()
        }
      })
    },
src/views/business/outsourcingFinishProduct/components/printDialog.vue
@@ -11,11 +11,11 @@
              <el-checkbox :label="i" :key="i" style="position: relative;top:0;left:10px"><br></el-checkbox>
              <div>
                <div style="text-align: center; margin-bottom: 2px;font-size: 22px;font-weight: bold;">成品检测</div>
                <div style="text-align: center; margin-bottom: 2px;font-size: 16px;font-weight: bold;">{{ item.partDesc
                <div style="text-align: left; margin-bottom: 2px;font-size: 16px;font-weight: bold;">{{ item.partDesc
                }}</div>
                <div style="display: flex; align-items: center;">
                  <div style="flex: 0 0 45%; text-align: center;">
                    <vueQr :text="getQrCodeText(item)" :size="160" :margin="2"></vueQr>
                <div style="display: flex;">
                  <div style="text-align: center;">
                    <vueQr :text="getQrCodeText(item)" :size="200" :margin="2"></vueQr>
                    <div style="margin-top: 5px; font-size: 14px;">
                      <span class="print-person-label">打印人</span>
                      <span style="margin-left: 20px; font-weight: bold;">{{ nickName }}</span>
@@ -82,10 +82,10 @@
        <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i"
          style="font-size: 0.29cm !important;font-weight: 700;page-break-after: always;color: #000;box-shadow: none;margin: 0 !important;padding: 0 !important;">
          <div>
            <div class="titleH1" style="text-align: center;margin-bottom: 1px">成品检测</div>
            <div class="titleH1" style="text-align: center;margin-bottom: 1px">{{ item.partDesc }}</div>
            <div style="display: flex; align-items: center;">
              <div style="flex: 0 0 45%; text-align: center;">
            <div class="titleH1" style="font-size:16px;font-weight:bold;text-align: center;margin-bottom: 1px">成品检测</div>
            <div class="titleH1" style="text-align: left;margin-bottom: 1px">{{ item.partDesc }}</div>
            <div style="display: flex;">
              <div style="text-align: center;">
                <vueQr :text="getQrCodeText(item)" :size="160" :margin="2"></vueQr>
                <div style="margin-top: 5px;">
                  <span class="print-person-label">打印人</span>
@@ -278,7 +278,7 @@
        targetStyles: ["*"], // 使用dom的所有样式,很重要
        printable: 'printOrder',//页面
        type: "html",//文档类型
        maxWidth: 360,
        maxWidth: 460,
        header: '',
        style:
          `@page {