2026-06-22

订单产出标签统计页面回显和修改Packing List

src/mixins/labelPrintTemplates.js

@@ -169,7 +169,7 @@ export default {
       const startX = '20mm';      // 文字左边距
       const fullTextWidth = '55mm'; // 单行完整文字区域宽度
       const fontSize = 4;       // 字体大小（缩小到2.5号，确保超长文本能显示）
-      const packingFontSize = 3.5; // Packing List 比主文本小一号
+      const packingFontSize = 4; // Packing List 比主文本小一号
       const lineHeight = '3mm'; // 行高
 
       // 第1行：编码（左） + Packing List（右）
@@ -312,7 +312,7 @@ export default {
       const startX = '20mm';  // 文字左边距
       const textWidth = '55mm'; // 文字区域宽度
       const fontSize = 5;     // 字体大小（比A002稍大，因为只有3行）
-      const packingFontSize = 4.5; // Packing List 比主文本小一号
+      const packingFontSize = 5; // Packing List 比主文本小一号
 
       // 第1行：编码（左） + Packing List（右）
       const packingList = printData.packingList || printData.PackingList || printData.packinglist || '';

src/views/modules/shopOrder/productionReport/searchSfdcRollsReport.vue

@@ -336,9 +336,19 @@
               <el-input v-model.number="editForm.poorPerformanceQtyNew" type="number" :min="0"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="Packing List">
+              <el-input
+                type="textarea"
+                :rows="3"
+                v-model="editForm.packingList"
+                placeholder="请输入Packing List">
+              </el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
-      <el-footer style="height:35px;margin-top: 25px;text-align:center">
+      <el-footer style="height:35px;margin-top: 55px;text-align:center">
         <el-button type="success" :loading="editSaveLoading" @click="saveEditData()">保存</el-button>
         <el-button type="primary" @click="editDialogVisible=false">关闭</el-button>
       </el-footer>
@@ -651,6 +661,7 @@ import labelPrintTemplates from '@/mixins/labelPrintTemplates.js';
         editSaveLoading: false,
         editForm: {
           site: '',
+          orderNo: '',
           rollNo: '',
           partNo: '',
           partDesc: '',
@@ -659,7 +670,8 @@ import labelPrintTemplates from '@/mixins/labelPrintTemplates.js';
           surfaceLossQtyOld: 0,
           surfaceLossQtyNew: 0,
           poorPerformanceQtyOld: 0,
-          poorPerformanceQtyNew: 0
+          poorPerformanceQtyNew: 0,
+          packingList: ''
         },
         columnList: [
           {
@@ -806,6 +818,24 @@ import labelPrintTemplates from '@/mixins/labelPrintTemplates.js';
             fixed: '',
             columnWidth: 80
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104003007,
+            serialNumber: '104003007TableSfdcRollsPackingList',
+            tableId: "104003007Table",
+            tableName: "订单产出标签报表",
+            columnProp: "packingList",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "Packing List",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 180
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 104003007,
@@ -1552,6 +1582,7 @@ import labelPrintTemplates from '@/mixins/labelPrintTemplates.js';
       handleEdit(row) {
         this.editForm = {
           site: row.site,
+          orderNo: row.orderNo,
           rollNo: row.rollNo,
           partNo: row.partNo,
           partDesc: row.partDesc,
@@ -1560,7 +1591,8 @@ import labelPrintTemplates from '@/mixins/labelPrintTemplates.js';
           surfaceLossQtyOld: row.surfaceLossQty || 0,
           surfaceLossQtyNew: row.surfaceLossQty || 0,
           poorPerformanceQtyOld: row.poorPerformanceQty || 0,
-          poorPerformanceQtyNew: row.poorPerformanceQty || 0
+          poorPerformanceQtyNew: row.poorPerformanceQty || 0,
+          packingList: row.packingList || ''
         };
         this.editDialogVisible = true;
       },
@@ -1637,6 +1669,7 @@ import labelPrintTemplates from '@/mixins/labelPrintTemplates.js';
         this.editSaveLoading = true;
         const params = {
           site: this.editForm.site,
+          orderNo: this.editForm.orderNo,
           partNo: this.editForm.partNo,
           rollNo: this.editForm.rollNo,
           rollQtyOld: this.editForm.rollQtyOld,
@@ -1645,6 +1678,7 @@ import labelPrintTemplates from '@/mixins/labelPrintTemplates.js';
           surfaceLossQtyNew: this.editForm.surfaceLossQtyNew,
           poorPerformanceQtyOld: this.editForm.poorPerformanceQtyOld,
           poorPerformanceQtyNew: this.editForm.poorPerformanceQtyNew,
+          packingList: this.editForm.packingList,
           type: 'update'
         };
         executeSfdcRollsReport(params).then(({data}) => {
@@ -1718,6 +1752,7 @@ import labelPrintTemplates from '@/mixins/labelPrintTemplates.js';
           if (data.rows.length > 0) {
             //this.columnList = []
             this.columnList = data.rows
+            this.ensurePackingListColumn()
           } else {
             this.getColumnList()
           }
@@ -1729,11 +1764,45 @@ import labelPrintTemplates from '@/mixins/labelPrintTemplates.js';
           if (!data.rows.length == 0) {
             // this.showDefault = false
             this.columnList = data.rows
+            this.ensurePackingListColumn()
           } else {
             // this.showDefault = true
           }
         })
       },
+      ensurePackingListColumn() {
+        if (!Array.isArray(this.columnList) || this.columnList.length === 0) {
+          return
+        }
+        const hasPackingList = this.columnList.some(item => item.columnProp === 'packingList')
+        if (hasPackingList) {
+          return
+        }
+        const packingListColumn = {
+          userId: this.$store.state.user.name,
+          functionId: 104003007,
+          serialNumber: '104003007TableSfdcRollsPackingList',
+          tableId: "104003007Table",
+          tableName: "订单产出标签报表",
+          columnProp: "packingList",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "Packing List",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 180
+        }
+        const totalQtyIndex = this.columnList.findIndex(item => item.columnProp === 'totalQty')
+        if (totalQtyIndex >= 0) {
+          this.columnList.splice(totalQtyIndex + 1, 0, packingListColumn)
+        } else {
+          this.columnList.push(packingListColumn)
+        }
+      },
     },
     created() {
       // this.getMultiLanguageList()//刷新按钮