695593266@qq.com 2 päivää sitten
vanhempi
commit
8501ace860

+ 1 - 3
src/views/batchRecord/print/electrodeBatchRecord/batchRecordCover.vue

@@ -19,9 +19,7 @@
         <div class="record-title">产品批记录</div>
         <div class="record-code">
           <span class="line-label">编号:</span>
-          <span class="line-value">{{
-            displayValue(form.recordCode || form.orderCode || form.code)
-          }}</span>
+          <span class="line-value"></span>
         </div>
 
         <div class="record-fields">

+ 11 - 30
src/views/batchRecord/print/electrodeBatchRecord/productionOrder.vue

@@ -60,7 +60,16 @@
             }}</span>
             日</div
           >
-          <div>生产指令编号:{{ form.orderCode }}</div>
+          <div
+            >生产指令编号:<span
+              style="
+                display: inline-block;
+                width: 140px;
+                border-bottom: 1px solid #000;
+              "
+              >&nbsp;</span
+            ></div
+          >
         </div>
         <div
           style="
@@ -189,16 +198,6 @@
                 >{{ form.expiryDate }}</td
               >
             </tr>
-            <tr style="height: 32px">
-              <td style="border: 1px solid #000; padding: 6px">&nbsp;</td>
-              <td style="border: 1px solid #000; padding: 6px">&nbsp;</td>
-              <td style="border: 1px solid #000; padding: 6px">&nbsp;</td>
-              <td style="border: 1px solid #000; padding: 6px">&nbsp;</td>
-              <td style="border: 1px solid #000; padding: 6px">&nbsp;</td>
-              <td style="border: 1px solid #000; padding: 6px">&nbsp;</td>
-              <td style="border: 1px solid #000; padding: 6px">&nbsp;</td>
-              <td style="border: 1px solid #000; padding: 6px">&nbsp;</td>
-            </tr>
             <tr>
               <td
                 style="
@@ -323,7 +322,7 @@
             </tr>
           </thead>
           <tbody>
-            <tr v-for="(item, idx) in getPaddedMaterialList(form)" :key="idx">
+            <tr v-for="(item, idx) in form.materialList" :key="idx">
               <td
                 style="
                   border: 1px solid #000;
@@ -485,24 +484,6 @@
         const qty = parseFloat(form.planQuantity);
         return isNaN(qty) ? '0.00' : qty.toFixed(2);
       },
-      getPaddedMaterialList(form) {
-        const list = form.materialList || [];
-        const minRows = 16;
-        const result = list.map((item) => ({ ...item }));
-        while (result.length < minRows) {
-          result.push({
-            materialCode: '',
-            materialName: '',
-            specification: '',
-            unit: '',
-            quantity: '',
-            lossQuantity: '',
-            planQuantity: '',
-            remark: ''
-          });
-        }
-        return result;
-      },
       getMaterialTotal(form, field) {
         const list = form.materialList || [];
         const total = list.reduce(

+ 3 - 3
vue.config.js

@@ -33,7 +33,7 @@ module.exports = {
       '/api': {
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.125:18086',
-        target: 'http://192.168.1.251:18086',
+        // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.251:18086', // 开发环境
         // target: 'http://192.168.1.103:18086',192.168.1.116
@@ -41,8 +41,8 @@ module.exports = {
         // target: 'http://192.168.1.30:18086',
         // target: 'http://192.168.1.211:18086',
         // target: 'http://192.168.1.113:18086',
-        // target: 'http://192.168.1.33:18086',
-        // target: 'http://192.168.1.116:18086',
+        // target: 'http://192.168.10.111:18086',
+        target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.19:18086',
         // target: 'http://192.168.1.251:18186', // 测试环境
         // target: 'http://192.168.1.251:18087',