feat(生产订单): 添加颜色和机型,单位字段并调整打印二维码样式

src/views/produceOrder/components/print.vue

@@ -5,56 +5,63 @@
 
 
             <div v-for="(item, index) in codeList" :key="index"
-                style=" display: flex; padding-left: 20px; align-items: center; justify-content: center; margin: auto;">
+                style=" display: flex; padding-left: 20px; align-items: center; justify-content: center; margin: auto; margin-bottom: 30px;">
                 <div style="width: 250px; height: 240px; ">
-                    <img :src="item.qrcode" alt="QR Code" style=" width: 240px; height: 240px;">
+                    <img :src="item.qrcode" alt="QR Code" style=" width: 200px; height: 200px;">
                 </div>
                 <div
-                    style="width: 440px; height: 240px; display: flex;  flex-direction: column;  flex-wrap: wrap; justify-content: space-between; align-items:flex-start;">
-                    <div style="text-align: left;   font-size: 20px; ">
+                    style="width: 440px; display: flex;  flex-direction: column;  flex-wrap: wrap; justify-content: space-between; align-items:flex-start;">
+                    <div style="text-align: left;   font-size: 16px; ">
                         <span style="display: inline-block;  width: 100px;">产品编码：</span>
                         <span style="color: #000;">{{ item.productCode }}</span>
                     </div>
 
-                    <div style="text-align: left;   font-size: 20px; ">
+                    <div style="text-align: left;   font-size: 16px; ">
                         <span style="display: inline-block;  width: 100px;">名称：</span>
                         <span style="color: #000;">{{ item.productName }}</span>
                     </div>
 
-                    <div style="text-align: left;   font-size: 20px; ">
+                    <div style="text-align: left;   font-size: 16px; ">
                         <span style="display: inline-block;  width: 100px;">牌号：</span>
                         <span style="color: #000;">{{ item.brandNo }}</span>
                     </div>
 
-                    <div style="text-align: left;   font-size: 20px; ">
+                    <div style="text-align: left;   font-size: 16px; ">
                         <span style="display: inline-block;  width: 100px;">型号：</span>
                         <span style="color: #000;">{{ item.model }}</span>
                     </div>
 
 
-                    <div style="text-align: left;   font-size: 20px; ">
+                    <div style="text-align: left;   font-size: 16px; ">
                         <span style="display: inline-block;  width: 100px;">生产数量：</span>
                         <span style="color: #000;">{{ item.formingNum }} {{ item.unit }}</span>
                     </div>
 
 
 
-                    <div style="text-align: left;   font-size: 20px; ">
+                    <div style="text-align: left;   font-size: 16px; ">
                         <span style="display: inline-block;  width: 100px;">生产重量：</span>
                         <span style="color: #000;">{{ item.formingWeight }} {{ item.weightUnit }}</span>
                     </div>
 
-                    <div style="text-align: left;   font-size: 20px; ">
+                    <div style="text-align: left;   font-size: 16px; ">
                         <span style="display: inline-block;  width: 100px;">状态：</span>
                         <span style="color: #000;">{{ statusList[item.status] }}</span>
                     </div>
 
 
-                    <div style="text-align: left;   font-size: 20px; ">
+                    <div style="text-align: left;   font-size: 16px; ">
                         <span style="display: inline-block;  width: 100px;">工艺路线：</span>
                         <span style="color: #000;">{{ item.produceRoutingName }} </span>
                     </div>
-
+                    <div style="text-align: left;   font-size: 16px; ">
+                        <span style="display: inline-block;  width: 100px;">颜色：</span>
+                        <span style="color: #000;">{{ item.colorKey }} </span>
+                    </div>
+                    <div style="text-align: left;   font-size: 16px; ">
+                        <span style="display: inline-block;  width: 100px;">机型：</span>
+                        <span style="color: #000;">{{ item.modelKey }} </span>
+                    </div>
 
                 </div>
 

src/views/produceOrder/components/printSr.vue

@@ -16,6 +16,7 @@
           display: flex;
           align-items: center;
           justify-content: center;
+          margin-bottom: 30px;
         "
       >
         <div
@@ -42,54 +43,63 @@
             align-items: flex-start;
           "
         >
-          <div style="text-align: left; font-size: 20px">
+          <div style="text-align: left; font-size: 16px">
             <span style="display: inline-block">产品编码：</span>
             <span style="color: #000">{{ item.productCode }}</span>
           </div>
 
-          <div style="text-align: left; font-size: 20px">
+          <div style="text-align: left; font-size: 16px">
             <span style="display: inline-block">名称：</span>
             <span style="color: #000">{{ item.productName }}</span>
           </div>
 
-          <div style="text-align: left; font-size: 20px">
+          <div style="text-align: left; font-size: 16px">
             <span style="display: inline-block">牌号：</span>
             <span style="color: #000">{{ item.brandNo }}</span>
           </div>
 
-          <div style="text-align: left; font-size: 20px">
+          <div style="text-align: left; font-size: 16px">
             <span style="display: inline-block">型号：</span>
             <span style="color: #000">{{ item.model }}</span>
           </div>
 
-          <div style="text-align: left; font-size: 20px">
+          <div style="text-align: left; font-size: 16px">
             <span style="display: inline-block">规格：</span>
             <span style="color: #000">{{ item.specification }}</span>
           </div>
 
-          <div style="text-align: left; font-size: 20px">
+          <div style="text-align: left; font-size: 16px">
             <span style="display: inline-block">生产数量：</span>
             <span style="color: #000"
               >{{ item.formingNum }} {{ item.unit }}</span
             >
           </div>
 
-          <div style="text-align: left; font-size: 20px">
+          <div style="text-align: left; font-size: 16px">
             <span style="display: inline-block">生产重量：</span>
             <span style="color: #000"
               >{{ item.formingWeight }} {{ item.weightUnit }}</span
             >
           </div>
 
-          <div style="text-align: left; font-size: 20px">
+          <div style="text-align: left; font-size: 16px">
             <span style="display: inline-block">状态：</span>
             <span style="color: #000">{{ statusList[item.status] }}</span>
           </div>
 
-          <div style="text-align: left; font-size: 20px">
+          <div style="text-align: left; font-size: 16px">
             <span style="display: inline-block">工艺路线：</span>
             <span style="color: #000">{{ item.produceRoutingName }} </span>
           </div>
+
+          <div style="text-align: left;   font-size: 16px; ">
+              <span style="display: inline-block;  width: 100px;">颜色：</span>
+              <span style="color: #000;">{{ item.colorKey }} </span>
+          </div>
+          <div style="text-align: left;   font-size: 16px; ">
+              <span style="display: inline-block;  width: 100px;">机型：</span>
+              <span style="color: #000;">{{ item.modelKey }} </span>
+          </div>
         </div>
       </div>
     </div>

src/views/produceOrder/components/printTg.vue

@@ -17,6 +17,7 @@
           align-items: center;
           justify-content: center;
           margin: auto;
+          margin-bottom: 30px;
         "
       >
         <div style="width: 200px; height: 200px; margin-right: 18px">
@@ -36,54 +37,62 @@
             align-items: flex-start;
           "
         >
-          <div style="text-align: left; font-size: 20px">
+          <div style="text-align: left; font-size: 16px">
             <span style="display: inline-block">产品编码：</span>
             <span style="color: #000">{{ item.productCode }}</span>
           </div>
 
-          <div style="text-align: left; font-size: 20px">
+          <div style="text-align: left; font-size: 16px">
             <span style="display: inline-block">名称：</span>
             <span style="color: #000">{{ item.productName }}</span>
           </div>
 
-          <div style="text-align: left; font-size: 20px">
+          <div style="text-align: left; font-size: 16px">
             <span style="display: inline-block">牌号：</span>
             <span style="color: #000">{{ item.brandNo }}</span>
           </div>
 
-          <div style="text-align: left; font-size: 20px">
+          <div style="text-align: left; font-size: 16px">
             <span style="display: inline-block">型号：</span>
             <span style="color: #000">{{ item.model }}</span>
           </div>
 
-          <div style="text-align: left; font-size: 20px">
+          <div style="text-align: left; font-size: 16px">
             <span style="display: inline-block">规格：</span>
             <span style="color: #000">{{ item.specification }}</span>
           </div>
 
-          <div style="text-align: left; font-size: 20px">
+          <div style="text-align: left; font-size: 16px">
             <span style="display: inline-block">生产数量：</span>
             <span style="color: #000"
               >{{ item.formingNum }} {{ item.unit }}</span
             >
           </div>
 
-          <div style="text-align: left; font-size: 20px">
+          <div style="text-align: left; font-size: 16px">
             <span style="display: inline-block">生产重量：</span>
             <span style="color: #000"
               >{{ item.formingWeight }} {{ item.weightUnit }}</span
             >
           </div>
 
-          <div style="text-align: left; font-size: 20px">
+          <div style="text-align: left; font-size: 16px">
             <span style="display: inline-block">状态：</span>
             <span style="color: #000">{{ statusList[item.status] }}</span>
           </div>
 
-          <div style="text-align: left; font-size: 20px">
+          <div style="text-align: left; font-size: 16px">
             <span style="display: inline-block">工艺路线：</span>
             <span style="color: #000">{{ item.produceRoutingName }} </span>
           </div>
+          <div style="text-align: left;   font-size: 16px; ">
+              <span style="display: inline-block;  width: 100px;">颜色：</span>
+              <span style="color: #000;">{{ item.colorKey }} </span>
+          </div>
+          <div style="text-align: left;   font-size: 16px; ">
+              <span style="display: inline-block;  width: 100px;">机型：</span>
+              <span style="color: #000;">{{ item.modelKey }} </span>
+          </div>
         </div>
       </div>
     </div>

src/views/produceOrder/index.vue

@@ -572,6 +572,18 @@
             align: 'center',
             showOverflowTooltip: true
           },
+          {
+            prop: 'colorKey',
+            label: '颜色',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'modelKey',
+            label: '机型',
+            align: 'center',
+            showOverflowTooltip: true
+          },
           {
             prop: 'productionCodes',
             label: '生产编号',
@@ -619,6 +631,13 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          {
+            prop: 'unit',
+            label: '单位',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'formingWeight',
             label: '要求生产重量',
@@ -1090,6 +1109,7 @@
       },
 
       handleQRcode(row) {
+        console.log('clientEnvironmentId', this.clientEnvironmentId)
         if (this.clientEnvironmentId == 2) {
           this.$refs.printSrRef.open([row.id]);
         } else if (this.clientEnvironmentId == 3) {
@@ -1101,7 +1121,6 @@
 
       allPrinting() {
         let ids = this.findAllIds(this.selection);
-
         if (this.clientEnvironmentId == 2) {
           this.$refs.printSrRef.open(ids);
         } else if (this.clientEnvironmentId == 3) {

src/views/produceOrder/print.vue

@@ -10,14 +10,14 @@
         <div style="text-align: center; font-size: 16px; font-weight: bold; margin: 5px 0;">工艺流程卡</div>
         <table style="width: 100%; border-collapse: collapse; margin-bottom: 6px;">
           <tr>
-            <td rowspan="5" style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle; text-align: center; width: 100px; height: 120px;">
+            <td rowspan="6" style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle; text-align: center; width: 100px; height: 120px;">
               <img :src="card.qrLeft" alt="二维码" style="width: 90px; height: 90px;" />
             </td>
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">单号</td>
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">{{ card.code }}</td>
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">单据日期</td>
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">{{ card.createDate }}</td>
-            <td rowspan="5" style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle; text-align: center; width: 100px; height: 120px;">
+            <td rowspan="6" style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle; text-align: center; width: 100px; height: 120px;">
               <img :src="card.qrRight" alt="二维码" style="width: 90px; height: 90px;" />
             </td>
           </tr>
@@ -39,6 +39,12 @@
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">规格</td>
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">{{ card.specification }}</td>
           </tr>
+          <tr>
+            <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">颜色</td>
+            <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">{{ card.colorKey }}</td>
+            <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">机型</td>
+            <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">{{ card.modelKey }}</td>
+          </tr>
           <tr>
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">计划开始时间</td>
             <td style="border: 1px solid #000; padding: 3px 5px; vertical-align: middle;">{{ card.planStartTime }}</td>