From 54c2f0fda44123782e5241ff7d1ad6e81c95f2b2 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期二, 12 十一月 2024 15:52:32 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue |   56 ++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 34 insertions(+), 22 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 93e80c6..d69087a 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
@@ -7,8 +7,12 @@
 import {ElDatePicker, ElMessage} from "element-plus";
 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) {
@@ -78,11 +82,11 @@
 
 //鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
 function getNowTime() {
-  const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
+  const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 15)
       .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)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
@@ -91,10 +95,11 @@
 
 
 //绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
-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) => {
@@ -112,8 +117,8 @@
 //鐐瑰嚮鏌ヨ
 const getWorkOrder = () => {
 
-  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) => {
     if (res.code == 200) {
 
@@ -148,8 +153,8 @@
   }
 
 //鑾峰彇閫変腑鏃堕棿
-  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) => {
     if (res.code == 200) {
@@ -180,7 +185,7 @@
   align: 'center',//鏂囧瓧灞呬腑
   stripe: true,//鏂戦┈绾�
   rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
-  id: 'demo_1',
+  id: 'selectAddProcess',
   showFooter: true,//鏄剧ず鑴�
   printConfig: {},
   importConfig: {},
@@ -257,14 +262,13 @@
     <div id="selectForm">
       <el-row :gutter="0">
         <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;
@@ -277,8 +281,7 @@
 
     </div>
     <vxe-grid
-        max-height="100%"
-        height="600px"
+        height="95%"
         @filter-change="filterChanged"
         class="mytable-scrollbar"
         ref="xGrid"
@@ -300,13 +303,22 @@
 
       <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
       <template #button_slot="{ row }">
-        <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('basicData.edit')}}</el-button>
+<!--        <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('basicData.edit')}}</el-button>-->
+        <el-button @click="getTableRow(row,'edit')"
+                   v-if="userStore.user.permissions.indexOf('selectAddProcess.edit') > -1"
+                   link
+                   type="primary"
+                   size="small">
+          {{ $t('basicData.edit') }}
+        </el-button>
       </template>
 
       <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>

--
Gitblit v1.8.0