From e50fa16b6dbc4e7c50d5fbdbc04d2a556ca01c4e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:36 +0800
Subject: [PATCH] 补片流程卡调整

---
 north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue |  263 +++++++++++++++++++++++++++++-----------------------
 1 files changed, 146 insertions(+), 117 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
index f2b4c5b..6b7ec73 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
@@ -1,25 +1,28 @@
 <script setup>
 
-import {reactive, ref} from "vue";
-import {useRouter} from  'vue-router'
+import request from "@/utils/request"
+import {ElDatePicker, ElMessage} from "element-plus"
+import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
+import {Search} from "@element-plus/icons-vue"
+import {useRouter} from 'vue-router'
+import {changeFilterEvent, filterChanged} from "@/hook"
+
+import { useI18n } from 'vue-i18n'
+//璇█鑾峰彇
+const { t } = useI18n()
 let router=useRouter()
-const getTableRow = (row,type) =>{
-  switch (type) {
-    case 'edit' :{
-      //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
-      router.push({path: '/main/reportingWorks/ReportingWorkDetail', query: { id: row.id }})
-      break
-    }
-    case 'delete':{
-      alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
-      break
-    }
-    case  'setType':{
-      alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍙嶅鐘舵��')
-      break
-    }
+
+let props = defineProps({
+  orderId:null
+})
+onMounted(()=>{
+  if(props.orderId===null  || props.orderId===undefined || props.orderId===''){
+    return
   }
-}
+  form.orderId = props.orderId
+  getWorkOrder()
+})
+
 
 //琛ㄥ熬姹傚拰
 const sumNum = (list, field) => {
@@ -30,15 +33,75 @@
   return count.toFixed(2)
 }
 
-//瀛愮粍浠舵帴鏀跺弬鏁�
 
+//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
+let filterData = ref({
+  order: {
+    project: ''
+  },
+  orderDetail: {
+    productId: '',
+    productName: '',
+    computeGrossArea: '',
+    processingNote: '',
+  }
+})
+
+//闇�瑕佸悎骞剁殑鍒�
+let column = [1,3,8]
+//鐐瑰嚮鏌ヨ
+const getWorkOrder = () => {
+  request.post(`/report/processCardProgress/${form.orderId}`,column).then((res) => {
+    if (res.code == 200) {
+      if(res.data.data.length===0){
+        ElMessage.warning(t('report.noDataFoundForThisOrder'))
+        return
+      }
+      //gridOptions.columns = JSON.parse(JSON.stringify(columns))
+      res.data.title.forEach(item =>{
+        let column = {slots: { default: 'quantitySum' }, width: 90,title: item.process}
+        gridOptions.columns.push(column)
+      })
+      res.data.data.forEach(item => {
+        item.reportWorkQuantity=JSON.parse(item.reportWorkQuantity)
+        item.reportWorkQuantityCount=JSON.parse(item.reportWorkQuantityCount)
+      })
+      mergeCells.value = res.data.mergeCell
+      xGrid.value.loadData(res.data.data)
+    } else {
+      ElMessage.warning(res.msg)
+    }
+  })
+}
+const quantitySum = ( row,column )=>{
+  const reportWorkQuantity = row.reportWorkQuantity[column.title] || 0
+  const reportWorkQuantityCount = row.reportWorkQuantityCount[column.title] || 0
+  if(reportWorkQuantity===reportWorkQuantityCount){
+    return reportWorkQuantity
+  }
+
+  return (reportWorkQuantity
+      +'('
+      +reportWorkQuantityCount
+      +')' )
+  //return
+}
+
+
+/*鍚庣杩斿洖缁撴灉澶氬眰宓屽灞曠ず*/
+const hasDecimal = (value) => {
+  const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
+  return regex.test(value); // 杩斿洖true/false
+}
+
+const xGrid = ref()
 const gridOptions = reactive({
   border:  "full",//琛ㄦ牸鍔犺竟妗�
   keepSource: true,//淇濇寔婧愭暟鎹�
   align: 'center',//鏂囧瓧灞呬腑
   stripe:true,//鏂戦┈绾�
   rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
-  id: 'CustomerList',
+  id: 'ProcessCardProgress',
   showFooter: true,//鏄剧ず鑴�
   printConfig: {},
   importConfig: {},
@@ -50,7 +113,7 @@
     useKey: true
   },
   filterConfig: {   //绛涢�夐厤缃」
-    remote: true
+    // remote: true
   },
   customConfig: {
     storage: true
@@ -60,71 +123,49 @@
     mode: 'row',
     showStatus: true
   },//琛ㄥご鍙傛暟
-  columns:[
-    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
-    {field: '1', width: 150, title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
-    {field: '2',width: 130, title: '鍗曠墖鍚嶇О', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
-    {field: '3', width: 120,title: '璁㈠崟绫诲瀷', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
-    {field: '4',width: 110, title: '娴佺▼鍗″彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: '5', width: 90,title: '鏍囪', sortable: true,showOverflow:"ellipsis"},
-    {field: '6', width: 90,title: '鏁伴噺', sortable: true},
-    {field: '7',width: 90, title: '娆＄牬鏁伴噺', sortable: true},
-    {field: '8',width: 120, title: '鍒囧壊', sortable: true},
-    {field: '9',width: 120, title: '纾ㄨ竟', sortable: true},
-    {field: '10',width: 120, title: '閽㈠寲', sortable: true},
-    {field: '11',width: 120, title: '鍏ュ簱闈㈢Н', sortable: true},
-  ],//琛ㄥご鎸夐挳
+   columns : [
+    // {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
+    {field: 'product_name', width: 150,
+      title: t('order.product'),
+      filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged},
+    {field: 'glass_child',width: 130, title:  t('reportingWorks.glassChild') ,filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged},
+    {field: 'order_type', width: 120,title: t('order.orderType'),filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged},
+    {field: 'process_id',width: 150, title: t('processCard.processId'),filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged},
+    {field: 'order_number', width: 100,title: t('order.OrderNum'),showOverflow:"ellipsis",filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged},
+    {field: 'glassNumber', width: 110,title: t('reportingWorks.glassNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged},
+    {field: 'technology_number', width: 110,title: t('processCard.technologyNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged},
+    {field: 'quantity', width: 90,title: t('order.quantity')},
+    {field: 'broken_num',width: 90, title: t('reportingWorks.quantityBroken')},
+    // {field: 'shippedQuantity',width: 120, title: t('report.shippedQuantity')},
+    {field: 'inventory',width: 120, title: t('report.inventoryNum')},
+    {field: 'inventoryArea',width: 120, title: t('report.inventoryArea')},
+  ],
 
   toolbarConfig: {
     // buttons: [{
     //
     // }],
-    import: false,
-    export: true,
-    print: true,
+    // import: false,
+    // export: true,
+     // print: true,
     zoom: true,
     custom: true
   },
   data:  [
-    {
-      1:'10mm瓒呯櫧UD60骞抽挗(澶�)+12Ar(缁�)+10mm瓒呯櫧骞抽挗+12Ar(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
-      2:'10mm瓒呯櫧UD60骞抽挗(澶�)',
-      3:'鏅�氳鍗�',
-      4:'NG23052602A01/1',
-      5:'1',
-      6:'33',
-      7:'1',
-      8:'22',
-      9:'22',
-      10:'22',
-      11:'314.13',
-    },
-    {
-      1:'10mm瓒呯櫧UD60骞抽挗(澶�)+12Ar(缁�)+10mm瓒呯櫧骞抽挗+12Ar(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
-      2:'10mm瓒呯櫧骞抽挗+12Ar(缁�)',
-      3:'鏅�氳鍗�',
-      4:'NG23052602A01/2',
-      5:'2',
-      6:'33',
-      7:'1',
-      8:'22',
-      9:'22',
-      10:'22',
-      11:'314.13',
-    },
-    {
-      1:'10mm瓒呯櫧UD60骞抽挗(澶�)+12Ar(缁�)+10mm瓒呯櫧骞抽挗+12Ar(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
-      2:'10mm瓒呯櫧骞抽挗(鍐�)',
-      3:'鏅�氳鍗�',
-      4:'NG23052602A01/3',
-      5:'3',
-      6:'33',
-      7:'1',
-      8:'22',
-      9:'22',
-      10:'22',
-      11:'314.13',
-    },
   ],//table body瀹為檯鏁版嵁
   //鑴氶儴姹傚拰
   // footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
@@ -144,42 +185,18 @@
 
 })
 
-const value = ref('')
-const options = [
-  {
-    value: 'Option1',
-    label: 'Option1',
-  },
-  {
-    value: 'Option2',
-    label: 'Option2',
-  },
-  {
-    value: 'Option3',
-    label: 'Option3',
-  },
-]
+
 
 const form = reactive({
-  name: '',
-  region: '',
-  date1: '',
-  date2: '',
-  delivery: false,
-  type: [],
-  resource: '',
-  desc: '',
+  orderId: '',
 
 })
 
 const mergeCells = ref([
-  { row: 0, col: 1, rowspan: 3, colspan: 0},
-  { row: 3, col: 1, rowspan: 3, colspan: 0},
-
-  { row: 0, col: 6, rowspan: 3, colspan: 0},
-  { row: 3, col: 6, rowspan: 3, colspan: 0},
 
 ])
+
+
 
 </script>
 
@@ -187,15 +204,25 @@
   <div class="main-div-customer" >
     <div id="selectForm">
       <el-row :gutter="0">
-        <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" value="NG23110102" style="width: 150px"/>
+        <el-input
+            v-model="form.orderId"
+            clearable
+            :disabled="props.orderId"
+            :placeholder="$t('order.orderId')"
+            style="width: 140px"></el-input>
         &nbsp;&nbsp;
-        <el-button type="primary">鏌ヨ</el-button>
+        <el-button
+            :disabled="props.orderId"
+            @click="getWorkOrder"
+            id="select"
+            type="primary" :icon="Search">{{$t('basicData.search')}}
+
+        </el-button>
       </el-row>
 
     </div>
     <vxe-grid
-       height="400px"
-        @filter-change="filterChanged"
+       height="100%"
         class="mytable-scrollbar"
         ref="xGrid"
         v-bind="gridOptions"
@@ -213,19 +240,21 @@
         </ul>
       </template>
 
-      <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
-      <template #button_slot="{ row }">
-        <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">缂栬緫</el-button>
-        <el-button @click="getTableRow(row,'setType')" link type="primary" size="small">鍙嶅</el-button>
-        <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</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 v-model="option.data"
+                   type="text"
+                   @keyup.enter.native="$panel.confirmFilter()"
+                   @input="changeFilterEvent($event, option, $panel)"/>
           </div>
         </div>
+      </template>
+
+      <template #quantitySum="{ row,column }">
+        <span>{{ quantitySum(row,column) }} </span>
       </template>
 
 
@@ -236,7 +265,7 @@
 <style scoped>
 .main-div-customer{
   width: 99%;
-  height: 100%;
+  height: 90%;
 }
 #selectForm {
   width: 60%;

--
Gitblit v1.8.0