From 25cc86fd8a2fb3b2bb6b385cba0adaf89ff3dcdc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 十二月 2025 16:39:32 +0800
Subject: [PATCH] 流程卡进度打印部分代码

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue |   69 +++++++++++++++++++++-------------
 1 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
index b9d02a2..7a95bd4 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
@@ -8,9 +8,11 @@
 import {Search} from "@element-plus/icons-vue";
 import { useI18n } from 'vue-i18n'
 import  useUserInfoStore from '@/stores/userInfo'
+import useOrderInfoStore from "@/stores/sd/order/orderInfo"
 //璇█鑾峰彇
 const { t } = useI18n()
 const userStore = useUserInfoStore()
+const orderInfo = useOrderInfoStore()
 let router=useRouter()
 const getTableRow = (row,type) =>{
   switch (type) {
@@ -20,11 +22,9 @@
       break
     }
     case 'delete':{
-      alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
       break
     }
     case  'setType':{
-      alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鎺掔増鐘舵��')
       break
     }
   }
@@ -84,7 +84,7 @@
       .toISOString()
       .replace('T', ' ')
       .slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
-  const end = new Date(new Date().getTime()+ 3600 * 1000 * 24)
+  const end = new Date(new Date().getTime())
       .toISOString()
       .replace('T', ' ')
       .slice(0, 10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
@@ -93,17 +93,19 @@
 
 
 //绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
-form.date1 = getNowTime()
-let startTime = form.date1[0]
-let endTime = form.date1[1]
-
+if (orderInfo.workOrderDate[0]=="" && orderInfo.workOrderDate[1]==""){
+  orderInfo.workOrderDate=getNowTime()
+}
+let startTime = orderInfo.workOrderDate[0]
+let endTime = orderInfo.workOrderDate[1]
 //绗竴娆″姞杞芥暟鎹�
 
-request.post(`/processCard/selectAddProcess/${startTime}/${endTime}`, filterData.value).then((res) => {
+request.post(`/processCard/selectAddProcess/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
 
   if (res.code == 200) {
     pageTotal.value = res.data.total
     produceList = produceList.value.concat(deepClone(res.data.data))
+    orderInfo.workOrderDate = res.data.selectDate
     xGrid.value.reloadData(produceList)
     gridOptions.loading = false
   } else {
@@ -113,17 +115,19 @@
 
 //鐐瑰嚮鏌ヨ
 const getWorkOrder = () => {
+  gridOptions.loading = true
 
-  let startTime = form.date1[0]
-  let endTime = form.date1[1]
-  request.post(`/processCard/selectAddProcess/${startTime}/${endTime}`, filterData.value).then((res) => {
+  request.post(`/processCard/selectAddProcess/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
     if (res.code == 200) {
 
       pageTotal.value = res.data.total
       xGrid.value.loadData(res.data.data)
+      orderInfo.workOrderDate = res.data.selectDate
       gridOptions.loading = false
+
     } else {
       ElMessage.warning(res.msg)
+      gridOptions.loading = false
     }
   })
 }
@@ -150,10 +154,10 @@
   }
 
 //鑾峰彇閫変腑鏃堕棿
-  let startTime = form.date1[0]
-  let endTime = form.date1[1]
+  let startTime = orderInfo.workOrderDate[0]
+  let endTime = orderInfo.workOrderDate[1]
 
-  request.post(`/processCard/selectAddProcess/${startTime}/${endTime}`, filterData.value).then((res) => {
+  request.post(`/processCard/selectAddProcess/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
     if (res.code == 200) {
       pageTotal.value = res.data.total
 
@@ -255,18 +259,16 @@
 </script>
 
 <template>
-  <div class="main-div-customer">
-    <div id="selectForm">
-      <el-row :gutter="0">
+  <div  style="width: 100%;height: 100%">
+    <div class="head">
         <el-date-picker
-            v-model="form.date1"
-            type="daterange"
-            format="YYYY/MM/DD"
-            value-format="YYYY-MM-DD"
-            :start-placeholder="$t('basicData.startDate')"
-            :end-placeholder="$t('basicData.endDate')"
+            v-model="orderInfo.workOrderDate"
             :default-time="defaultTime"
-
+            :end-placeholder="$t('basicData.endDate')"
+            :start-placeholder="$t('basicData.startDate')"
+            format="YYYY/MM/DD"
+            type="daterange"
+            value-format="YYYY-MM-DD"
         />
 
         &nbsp;&nbsp;
@@ -275,11 +277,12 @@
             id="select"
             type="primary" :icon="Search">{{$t('basicData.search')}}
         </el-button>
-      </el-row>
 
     </div>
+
+    <div class="main-table">
     <vxe-grid
-        height="95%"
+        height="100%"
         @filter-change="filterChanged"
         class="mytable-scrollbar"
         ref="xGrid"
@@ -314,13 +317,16 @@
       <template #num1_filter="{ column, $panel }">
         <div>
           <div v-for="(option, index) in column.filters" :key="index">
-            <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+            <input type="type" v-model="option.data"
+                   @keyup.enter.native="$panel.confirmFilter()"
+                   @input="changeFilterEvent($event, option, $panel)"/>
           </div>
         </div>
       </template>
 
 
     </vxe-grid>
+  </div>
   </div>
 </template>
 
@@ -333,4 +339,13 @@
   width: 50%;
   text-align: center;
 }
+.head{
+  width: 100%;
+  height: 35px;
+}
+
+.main-table{
+  width: 100%;
+  height: calc(100% - 35px);
+}
 </style>
\ No newline at end of file

--
Gitblit v1.8.0