2026-06-11

增加packing list功能
3 days ago · 7f0ff5ae3a
6 changed files with 105 additions and 5 deletions
--- a/src/views/modules/base/workCenter.vue
+++ b/src/views/modules/base/workCenter.vue
@ -213,6 +213,13 @@
            <el-option label="N" value="N"></el-option>
          </el-select>
        </el-form-item>
+        <el-form-item label=" ">
+          <el-checkbox
+            v-model="modelData2.packingListFlag"
+            true-label="Y"
+            false-label="N"
+            style="width: 100px">Packing List</el-checkbox>
+        </el-form-item>
      </el-form>
      <el-footer style="height:35px;margin-top: 15px;text-align:center">
        <el-button type="primary" @click="modelSave()">{{buttons.save}}</el-button>
@ -676,6 +683,7 @@ export default {
        createdDate:'',
        remark:'',
        needSetupFlag:'',
+        packingListFlag:'N',
        user:this.$store.state.user.name,
      },
      modelData2: {
@ -692,6 +700,7 @@ export default {
        createdDate: '',
        remark: '',
        needSetupFlag: '',
+        packingListFlag: 'N',
        user: this.$store.state.user.name,
      },
      modelData3:{
@ -1275,6 +1284,24 @@ export default {
          fixed: '',
          columnWidth: 80
        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 103004,
+          serialNumber: '103004Table3PackingListFlag',
+          tableId: "103004Table3",
+          tableName: "加工中心表",
+          columnProp: "packingListFlag",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "Packing List",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
        {
          userId: this.$store.state.user.name,
          functionId: 103004,
@ -1477,6 +1504,7 @@ export default {
        createdDate:'',
        remark:'',
        needSetupFlag:'',
+        packingListFlag:'N',
        user:this.$store.state.user.name,
      }
      this.dataList = []
@ -2006,6 +2034,7 @@ export default {
        createdDate: '',
        remark: '',
        needSetupFlag: '',
+        packingListFlag: 'N',
        user: this.$store.state.user.name,
      }
      this.modelData2.add = 0
@ -2013,6 +2042,7 @@ export default {
      this.modelData2.active = 'Y'
      this.modelData2.canCreateNewRollFlag = 'Y'
      this.modelData2.needSetupFlag = 'Y'
+      this.modelData2.packingListFlag = 'N'
      this.modelData2.workCenterType = '内部'
      this.modelData2.createdDate = new Date()
      this.modelFlag = true
@ -2021,6 +2051,7 @@ export default {
    editModel (row) {
      this.modelData2 = {
        ...row,
+        packingListFlag: row.packingListFlag || 'N',
        bu: row.site + '_' + row.buNo,
        add: 1,
        user: this.$store.state.user.name
--- a/src/views/modules/boxManage/saleBoxManage.vue
+++ b/src/views/modules/boxManage/saleBoxManage.vue
@ -405,6 +405,14 @@
            header-align="center"
            align="left">
        </el-table-column>
+        <el-table-column
+            prop="packingList"
+            label="Packing List"
+            min-width="150"
+            header-align="center"
+            align="left"
+            show-overflow-tooltip>
+        </el-table-column>
        <el-table-column
            prop="rollQty"
            label="卷数量"
@ -1199,6 +1207,7 @@ export default {
            this.caseRollList.unshift({
              casesNo: this.caseForm.casesNo,
              rollNo: rollInfo.rollNo,
+              packingList: rollInfo.packingList || '',
              rollQty: rollInfo.rollQty,
              partNo: rollInfo.partNo,
              partDesc: rollInfo.partDesc,
--- a/src/views/modules/print/rePrintPoPart.vue
+++ b/src/views/modules/print/rePrintPoPart.vue
@ -933,6 +933,24 @@ export default {
          status: true,
          fixed: false
        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: this.functionId,
+          serialNumber: '680Table1PackingList',
+          tableId: "680Table1",
+          tableName: "库存标签表",
+          columnProp: "packingList",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "Packing List",
+          columnWidth: '120',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
        {
          userId: this.$store.state.user.name,
          functionId: this.functionId,
--- a/src/views/modules/qc/inboundNotification.vue
+++ b/src/views/modules/qc/inboundNotification.vue
@ -665,6 +665,14 @@
              min-width="120"
              label="卷号">
            </el-table-column>
+            <el-table-column
+              prop="packingList"
+              header-align="center"
+              align="left"
+              min-width="150"
+              show-overflow-tooltip
+              label="Packing List">
+            </el-table-column>
            <el-table-column
              prop="remark"
              header-align="center"
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@ -3459,6 +3459,7 @@ export default {
        rowCount: '',
        rollCount: '',
        carrierNo: '',
+        packingListFlag: 'N',
        batchNo: '',            // 合约号码
        parkFlag: '',           // 暂停生产标识 N-暂停 Y-继续
      },
@ -4340,6 +4341,7 @@ export default {
        this.scheduleData.rowCount = data.row.rowCount;
        this.scheduleData.rollCount = data.row.rollCount;
        this.scheduleData.carrierNo = data.row.carrierNo;
+        this.scheduleData.packingListFlag = data.row.packingListFlag || 'N';
        this.scheduleData.parkFlag = data.row.parkFlag;
      });
    },
@ -4626,6 +4628,7 @@ export default {
        this.scheduleData.rowCount = data.row.rowCount;
        this.scheduleData.rollCount = data.row.rollCount;
        this.scheduleData.carrierNo = data.row.carrierNo;
+        this.scheduleData.packingListFlag = data.row.packingListFlag || 'N';
        this.scheduleData.batchNo = data.row.batchNo;
        this.scheduleData.parkFlag = data.row.parkFlag;
        this.scheduleData.remark = data.row.remark;
--- a/src/views/modules/yieldReport/com_separate_roll.vue
+++ b/src/views/modules/yieldReport/com_separate_roll.vue
@ -109,6 +109,19 @@
                </div>
              </template>
            </el-table-column>
+            <el-table-column v-if="scheduleData.packingListFlag === 'Y'" label="Packing List" align="center" class-name="packing-list-column">
+              <template slot-scope="scope">
+                <div class="remark-wrapper">
+                  <el-input
+                    type="textarea"
+                    v-model="scope.row.packingList"
+                    resize="none"
+                    :autosize="false"
+                    class="remark-textarea">
+                  </el-input>
+                </div>
+              </template>
+            </el-table-column>
            <el-table-column label="备注" align="center" class-name="remark-column">
              <template slot-scope="scope">
                <div class="remark-wrapper">
@ -652,6 +665,7 @@ export default {
            defectQty: Number(item.defectQty) || 0,
            yieldRate: this.calculateYieldRate(Number(item.goodQty) || 0, Number(item.defectQty) || 0),
            totalQty: (Number(item.goodQty) || 0) + (Number(item.defectQty) || 0),
+            packingList: item.packingList || '',
            remark: item.remark || ''
          }));

@ -693,6 +707,7 @@ export default {
          defectQty: 0,
          yieldRate: '0.00%',
          totalQty: 0,
+          packingList: '',
          remark: ''
        })
      }
@ -812,6 +827,7 @@ export default {
            surfaceLossQty: row.surfaceLossQty || 0,
            poorPerformanceQty: row.poorPerformanceQty || 0,
            defectQty: row.defectQty || 0,
+            packingList: row.packingList || '',
            remark: row.remark || ''
          }))
        };
@ -897,6 +913,7 @@ export default {

          // 获取当前卷的备注
          let rollRemark = '';
+          let rollPackingList = '';

          // 收集当前卷的行数据
          const currentRollRowDataList = [];
@ -908,6 +925,7 @@ export default {

            if (i === 0) {
              rollRemark = row.remark || '';
+              rollPackingList = row.packingList || '';
            }

            rollRows.push({
@ -917,6 +935,7 @@ export default {
              poorPerformanceQty: row.poorPerformanceQty || 0,
              defectQty: row.defectQty || 0,
              totalQty: row.totalQty || 0,
+              packingList: row.packingList || '',
              remark: row.remark || ''
            });

@ -927,6 +946,7 @@ export default {
              surfaceLossQty: row.surfaceLossQty || 0,
              poorPerformanceQty: row.poorPerformanceQty || 0,
              defectQty: row.defectQty || 0,
+              packingList: row.packingList || '',
              remark: row.remark || ''
            });
          }
@ -938,6 +958,7 @@ export default {
            rollNums: 1,
            totalDefectQty: totalDefectQty,
            rollRows: rollRows,
+            packingList: rollPackingList,
            remark: rollRemark
          };

@ -1021,8 +1042,8 @@ export default {

    // 表格合并行方法（备注列根据卷数合并）
    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-      // 只对备注列进行合并（最后一列）
-      if (column.label === '备注') {
+      // 对备注和Packing List列进行按卷合并
+      if (column.label === '备注' || column.label === 'Packing List') {
        // 计算每卷的排数
        const rowsPerRoll = Math.floor(this.pageData.rowCount / this.pageData.rollCount)
        const remainingRows = this.pageData.rowCount % this.pageData.rollCount
@ -1405,6 +1426,7 @@ export default {

          // 获取当前卷的备注（第一排的备注）
          let rollRemark = ''
+          let rollPackingList = ''

          for (let i = 0; i < currentRollRows; i++) {
            const row = this.rowDataList[currentRowIndex + i]
@ -1414,6 +1436,7 @@ export default {
            // 第一排的备注作为整卷的备注
            if (i === 0) {
              rollRemark = row.remark || ''
+              rollPackingList = row.packingList || ''
            }

            rollRows.push({
@ -1423,6 +1446,7 @@ export default {
              poorPerformanceQty: row.poorPerformanceQty || 0,
              defectQty: row.defectQty || 0,
              totalQty: row.totalQty || 0,
+              packingList: row.packingList || '',
              remark: row.remark || ''
            })
          }
@ -1434,6 +1458,7 @@ export default {
            rollNums: 1,            // 固定为1
            defectQty: totalDefectQty,  // 该卷的不良总数
            rollRows: rollRows,     // 该卷包含的排数据
+            packingList: rollPackingList, // 该卷的Packing List
            remark: rollRemark      // 该卷的备注
          }

@ -1746,12 +1771,16 @@ export default {
 }

 /* 备注列单元格样式 - 使用绝对定位填满 */
-.customer-dialog >>> .el-table td:last-child {
+.customer-dialog >>> .el-table td:last-child,
+.customer-dialog >>> .el-table td.remark-column,
+.customer-dialog >>> .el-table td.packing-list-column {
  padding: 0 !important;
  position: relative !important;
 }

-.customer-dialog /deep/ .el-table td:last-child {
+.customer-dialog /deep/ .el-table td:last-child,
+.customer-dialog /deep/ .el-table td.remark-column,
+.customer-dialog /deep/ .el-table td.packing-list-column {
  padding: 0 !important;
  position: relative !important;
 }
@ -1827,7 +1856,9 @@ export default {
 }

 /* 备注列样式 - 只针对创建分卷对话框 */
-.customer-css .el-table td:last-child {
+.customer-css .el-table td:last-child,
+.customer-css .el-table td.remark-column,
+.customer-css .el-table td.packing-list-column {
  padding: 0 !important;
  position: relative !important;
 }