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/CreateDelivery.vue | 181 +++++++++++++++++++++++++++++++-------------
1 files changed, 126 insertions(+), 55 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 e5643b1..78095f0 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
@@ -13,6 +13,8 @@
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()
@@ -21,6 +23,7 @@
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)
@@ -35,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]]
@@ -53,6 +57,7 @@
// 瀹氫箟琛ㄥご涓婁紶鏁版嵁
let titleUploadData = ref({
+ deliveryId:'',
deliveryState:'',
stockState:'',
paymentTerms:'',
@@ -70,6 +75,9 @@
deliveryDate:'',
salesmanId:'',
salesman:'',
+ freight:'',
+ freightPrice:'',
+ freightQuantity:'',
creatorId:userStore.user.userid,
creator:userStore.user.userName
})
@@ -99,7 +107,10 @@
remarks:'',
createTime:'',
deliveryDate:'',
- creator:''
+ creator:'',
+ freight:'',
+ freightPrice:'',
+ freightQuantity:'',
},
finishedGoodsInventory:{
quantityAvailable:'',
@@ -109,34 +120,37 @@
},
})
+const initOrder = async ()=> {
//椤甸潰绗竴娆″姞杞�
-request.get(`/basicData/BasicDataByType/delivery`).then((res) => {
+ await request.get(`/basicData/BasicDataByType/delivery`).then((res) => {
- 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)
- }
-})
+ 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)
//鍙戣揣鏂板
@@ -154,8 +168,9 @@
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)
@@ -196,7 +211,7 @@
if(res.code==200){
pageTotal.value=res.data.total
titleUploadData.value=deepClone(res.data.delivery)
-
+ titleUploadData.value.deliveryId=str
//鏍规嵁瀹℃牳鐘舵�佹樉绀哄鏍告寜閽垨鑰呮槸鍙嶅鎸夐挳
@@ -218,6 +233,9 @@
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)
@@ -253,7 +271,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'OrderList',
+ id: 'CreateDelivery',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -264,8 +282,8 @@
body: {
options: [
[
- { code: 'copyChecked', name: '閫変腑鐩稿悓', prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
- { code: 'otherMoney', name: '鍏朵粬閲戦', prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false }
+ { 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 }
]
]
}
@@ -280,30 +298,34 @@
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',fixed:"left",slots: { content:'content' },width: 60},
+ //{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: 'order.batch',width:120, title: t('order.batch'),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: 'deliveryDetail.quantity',width:120, title: t('delivery.deliveryQuantity'),editRender: { name: 'input' },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: t('order.productId'),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: 'price',width:120, title: t('order.price'),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: '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: '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},
@@ -381,27 +403,46 @@
ElMessage.error(t('delivery.pleaseEnterThePaymentMethod'))
return
}
-
-
+ const freightPrice = titleUploadData.value.freightPrice
+ if(freightPrice=== null || freightPrice === undefined || freightPrice === ''){
+ titleUploadData.value.freightPrice=0
+ }
+ const freightQuantity = titleUploadData.value.freightQuantity
+ if(freightQuantity=== null || freightQuantity === undefined || freightQuantity === ''){
+ titleUploadData.value.freightQuantity=0
+ }
let flowData = ref({
delivery: selectRecords,
title: titleUploadData.value,
deliveryId: route.query.deliveryID,
- otherMoney:otherMoney.value
+ otherMoney:otherMoney.value,
+ deliveryIdType:company.deliveryIdType
})
request.post("/Delivery/insertDelivery", flowData.value).then((res) => {
- if(res.code==200 && res.data===true){
+ if(res.code==200 && res.data==="true"){
ElMessage.success(t('delivery.deliveryNoteSubmittedSuccessfully'))
- router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
+ //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("淇濆瓨澶辫触")
- router.push("/login")
+ ElMessage.warning(t('basicData.msg.saveFail'))
}
}).catch((err)=>{
- ElMessage.error('绯荤粺閿欒')
+ ElMessage.error(t('basicData.msg.ServerConnectionError'))
router.push("/login")
})
break
@@ -415,13 +456,15 @@
request.post("/Delivery/updateDeliveryToExamine", flowData.value).then((res) => {
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/selectDelivery', query:{random:Math.random()}})
+ router.push({path:'/main/delivery/createDelivery',query:{
+ deliveryID:titleUploadData.value.deliveryId,
+ random:Math.random()}})
} else {
- ElMessage.warning("瀹℃牳澶辫触")
- router.push("/login")
+ ElMessage.warning(t('basicData.msg.reviewFail'))
}
}).catch((err)=>{
- ElMessage.error('绯荤粺閿欒')
+ ElMessage.error(t('basicData.msg.ServerConnectionError'))
router.push("/login")
})
break
@@ -435,13 +478,15 @@
request.post("/Delivery/updateDeliveryToExamine", flowData.value).then((res) => {
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/selectDelivery', query:{random:Math.random()}})
+ router.push({path:'/main/delivery/createDelivery',query:{
+ deliveryID:titleUploadData.value.deliveryId,
+ random:Math.random()}})
} else {
- ElMessage.warning("瀹℃牳澶辫触")
- router.push("/login")
+ ElMessage.warning(t('basicData.msg.reviewFail'))
}
}).catch((err)=>{
- ElMessage.error('绯荤粺閿欒')
+ ElMessage.error(t('basicData.msg.ServerConnectionError'))
router.push("/login")
})
break
@@ -467,6 +512,10 @@
}
dataList.forEach((item,index) =>{
if(index>=result.start && index<=result.end){
+ //鍙栨秷閫変腑
+ if(parseInt(firstVal)<=0){
+ xGrid.value.setCheckboxRow(item, false);
+ }
if(result.cell.indexOf('.')>-1){
const columnArr = result.cell.split('.')
item[columnArr[0]][columnArr[1]] = firstVal
@@ -519,7 +568,7 @@
return new Error(t('delivery.theShipmentQuantityCannotBeGreaterThanTheInventoryQuantity'))
}else if (e.row.deliveryDetail.quantity ==="") {
return new Error(t('delivery.theShipmentQuantityCannotBeEmptyOr0'))
- }
+ }
const regex = /^[1-9]\d*$/g
if ( !regex.test(e.row.deliveryDetail.quantity) ) {
return new Error(t('productStock.pleaseEnterAPositiveInteger'))
@@ -540,6 +589,16 @@
],
})
+
+const editClosedEvent = ({ row, column }) => {
+
+ if (['deliveryDetail.quantity'].includes(column.property)) {
+ if(parseInt(row.deliveryDetail.quantity)===0){
+ xGrid.value.setCheckboxRow(row, false);
+ }
+ }
+
+}
</script>
@@ -618,6 +677,12 @@
<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">
@@ -628,6 +693,7 @@
v-bind="gridOptions"
v-on="gridEvents"
:edit-rules="validRules"
+ @edit-closed="editClosedEvent"
>
<template #num1_filter="{ column, $panel }">
@@ -658,7 +724,7 @@
</div>
<el-dialog v-model="otherMoneyVisible"
- :title="'鍏朵粬閲戦'"
+ :title="$t('basicData.otherAmounts')"
:close-on-click-modal="false"
:close-on-press-escape="false"
:before-close="closeOtherMoneyDialog"
@@ -700,4 +766,9 @@
-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