Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/api/pocket/acidTyping.js

@@ -8,10 +8,10 @@ export function getAcidTypingPrefill(currentCoilNo) {
   })
 }
 
-export function getGalvanize1TypingPrefill(currentCoilNo) {
+export function getGalvanize1TypingPrefill(params) {
   return request({
     url: '/pocket/galvanize1/crmPdoExcoil/list',
     method: 'get',
-    params: { currentCoilNo }
+    params
   })
 }

klp-ui/src/views/wms/coil/panels/LabelRender/DuGeTag.vue

@@ -434,10 +434,14 @@ export default {
 .nob {
   width: 100%;
   height: 100%;
+  font-weight: bold;
+  color: #000;
+  font-family: '黑体', serif;
   border: none;
   outline: none;
   background: transparent;
   text-align: center;
+  font-size: 1.2em;
 }
 
 /* 打印样式 - 强制单页，适配180mm x 100mm纸张，保持原有样式不变 */

klp-ui/src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue

@@ -102,7 +102,7 @@
         <!-- 第八行：生产日期（跨3列） -->
         <div class="info-grid-item label-cell">生产日期</div>
         <div class="info-grid-item value-cell">
-          <div>{{ parseTime(content.updateTime, '{y}-{m}-{d}') }}</div>
+          <div class="nob">{{ parseTime(content.updateTime, '{y}-{m}-{d}') }}</div>
           <!-- <input type="text" class="nob" :value=" /> -->
         </div>
       </div>
@@ -437,8 +437,12 @@ export default {
   height: 100%;
   border: none;
   outline: none;
+  font-weight: bold;
+  color: #000;
+  font-family: '黑体', serif;
   background: transparent;
   text-align: center;
+  font-size: 1.2em;
 }
 
 /* 打印样式 - 强制单页，适配180mm x 100mm纸张，保持原有样式不变 */

klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue

@@ -333,6 +333,9 @@ export default {
 .nob {
   width: 100%;
   height: 100%;
+  font-weight: bold;
+  color: #000;
+  font-family: '黑体', serif;
   border: none;
   outline: none;
   background: transparent;

klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue

@@ -392,7 +392,7 @@ export default {
 .info-grid-item {
   border: 1px solid #000;
   padding: 0.1em;
-  font-size: 1.05em;
+  font-size: 1.2em;
   height: 2em;
   text-align: center;
   vertical-align: middle;
@@ -443,8 +443,12 @@ export default {
   height: 100%;
   border: none;
   outline: none;
+  font-weight: bold;
+  color: #000;
+  font-family: '黑体', serif;
   background: transparent;
   text-align: center;
+  font-size: 1.2em;
 }
 
 /* 打印样式 - 强制单页，适配180mm x 100mm纸张，保持原有样式不变 */

klp-ui/src/views/wms/coil/panels/LabelRender/TuoZhiTag.vue

@@ -253,6 +253,10 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
+  font-weight: bold;
+  color: #000;
+  font-family: '黑体', serif;
+  font-size: 1.2em;
 }
 
 /* 打印样式 */

klp-ui/src/views/wms/coil/panels/LabelRender/WhereTag.vue

@@ -246,6 +246,10 @@ export default {
   word-break: break-all;
   overflow-wrap: break-word;
   white-space: normal;
+  font-weight: bold;
+  color: #000;
+  font-family: '黑体', serif;
+  font-size: 1.2em;
 }
 
 /* 打印样式 - 强制单页，适配100mm x 80mm纸张，保持原有样式不变 */

klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue

@@ -244,6 +244,7 @@ export default {
 .nob {
   width: 100%;
   height: 100%;
+  font-size: 1.2em;
   border: none;
   outline: none;
   background: transparent;
@@ -253,6 +254,10 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
+  font-weight: bold;
+  color: #000;
+  font-family: '黑体', serif;
+  font-size: 1.2em;
 }
 
 /* 打印样式 */

klp-ui/src/views/wms/coil/panels/do.vue

@@ -454,7 +454,7 @@
 
     <el-dialog title="分步加工" :visible.sync="stepSpilt.visible" width="1400px" append-to-body>
       <step-split @print="handlePrintLabel" @complete="handleComposeSplit" :actionId="stepSpilt.actionId"
-        :coilId="stepSpilt.coilId" :actionStatus="stepSpilt.actionStatus" />
+        :coilId="stepSpilt.coilId" :actionStatus="stepSpilt.actionStatus" :actionType="stepSpilt.actionType" />
     </el-dialog>
 
     <label-render ref="labelRender" v-show="false" :content="labelRender.data" :labelType="labelRender.type" />
@@ -577,7 +577,8 @@ export default {
         visible: false,
         coilId: null,
         actionId: null,
-        actionStatus: null
+        actionStatus: null,
+        actionType: null,
       }
     }
   },
@@ -642,6 +643,10 @@ export default {
         // 如果待操作列表为空，则加载数据
         if (this.pendingActionList.length === 0) {
           this.getPendingAction()
+          console.log(this.useSpecialSplit)
+          if (this.useSpecialSplit) {
+            this.getStepSplitList()
+          }
         }
       }
     },
@@ -673,15 +678,16 @@ export default {
     // 立即加载物料列表（不依赖字典）
     // this.getMaterialCoil()
     // 尝试加载待操作列表（如果字典已加载）
-    this.$nextTick(() => {
+    // this.$nextTick(() => {
-      if (this.acidRollingActionType) {
+    //   if (this.acidRollingActionType) {
-        this.actionQueryParams.actionType = this.acidRollingActionType
+    //     this.actionQueryParams.actionType = this.acidRollingActionType
-        this.getPendingAction()
+    //     this.getPendingAction()
-        if (this.useSpecialSplit) {
+    //     console.log(this.useSpecialSplit)
-          this.getStepSplitList()
+    //     if (this.useSpecialSplit) {
-        }
+    //       this.getStepSplitList()
-      }
+    //     }
-    })
+    //   }
+    // })
   },
   mounted() {
     // 确保在mounted时也尝试加载（字典数据可能此时才加载完成）
@@ -689,6 +695,10 @@ export default {
       if (this.acidRollingActionType && !this.actionQueryParams.actionType) {
         this.actionQueryParams.actionType = this.acidRollingActionType
         this.getPendingAction()
+        console.log(this.useSpecialSplit)
+        if (this.useSpecialSplit) {
+          this.getStepSplitList()
+        }
       }
     })
   },
@@ -1008,6 +1018,7 @@ export default {
       this.stepSpilt.coilId = row.coilId
       this.stepSpilt.actionId = row.actionId
       this.stepSpilt.actionStatus = row.actionStatus
+      this.stepSpilt.actionType = row.actionType
       this.stepSpilt.visible = true
       // this.buttonLoading = true
       // this.getPendingAction()

klp-ui/src/views/wms/coil/panels/stepSplit.vue

@@ -67,8 +67,13 @@
             </el-table-column>
           </el-table>
 
-          <!-- <el-descriptions :column="1" border title="二级数据" v-if="showSplitForm"></el-descriptions>
+          <el-descriptions :column="1" border title="镀锌二级数据" v-if="actionType == 501 && showSplitForm"></el-descriptions>
-          <el-table v-if="showSplitForm"></el-table> -->
+          <el-table v-if="actionType == 501 && showSplitForm" v-loading="zincLoading" :data="zincList" border stripe @row-click="handleZincItemClick">
+            <el-table-column prop="enterCoilNo" label="入场钢卷号" />
+            <el-table-column prop="createTime" label="生产开始时间" />
+            <el-table-column prop="endTime" label="生产结束时间" />
+            <el-table-column prop="shiftNo" label="班组" />
+          </el-table>
         </div>
       </el-col>
 
@@ -268,6 +273,7 @@
 <script>
 import { getMaterialCoil, listMaterialCoil, createSpecialChild, completeSpecialSplit, updateMaterialCoilSimple, checkCoilNo, delMaterialCoil } from '@/api/wms/coil'
 import { completeAction, getPendingAction, updatePendingAction } from '@/api/wms/pendingAction'
+import { getGalvanize1TypingPrefill } from '@/api/pocket/acidTyping';
 import ProductSelect from "@/components/KLPService/ProductSelect";
 import RawMaterialSelect from "@/components/KLPService/RawMaterialSelect";
 import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
@@ -280,7 +286,7 @@ export default {
   name: 'StepSplit',
   props: {
     actionId: {
-      type: String,
+      type: [String, Number],
       required: true,
     },
     coilId: {
@@ -291,6 +297,10 @@ export default {
       type: Number,
       default: 0,
     },
+    actionType: {
+      type: Number,
+      required: true,
+    },
   },
   components: {
     ProductSelect,
@@ -398,7 +408,10 @@ export default {
         defectCode: null,
         degree: null,
         remark: null
-      }
+      },
+
+      zincList: [],
+      zincLoading: false,
     }
   },
   computed: {
@@ -427,6 +440,16 @@ export default {
         // 若actionId变化需要重新加载数据，可在此补充逻辑
       },
     },
+    actionType: {
+      immediate: true,
+      handler(val) {
+        console.log('actionType', val)
+        if (val == 501) {
+          // 获取镀锌线二级系统数据
+          this.getZincList()
+        }
+      }
+    }
   },
   methods: {
     // 查询待分条的钢卷信息
@@ -443,6 +466,16 @@ export default {
       }
     },
 
+    async getZincList() {
+      this.zincLoading = true
+      const res = await getGalvanize1TypingPrefill({
+        pageSize: 10,
+        pageNum: 1,
+      })
+      this.zincList = res.rows || []
+      this.zincLoading = false
+    },
+
     async handlePrint(row) {
       this.$emit('print', row)
     },
@@ -557,6 +590,20 @@ export default {
       this.showSplitForm = false
     },
 
+    handleZincItemClick(row) {
+      this.splitForm = {
+        ...this.splitForm,
+        team: row.shiftNo,
+        // enterCoilNo: row.enterCoilNo,
+        productionStartTime: row.createTime,
+        productionEndTime: row.endTime,
+        itemType: 'product',
+        materialType: '成品',
+        length: row.exitLength,
+        netWeight: row.exitNetWeight,
+      }
+    },
+
     // 编辑分条项
     async handleEditSplit(row) {
       this.showSplitForm = true

klp-ui/src/views/wms/report/template/year.vue

@@ -301,9 +301,7 @@ export default {
             computedWidth: parseFloat(width),
           }
         })
-        // this.loading = false
         this.getLossList()  
-        // this.loading = false
       })
     },
     async getLossList() {