调胶

applications/dee-mes/src/privateComponents/components/LacquerFreeze/printTag.vue

@@ -48,7 +48,7 @@
                   padding-left: 20px;
                 "
               >
-                数量 <span style="padding-left: 20px">{{ item.count }}</span>
+                重量 <span style="padding-left: 20px">{{ item.weight }}</span>
               </div>
             </div>
             <div
@@ -85,7 +85,6 @@
                 {{ item.number.value }}
               </div>
             </div>
-
             <div
               style="
                 height: 76px;
@@ -174,6 +173,33 @@
             />
           </div>
         </div>
+        <div
+          style="height: 40px; border-bottom: 2px solid #222"
+        >
+          <!-- 材料规范 -->
+          <div
+            style="
+              display: inline-block;
+              border-right: 2px solid #222;
+              line-height: 40px;
+              width: 24%;
+              text-align: center;
+              box-sizing: border-box;
+            "
+          >
+            {{ item.standard.label }}
+          </div>
+          <div
+            style="
+              display: inline-block;
+              width: 59%;
+              box-sizing: border-box;
+              padding-left: 10px;
+            "
+          >
+            {{ item.standard.value }}
+          </div>
+        </div>
         <div
           v-if="item.remainingConstructionPeriod"
           style="height: 40px; border-bottom: 2px solid #222"

applications/dee-mes/src/privateComponents/components/LacquerFreeze/subpackagePrint.vue

@@ -23,7 +23,8 @@ export default {
         visible: false,
         width: 260,
         prints: []
-      }
+      },
+      form: {}
     }
   },
   computed: {},
@@ -36,6 +37,7 @@ export default {
   },
   // 生命周期 - 挂载完成（可以访问 DOM 元素）
   mounted() {
+    this.form = this.$utils.findByNameVnode(this, 'DeeAsForm').form
     this.eventFunc()
   },
   methods: {
@@ -107,17 +109,25 @@ export default {
           this.printConfig.prints = [
             {
               text: data.itemNo,
-              title: '胶料冷冻标签',
-              count: data.weight,
+              title: '密封剂冷冻标签',
+              weight: data.weight,
               number: { label: '编号', value: data.itemNo },
+              modelNo: {
+                label: '材料规范',
+                value: data.assignCard.modelNo
+              },
               mark: {
-                label: '牌号',
+                label: '材料标识/牌号',
                 value: data.assignCard.modelNo
               },
               mixingUnit: {
-                label: '合格证号',
+                label: '合格证编号',
                 value: data.assignCard.certificateNo
               },
+              standard: {
+                label: '材料规范',
+                value: this.form.standard
+              },
               remainingConstructionPeriod: {
                 label: '剩余施工期',
                 value: data.assignCard.leftWorkMinutes
@@ -139,9 +149,9 @@ export default {
                   }
                 }
               },
-              deployment: { label: '调配员', value: data.creator.userName },
+              deployment: { label: '发料员', value: data.creator.userName },
               inspector: {
-                label: '检验员',
+                label: '检验',
                 value: data.assignCard.checker
               }
             }

applications/dee-mes/src/privateComponents/components/PaintProcess/glueMixingApplyNode.vue

+<template>
+  <div>
+    <dee-as-com
+      :lay-config="layConfig"
+      :basic-data="basicData"
+    />
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'GlueMixingApplyNode',
+  components: {},
+  props: {
+    componentProp: {
+      type: Object
+    },
+    basicData: {
+      type: Object,
+      default: () => null
+    }
+  },
+  data() {
+    return {}
+  },
+  computed: {
+    layConfig() {
+      return JSON.parse(JSON.parse(this.componentProp.configParams))
+    }
+  },
+  watch: {},
+  // 生命周期 - 创建完成（可以访问当前this 实例）
+  created() {
+  },
+  // 生命周期 - 挂载之前
+  beforeMount() {
+  },
+  // 生命周期 - 挂载完成（可以访问 DOM 元素）
+  mounted() {
+    console.log(this.layConfig)
+  },
+  methods: {}
+}
+</script>
+
+<style lang='scss' scoped>
+
+</style>