From fcd6de629c4f6b8d9e610da854f15ef40115b058 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 07 五月 2024 17:03:49 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue |  440 ++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 355 insertions(+), 85 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
index 643db12..618f499 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
@@ -1,105 +1,375 @@
 <script setup>
 import {Search} from "@element-plus/icons-vue";
+import {reactive, ref} from "vue";
+import {useRouter} from "vue-router"
+import request from "@/utils/request"
+import deepClone from "@/utils/deepClone"
+import VXETable from "vxe-table";
+import useUserInfoStore from "@/stores/userInfo";
+import {ElMessage} from "element-plus";
+import { useI18n } from 'vue-i18n'
+import DeliveryPrinting from "@/views/sd/delivery/DeliveryPrinting.vue";
 
-let deliveryTitle = $ref([
-  '搴忓彿',
-  '瀹℃牳',
-  '鍑哄簱',
-  '鍙戣揣鍗曞彿',
-  '鍙戣揣鍛�',
-  '鍙戣揣鏃ユ湡',
-  '瀹㈡埛缂栧彿',
-  '瀹㈡埛鍚嶇О',
-  '鎵规',
-  '椤圭洰鍚嶇О',
-  '璁㈠崟缂栧彿',
-  '浠樻鏉′欢',
-  '浠樻鏂瑰紡',
-  '鎬绘暟閲�',
-  '鎬婚潰绉�',
-  '鎬婚噾棰�',
-  '鎶ヨ〃鏃ユ湡',
-  '涓氬姟鍛�',
-  '閫佽揣鏃ユ湡',
-  '鏀舵鏃堕棿'
+//璇█鑾峰彇
+const { t } = useI18n()
+const router = useRouter()
+const userStore = useUserInfoStore()
+const username = userStore.user.userName
+const userid = userStore.user.userId
+const dialogTableVisible = ref(false)
+let rowClickIndex = ref(null)
+let produceList = ref([])
+const getTableRow = (row,type) =>{
+  switch (type) {
+    case 'edit' :{
+      router.push({path: '/main/delivery/createDelivery', query: { deliveryID: row.deliveryId }})
+      break
+    }
+    case 'printing' :{
+      router.push({path: '/main/delivery/deliveryPrinting', query: { deliveryID: row.deliveryId }})
+      break
+    }
+    case 'delete':{
+      let flowData = ref({
+        deliveryId:row.deliveryId
+      })
+      request.post("/Delivery/deleteDelivery",flowData.value).then((res) => {
+        if(res.code==200){
+          ElMessage.success(t('searchOrder.msgDeleteSuccess'))
+          router.push({path:'/main/delivery/selectDelivery',query:{random:Math.random()}})
+        }else{
+          ElMessage.warning(res.msg)
+          router.push("/login")
+        }
+      })
 
-])
-
-let deliveryList =[
-  {
-    '0': '1',
-    '1': '',
-    '2': '',
-    '3': 'JG23120801',
-    '4': '閮戠強鐝�',
-    '5': '2023-12-08',
-    '6': '310',
-    '7': '涓婃捣閲岃寤虹瓚宸ョ▼鏈夐檺鍏徃',
-    '8': '琛�1-2',
-    '9': '瀹胯縼鏌愭煇椤圭洰',
-    '10': 'NG23112304',
-    '11': '鎸夊悎鍚�',
-    '12': '',
-    '13': '8',
-    '14': '15.68',
-    '15': '11912.05',
-    '16': '2023-11-24',
-    '17': '鐜嬮緳',
-    '18': '瀹胯縼鏌愭煇鍦板潃',
-    '19': '2023-12-08'
+      return
+    }
   }
-]
+}
+
+
+const hasDecimal=(value)=>{
+  const regex=/\./ // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
+  return regex.test(value) //杩斿洖true/false
+}
+
+const hasDecimalhtml=(item,row)=>{
+  let aa=item.split('.').length
+  if (aa===2){
+    return row[item.split('.')[0]][item.split('.')[1]]
+  }else if(aa===3){
+    return row[item.split('.')[0]][item.split('.')[1]][item.split('.')[2]]
+  }
+
+
+}
+
+
+//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
+let filterData = ref({})
+
+let selectDate = ref(["",""])
+
+const  xGrid = ref();
+let pageNum=ref(1)
+let total = reactive({
+  pageTotal : 0,
+  dataTotal : 0,
+  pageSize : 100
+})
+
+//绗竴娆¤皟鐢�
+request.post(`/Delivery/getSelectShippingOrder/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
+
+  if(res.code==200){
+    total.dataTotal = res.data.total.total*1
+    total.pageTotal= res.data.total.pageTotal
+
+    selectDate.value = res.data.selectDate
+    pageNum.value=1
+    produceList = deepClone(res.data.data)
+    xGrid.value.loadData(produceList)
+    gridOptions.loading=false
+  }else{
+    ElMessage.warning(res.msg)
+    router.push("/login")
+  }
+})
+
+
+//瀹氫箟褰撳墠椤垫暟
+
+
+/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
+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
+  }
+  request.post(`/Delivery/getSelectShippingOrder/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
+
+    if(res.code==200){
+      total.dataTotal = res.data.total.total*1
+      total.pageTotal= res.data.total.pageTotal
+      pageNum.value=1
+      produceList = deepClone(res.data.data)
+      xGrid.value.loadData(produceList)
+      gridOptions.loading=false
+    }else{
+      ElMessage.warning(res.msg)
+      router.push("/login")
+    }
+  })
+}
+
+
+const selectOrderList = ()=>{
+  request.post(`/Delivery/getSelectShippingOrder/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
+
+    if(res.code==200){
+      if (res.data.total!=null){
+        total.dataTotal = res.data.total.total*1
+        total.pageTotal= res.data.total.pageTotal
+      }
+      produceList = deepClone(res.data.data)
+      xGrid.value.loadData(produceList)
+      gridOptions.loading=false
+    }else{
+      ElMessage.warning(res.msg)
+      router.push("/login")
+    }
+  })
+}
+
+const changeDate =  ()=>{
+  pageNum.value=1
+  selectOrderList()
+}
+
+//椤佃剼璺宠浆
+const handlePageChange = ({ currentPage, pageSize }) => {
+  total.pageTotal = pageSize
+  pageNum.value=currentPage
+
+  selectOrderList()
+}
+
+const gridEvents = {
+
+  menuClick ({ menu, row, column }) {
+    const $grid = xGrid.value
+    if ($grid) {
+      switch (menu.code) {
+        case 'getProcessList': {
+          if(rowClickIndex.value===null){
+            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+            return
+          }
+          dialogTableVisible.value = true
+          break
+        }
+
+      }
+    }
+  },
+  cellClick({ row }){
+    rowClickIndex.value = row
+  }
+}
+
+const gridOptions = reactive({
+  border:  "full",//琛ㄦ牸鍔犺竟妗�
+  keepSource: true,//淇濇寔婧愭暟鎹�
+  align: 'center',//鏂囧瓧灞呬腑
+  stripe:true,//鏂戦┈绾�
+  rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+  id: 'OrderList',
+  showFooter: true,//鏄剧ず鑴�
+  printConfig: {},
+  importConfig: {},
+  exportConfig: {},
+  scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
+  showOverflow:true,
+  columnConfig: {
+    resizable: true,
+    useKey: true
+  },
+  filterConfig: {   //绛涢�夐厤缃」
+    remote: true
+  },
+  customConfig: {
+    storage: true
+  },
+  editConfig: {
+    trigger: 'click',
+    mode: 'row',
+    showStatus: true
+  },
+  menuConfig: {
+    body: {
+      options: [
+        [
+          { code: 'getProcessList', name: "鎵撳嵃", prefixIcon: 'vxe-icon-file-txt', visible: true}
+        ]
+      ]
+    }
+  },
+  //琛ㄥご鍙傛暟
+  columns:[
+    {type:'expand',slots: { content:'content' },width: 60},
+    {title: t('basicData.operate'), width: 150, slots: { default: 'button_slot' }},
+    {type: 'seq', title: t('basicData.Number'), width: 80 },
+
+    {field: 'deliveryState',title: t('basicData.review'), width: 40, slots: { default: 'state' }},
+    {field: 'stockState',title: t('productStock.outbound'), width: 40, slots: { default: 'state' }},
+
+    {field: 'deliveryId',width:120,  title: t('delivery.deliveryNoteId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'creator',width:120,  title: t('delivery.shipper'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'deliveryDate',width:120,  title: t('delivery.deliveryDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'customerId',width:120,  title: t('customer.customerNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'customerName',width:120,  title: t('customer.customerName'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'project',width:120,  title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'orderId',width:120,   title: t('order.OrderNum'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'paymentTerms',width:120,  title: t('delivery.paymentTerms'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'payMethod',width:120,  title:t('delivery.paymentMethod'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'quantity',width:120,  title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'area',width:120,  title: t('productStock.totalArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'createTime',width:120,  title: t('productStock.statementDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }}
+
+
+  ],//琛ㄥご鎸夐挳
+  toolbarConfig: {
+    buttons: [],
+    /*import: false,
+   export: true,
+   print: true,*/
+    zoom: true,
+    custom: true
+  },
+
+  footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+    let footList=['quantity','area']
+    return[
+      columns.map((column, columnIndex) => {
+        if (columnIndex === 0) {
+          return t('basicData.total')
+        }
+        if (footList.includes(column.field)) {
+          return sumNum(data, column.field)
+        }
+        return ''
+      })
+    ]
+  }
+
+})
+
+
+//琛ㄥ熬姹傚拰
+const sumNum = (list, field) => {
+  let count = 0
+  list.forEach(item => {
+    count += Number(item[field])
+  })
+  return count.toFixed(2)
+}
 </script>
 
 <template>
-  <div>
+  <div style="width: 100%;height: 100%">
     <el-date-picker
-        v-model="value1"
+        v-model="selectDate"
         type="daterange"
         start-placeholder="寮�濮嬫椂闂�"
         end-placeholder="缁撴潫鏃堕棿"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+
     />
-    <el-button style="margin-top: -5px"  id="searchButton" type="primary" :icon="Search">鏌ヨ</el-button>
-    <el-table
-        :data="deliveryList"
-        :header-cell-style="{ 'text-align': 'center' }"
-        :cell-style="{ 'text-align': 'center' }"
-        lazy
-        border
-        style="width: 99%;"
-        max-height="80vh">
-      <el-table-column type="expand" fixed>
-        <template #default="props" >
-          <div m="4">
-            <p m="t-0 b-2">: {{ props.row['2'] }}</p>
+    <el-button @click="changeDate" style="margin-top: -5px"  id="searchButton" type="primary" :icon="Search">{{$t('basicData.search')}}</el-button>
+    <vxe-grid
+        max-height="97%"
+        @filter-change="filterChanged"
+        class="mytable-scrollbar"
+        ref="xGrid"
+        v-bind="gridOptions"
+        v-on="gridEvents"
+
+    >
+      <!--      涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
+      <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)">{{ hasDecimalhtml(item.field,row) }}</span>
+            <span v-else>{{ row[item.field] }}</span>
+          </li>
+        </ul>
+      </template>
+
+      <template #state="{ row,column}">
+        <el-checkbox @click.native.prevent :indeterminate="row[column.field]===1" :checked="row[column.field]===2"/>
+      </template>
+
+
+
+      <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
+      <template #button_slot="{ row }">
+        <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('basicData.edit')}}</el-button>
+        <el-button @click="getTableRow(row,'printing')" :disabled="row.deliveryState!==2" link type="primary" size="small">鎵撳嵃</el-button>
+        <el-popconfirm @confirm="getTableRow(row,'delete')" title="纭畾鍒犻櫎?">
+          <template #reference>
+            <el-button  link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
+          </template>
+        </el-popconfirm>
+      </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>
-        </template>
-      </el-table-column>
-      <el-table-column label="鎿嶄綔" fixed width="110"  >
-        <el-button link type="primary" size="small">缂栬緫</el-button>
-<!--        <el-button @click="openCraft" link type="primary" size="small">瀹℃牳</el-button>-->
-<!--        <el-button link type="primary" size="small">淇敼</el-button>-->
-        <el-button link type="primary" size="small">鍒犻櫎</el-button>
-      </el-table-column>
-      <el-table-column
-         :prop="index.toString()"
-         :show-overflow-tooltip='true'
-         width="100" v-for="(item,index) in deliveryTitle"
-         :label="item" >
-        <el-checkbox v-if="index>0 && index<3" checked/>
-      </el-table-column>
+        </div>
+      </template>
 
+      <template #pager>
+        <!--浣跨敤 pager 鎻掓Ы-->
+        <vxe-pager
+            @page-change="handlePageChange"
+            :layouts="[  'PrevPage', 'Jump','PageCount', 'NextPage',  'Total']"
+            v-model:current-page="pageNum"
+            v-model:page-size="total.pageSize"
+            v-model:pager-count="total.pageTotal"
+            :total="total.dataTotal"
+        >
+        </vxe-pager>
+      </template>
+    </vxe-grid>
 
-    </el-table>
+    <el-dialog
+        v-model="dialogTableVisible"
+        destroy-on-close
+        id="deliveryPrinting"
+        style="width: 100%;height:100%;margin-top: 0; ">
+      <DeliveryPrinting
+          :deliveryId="rowClickIndex.deliveryId"
+          style="width: 100%;height: 100%;" />
+    </el-dialog>
   </div>
 
 </template>
 
-<style scoped>
-:deep(.el-table .el-input__wrapper) {
-  box-shadow: 0 0 0 0px var(--el-input-border-color, var(--el-border-color)) inset;
-  cursor: default;
-  border: none !important;
-  background-color: transparent;
-}
-</style>
\ No newline at end of file

--
Gitblit v1.8.0