From edc227277159601c5cb86829f1c5ce14cf7903a4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 24 九月 2024 10:12:55 +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 |  238 ++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 153 insertions(+), 85 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..e4c3edd 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
@@ -8,30 +8,44 @@
 import GlassType from "@/components/sd/product/GlassType.vue"
 import {useRouter} from 'vue-router'
 import Sortable from 'sortablejs'
-import BasicTable from '@/components/basic/BasicTable.vue'
+import BasicTable from '@/components/sd/product/BasicTable.vue'
 import {VXETable} from "vxe-table";
-
+import { useI18n } from 'vue-i18n'
+import  useUserInfoStore from '@/stores/userInfo'
+import footSum from "@/hook/footSum"
+import useOrderInfoStore from "@/stores/sd/order/orderInfo"
+//璇█鑾峰彇
+const { t } = useI18n()
+const userStore = useUserInfoStore()
+const orderInfo = useOrderInfoStore()
 
 let productGlassTypeStore = useProductGlassTypeStore()
 let router = useRouter()
+let isButtonDisabled=false
+
 const getTableRow = (row, type) => {
   switch (type) {
     case 'edit' : {
-      //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
-      router.push({path: '/main/workOrder/addWorkOrder', query: {id: row.id}})
+      router.push({path: '/main/workOrder/addWorkOrder', query: {orderId: row.orderId}})
       break
     }
     case 'delete': {
-      alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
+      let startTime = form.date1[0]
+      let endTime = form.date1[1]
+      let state = optionVal.value
+        request.post(`/workOrder/deleteOrderWork/${row.orderId}/${row.productionId}`).then((res) => {
+          if (res.code == 200 && res.data===true) {
+            ElMessage.success(t('workOrder.deleteOk'))
+            router.push({path: '/main/workOrder/SelectWorkOrder', query: {startTime:startTime,endTime:endTime,state:state,random:Math.random()}})
+          } else {
+
+            ElMessage.warning(t('workOrder.deleteNo'))
+
+          }
+      })
       break
     }
   }
-}
-
-
-
-function padLeftZero(str) {
-  return ('00' + str).substr(str.length)
 }
 
 //瀹氫箟鏃堕棿
@@ -41,15 +55,15 @@
 
 
 //瀹氫箟杞崟鐘舵��
-const optionVal = ref('0')
+const optionVal = ref('1')
 const options = [
   {
     value: '0',
-    label: '宸茶浆',
+    label: t('workOrder.convert'),
   },
   {
     value: '1',
-    label: '鏈浆',
+    label: t('workOrder.unConverted'),
   },
 ]
 
@@ -78,7 +92,7 @@
   order: {
     batch: ''
   },
-    orderDetail: {
+  orderDetail: {
     productName: '',
     computeArea: '',
     quantity: '',
@@ -97,50 +111,54 @@
 let pageNum = $ref(1)
 let pageState = null
 
-//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
+//鑾峰彇3澶╁墠鍒板綋鍓嶆椂闂�
 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())
+      .slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
+  const end = new Date(new Date().getTime()+3600 * 1000 * 24)
       .toISOString()
       .replace('T', ' ')
-      .slice(0,10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
+      .slice(0, 10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
   return [start, end]
 }
 
-
-//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
-form.date1=getNowTime()
-let startTime = form.date1[0]
-let endTime = form.date1[1]
-let state = optionVal.value
+const getFirst = () => {
+  //绗竴娆″姞杞借幏鍙栬繎3澶╂椂闂村拰榛樿鐘舵��
+//form.date1 = getNowTime()
+  if (orderInfo.workOrderDate[0]=="" && orderInfo.workOrderDate[1]==""){
+    orderInfo.workOrderDate=getNowTime()
+  }
+  let startTime = orderInfo.workOrderDate[0]
+  let endTime = orderInfo.workOrderDate[1]
+  let state = optionVal.value
 
 //绗竴娆″姞杞芥暟鎹�
+  request.post(`/workOrder/orderGlassDetail/${startTime}/${endTime}/${state}`, filterData.value).then((res) => {
 
-request.post(`/workOrder/orderGlassDetail/${startTime}/${endTime}/${state}`, filterData.value).then((res) => {
+    if (res.code == 200) {
+      pageTotal.value = res.data.total
+      produceList = produceList.value.concat(deepClone(res.data.data))
+      xGrid.value.reloadData(produceList)
+      gridOptions.loading = false
+    } else {
+      ElMessage.warning(res.msg)
+    }
+  })
+}
 
-  if (res.code == 200) {
-    console.log(res.data.data)
-    pageTotal.value = res.data.total
-    produceList = produceList.value.concat(deepClone(res.data.data))
-    xGrid.value.reloadData(produceList)
-    gridOptions.loading = false
-  } else {
-    ElMessage.warning(res.msg)
-  }
-})
+
 
 //鐐瑰嚮鏌ヨ
 const getWorkOrder = () => {
 
-  let startTime = form.date1[0]
-  let endTime = form.date1[1]
-  let selectState=optionVal.value
+  let startTime = orderInfo.workOrderDate[0]
+  let endTime = orderInfo.workOrderDate[1]
+  let selectState = optionVal.value
   request.post(`/workOrder/orderGlassDetail/${startTime}/${endTime}/${selectState}`, filterData.value).then((res) => {
     if (res.code == 200) {
-
+      //isButtonDisabled=false
       pageTotal.value = res.data.total
       xGrid.value.loadData(res.data.data)
       gridOptions.loading = false
@@ -156,6 +174,7 @@
   $panel.changeOption(event, !!option.data, option)
 }
 
+//绛涢�夋椂鏌ヨ
 function filterChanged(column) {
   gridOptions.loading = true
   //绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
@@ -172,18 +191,18 @@
   }
 
 //鑾峰彇閫変腑鏃堕棿鍜屾槸鍚﹁浆鍗曠姸鎬�
-  let startTime = form.date1[0]
-  let endTime = form.date1[1]
-  let selectState=optionVal.value
+  let startTime = orderInfo.workOrderDate[0]
+  let endTime = orderInfo.workOrderDate[1]
+  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)
     }
   })
@@ -196,7 +215,6 @@
 }
 
 //瀛愮粍浠舵帴鏀跺弬鏁�
-
 const xGrid = ref()
 const gridOptions = reactive({
   loading: true,
@@ -204,8 +222,8 @@
   keepSource: true,//淇濇寔婧愭暟鎹�
   align: 'center',//鏂囧瓧灞呬腑
   stripe: true,//鏂戦┈绾�
-  rowConfig: {isCurrent: true, isHover: true, height: 60, useKey: true},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
-  id: 'demo_1',
+  rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+  id: 'selectWorkOrder',
   showFooter: true,//鏄剧ず鑴�
   printConfig: {},
   importConfig: {},
@@ -228,48 +246,57 @@
     mode: 'row',
     showStatus: true
   },//琛ㄥご鍙傛暟
+  checkboxConfig: {
+    labelField: 'name',
+    checkMethod: ({ row }) => {
+      return optionVal.value === '1'
+    }
+  },
   columns: [
     {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
-    {title: '鎿嶄綔', width: 110, slots: {default: 'button_slot'}, fixed: "left"},
-    {type: 'seq', fixed: "left", title: '鑷簭', width: 50},
-    {field: 'orderId', title: '閿�鍞崟鍙�', filters: [{data: ''}], slots: {filter: 'num1_filter'},},
+    {type: 'checkbox', fixed: "left", title: t('basicData.check'), width: 80},
+    {title: t('basicData.operate'), width: 110, slots: {default: 'button_slot'}, fixed: "left"},
+    {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
+    {field: 'orderId', title: t('order.orderId'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
+    {field: 'order.customerName', title: t('processCard.customerName'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
     {
       field: 'productionId',
-      title: '鐢熶骇璁㈠崟鍙�',
+      title: t('workOrder.productionId'),
       showOverflow: "ellipsis",
       filters: [{data: ''}],
       slots: {filter: 'num1_filter'}
+      , width: 130
     },
-    {field: 'order.batch', title: '鎵规', filters: [{data: ''}], slots: {filter: 'num1_filter'}},
-    {field: 'orderDetail.productName', title: '浜у搧鍚嶇О', filters: [{data: ''}], slots: {filter: 'num1_filter'},},
-    {field: 'orderDetail.computeArea', title: '鍗曠墖鎬婚潰绉�', showOverflow: "ellipsis"},
-    {field: 'orderDetail.quantity', title: '鎬绘暟閲�',},
-    {field: 'orderDetail.computeGrossArea', title: '鎴愬搧鎬婚潰绉�',},
-    {field: 'orderDetail.perimeter', title: '鍛ㄩ暱', showOverflow: "ellipsis"},
-    {field: 'orderDetail.bendRadius', title: '鍗婂緞',},
-    {field: 'orderDetail.processingNote', title: '鍔犲伐瑕佹眰',}
+    {field: 'order.batch', title: t('order.batch'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
+    {field: 'order.project', title: t('order.project'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 210},
+    {field: 'order.orderType', title: t('order.orderType'), showOverflow: "ellipsis", width: 110},
+    {field: 'orderDetail.grossArea', title: t('order.grossArea'), width: 70},
+    {field: 'orderDetail.quantity', title: t('order.quantity'),},
+    {field: 'order.creator', title: t('order.creator'),},
+    {field: 'founder', title: t('product.creator'),},
+    {field: 'order.processingNote', title: t('order.processingNote'), filters: [{data: ''}], slots: {filter: 'num1_filter'},},
   ],//琛ㄥご鎸夐挳
   data: null,//琛ㄦ牸鏁版嵁
   toolbarConfig: {
-    // buttons: [{
-    //
-    // }],
-    import: false,
-    export: true,
-    print: true,
+    buttons: [
+      {'code': 'transferOrder', 'name': t('workOrder.transferOrder'),status: 'primary'}
+    ],
+    // import: false,
+    // export: true,
+    // print: true,
     zoom: true,
     custom: true
   },
   //鑴氶儴姹傚拰
-  footerMethod({columns, data}) {//椤佃剼鍑芥暟
-    let footList = ['', '', '']
-    return [
+  footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+    return[
       columns.map((column, columnIndex) => {
         if (columnIndex === 0) {
-          return '鍚堣:'
+          return t('basicData.total')
         }
-        if (footList.includes(column.field)) {
-          return sumNum(data, column.field)
+        const List = ["orderDetail.grossArea",'orderDetail.quantity']
+        if (List.includes(column.field)) {
+          return footSum(data, column.field)
         }
         return ''
       })
@@ -277,8 +304,27 @@
   }
 
 })
+const gridEvents = {
+  async toolbarButtonClick({code}) {
+    const $grid = xGrid.value
+    if ($grid) {
+      switch (code) {
+        case 'transferOrder':  {
+          const idList = []
+           $grid.getCheckboxRecords().forEach(item => {
+             idList.push(item.orderId)
+          })
+          router.push({path: '/main/workOrder/addWorkOrder', query: {orderId:idList.join(',')}})
+          break
+        }
+      }
+    }
+  }
+}
 
-
+onMounted(() => {
+  getFirst()
+})
 </script>
 
 <template>
@@ -286,17 +332,23 @@
     <div id="selectForm">
       <el-row :gutter="0">
         <el-date-picker
-            v-model="form.date1"
+            v-model="orderInfo.workOrderDate"
             type="daterange"
             format="YYYY/MM/DD"
             value-format="YYYY-MM-DD"
-            start-placeholder="寮�濮嬫椂闂�"
-            end-placeholder="缁撴潫鏃堕棿"
+            :start-placeholder="$t('basicData.startDate')"
+            :end-placeholder="$t('basicData.endDate')"
             :default-time="defaultTime"
 
         />
         &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: 130px"
+            v-model="optionVal"
+            class="m-2"
+            @change="getWorkOrder"
+                   >
           <el-option
               v-for="item in options"
               :key="item.value"
@@ -307,8 +359,9 @@
         &nbsp;&nbsp;
         <el-button
             @click="getWorkOrder"
+            :disabled="isButtonDisabled"
             id="select"
-            type="primary" :icon="Search">鏌ヨ
+            type="primary" :icon="Search">{{$t('basicData.search')}}
         </el-button>
       </el-row>
 
@@ -319,14 +372,15 @@
         class="mytable-scrollbar"
         ref="xGrid"
         v-bind="gridOptions"
+        v-on="gridEvents"
 
     >
       <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
       <!--      涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
       <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>
 
@@ -336,8 +390,22 @@
 
       <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
       <template #button_slot="{ row }">
-        <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">杞伐鍗�</el-button>
-        <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>
+<!--        <el-button :class="{disable: optionVal== 0}" :disabled="optionVal == 0" @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('workOrder.transferOrder')}}</el-button>-->
+<!--        <el-button :class="{disable: optionVal== 0}" :disabled="optionVal == 0"-->
+<!--                   @click="getTableRow(row,'edit')"-->
+<!--                   v-if="userStore.user.permissions.indexOf('SelectWorkOrder.edit') > -1"-->
+<!--                   link-->
+<!--                   type="primary"-->
+<!--                   size="small">-->
+<!--          {{$t('workOrder.transferOrder')}}-->
+<!--        </el-button>-->
+
+        <!--        <el-button :class="{disable: optionVal== 1}" :disabled="optionVal == 1" @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>-->
+        <el-popconfirm   @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
+          <template #reference>
+            <el-button :class="{disable: optionVal== 1}" :disabled="optionVal == 1" link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
+          </template>
+        </el-popconfirm>
       </template>
 
       <template #num1_filter="{ column, $panel }">

--
Gitblit v1.8.0