From d809ecd16cbb23f5aad86a6844f51ffea0455fe8 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 06 九月 2024 16:53:55 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue | 219 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 127 insertions(+), 92 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue
index ed54f9c..038385e 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue
@@ -7,6 +7,12 @@
import VXETable from "vxe-table";
import useUserInfoStore from "@/stores/userInfo";
import {ElMessage} from "element-plus";
+import { useI18n } from 'vue-i18n'
+import useOrderInfoStore from "@/stores/sd/order/orderInfo";
+
+//璇█鑾峰彇
+const { t } = useI18n()
+const orderInfo = useOrderInfoStore()
const router = useRouter()
const userStore = useUserInfoStore()
const username = userStore.user.userName
@@ -59,17 +65,17 @@
let total = reactive({
pageTotal : 0,
dataTotal : 0,
- pageSize : 10
+ pageSize : 100
})
//绗竴娆¤皟鐢�
-request.post(`/Delivery/getSelectOrderInventory/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
+request.post(`/Delivery/getSelectOrderInventory/1/${total.pageSize}/${orderInfo.selectOrderListDate}`,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
+ orderInfo.selectOrderListDate = res.data.selectDate
pageNum.value=1
produceList = deepClone(res.data.data)
xGrid.value.loadData(produceList)
@@ -99,12 +105,12 @@
}else{
filterData.value[column.property] = value
}
- request.post(`/Delivery/getSelectOrderInventory/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
+ request.post(`/Delivery/getSelectOrderInventory/1/${total.pageSize}/${orderInfo.selectOrderListDate}`,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
+ orderInfo.selectOrderListDate = res.data.selectDate
pageNum.value=1
produceList = deepClone(res.data.data)
xGrid.value.loadData(produceList)
@@ -117,9 +123,13 @@
}
const selectOrderList = ()=>{
- request.post(`/Delivery/getSelectOrderInventory/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
+ request.post(`/Delivery/getSelectOrderInventory/${pageNum.value}/${total.pageSize}/${orderInfo.selectOrderListDate}`,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
@@ -151,7 +161,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'OrderList',
+ id: 'SelectOrderList',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -176,40 +186,40 @@
columns:[
{type:'expand',slots: { content:'content' },width: 60,fixed:"left"},
- {type:'checkbox',title: '閫夋嫨', width: 80,fixed:"left"},
- {type: 'seq', title: '鑷簭', width: 80 ,fixed:"left"},
+ {type:'checkbox',title: t('basicData.check'), width: 80,fixed:"left"},
+ {type: 'seq', title: t('basicData.Number'), width: 80 ,fixed:"left"},
- {field: 'createOrder',title: '涓嬪崟', width: 40, slots: { default: 'state' }},
- {field: 'processReview',title: '宸ヨ壓', width: 40, slots: { default: 'state' }},
- {field: 'orderReview',title: '瀹℃牳', width: 40, slots: { default: 'state' }},
- {field: 'productionOrder',title: '鐢熶骇', width: 40, slots: { default: 'state' }},
- {field: 'processingCard',title: '娴佺▼鍗�', width: 60, slots: { default: 'state' }},
- {field: 'warehousing',title: '鍏ュ簱', width: 40, slots: { default: 'state' }},
- {field: 'delivery',title: '鍙戣揣', width: 40, slots: { default: 'state' }},
+ {field: 'createOrder',title: t('delivery.place'), width: 40, slots: { default: 'state' }},
+ {field: 'processReview',title: t('delivery.technology'), width: 40, slots: { default: 'state' }},
+ {field: 'orderReview',title: t('basicData.review'), width: 40, slots: { default: 'state' }},
+ {field: 'productionOrder',title: t('delivery.produce'), width: 40, slots: { default: 'state' }},
+ {field: 'processingCard',title: t('delivery.traveler'), width: 60, slots: { default: 'state' }},
+ {field: 'warehousing',title: t('delivery.warehousing'), width: 40, slots: { default: 'state' }},
+ {field: 'delivery',title: t('delivery.delivery'), width: 40, slots: { default: 'state' }},
- {field: 'orderId',width:120, title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'customerId',width:120, title: '瀹㈡埛缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'customerName',width:120, title: '瀹㈡埛鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'quantity',width:120, title: '鎬绘暟閲�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'finishedGoodsInventory.quantityAvailable',width:120, title: '鍙敤搴撳瓨',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'project',width:120, title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'batch',width:120, title: '鎵规',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'money',width:120, title: '鎬婚噾棰�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'area',width:120, title: '鎬婚潰绉�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'createTime',width:120, title: '鎶ヨ〃鏃ユ湡',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'packType',width:120, title: '鍖呰鏂瑰紡',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'orderType',width:120, title: '璁㈠崟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'creator',width:120, title: '鍒涘缓浜�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true}
+ {field: 'orderId',width:120, title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'customerId',width:120, title: t('customer.customerNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'customerName',width:120, title: t('customer.customerName'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'quantity',width:120, title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'finishedGoodsInventory.quantityAvailable',width:120, title: t('delivery.availableStock'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'project',width:120, title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'batch',width:120, title: t('order.batch'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'money',width:120, title: t('order.money'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'area',width:120, title: t('productStock.totalArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'createTime',width:120, title: t('productStock.statementDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'packType',width:120, title: t('order.packType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'orderType',width:120, title: t('order.orderType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'creator',width:120, title:t('productStock.creator'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true}
],//琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [
- {'code': 'add', 'name': '鍙戣揣',status: 'primary',icon: 'vxe-icon-add'}
+ {'code': 'add', 'name': t('delivery.delivery'),status: 'primary',icon: 'vxe-icon-add'}
],
- import: false,
- export: true,
- print: true,
+ /*import: false,
+ export: true,
+ print: true,*/
zoom: true,
custom: true
},
@@ -217,7 +227,7 @@
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return `鍚堣:`
+ return t('basicData.total')
}
// if (props.tableProp.footList.includes(column.field)) {
// return sumNum(data, column.field)
@@ -238,13 +248,20 @@
if (selectRecords.length === 0) {
- ElMessage.warning("鏈�変腑鏁版嵁")
+ ElMessage.warning(t('productStock.unselectedData'))
return
}
let order_id=""
- const array=[];
+ const customerIdArray=[];
+ const projectArray=[];
for (let i=0;i<selectRecords.length;i++){
- array.push(selectRecords[i].customerId)
+ customerIdArray.push(selectRecords[i].customerId)
+ if(selectRecords[i].project.trim().length===0){
+ projectArray.push(selectRecords[i].project.trim())
+ }else{
+ projectArray.push(selectRecords[i].project)
+ }
+
if(i+1===selectRecords.length){
order_id+=selectRecords[i].orderId
}else{
@@ -252,8 +269,13 @@
}
}
//鍒ゆ柇鎵�閫夊鎴锋槸鍚︾浉鍚�
- if(!isAllEqual(array)){
- ElMessage.warning("璇烽�夋嫨鐩稿悓鐨勫鎴疯鍗�")
+ if(!isAllEqual(customerIdArray)){
+ ElMessage.warning(t('delivery.pleaseSelectTheSameCustomerOrder'))
+ return
+ }
+ //鍒ゆ柇鎵�閫夐」鐩槸鍚︾浉鍚�
+ if(!isAllEqual(projectArray)){
+ ElMessage.warning(t('delivery.pleaseSelectTheSameCustomerProject'))
return
}
@@ -283,71 +305,84 @@
<template>
<div style="width: 100%;height: 100%">
- <el-date-picker
- v-model="selectDate"
- type="daterange"
- start-placeholder="寮�濮嬫椂闂�"
- end-placeholder="缁撴潫鏃堕棿"
- format="YYYY-MM-DD"
- value-format="YYYY-MM-DD"
+ <div class="head">
+ <el-date-picker
+ v-model="orderInfo.selectOrderListDate"
+ type="daterange"
+ :start-placeholder="$t('basicData.startDate')"
+ :end-placeholder="$t('basicData.endDate')"
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD"
- />
- <el-button @click="changeDate" style="margin-top: -5px" id="searchButton" type="primary" :icon="Search">鏌ヨ</el-button>
- <vxe-grid
- max-height="97%"
- class="mytable-scrollbar"
- @filter-change="filterChanged"
- ref="xGrid"
- v-bind="gridOptions"
- v-on="gridEvents"
+ />
+ <el-button @click="changeDate" style="margin-top: -5px" id="searchButton" type="primary" :icon="Search">{{$t('basicData.search')}}</el-button>
+ </div>
+ <div class="main-table">
+ <vxe-grid
+ max-height="100%"
+ class="mytable-scrollbar"
+ @filter-change="filterChanged"
+ 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>{{ row[item.field] }}</span>
- </li>
- </ul>
- </template>
+ >
+ <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
+ <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>{{ row[item.field] }}</span>
+ </li>
+ </ul>
+ </template>
- <template #state="{ row,column}">
- <el-checkbox @click.native.prevent :checked="row[column.field]===2"/>
- </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">缂栬緫</el-button>
- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>
- </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,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</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)"/>
+ <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>
- </div>
- </template>
+ </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>
+ <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>
+ </div>
+
</div>
</template>
<style scoped>
+.head{
+ width: 100%;
+ height: 35px;
+}
+.main-table{
+ width: 100%;
+ height: calc(100% - 35px);
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0