From 7ec26ace7100b90b87603acd9dbbc8012a51eed0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 21 三月 2025 10:32:14 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue | 238 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 172 insertions(+), 66 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 0b08938..84a16ce 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)
@@ -54,6 +57,7 @@
// 瀹氫箟琛ㄥご涓婁紶鏁版嵁
let titleUploadData = ref({
+ deliveryId:'',
deliveryState:'',
stockState:'',
paymentTerms:'',
@@ -116,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)
//鍙戣揣鏂板
@@ -152,7 +159,7 @@
filterData.value.orderId=orderId
number.value=orderId
//绗竴娆¤皟鐢�
- request.post("/Delivery/getSelectShippingOrderDetails/1/100",filterData.value).then((res) => {
+ request.post("/delivery/getSelectShippingOrderDetails/1/100",filterData.value).then((res) => {
if(res.code==200){
pageTotal.value=res.data.total
@@ -161,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)
@@ -198,15 +206,20 @@
if (typeof str != 'undefined' && str != null && str !== '' && str !== '\n' && str !== '\r'){
filterData.value.deliveryDetail.deliveryId=str
//绗竴娆¤皟鐢�
- request.post("/Delivery/getSelectShippingOrderDetail/1/100",filterData.value).then((res) => {
+ request.post("/delivery/getSelectShippingOrderDetail/1/100",filterData.value).then((res) => {
if(res.code==200){
pageTotal.value=res.data.total
titleUploadData.value=deepClone(res.data.delivery)
+ titleUploadData.value.deliveryId=str
-
+ //鍒ゆ柇鏄惁鍙戣揣鍑哄簱
+ if(!company.deliveryOutbound){
+ if(titleUploadData.value.stockState!==0){
+ gridOptions.toolbarConfig.buttons[2].disabled = true
+ }
+ }
//鏍规嵁瀹℃牳鐘舵�佹樉绀哄鏍告寜閽垨鑰呮槸鍙嶅鎸夐挳
-
if(titleUploadData.value.deliveryState!==0){
gridOptions.toolbarConfig.buttons[1].disabled = true
gridOptions.toolbarConfig.buttons[0].disabled = true
@@ -214,9 +227,7 @@
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)
@@ -225,6 +236,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)
@@ -272,7 +286,7 @@
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 }
+ { code: 'copyAll', name: t('basicData.sameAfterwards'), prefixIcon: 'vxe-icon-feedback', visible: true, disabled: false },
]
]
}
@@ -287,6 +301,7 @@
customConfig: {
storage: true
},
+ checkboxConfig:{checkAll:true},
mouseConfig:{selected: true},//榧犳爣閫変腑
keyboardConfig:{isArrow: true, isDel: true, isEnter: true, isTab: true, isEdit: true, isChecked: true},
editConfig: {
@@ -301,21 +316,21 @@
{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: 'area',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},
@@ -376,11 +391,6 @@
return
}
//琛ㄥご鏁版嵁鏍￠獙
- const project = titleUploadData.value.project
- if(project === null || project === undefined || project === ''){
- ElMessage.error(t('delivery.pleaseEnterTheAmountOfFunds'))
- return
- }
const paymentTerms = titleUploadData.value.paymentTerms
if(paymentTerms === null || paymentTerms === undefined || paymentTerms === ''){
ElMessage.error(t('delivery.pleaseSelectPaymentTerms'))
@@ -405,16 +415,29 @@
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){
+ request.post("/delivery/insertDelivery", flowData.value).then((res) => {
+ 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(t('basicData.msg.quantityError'))
+ }else if(res.data==="false3"){
+ ElMessage.warning(t('basicData.msg.dataDoesNotExist'))
}else{
ElMessage.warning(t('basicData.msg.saveFail'))
- router.push("/login")
}
}).catch((err)=>{
ElMessage.error(t('basicData.msg.ServerConnectionError'))
@@ -425,16 +448,21 @@
case 'toExamine': {
let flowData = ref({
deliveryId: route.query.deliveryID,
- type: 2
+ type: 2,
+ userName:userStore.user.userName,
+ userId:userStore.user.userId,
+ deliveryOutbound:company.deliveryOutbound
})
- request.post("/Delivery/updateDeliveryToExamine", flowData.value).then((res) => {
- if (res.code == 200 && res.data===true) {
+ 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(t('basicData.msg.reviewFail'))
- router.push("/login")
}
}).catch((err)=>{
ElMessage.error(t('basicData.msg.ServerConnectionError'))
@@ -445,16 +473,21 @@
case 'CounterExamination': {
let flowData = ref({
deliveryId: route.query.deliveryID,
- type: 0
+ type: 0,
+ userName:userStore.user.userName,
+ userId:userStore.user.userId,
+ deliveryOutbound:company.deliveryOutbound
})
- request.post("/Delivery/updateDeliveryToExamine", flowData.value).then((res) => {
- if (res.code == 200 && res.data===true) {
+ 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(t('basicData.msg.reviewFail'))
- router.push("/login")
}
}).catch((err)=>{
ElMessage.error(t('basicData.msg.ServerConnectionError'))
@@ -483,6 +516,38 @@
}
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
+ }else{
+ item[result.cell] = firstVal
+ }
+
+ }
+ })
+ }
+ break
+ }
+ case 'copyAll' :{
+ 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){
+ //鍙栨秷閫変腑
+ 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
@@ -527,6 +592,22 @@
}
}
+function getNestedProperty(obj, path) {
+ return path.split('.').reduce(function(o, p) {
+ if(o && o.hasOwnProperty(p)) {
+ return o[p];
+ }
+ }, obj);
+}
+
+function setNestedValue(obj, path, value) {
+ const keys = path.split('.');
+ const lastKey = keys.pop();
+ const lastObj = keys.reduce((obj, key) => obj[key], obj);
+ lastObj[lastKey] = value;
+}
+
+
/*鏁版嵁鏍￠獙*/
const validRules = ref({
"deliveryDetail.quantity": [{
@@ -535,7 +616,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'))
@@ -557,12 +638,22 @@
})
+const editClosedEvent = ({ row, column }) => {
+
+ if (['deliveryDetail.quantity'].includes(column.property)) {
+ if(parseInt(row.deliveryDetail.quantity)===0){
+ xGrid.value.setCheckboxRow(row, false);
+ }
+ }
+
+}
+
</script>
<template>
- <div class="main-div">
- <div class="order-primary" style="background-color: white">
+ <div style="width: 100%;height: 100%">
+ <div class="head" style="background-color: white">
<el-row>
<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>
@@ -634,28 +725,33 @@
<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>杩愯垂鍗曚环:</el-text></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>杩愯垂鏁伴噺:</el-text></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>杩愯垂閲戦:</el-text></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">
+ <div class="main-table">
<vxe-grid
- max-height="97%"
+ max-height="100%"
class="mytable-scrollbar"
ref="xGrid"
v-bind="gridOptions"
v-on="gridEvents"
:edit-rules="validRules"
+ @edit-closed="editClosedEvent"
>
<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)"/>
+ <input
+ type="type"
+ v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
@@ -727,4 +823,14 @@
height: 90%;
width: 100%;
}
+
+.head{
+ width: 100%;
+ height: 170px;
+}
+
+.main-table{
+ width: 100%;
+ height: calc(100% - 170px);
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0