优化

src/view/job/processSheet/processSheet.vue

@@ -5381,31 +5381,35 @@ const selectpYj = (event) => {
     ]
   }
   // hiprint.init()
-  const hiprintTemplate = new hiprint.PrintTemplate({ template: jsondata1 })
+  const hiprintTemplate = new hiprint.PrintTemplate({ template: jsondata1 });
 
-      for (let i = workData.value.start_liucheng; i <= workData.value.liucheng_total; i++) {
-        (function(currentIndex) {
-        // 创建一个基于当前索引的延迟
-        const delay = (currentIndex - 1) * 3600; // 延迟时间
-          setTimeout(() => {
-            const printdata = {
-              "scpch": getDocumentInfos.data[0].Gd_gdbh,
-              "xsddh": getDocumentInfos.data[0].销售订单号,
-              "mbh": getDocumentInfos.data[0].mabao,
-              "lcdh": `${workData.value.liucheng_total}-${i}`,
-              "qrcode": `${getDocumentInfos.data[0].Gd_gdbh}-${workData.value.liucheng_total}-${currentIndex}`,
-              "gdsm": getDocumentInfos.data[0].version,
-              "cpmc": getDocumentInfos.data[0].Gd_cpmc,
-              "ztzs": workData.value.num,
-              'table': getDocumentInfos.data.gy_data.map(item => ({
-                gxmc: item 
-              }))
-            };
-          hiprintTemplate.print2(printdata);
-          // hiprintTemplate.toPdf(printdata,'流程单');
-          }, delay);
-        })(i); // 立即执行函数，传入当前的i值作为currentIndex
-      }
+// 获取起始和结束值
+const start = workData.value.start_liucheng;
+const total = workData.value.liucheng_total;
+
+for (let i = start; i <= total; i++) {
+  (function(currentIndex, relativeIndex) {  // 新增 relativeIndex 参数
+    console.log("currentIndex:", currentIndex, "relativeIndex:", relativeIndex);
+    const delay = relativeIndex * 3600;  // 使用 relativeIndex 计算延迟
+    setTimeout(() => {
+      const printdata = {
+        "scpch": getDocumentInfos.data[0].Gd_gdbh,
+        "xsddh": getDocumentInfos.data[0].销售订单号,
+        "mbh": getDocumentInfos.data[0].mabao,
+        "lcdh": `${workData.value.liucheng_total}-${currentIndex}`,
+        "qrcode": `${getDocumentInfos.data[0].Gd_gdbh}-${workData.value.liucheng_total}-${currentIndex}`,
+        "gdsm": getDocumentInfos.data[0].version,
+        "cpmc": getDocumentInfos.data[0].Gd_cpmc,
+        "ztzs": workData.value.num,
+        'table': getDocumentInfos.data.gy_data.map(item => ({
+          gxmc: item 
+        }))
+      };
+      console.log("执行打印:", currentIndex);
+      hiprintTemplate.print2(printdata);
+    }, delay);
+  })(i, i - start + 1);  // 传入 currentIndex 和 relativeIndex
+}
 
     }
   }

src/view/managements/hardversionlibrary.vue

@@ -195,12 +195,12 @@
                 <el-row :gutter="20">
                   <el-col :span="10">
                     <el-form-item label="初始印数">
-                    <el-input v-model="Plate.初始印数" placeholder="请输入初始印数" />
+                    <el-input v-model="Plate.初始印数" type="number" placeholder="请输入初始印数" />
                     </el-form-item>
                 </el-col>
                 <el-col :span="10">
                     <el-form-item label="考核印数">
-                    <el-input v-model="Plate.考核印数" placeholder="请输入考核印数" />
+                    <el-input v-model="Plate.考核印数" type="number" placeholder="请输入考核印数" />
                     </el-form-item>
                 </el-col>
                 </el-row>
@@ -624,8 +624,8 @@ const dhlenterDialog = async () => {
     code: Plate.存货编码,
     name: Plate.存货名称,
     desc: Plate.印版备注,
-    Manufactur_date:dayjs(Plate.制造日期).format('YYYY-MM-DD'),
-    Scrappe_date: dayjs(Plate.报废日期).format('YYYY-MM-DD'),
+    Manufactur_date:dayjs(Plate.制造日期).format('YYYY-MM-DD')||'',
+    Scrappe_date: dayjs(Plate.报废日期).format('YYYY-MM-DD')||'',
     start_num: Plate.初始印数,
     Assessment_num: Plate.考核印数,
     batch: Plate.供方批号,
@@ -665,9 +665,20 @@ console.log(type.value)
   }
 }
 
+const initialPlateState = {
+  存货编码: '',
+  存货名称: '',
+  印版备注: '',
+  制造日期: '',
+  报废日期: '',
+  初始印数: '',
+  考核印数: '',
+  供方批号: '',
+  value: [],
+};
 //关闭弹窗
 const dhlcloseDialog = async () => {
-  console.log('关闭')
+  Object.assign(Plate, initialPlateState);
   dialogPlateVisible.value = false
 }
 

src/view/yunyin/shengchanguanli/PrintingPlateRequisition.vue

@@ -122,7 +122,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="印件号">
-            <el-input v-model="Plate.印件号" placeholder="请输入印件号" />
+            <el-input v-model="Plate.印件号" readonly  />
           </el-form-item>
         </el-col>
       </el-row>
@@ -130,7 +130,7 @@
       <el-row :gutter="20">
         <el-col :span="18">
           <el-form-item label="产品名称">
-            <el-input v-model="Plate.产品名称" placeholder="请输入产品名称" />
+            <el-input v-model="Plate.产品名称" readonly />
           </el-form-item>
         </el-col>
       </el-row>
@@ -164,7 +164,7 @@
     :style="{ minWidth: '200px' }"
   >
     <el-form-item label="印数">
-      <el-input v-model="Plate.印数" placeholder="请输入印数" />
+      <el-input v-model="Plate.印数" type="number" placeholder="请输入印数" />
     </el-form-item>
 
     <template #footer>
@@ -533,9 +533,17 @@ const confirmMachineSelection = () => {
   }
 }
 
+
+const initialPlateState = {
+  工单编号: '',
+  印件号: '',
+  产品名称: '',
+  机台备注: '',
+  value: [],
+};
 // 其他原有方法保持不变
 const dhlcloseDialog = () => {
-  Plate.value = []
+  Object.assign(Plate, initialPlateState);
   dialogPlateVisible.value = false
 }
 

src/view/yunyin/shengchanguanli/chengpinrucang.vue

@@ -32,7 +32,7 @@
 			  
             </el-form-item>
             <!-- 数据展示 -->
-            <el-table ref="multipleTable" height=74vh style="width: 100%" tooltip-effect="dark" :data="tableData" row-key="ID" @row-click="Click"
+            <el-table ref="multipleTable" height=68vh style="width: 100%" tooltip-effect="dark" :data="tableData" row-key="ID" @row-click="Click"
               highlight-current-row="true" border @selection-change="handleSelectionChange" :show-overflow-tooltip="true" @row-dblclick="doubleClick">
               <el-table-column type="selection" width="45" />
 			  <el-table-column align="left"   label="入仓类型" prop="入仓类型" width="90"/>
@@ -64,12 +64,16 @@
 			  <el-table-column align="left"  label="UNIQID" prop="UniqId" width="90"/>
             </el-table>
             <!-- 分页 -->
-            <!-- <div class="gva-pagination">
-              <el-pagination layout="total, sizes, prev, pager, next, jumper" v-model:current-page="page"
-                v-model:page-size="limit"
-                :page-sizes="[10, 30, 50, 100]" :total="total" @current-change="handleCurrentChange"
-                @size-change="handleSizeChange" />
-            </div> -->
+            <div class="gva-pagination">
+                  <el-pagination
+                    @size-change="handleSizeChange"
+                    @current-change="handleCurrentChange"
+                    :current-page="page"
+                    :page-size="limit"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    :total="total">
+                  </el-pagination>
+                </div>
           </div>
 		  
           <!-- 弹出框 -->
@@ -682,7 +686,7 @@ const detailData = reactive([
 ])
 const total = ref(0)
 const page = ref(1)
-const limit = ref(999)
+const limit = ref(50)
 const searchInfo = ref('')
 const tableRef = ref(null); // 表格的引用
 const params = {
@@ -690,35 +694,41 @@ const params = {
   date: '',
   sys_id: '',
   gdbh: '',
+  page:page.value ,
+  limit:limit.value,
 }
 
-// // 分页设置
-// const handleSizeChange = (val) => {
-//   switch (params.type) {
-//     case 'getTableData':
-//       getTableData()
-//       break
-//     case 'getLocateTable':
-//       GetmachineLocate()
-//       break
-//     default:
-//       break
-//   }
-// }
+// 分页设置
+const handleSizeChange = (val) => {
+  limit.value = val
+  params.limit = val
+  switch (params.type) {
+    case 'getTableData':
+      getTableData()
+      break
+    case 'getLocateTable':
+      GetmachineLocate()
+      break
+    default:
+      break
+  }
+}
 
-// // 页面跳转
-// const handleCurrentChange = (val) => {
-//   switch (params.type) {
-//     case 'getTableData':
-//       getTableData()
-//       break
-//     case 'getLocateTable':
-//       GetmachineLocate()
-//       break
-//     default:
-//       break
-//   }
-// }
+// 页面跳转
+const handleCurrentChange = (val) => {
+  page.value = val
+  params.page = val
+  switch (params.type) {
+    case 'getTableData':
+      getTableData()
+      break
+    case 'getLocateTable':
+      GetmachineLocate()
+      break
+    default:
+      break
+  }
+}
 
 
 const ExcelformData = ref({})
@@ -732,10 +742,12 @@ const getTableData = async () => {
   console.log(response)
   if (response.code === 0) {
     tableData.splice(0, tableData.length, ...response.data.rows);
+    total.value = response.data.total
   }
 }
 
 const handleNodeClick = (node, check) => {
+  params.type ='getTableData'
   //存放当前节点的nodeId
   if (node.params) {
     params.date = node.params.date;