From 1e9a52cf65f364b4332a008210700adbaea0c35e Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 06 九月 2024 11:34:16 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue | 588 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 361 insertions(+), 227 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
index 2b94a69..58243e5 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
@@ -8,13 +8,26 @@
import VXETable from "vxe-table";
import useUserInfoStore from "@/stores/userInfo";
import {ElMessage} from "element-plus";
-import validator from "vxe-table/lib/validator";
+import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove";
+import { useI18n } from 'vue-i18n'
+import OrderOtherMoney from "@/components/sd/order/OrderOtherMoney.vue";
+import footSum from "@/hook/footSum";
+import {changeFilterEvent,filterChanged} from "@/hook"
+import companyInfo from "@/stores/sd/companyInfo";
+import {multiply} from "@/utils/decimal";
+
+//璇█鑾峰彇
+const { t } = useI18n()
const router = useRouter()
const route = useRoute()
const userStore = useUserInfoStore()
const username = userStore.user.userName
const userid = userStore.user.userId
+const company = companyInfo()
let produceList = ref([])
+let cellArea = ref()
+let otherMoneyVisible = ref(false)
+let otherMoney = ref(null)
const hasDecimal=(value)=>{
@@ -25,6 +38,7 @@
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]]
@@ -36,12 +50,16 @@
//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
const titleSelectJson = ref({
+ deliveryOtherMoney:[],
paymentTerms:[],
+ payMethod:[]
})
// 瀹氫箟琛ㄥご涓婁紶鏁版嵁
let titleUploadData = ref({
+ deliveryId:'',
deliveryState:'',
+ stockState:'',
paymentTerms:'',
customerId:'',
customerName:'',
@@ -57,6 +75,9 @@
deliveryDate:'',
salesmanId:'',
salesman:'',
+ freight:'',
+ freightPrice:'',
+ freightQuantity:'',
creatorId:userStore.user.userid,
creator:userStore.user.userName
})
@@ -86,7 +107,10 @@
remarks:'',
createTime:'',
deliveryDate:'',
- creator:''
+ creator:'',
+ freight:'',
+ freightPrice:'',
+ freightQuantity:'',
},
finishedGoodsInventory:{
quantityAvailable:'',
@@ -96,43 +120,57 @@
},
})
+const initOrder = async ()=> {
//椤甸潰绗竴娆″姞杞�
-request.get(`/basicData/deliveryBasicData`).then((res) => {
+ await request.get(`/basicData/BasicDataByType/delivery`).then((res) => {
- if(res.code==200){
- titleSelectJson.value=deepClone(res.data)
- titleUploadData.value.paymentTerms = titleSelectJson.value.paymentTerms[0].basicName
- const today = new Date
- today.setTime(today.getTime() + (15 * 24 * 60 * 60 * 1000))
- titleUploadData.value.deliveryDate = today.getFullYear() +
- '-' + ("0" + (today.getMonth() + 1)).slice(-2)
- + '-' + ("0" + today.getDate()).slice(-2)
- }else{
- ElMessage.warning(res.msg)
- }
-})
+ if (res.code == 200) {
+ titleSelectJson.value = deepClone(res.data)
+ //鍏朵粬閲戦
+ otherMoney.value = titleSelectJson.value.deliveryOtherMoney[0]
+ //let columns = []
+ otherMoney.value.forEach(item => {
+ let column = {field: `otherColumns.${item.column}`, width: 50, title: item.alias, editRender: {name: 'input'}}
+ //columns.push(column)
+ gridOptions.columns.push(column)
+ })
+ const today = new Date
+ today.setTime(today.getTime() + (15 * 24 * 60 * 60 * 1000))
+ titleUploadData.value.deliveryDate = today.getFullYear() +
+ '-' + ("0" + (today.getMonth() + 1)).slice(-2)
+ + '-' + ("0" + today.getDate()).slice(-2)
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+}
const xGrid = ref();
const number = ref();
-onMounted(()=>{
+onMounted( async()=>{
+ await initOrder()
+ //鍚敤琛ㄦ牸鎷栧姩閫変腑
+ addListener(xGrid.value,gridOptions,cellArea.value)
//鍙戣揣鏂板
const orderId = route.query.orderId
if (typeof orderId !== 'undefined' && orderId !== null && orderId !== '' && orderId !== '\n' && orderId !== '\r'){
filterData.value.orderId=orderId
number.value=orderId
//绗竴娆¤皟鐢�
- request.post("/Delivery/getseletShippingOrderDetails/1/100",filterData.value).then((res) => {
+ request.post("/Delivery/getSelectShippingOrderDetails/1/100",filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data.title)
pageTotal.value=res.data.total
titleUploadData.value=deepClone(res.data.title)
+ titleUploadData.value.paymentTerms = titleSelectJson.value.paymentTerms[0].basicName
+ titleUploadData.value.payMethod = titleSelectJson.value.payMethod[0].basicName
+ titleUploadData.value.deliveryId=""
const today = new Date
- today.setTime(today.getTime() + (15 * 24 * 60 * 60 * 1000))
+ today.setTime(today.getTime() )
titleUploadData.value.deliveryDate=today.getFullYear() +
'-' + ("0" + (today.getMonth() + 1)).slice(-2)
+ '-' + ("0" + today.getDate()).slice(-2)
@@ -150,8 +188,7 @@
produceList = deepClone(res.data.data)
xGrid.value.loadData(produceList)
- //let arr = Object.values(gridOptions.toolbarConfig);
- //arr[0].splice(1,2)
+
//绂佺敤鎸夐挳
gridOptions.toolbarConfig.buttons[1].disabled = true
gridOptions.toolbarConfig.buttons[2].disabled = true
@@ -160,7 +197,6 @@
gridOptions.loading=false
}else{
ElMessage.warning(res.msg)
- router.push("/login")
}
})
}
@@ -169,35 +205,48 @@
if (typeof str != 'undefined' && str != null && str !== '' && str !== '\n' && str !== '\r'){
filterData.value.deliveryDetail.deliveryId=str
- console.log(filterData)
//绗竴娆¤皟鐢�
- request.post("/Delivery/getseletShippingOrderDetail/1/100",filterData.value).then((res) => {
+ request.post("/Delivery/getSelectShippingOrderDetail/1/100",filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data.data)
pageTotal.value=res.data.total
titleUploadData.value=deepClone(res.data.delivery)
- console.log(deepClone(res.data.delivery))
-
+ titleUploadData.value.deliveryId=str
//鏍规嵁瀹℃牳鐘舵�佹樉绀哄鏍告寜閽垨鑰呮槸鍙嶅鎸夐挳
- gridOptions.toolbarConfig.buttons[0].disabled = true
- if(titleUploadData.value.deliveryState===1){
+
+ if(titleUploadData.value.deliveryState!==0){
gridOptions.toolbarConfig.buttons[1].disabled = true
+ gridOptions.toolbarConfig.buttons[0].disabled = true
}
if(titleUploadData.value.deliveryState===0){
gridOptions.toolbarConfig.buttons[2].disabled = true
}
+ if(titleUploadData.value.stockState!==0){
+ gridOptions.toolbarConfig.buttons[2].disabled = true
+ }
pageNum=1
produceList = deepClone(res.data.data)
+
+ const orderDetails = res.data.data
+ orderDetails.forEach(item => {
+ item.otherColumns = JSON.parse(item.otherColumns)
+ })
+ otherMoney.value =res.data.orderOtherMoneyList
+
+ titleUploadData.value.creator=userStore.user.userName
+ titleUploadData.value.creatorId=userStore.user.userId
+
+ xGrid.value.reloadData(orderDetails)
xGrid.value.loadData(produceList)
//闅愯棌澶嶉�夋
- xGrid.value.hideColumn("select")
+ /*xGrid.value.hideColumn("select")
+ gridOptions.loading=false*/
+ xGrid.value.showColumn("select")
gridOptions.loading=false
}else{
ElMessage.warning(res.msg)
- router.push("/login")
}
})
}
@@ -212,81 +261,6 @@
//瀹氫箟褰撳墠椤垫暟
let pageNum=$ref(1)
-const changeFilterEvent = (event, option, $panel) => {
- // 鎵嬪姩瑙﹀彂绛涢��
- $panel.changeOption(event, !!option.data, option)
-}
-//鍓嶇绛涢��
-const filterChanged = ({ option, row, column }) => {
- if (option.data) {
- let param = column.field
- if(param.indexOf(".")>-1){
- let array = param.split('.')
- return row[array[0]][array[1]].toString().toLowerCase().indexOf(option.data) > -1
- }else{
- return row[param].toString().toLowerCase().indexOf(option.data) > -1
- }
-
- }
- return true
- //@filter-change="filterChanged"
-
- /*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
- }
-
- const str = route.query.deliveryID
- if (typeof str != 'undefined' && str != null && str !== '' && str !== '\n' && str !== '\r'){
- filterData.value.deliveryDetail.deliveryId=str
- request.post("/Delivery/getseletShippingOrderDetail/1/100",filterData.value).then((res) => {
-
- if(res.code==200){
- console.log(res.data.data)
- pageTotal.value=res.data.total
- pageNum=1
- produceList = deepClone(res.data.data)
- xGrid.value.reloadData(produceList)
- gridOptions.loading=false
- }else{
- ElMessage.warning(res.msg)
- router.push("/login")
- }
- })
- }
- const orderId = route.query.orderId
- if (typeof orderId !== 'undefined' && orderId !== null && orderId !== '' && orderId !== '\n' && orderId !== '\r'){
- filterData.value.orderId=orderId
- request.post("/Delivery/getseletShippingOrderDetails/1/100",filterData.value).then((res) => {
-
- if(res.code==200){
- console.log(res.data.title)
- pageTotal.value=res.data.total
-
- pageNum=1
- produceList = deepClone(res.data.data)
- xGrid.value.loadData(produceList)
- gridOptions.loading=false
- }else{
- ElMessage.warning(res.msg)
- router.push("/login")
- }
- })
- }
- console.log(route.query.orderId)
- console.log(filterData.value.deliveryDetail.deliveryId)
- console.log(filterData.value)*/
-
-}
@@ -296,14 +270,24 @@
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'OrderList',
+ rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ id: 'CreateDelivery',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
exportConfig: {},
scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
showOverflow:true,
+ menuConfig: {
+ body: {
+ options: [
+ [
+ { code: 'copyChecked', name: t('basicData.selectSame'), prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
+ //{ code: 'otherMoney', name: t('basicData.otherAmounts'), prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false }
+ ]
+ ]
+ }
+ },
columnConfig: {
resizable: true,
useKey: true
@@ -314,69 +298,77 @@
customConfig: {
storage: true
},
+ checkboxConfig:{checkAll:true},
+ mouseConfig:{selected: true},//榧犳爣閫変腑
+ keyboardConfig:{isArrow: true, isDel: true, isEnter: true, isTab: true, isEdit: true, isChecked: true},
editConfig: {
- trigger: 'click',
- mode: 'row',
- showStatus: true
+ trigger: 'dblclick',
+ mode: 'cell',
+ showStatus: true,
+ showIcon:false
},//琛ㄥご鍙傛暟
columns:[
- {type:'expand',slots: { content:'content' },width: 60,fixed:"left"},
- {field: 'select',type:'checkbox',title: '閫夋嫨', width: 80,fixed:"left"},
- {type: 'seq', title: '鑷簭', width: 80 ,fixed:"left"},
- {field: 'orderId',width:120, title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'order.batch',width:120, title: '鎵规',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'finishedGoodsInventory.quantityAvailable',width:120, title: '搴撳瓨鍙彂',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'order.quantity',width:120, title: '鏈彂鏁伴噺',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'quantity',width:120, title: '鎬绘暟閲�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'deliveryDetail.quantity',width:120, title: '鍙戣揣鏁伴噺',editRender: { name: 'input', attrs: { placeholder: '' } },filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'buildingNumber',width:120, title: '妤煎彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'productId',width:120, title: '浜у搧缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'productName',width:120, title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'price',width:120, title: '鍗曚环',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'finishedGoodsInventory.storageRegion',width:120, title: '搴撳尯',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'deliveryDetail.money',width:120, title: '閲戦',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'width',width:120, title: '瀹�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'height',width:120, title: '楂�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'shape',width:120, title: '褰㈢姸',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'finishedGoodsInventory.actualSignalArea',width:120, title: '鍗曠墖闈㈢Н',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'grossArea',width:120, title: '鎬婚潰绉�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'computeArea',width:120, title: '缁撶畻鍗曠墖闈㈢Н',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'computeGrossArea',width:120, title: '缁撶畻鎬婚潰绉�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'processingNote',width:120, title: '鍔犲伐瑕佹眰',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'deliveryDetail.deliveryDetailRemakes',width:120, title: '澶囨敞',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'edgingType',width:120, title: '纾ㄨ竟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'perimeter',width:120, title: '鍛ㄩ暱',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ //{type:'expand',fixed:"left",slots: { content:'content' },width: 60},
+ {field: 'select',type:'checkbox',title: t('basicData.check'), width: 80,fixed:"left"},
+ {type: 'seq', title: t('basicData.Number'), width: 80 ,fixed:"left"},
+ {field: 'orderId',width:120, title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'productName',width:120, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'width',width:120, title: t('order.width'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'height',width:120, title: t('order.height'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'deliveryDetail.quantity',width:120, title: t('delivery.deliveryQuantity'),editRender: { name: 'input' },filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'finishedGoodsInventory.quantityAvailable',width:120, title: t('delivery.availableStock'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'order.quantity',width:120, title: t('delivery.unpaidQuantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'quantity',width:120, title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ //{field: 'buildingNumber',width:120, title: '妤煎彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'productId',width:120, title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'price',width:120, title: t('order.price'),editRender: { name: 'input' },filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'finishedGoodsInventory.storageRegion',width:120, title: t('productStock.inventoryArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'deliveryDetail.money',width:120, title: t('order.grossAmount'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'order.batch',width:120, title: t('order.batch'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'shape',width:120, title: t('order.shape'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'finishedGoodsInventory.actualSignalArea',width:120, title: t('productStock.singlePieceArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'grossArea',width:120, title: t('productStock.totalArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'computeArea',width:120, title: t('order.computeArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'computeGrossArea',width:120, title: t('order.computeGrossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'processingNote',width:120, title: t('order.processingNote'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'deliveryDetail.deliveryDetailRemakes',width:120, title: t('productStock.remarks'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'edgingType',width:120, title: t('order.edgingType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'perimeter',width:120, title: t('productStock.perimeter'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
],//琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [
- {'code': 'add', 'name': '淇濆瓨',status: 'primary',icon: 'vxe-icon-save'},
- {'code': 'toExamine', 'name': '瀹℃牳',status: 'primary'},
- {'code': 'CounterExamination', 'name': '鍙嶅',status: 'primary'}
+ {'code': 'add', 'name': t('basicData.save'),status: 'primary',icon: 'vxe-icon-save'},
+ {'code': 'toExamine', 'name': t('basicData.review'),status: 'primary'},
+ {'code': 'CounterExamination', 'name': t('basicData.cancelReview'),status: 'primary'}
],
- import: false,
- export: true,
- print: true,
+ /*import: false,
+ export: true,
+ print: true,*/
zoom: true,
custom: true
},
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+ let footList=['deliveryDetail.quantity','quantity','deliveryDetail.money']
+ //let footList=[]
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return `椤垫暟:${pageNum}/${pageTotal.value}`
+ return t('basicData.total')
}
- // if (props.tableProp.footList.includes(column.field)) {
- // return sumNum(data, column.field)
- // }
+ if (footList.includes(column.field)) {
+ return footSum(data, column.field)
+ }
return ''
})
]
}
})
+
+
const gridEvents = {
async toolbarButtonClick({code}) {
@@ -385,85 +377,95 @@
switch (code) {
case 'add': {
const selectRecords = $grid.getCheckboxRecords()
- console.log(selectRecords)
if (selectRecords.length === 0) {
- ElMessage.warning("鏈�変腑鏁版嵁")
+ ElMessage.warning(t('productStock.unselectedData'))
return
}
const errMap = await $grid.validate(selectRecords)
- console.log(errMap)
if (errMap) {
- ElMessage.warning("鏁版嵁鏍￠獙澶辫触")
+ ElMessage.warning(t('productStock.dataVerificationFailed'))
return
}
//琛ㄥご鏁版嵁鏍￠獙
const project = titleUploadData.value.project
if(project === null || project === undefined || project === ''){
- ElMessage.error('杈撳叆椤圭洰鍚嶇О锛�')
+ ElMessage.error(t('delivery.pleaseEnterTheAmountOfFunds'))
return
}
const paymentTerms = titleUploadData.value.paymentTerms
if(paymentTerms === null || paymentTerms === undefined || paymentTerms === ''){
- ElMessage.error('璇烽�夋嫨浠樻鏉′欢锛�')
+ ElMessage.error(t('delivery.pleaseSelectPaymentTerms'))
return
}
const payMethod = titleUploadData.value.payMethod
if(payMethod === null || payMethod === undefined || payMethod === ''){
- ElMessage.error('璇疯緭鍏ユ敹娆炬柟寮忥紒')
+ ElMessage.error(t('delivery.pleaseEnterThePaymentMethod'))
return
}
- const contacts = titleUploadData.value.contacts
- if(contacts === null || contacts === undefined || contacts === ''){
- ElMessage.error('璇疯緭鍏ヨ仈绯讳汉锛�')
- return
+ const freightPrice = titleUploadData.value.freightPrice
+ if(freightPrice=== null || freightPrice === undefined || freightPrice === ''){
+ titleUploadData.value.freightPrice=0
}
-
- const contactNumber = titleUploadData.value.contactNumber
- if(contactNumber === null || contactNumber === undefined || contactNumber === ''){
- ElMessage.error('璇疯緭鍏ヨ仈绯荤數璇濓紒')
- return
+ const freightQuantity = titleUploadData.value.freightQuantity
+ if(freightQuantity=== null || freightQuantity === undefined || freightQuantity === ''){
+ titleUploadData.value.freightQuantity=0
}
- const deliveryAddress = titleUploadData.value.deliveryAddress
- if(deliveryAddress === null || deliveryAddress === undefined || deliveryAddress === ''){
- ElMessage.error('璇疯緭鍏ラ�佽揣鍦板潃锛�')
- return
- }
-
let flowData = ref({
delivery: selectRecords,
- title: titleUploadData.value
+ title: titleUploadData.value,
+ deliveryId: route.query.deliveryID,
+ otherMoney:otherMoney.value,
+ deliveryIdType:company.deliveryIdType
})
- console.log(flowData)
request.post("/Delivery/insertDelivery", flowData.value).then((res) => {
- if(res.code==200){
- ElMessage.success("鍙戣揣鍗曟彁浜ゆ垚鍔�")
- router.push({path: '/main/delivery/selectDelivery', query: { id: 1 }})
+ if(res.code==200 && res.data==="true"){
+ ElMessage.success(t('delivery.deliveryNoteSubmittedSuccessfully'))
+ //router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
+ if(titleUploadData.value.deliveryId.trim()===""){
+ router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
+ }else{
+ router.push({path:'/main/delivery/createDelivery',query:{
+ deliveryID:titleUploadData.value.deliveryId,
+ random:Math.random()}})
+ }
+ }else if(res.data==="false1"){
+ ElMessage.warning(t('delivery.pleaseMsg1'))
+ }else if(res.data==="false2"){
+ ElMessage.warning("璁㈠崟瀛樺湪宸插彂璐ц鍒锋柊鐣岄潰")
+ }else if(res.data==="false3"){
+ ElMessage.warning("鏁版嵁涓嶅瓨鍦�")
}else{
- ElMessage.warning(res.msg)
- router.push("/login")
+ ElMessage.warning(t('basicData.msg.saveFail'))
}
+ }).catch((err)=>{
+ ElMessage.error(t('basicData.msg.ServerConnectionError'))
+ router.push("/login")
})
break
}
case 'toExamine': {
let flowData = ref({
deliveryId: route.query.deliveryID,
- type: 1
+ type: 2
})
- console.log(flowData)
request.post("/Delivery/updateDeliveryToExamine", flowData.value).then((res) => {
- if (res.code == 200) {
- ElMessage.success("瀹℃牳鎴愬姛")
- router.push({path: '/main/delivery/selectDelivery', query: {id: 1}})
+ if (res.code == 200 && res.data===true) {
+ ElMessage.success(t('basicData.msg.ReviewSuccess'))
+ //router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
+ router.push({path:'/main/delivery/createDelivery',query:{
+ deliveryID:titleUploadData.value.deliveryId,
+ random:Math.random()}})
} else {
- ElMessage.warning(res.msg)
- router.push("/login")
+ ElMessage.warning(t('basicData.msg.reviewFail'))
}
+ }).catch((err)=>{
+ ElMessage.error(t('basicData.msg.ServerConnectionError'))
+ router.push("/login")
})
break
}
@@ -473,46 +475,126 @@
type: 0
})
- console.log(flowData)
request.post("/Delivery/updateDeliveryToExamine", flowData.value).then((res) => {
- if (res.code == 200) {
- ElMessage.success("瀹℃牳鎴愬姛")
- router.push({path: '/main/delivery/selectDelivery', query: {id: 1}})
+ if (res.code == 200 && res.data===true) {
+ ElMessage.success(t('basicData.msg.cancelReviewSuccess'))
+ //router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
+ router.push({path:'/main/delivery/createDelivery',query:{
+ deliveryID:titleUploadData.value.deliveryId,
+ random:Math.random()}})
} else {
- ElMessage.warning(res.msg)
- router.push("/login")
+ ElMessage.warning(t('basicData.msg.reviewFail'))
}
+ }).catch((err)=>{
+ ElMessage.error(t('basicData.msg.ServerConnectionError'))
+ router.push("/login")
})
break
}
+
+ }
+ }
+ },
+ menuClick ({ menu, row, column }) {
+ const $grid = xGrid.value
+ if ($grid) {
+ switch (menu.code) {
+
+ case 'copyChecked' :{
+ let result = toolbarButtonClickEvent()
+ if(result){
+ const dataList = xGrid.value.getTableData().visibleData
+ let firstVal=null;
+ if(result.cell.indexOf('.')>-1){
+ firstVal = eval("dataList["+result.start +"]."+result.cell)
+ }else {
+ firstVal=dataList[result.start][result.cell];
+ }
+ dataList.forEach((item,index) =>{
+ if(index>=result.start && index<=result.end){
+ if(result.cell.indexOf('.')>-1){
+ const columnArr = result.cell.split('.')
+ item[columnArr[0]][columnArr[1]] = firstVal
+ }else{
+ item[result.cell] = firstVal
+ }
+
+ }
+ })
+ }
+ break
+ }
+ case 'otherMoney' :{
+ otherMoneyVisible.value=true
+ break
+ }
+
}
}
}
}
+//璁＄畻閲戦挶
+const countMoney = (list) => {
+ let countMoney = 0
+ list.forEach((item)=>{
+ countMoney += parseFloat(item.grossAmount)
+ })
+ // otherMoney.value.forEach(item => {
+ // countMoney+=item.quantity*item.price
+ // })
+ return parseFloat((countMoney).toFixed(2))
+}
+
+//鍏抽棴鍏朵粬閲戦鐣岄潰
+const refOtherMoney = ref()
+const closeOtherMoneyDialog = async (done) => {
+ const flag = await refOtherMoney.value.validate()
+ if(flag){
+ done()
+ //titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
+ }
+}
+
/*鏁版嵁鏍￠獙*/
const validRules = ref({
- quantity: [
- { type: 'number', min: 0, message: '璇疯緭鍏ュぇ浜庣瓑浜�0鐨勬暟鍊�' }
- ],
-
- "deliveryDetail.quantity": [{
+ "deliveryDetail.quantity": [{
validator (e) {
if (e.row.deliveryDetail.quantity > e.row.finishedGoodsInventory.quantityAvailable) {
- return new Error('鍙戣揣鏁伴噺涓嶈兘澶т簬搴撳瓨鏁�')
+ return new Error(t('delivery.theShipmentQuantityCannotBeGreaterThanTheInventoryQuantity'))
}else if (e.row.deliveryDetail.quantity ==="") {
- return new Error('鍙戣揣鏁伴噺涓嶈兘涓虹┖鎴栬�呮槸0')
+ return new Error(t('delivery.theShipmentQuantityCannotBeEmptyOr0'))
}
const regex = /^[1-9]\d*$/g
if ( !regex.test(e.row.deliveryDetail.quantity) ) {
- return new Error('璇疯緭鍏ユ鏁存暟')
+ return new Error(t('productStock.pleaseEnterAPositiveInteger'))
}
}
- }]
+ }],
+ price: [
+ {
+ validator ({ cellValue }) {
+ const regex = /^(0(\.\d{1,2})?|([1-9]\d{0,4})(\.\d{1,2})?|99999(\.9{1,2})?)$/
+ if ( !regex.test(cellValue) ) {
+ return new Error(t('basicData.msg.range99999Dec2') )
+ }
+ }
+ }
+ ],
})
+
+const editClosedEvent = ({ row, column }) => {
+
+ if (['deliveryDetail.quantity'].includes(column.property)) {
+ if(parseInt(row.deliveryDetail.quantity)===0){
+ xGrid.value.setCheckboxRow(row, false);
+ }
+ }
+
+}
</script>
@@ -521,15 +603,15 @@
<div class="main-div">
<div class="order-primary" style="background-color: white">
<el-row>
- <el-col :span="2"><el-text>瀹㈡埛缂栫爜:</el-text></el-col>
- <el-col :span="3"><el-input style="font-size: large;color: #181818" v-model="titleUploadData.customerId" ></el-input></el-col>
- <el-col :span="2"><el-text>瀹㈡埛鍚嶇О:</el-text></el-col>
- <el-col :span="5"><el-input v-model="titleUploadData.customerName"></el-input></el-col>
- <el-col :span="2"><el-text>椤圭洰鍚嶇О:</el-text></el-col>
- <el-col :span="5"><el-input v-model="titleUploadData.project"></el-input></el-col>
+ <el-col :span="2"><el-text>{{$t('customer.customerNumber')}}:</el-text></el-col>
+ <el-col :span="3"><el-input style="font-size: large;color: #181818" v-model="titleUploadData.customerId" :readonly="true" ></el-input></el-col>
+ <el-col :span="2"><el-text>{{$t('customer.customerName')}}:</el-text></el-col>
+ <el-col :span="5"><el-input v-model="titleUploadData.customerName" :readonly="true"></el-input></el-col>
+ <el-col :span="2"><el-text>{{$t('customer.customerNumber')}}:</el-text></el-col>
+ <el-col :span="5"><el-input v-model="titleUploadData.project" :readonly="true"></el-input></el-col>
</el-row>
<el-row>
- <el-col :span="2"><el-text>浠樻鏉′欢锛�</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('delivery.paymentTerms')}}锛�</el-text></el-col>
<el-col :span="3">
<el-select v-model="titleUploadData.paymentTerms" clearable placeholder="" >
<el-option
@@ -540,43 +622,63 @@
/>
</el-select>
</el-col>
- <el-col :span="2"><el-text>鏀舵鏂瑰紡:</el-text></el-col>
- <el-col :span="5"><el-input v-model="titleUploadData.payMethod"></el-input></el-col>
- <el-col :span="2"><el-text>鏀舵鏃ユ湡:</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('customer.contacts')}}:</el-text></el-col>
+ <el-col :span="5"><el-input v-model="titleUploadData.contacts"/></el-col>
+ <el-col :span="2"><el-text>{{$t('delivery.paymentDate')}}:</el-text></el-col>
<el-col :span="5">
<el-date-picker
v-model="titleUploadData.payDate"
type="date"
- placeholder="閫夋嫨鏃ユ湡"/>
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD"
+ :placeholder="$t('delivery.selectDate')"/>
</el-col>
</el-row>
<el-row>
- <el-col :span="2"><el-text>鑱旂郴浜�:</el-text></el-col>
- <el-col :span="3"><el-input v-model="titleUploadData.contacts"/></el-col>
- <el-col :span="2"><el-text>鑱旂郴鐢佃瘽:</el-text></el-col>
+
+ <el-col :span="2"><el-text>{{$t('delivery.paymentMethod')}}锛�</el-text></el-col>
+ <el-col :span="3">
+ <el-select v-model="titleUploadData.payMethod" clearable placeholder="" >
+ <el-option
+ v-for="item in titleSelectJson['payMethod']"
+ :key="item.id"
+ :label="item.basicName"
+ :value="item.basicName"
+ />
+ </el-select>
+ </el-col>
+ <el-col :span="2"><el-text>{{$t('customer.telephone')}}:</el-text></el-col>
<el-col :span="5"><el-input v-model="titleUploadData.contactNumber"/></el-col>
- <el-col :span="2"><el-text>閫佽揣鍦板潃:</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('customer.address')}}:</el-text></el-col>
<el-col :span="5"><el-input v-model="titleUploadData.deliveryAddress"/></el-col>
</el-row>
<el-row>
- <el-col :span="2"><el-text>澶囨敞:</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('basicData.remarks')}}:</el-text></el-col>
<el-col :span="3"><el-input v-model="titleUploadData.remarks"/></el-col>
- <el-col :span="2"><el-text>鎶ヨ〃鏃ユ湡:</el-text></el-col>
- <el-col :span="5"><el-input v-model="titleUploadData.createTime"></el-input></el-col>
- <el-col :span="2"><el-text>鍙戣揣鎶ヨ〃鏃ユ湡:</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('delivery.deliveryReportDate')}}:</el-text></el-col>
+ <el-col :span="5"><el-input v-model="titleUploadData.createTime" :readonly="true"></el-input></el-col>
+ <el-col :span="2"><el-text>{{$t('delivery.deliveryDate')}}:</el-text></el-col>
<el-col :span="5">
<el-date-picker
v-model="titleUploadData.deliveryDate"
type="date"
- placeholder="閫夋嫨鏃ユ湡"/>
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD"
+ :placeholder="$t('delivery.selectDate')"/>
</el-col>
</el-row>
<el-row>
- <el-col :span="2"><el-text>涓氬姟鍛�:</el-text></el-col>
- <el-col :span="3"><el-input v-model="titleUploadData.salesman"/></el-col>
- <el-col :span="2"><el-text>鍙戣揣鍛�:</el-text></el-col>
- <el-col :span="5"><el-input v-model="titleUploadData.creator"/></el-col>
+ <el-col :span="2"><el-text>{{$t('order.salesman')}}:</el-text></el-col>
+ <el-col :span="3"><el-input v-model="titleUploadData.salesman" :readonly="true"/></el-col>
+ <el-col :span="2"><el-text>{{$t('delivery.shipper')}}:</el-text></el-col>
+ <el-col :span="5"><el-input v-model="titleUploadData.creator" :readonly="true"/></el-col>
+ <el-col :span="1"><el-text>{{$t('delivery.freightPrice')}}:</el-text></el-col>
+ <el-col :span="1"><el-input v-model="titleUploadData.freightPrice" /></el-col>
+ <el-col :span="1"><el-text>{{$t('delivery.freightQuantity')}}:</el-text></el-col>
+ <el-col :span="1"><el-input v-model="titleUploadData.freightQuantity" /></el-col>
+ <el-col :span="1"><el-text>{{$t('delivery.freight')}}:</el-text></el-col>
+ <el-col :span="2"><el-input v-model="titleUploadData.freight" :readonly="true"/></el-col>
</el-row>
</div>
<div class="order-detail">
@@ -587,6 +689,7 @@
v-bind="gridOptions"
v-on="gridEvents"
:edit-rules="validRules"
+ @edit-closed="editClosedEvent"
>
<template #num1_filter="{ column, $panel }">
@@ -596,17 +699,37 @@
</div>
</div>
</template>
- <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)">{{ hasDecimalhtml(item.field,row) }}</span>
+ <span v-else>{{ row[item.field] }}</span>
</li>
</ul>
</template>
</vxe-grid>
</div>
+ <div class="vxe-table--cell-area" ref="cellArea" >
+ <span class="vxe-table--cell-main-area" ></span>
+
+ <span class="vxe-table--cell-active-area" ></span>
+ </div>
+
+ <el-dialog v-model="otherMoneyVisible"
+ :title="$t('basicData.otherAmounts')"
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ :before-close="closeOtherMoneyDialog"
+ style="width: 614px;height:445px ">
+ <order-other-money
+ ref="refOtherMoney"
+ :otherMoney="otherMoney"
+ style="width: 100%;height: 100%" />
+ </el-dialog>
</div>
</template>
@@ -615,7 +738,6 @@
.main-div {
width: 100%;
height: 100%;
- text-align: center;
}
.el-col{
border: #181818 1px solid;
@@ -633,4 +755,16 @@
width: 100%;
height: 70%;
}
+.vxe-grid {
+ /* 绂佺敤娴忚鍣ㄩ粯璁ら�変腑 */
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+}
+
+:deep(#product .el-dialog__body){
+ height: 90%;
+ width: 100%;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0