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/processCard/SelectProcessCard.vue |  299 +++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 179 insertions(+), 120 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
index f298d8b..802f6b6 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
@@ -1,25 +1,46 @@
 <script setup>
 
-import {reactive} from "vue";
-import {useRouter} from  'vue-router'
-let router=useRouter()
-const getTableRow = (row,type) =>{
+import request from "@/utils/request"
+import deepClone from "@/utils/deepClone"
+import {ElDatePicker, ElMessage} from "element-plus"
+import useProductGlassTypeStore from "@/stores/sd/product/productGlassType"
+import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
+import {Search} from "@element-plus/icons-vue"
+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 {VXETable} from "vxe-table";
+
+let productGlassTypeStore = useProductGlassTypeStore()
+let router = useRouter()
+const getTableRow = (row, type) => {
   switch (type) {
-    case 'edit' :{
+    case 'edit' : {
       //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
-      router.push({path: '/main/processCard/PrintFlowCard', query: { id: row.id }})
+      router.push({path: '/main/workOrder/addWorkOrder', query: {id: row.id}})
       break
     }
-    case 'delete':{
+    case 'delete': {
       alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
-      break
-    }
-    case  'setType':{
-      alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鎺掔増鐘舵��')
       break
     }
   }
 }
+
+
+
+function padLeftZero(str) {
+  return ('00' + str).substr(str.length)
+}
+
+//瀹氫箟鏃堕棿
+const form = reactive({
+  date1: '',
+})
+
+
+
 
 //琛ㄥ熬姹傚拰
 const sumNum = (list, field) => {
@@ -30,8 +51,134 @@
   return count.toFixed(2)
 }
 
-//瀛愮粍浠舵帴鏀跺弬鏁�
+//瀹氫箟婊氬姩鏉￠珮搴�
+let scrollTop = ref(null)
+let scrollHeight = ref(null)
+let clientHeight = ref(null)
+const scrollEvnt = (row) => {
+  // 鍐呭楂樺害
+  scrollTop.value = row.$event.target.scrollTop
+  scrollHeight.value = row.$event.target.scrollHeight
+  clientHeight.value = row.$event.target.clientHeight
+}
+//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
+let filterData = ref({
+  order: {
+    project: ''
+  },
+  orderDetail: {
+    productId: '',
+    productName: '',
+    computeGrossArea: '',
+    processingNote: '',
+  }
 
+})
+//瀹氫箟椤甸潰鎬婚〉鏁�
+let pageTotal = ref('')
+//瀹氫箟鏁版嵁杩斿洖缁撴灉
+let produceList = ref([])
+//瀹氫箟褰撳墠椤垫暟
+let pageNum = $ref(1)
+let pageState = null
+
+//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
+function getNowTime() {
+  const start = new Date(new Date().getTime()- 3600 * 1000 * 24 * 7)
+      .toISOString()
+      .replace('T', ' ')
+      .slice(0,10) //榛樿寮�濮嬫椂闂�7澶╁墠
+  const end = new Date(new Date().getTime())
+      .toISOString()
+      .replace('T', ' ')
+      .slice(0,10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
+  return [start, end]
+}
+
+
+//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
+form.date1=getNowTime()
+let startTime = form.date1[0]
+let endTime = form.date1[1]
+
+//绗竴娆″姞杞芥暟鎹�
+
+request.post(`/processCard/flowCard/${startTime}/${endTime}`, filterData.value).then((res) => {
+
+  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]
+  request.post(`/processCard/flowCard/${startTime}/${endTime}`, filterData.value).then((res) => {
+    if (res.code == 200) {
+
+      pageTotal.value = res.data.total
+      xGrid.value.loadData(res.data.data)
+      gridOptions.loading = false
+    } else {
+      ElMessage.warning(res.msg)
+    }
+  })
+}
+
+/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
+const changeFilterEvent = (event, option, $panel,) => {
+  // 鎵嬪姩瑙﹀彂绛涢��
+  $panel.changeOption(event, !!option.data, option)
+}
+
+function filterChanged(column) {
+  gridOptions.loading = true
+  //绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
+  let value = column.datas[0] != undefined ? column.datas[0] : ''
+  value = value.trim()
+  //鍒ゆ柇鏄惁瀛樺湪澶栭敭
+  if (column.property.indexOf('.') > -1) {
+    const columnArr = column.property.split('.')
+    filterData.value[columnArr[0]] = {
+      [columnArr[1]]: value
+    }
+  } else {
+    filterData.value[column.property] = value
+  }
+
+//鑾峰彇閫変腑鏃堕棿鍜屾槸鍚﹁浆鍗曠姸鎬�
+  let startTime = form.date1[0]
+  let endTime = form.date1[1]
+
+  request.post(`/processCard/flowCard/${startTime}/${endTime}`, filterData.value).then((res) => {
+    if(res.code==200){
+      pageTotal.value=res.data.total
+
+      produceList = deepClone(res.data.data)
+      xGrid.value.loadData(produceList)
+      gridOptions.loading=false
+    }else{
+      ElMessage.warning(res.msg)
+    }
+  })
+}
+
+/*鍚庣杩斿洖缁撴灉澶氬眰宓屽灞曠ず*/
+const hasDecimal = (value) => {
+  const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
+  return regex.test(value); // 杩斿洖true/false
+}
+
+//瀛愮粍浠舵帴鏀跺弬鏁�
+const xGrid = ref()
 const gridOptions = reactive({
   border:  "full",//琛ㄦ牸鍔犺竟妗�
   keepSource: true,//淇濇寔婧愭暟鎹�
@@ -64,16 +211,15 @@
     {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
     {title: '鎿嶄綔', width: 140, slots: { default: 'button_slot' },fixed:"left"},
     { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
-    {field: '閿�鍞崟鍙�', title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
-    {field: '娴佺▼鍗″彿', width: 120, title: '娴佺▼鍗″彿', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
-    {field: '浜у搧缂栧彿', title: '浜у搧缂栧彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
-    {field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: '椤圭洰鍚嶇О', title: '椤圭洰鍚嶇О', sortable: true,showOverflow:"ellipsis"},
-    {field: '鎬绘暟閲�', title: '鎬绘暟閲�', sortable: true},
-    {field: '鎬婚潰绉�', title: '鎬婚潰绉�', sortable: true},
-    {field: '鍒嗙鏁�', title: '鍒嗙鏁�', sortable: true,showOverflow:"ellipsis"},
-    {field: '鍒嗘灦鍛�', title: '鍒嗘灦鍛�', sortable: true},
-    {field: '鍔犲伐瑕佹眰', title: '鍔犲伐瑕佹眰', sortable: true}
+    {field: 'orderId', title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
+    {field: 'productionId', width: 120, title: '娴佺▼鍗″彿', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'orderDetail.productId', title: '浜у搧缂栧彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'orderDetail.productName', title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'order.project', title: '椤圭洰鍚嶇О', sortable: true,showOverflow:"ellipsis"},
+    {field: 'binningQuantity', title: '鏁伴噺', sortable: true},
+    {field: 'orderDetail.compute_gross_area', title: '闈㈢Н', sortable: true},
+    {field: 'founder', title: '鍒嗘灦鍛�', sortable: true},
+    {field: 'orderDetail.processingNote', title: '鍔犲伐瑕佹眰', sortable: true}
   ],//琛ㄥご鎸夐挳
 
   toolbarConfig: {
@@ -87,90 +233,7 @@
     custom: true
   },
   data:  [
-    {
-      閿�鍞崟鍙�: 'NG231201',
-      娴佺▼鍗″彿: 'NG231201A01 ',
-      浜у搧缂栧彿: '9001010203000008',
-      浜у搧鍚嶇О: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
-      椤圭洰鍚嶇О: '淇″悎鏄ュぉ閲�',
-      鎬绘暟閲�: '169',
-      鎬婚潰绉�: '175.31',
-      鍒嗙鏁�: '3',
-      鍒嗘灦鍛�: 'xxx',
-      鍔犲伐瑕佹眰: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
-    },
-    {
-      閿�鍞崟鍙�: 'NG231201',
-      娴佺▼鍗″彿: 'NG231201A01 ',
-      浜у搧缂栧彿: '9001010203000008',
-      浜у搧鍚嶇О: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
-      椤圭洰鍚嶇О: '淇″悎鏄ュぉ閲�',
-      鎬绘暟閲�: '169',
-      鎬婚潰绉�: '175.31',
-      鍒嗙鏁�: '3',
-      鍒嗘灦鍛�: 'xxx',
-      鍔犲伐瑕佹眰: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
-    },
-    {
-      閿�鍞崟鍙�: 'NG231201',
-      娴佺▼鍗″彿: 'NG231201A01 ',
-      浜у搧缂栧彿: '9001010203000008',
-      浜у搧鍚嶇О: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
-      椤圭洰鍚嶇О: '淇″悎鏄ュぉ閲�',
-      鎬绘暟閲�: '169',
-      鎬婚潰绉�: '175.31',
-      鍒嗙鏁�: '3',
-      鍒嗘灦鍛�: 'xxx',
-      鍔犲伐瑕佹眰: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
-    },
-    {
-      閿�鍞崟鍙�: 'NG231201',
-      娴佺▼鍗″彿: 'NG231201A01 ',
-      浜у搧缂栧彿: '9001010203000008',
-      浜у搧鍚嶇О: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
-      椤圭洰鍚嶇О: '淇″悎鏄ュぉ閲�',
-      鎬绘暟閲�: '169',
-      鎬婚潰绉�: '175.31',
-      鍒嗙鏁�: '3',
-      鍒嗘灦鍛�: 'xxx',
-      鍔犲伐瑕佹眰: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
-    },
-    {
-      閿�鍞崟鍙�: 'NG231201',
-      娴佺▼鍗″彿: 'NG231201A01 ',
-      浜у搧缂栧彿: '9001010203000008',
-      浜у搧鍚嶇О: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
-      椤圭洰鍚嶇О: '淇″悎鏄ュぉ閲�',
-      鎬绘暟閲�: '169',
-      鎬婚潰绉�: '175.31',
-      鍒嗙鏁�: '3',
-      鍒嗘灦鍛�: 'xxx',
-      鍔犲伐瑕佹眰: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
-    },
-    {
-      閿�鍞崟鍙�: 'NG231201',
-      娴佺▼鍗″彿: 'NG231201A01 ',
-      浜у搧缂栧彿: '9001010203000008',
-      浜у搧鍚嶇О: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
-      椤圭洰鍚嶇О: '淇″悎鏄ュぉ閲�',
-      鎬绘暟閲�: '169',
-      鎬婚潰绉�: '175.31',
-      鍒嗙鏁�: '3',
-      鍒嗘灦鍛�: 'xxx',
-      鍔犲伐瑕佹眰: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
-    },
-    {
-      閿�鍞崟鍙�: 'NG231201',
-      娴佺▼鍗″彿: 'NG231201A01 ',
-      浜у搧缂栧彿: '9001010203000008',
-      浜у搧鍚嶇О: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
-      椤圭洰鍚嶇О: '淇″悎鏄ュぉ閲�',
-      鎬绘暟閲�: '169',
-      鎬婚潰绉�: '175.31',
-      鍒嗙鏁�: '3',
-      鍒嗘灦鍛�: 'xxx',
-      鍔犲伐瑕佹眰: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
-    },
+
   ],//table body瀹為檯鏁版嵁
   //鑴氶儴姹傚拰
   footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
@@ -190,16 +253,7 @@
 
 })
 
-const form = reactive({
-  name: '',
-  region: '',
-  date1: '',
-  date2: '',
-  delivery: false,
-  type: [],
-  resource: '',
-  desc: '',
-})
+
 
 </script>
 
@@ -210,9 +264,12 @@
         <el-date-picker
             v-model="form.date1"
             type="daterange"
+            format="YYYY/MM/DD"
+            value-format="YYYY-MM-DD"
             start-placeholder="寮�濮嬫椂闂�"
             end-placeholder="缁撴潫鏃堕棿"
             :default-time="defaultTime"
+
         />
         &nbsp;&nbsp;
         <el-button type="primary">鏌ヨ</el-button>
@@ -229,11 +286,13 @@
     >
       <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
       <!--      涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
-      <template #content="{ row}">
+      <template #content="{ row }">
         <ul class="expand-wrapper">
-          <li  v-for="(item,key,index) in row">
-            <span style="font-weight: bold">{{key+':  '}}</span>
-            <span>{{ item }}</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>
+
           </li>
         </ul>
       </template>

--
Gitblit v1.8.0