From 65e918de84f0798f208d4a8222393623e890d556 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期六, 03 二月 2024 13:27:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
index 6bd8678..808ca0d 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
@@ -29,7 +29,6 @@
 }
 
 
-
 function padLeftZero(str) {
   return ('00' + str).substr(str.length)
 }
@@ -78,7 +77,7 @@
   order: {
     batch: ''
   },
-    orderDetail: {
+  orderDetail: {
     productName: '',
     computeArea: '',
     quantity: '',
@@ -99,20 +98,20 @@
 
 //鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
 function getNowTime() {
-  const start = new Date(new Date().getTime()- 3600 * 1000 * 24 * 7)
+  const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
       .toISOString()
       .replace('T', ' ')
-      .slice(0,10) //榛樿寮�濮嬫椂闂�7澶╁墠
+      .slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
   const end = new Date(new Date().getTime())
       .toISOString()
       .replace('T', ' ')
-      .slice(0,10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
+      .slice(0, 10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
   return [start, end]
 }
 
 
 //绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
-form.date1=getNowTime()
+form.date1 = getNowTime()
 let startTime = form.date1[0]
 let endTime = form.date1[1]
 let state = optionVal.value
@@ -137,7 +136,7 @@
 
   let startTime = form.date1[0]
   let endTime = form.date1[1]
-  let selectState=optionVal.value
+  let selectState = optionVal.value
   request.post(`/workOrder/orderGlassDetail/${startTime}/${endTime}/${selectState}`, filterData.value).then((res) => {
     if (res.code == 200) {
 
@@ -174,16 +173,16 @@
 //鑾峰彇閫変腑鏃堕棿鍜屾槸鍚﹁浆鍗曠姸鎬�
   let startTime = form.date1[0]
   let endTime = form.date1[1]
-  let selectState=optionVal.value
+  let selectState = optionVal.value
 
   request.post(`/workOrder/orderGlassDetail/${startTime}/${endTime}/${selectState}`, filterData.value).then((res) => {
-    if(res.code==200){
-      pageTotal.value=res.data.total
+    if (res.code == 200) {
+      pageTotal.value = res.data.total
 
       produceList = deepClone(res.data.data)
       xGrid.value.loadData(produceList)
-      gridOptions.loading=false
-    }else{
+      gridOptions.loading = false
+    } else {
       ElMessage.warning(res.msg)
     }
   })
@@ -296,7 +295,8 @@
 
         />
         &nbsp;&nbsp;
-        <el-select :default-first-option="true" ref="getSelect" style="width: 120px" v-model="optionVal" class="m-2" placeholder="鏄惁杞伐鍗�">
+        <el-select :default-first-option="true" ref="getSelect" style="width: 120px" v-model="optionVal" class="m-2"
+                   placeholder="鏄惁杞伐鍗�">
           <el-option
               v-for="item in options"
               :key="item.value"
@@ -325,8 +325,8 @@
       <!--      涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
       <template #content="{ row }">
         <ul class="expand-wrapper">
-          <li  v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
-            <span style="font-weight: bold">{{item.title+':  '}}</span>
+          <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
+            <span style="font-weight: bold">{{ item.title + ':  ' }}</span>
             <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
             <span v-else>{{ row[item.field] }}</span>
 

--
Gitblit v1.8.0