From 926a1e8b90381c7aa085d5462d78de9d2cc6034d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 27 二月 2024 08:58:15 +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/SelectAddProcess.vue |  437 ++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 307 insertions(+), 130 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 11afacb..2c22f9f 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
@@ -1,148 +1,325 @@
-<script lang="ts" setup>
-import { reactive } from 'vue'
+<script setup>
 
-// do not use same name with ref
+import {reactive, ref} from "vue";
+import {useRouter} from  'vue-router'
+import request from "@/utils/request";
+import deepClone from "@/utils/deepClone";
+import {ElDatePicker, ElMessage} from "element-plus";
+import {Search} from "@element-plus/icons-vue";
+let router=useRouter()
+const getTableRow = (row,type) =>{
+  switch (type) {
+    case 'edit' :{
+      //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
+      router.push({path: '/main/processCard/SplittingDetails', query: { orderId: row.orderId }})
+      break
+    }
+    case 'delete':{
+      alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
+      break
+    }
+    case  'setType':{
+      alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鎺掔増鐘舵��')
+      break
+    }
+  }
+}
+
+//瀹氫箟鏃堕棿
 const form = reactive({
-  name: '',
-  region: '',
   date1: '',
-  date2: '',
-  delivery: false,
-  type: [],
-  resource: '',
-  desc: '',
 })
-const tableData = [
-  {
-    salesOrderNo: 'NG231201',
-    customerName:"鎱曞鍏徃",
-    entryName: '淇″悎鏄ュぉ閲�',
-    batch: '23鎵�',
-    originalFilmRequired: '2022/5/24XFPO202205202',
-    trademark:'鍖楃幓鍟嗘爣',
-    orderType: '鏅�氳鍗�',
-    salesman: 'XXX',
-    processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
-    shipTo:'宸ュ湴',
-    deliveryDate:'2024-01-12'
-  },
-  {
-    salesOrderNo: 'NG231202',
-    customerName:"澶ц崚寤烘潗鏈夐檺鍏徃",
-    entryName: '淇″悎鏄ュぉ閲�',
-    batch: '23鎵�',
-    originalFilmRequired: '2022/5/24XFPO202205202',
-    trademark:'鍖楃幓鍟嗘爣',
-    orderType: '鏅�氳鍗�',
-    salesman: 'XXX',
-    processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
-    shipTo:'宸ュ湴',
-    deliveryDate:'2024-01-12'
-  },
-  {
-    salesOrderNo: 'NG231203',
-    customerName:"寤虹瓚宸ョ▼闆嗗洟鏈夐檺鍏徃",
-    entryName: '淇″悎鏄ュぉ閲�',
-    batch: '23鎵�',
-    originalFilmRequired: '2022/5/24XFPO202205202',
-    trademark:'鍖楃幓鍟嗘爣',
-    orderType: '鏅�氳鍗�',
-    salesman: 'XXX',
-    processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
-    shipTo:'宸ュ湴',
-    deliveryDate:'2024-01-12'
-  },
-  {
-    salesOrderNo: 'NG231204',
-    customerName:"鎱曞鍏徃",
-    entryName: '淇″悎鏄ュぉ閲�',
-    batch: '23鎵�',
-    originalFilmRequired: '2022/5/24XFPO202205202',
-    trademark:'鍖楃幓鍟嗘爣',
-    orderType: '鏅�氳鍗�',
-    salesman: 'XXX',
-    processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
-    shipTo:'宸ュ湴',
-    deliveryDate:'2024-01-12'
-  },
-  {
-    salesOrderNo: 'NG231205',
-    customerName:"鎱曞鍏徃",
-    entryName: '淇″悎鏄ュぉ閲�',
-    batch: '23鎵�',
-    originalFilmRequired: '2022/5/24XFPO202205202',
-    trademark:'鍖楃幓鍟嗘爣',
-    orderType: '鏅�氳鍗�',
-    salesman: 'XXX',
-    processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
-    shipTo:'宸ュ湴',
-    deliveryDate:'2024-01-12'
-  },
-  {
-    salesOrderNo: 'NG231206',
-    customerName:"鎱曞鍏徃",
-    entryName: '淇″悎鏄ュぉ閲�',
-    batch: '23鎵�',
-    originalFilmRequired: '2022/5/24XFPO202205202',
-    trademark:'鍖楃幓鍟嗘爣',
-    orderType: '鏅�氳鍗�',
-    salesman: 'XXX',
-    processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
-    shipTo:'宸ュ湴',
-    deliveryDate:'2024-01-12'
-  },
-  {
-    salesOrderNo: 'NG231207',
-    customerName:"鎱曞鍏徃",
-    entryName: '淇″悎鏄ュぉ閲�',
-    batch: '23鎵�',
-    originalFilmRequired: '2022/5/24XFPO202205202',
-    trademark:'鍖楃幓鍟嗘爣',
-    orderType: '鏅�氳鍗�',
-    salesman: 'XXX',
-    processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
-    shipTo:'宸ュ湴',
-    deliveryDate:'2024-01-12'
 
+//琛ㄥ熬姹傚拰
+const sumNum = (list, field) => {
+  let count = 0
+  list.forEach(item => {
+    count += Number(item[field])
+  })
+  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: {
+    batch: ''
   },
-]
+  orderDetail: {
+    productName: '',
+    computeArea: '',
+    quantity: '',
+    computeGrossArea: '',
+    perimeter: '',
+    bendRadius: '',
+    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()+ 3600 * 1000 * 24)
+      .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/selectAddProcess/${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/selectAddProcess/${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/selectAddProcess/${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({
+  loading: true,
+  border: "full",//琛ㄦ牸鍔犺竟妗�
+  keepSource: true,//淇濇寔婧愭暟鎹�
+  align: 'center',//鏂囧瓧灞呬腑
+  stripe: true,//鏂戦┈绾�
+  rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+  id: 'demo_1',
+  showFooter: true,//鏄剧ず鑴�
+  printConfig: {},
+  importConfig: {},
+  exportConfig: {},
+  scrollX: {enabled: true},
+  scrollY: {enabled: true, gt: 0},//寮�鍚櫄鎷熸粴鍔�
+  showOverflow: true,
+  columnConfig: {
+    resizable: true,
+    useKey: true
+  },
+  filterConfig: {   //绛涢�夐厤缃」
+    remote: true
+  },
+  customConfig: {
+    storage: true
+  },
+  editConfig: {
+    trigger: 'click',
+    mode: 'row',
+    showStatus: true
+  },//琛ㄥご鍙傛暟
+  columns:[
+    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
+    {title: '鎿嶄綔', width: 80, slots: { default: 'button_slot' },fixed:"left"},
+    { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
+    {field: 'order.orderId',  title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' } , },
+    {field: 'order.customerName', title: '瀹㈡埛鍚嶇О',showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'order.project', title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'order.batch', title: '鎵规',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, },
+    {field: 'order.otherRemarks', title: '鍘熺墖瑕佹眰' ,showOverflow:"ellipsis",filters:[{ data: '' },],slots: { filter: 'num1_filter' }},
+    {field: 'order.icon', title: '鍟嗘爣閫夐」',filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
+    {field: 'order.orderType', title: '璁㈠崟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
+    {field: 'order.salesman', title: '涓氬姟鍛�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'order.processingNote', title: '鍔犲伐瑕佹眰',showOverflow:"ellipsis"},
+    {field: 'order.deliveryAddress', title: '閫佽揣鍦板潃',},
+  ],//琛ㄥご鎸夐挳
+
+  toolbarConfig: {
+    // buttons: [{
+    //
+    // }],
+    import: false,
+    export: true,
+    print: true,
+    zoom: true,
+    custom: true
+  },
+  data: null,//琛ㄦ牸鏁版嵁
+  //鑴氶儴姹傚拰
+  footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+    let footList=['total','TotalArea','Cases']
+    return[
+      columns.map((column, columnIndex) => {
+        if (columnIndex === 0) {
+          return '鍚堣:'
+        }
+        // if (footList.includes(column.field)) {
+        //   return sumNum(data, column.field)
+        // }
+        return ''
+      })
+    ]
+  }
+
+})
+
+
+
 </script>
 
 <template>
-  <div>
-<!--    <div id="selectForm">-->
-<!--      <el-row :gutter="0">-->
-<!--          <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" style="width: 200px"/>-->
+  <div class="main-div-customer">
+    <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="寮�濮嬫椂闂�"
+            end-placeholder="缁撴潫鏃堕棿"
+            :default-time="defaultTime"
 
+        />
 
-<!--        &nbsp;&nbsp;-->
-<!--        <el-button type="primary">鏌ヨ</el-button>-->
-<!--      </el-row>-->
+        &nbsp;&nbsp;
+        <el-button
+            @click="getWorkOrder"
+            id="select"
+            type="primary" :icon="Search">鏌ヨ
+        </el-button>
+      </el-row>
 
-
-<!--    </div>-->
-    <div>
-      <el-table :data="tableData" border style="width: 100%" height="100%">
-        <el-table-column sortable prop="salesOrderNo" label="閿�鍞崟鍙�" width="110" >
-          <template v-slot="scope">
-            <router-link :to="{path:'SplittingDetails'}" >{{scope.row.salesOrderNo}}</router-link>
-          </template>
-        </el-table-column>
-        <el-table-column prop="customerName" label="瀹㈡埛鍚嶇О" :show-overflow-tooltip='true' width="110" />
-        <el-table-column prop="entryName" label="椤圭洰鍚嶇О" width="135" />
-        <el-table-column prop="batch" label="鎵规" width="80" />
-        <el-table-column prop="originalFilmRequired" :show-overflow-tooltip='true' label="鍘熺墖瑕佹眰" width="200" />
-        <el-table-column prop="trademark" label="鍟嗘爣閫夐」" width="100" />
-        <el-table-column prop="orderType" label="璁㈠崟绫诲瀷" width="100" />
-        <el-table-column prop="salesman" label="涓氬姟鍛�" width="75" />
-        <el-table-column prop="processRequirements" :show-overflow-tooltip='true' label="鍔犲伐瑕佹眰" width="400" />
-        <el-table-column prop="shipTo" label="閫佽揣鍦板潃" width="100" />
-        <el-table-column prop="deliveryDate" label="浜よ揣鏃ユ湡" width="100" />
-      </el-table><!-- <h1>{{msg}}</h1> -->
     </div>
+    <vxe-grid
+        max-height="100%"
+        @filter-change="filterChanged"
+        class="mytable-scrollbar"
+        ref="xGrid"
+        v-bind="gridOptions"
+
+    >
+      <!--      @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>
+            <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>
+
+      <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
+      <template #button_slot="{ row }">
+        <el-button @click="getTableRow(row,'edit')" 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)"/>
+          </div>
+        </div>
+      </template>
+
+
+    </vxe-grid>
   </div>
 </template>
 
 <style scoped>
-
+.main-div-customer{
+  width: 99%;
+  height: 100%;
+}
+#selectForm {
+  width: 50%;
+  text-align: center;
+}
 </style>
\ No newline at end of file

--
Gitblit v1.8.0