From a0b97eb8e934ba28b9e51824d4cbbcc99cc70e17 Mon Sep 17 00:00:00 2001
From: charles <981744753@qq.com>
Date: 星期四, 18 七月 2024 23:08:00 +0800
Subject: [PATCH] fxi:解决发货bug
---
src/views/sales/salesDetails/shipmentsDialog.vue | 230 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 166 insertions(+), 64 deletions(-)
diff --git a/src/views/sales/salesDetails/shipmentsDialog.vue b/src/views/sales/salesDetails/shipmentsDialog.vue
index 79dcc11..bd60295 100644
--- a/src/views/sales/salesDetails/shipmentsDialog.vue
+++ b/src/views/sales/salesDetails/shipmentsDialog.vue
@@ -13,7 +13,7 @@
:model="editConfig.infomation"
:rules="rules"
label-position="left"
- label-width="10%"
+ label-width="90px"
size="mini"
style="height: 60vh; overflow-x: hidden"
>
@@ -23,20 +23,20 @@
<div class="basic-info-view">
<el-row>
<el-col :span="24">
- <el-form-item width="50%" label="浜や粯绫诲瀷" prop="addressee">
- <el-radio-group v-model="shipmentsType" @change="handleRadioChange">
+ <el-form-item width="50%" label="浜や粯绫诲瀷锛�" prop="deliverType">
+ <el-radio-group v-model="editConfig.infomation.deliverType" @change="handleRadioChange">
<el-radio :label="1">涓�娆″彂璐�</el-radio>
<el-radio :label="2">澶氭鍙戣揣</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24">
- <el-form-item label="鍏宠仈椤圭洰" prop="projectId">
+ <el-form-item label="鍏宠仈椤圭洰锛�" prop="projectId">
<el-select
v-model="editConfig.infomation.projectId"
placeholder="璇烽�夋嫨"
+ disabled
size="mini"
- :disabled="true"
>
<el-option
v-for="item in projectList"
@@ -48,25 +48,26 @@
</el-select>
</el-form-item>
</el-col>
- <!-- <el-col :span="24">
+ <el-col :span="24">
<el-form-item label="鍙戣揣浠撳簱" prop="addressee">
- <el-select v-model="value" placeholder="璇烽�夋嫨">
+ <el-select v-model="value" placeholder="璇烽�夋嫨" @change="optionsChange">
<el-option
v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ :key="item.warehouseId"
+ :label="item.warehouseName"
+ :value="item">
</el-option>
</el-select>
</el-form-item>
- </el-col> -->
+ </el-col>
</el-row>
</div>
- <div class="product-view">
+ <div class="product-view" v-if="isCommonShow">
<CommonFormTableView
ref="commonFormTableView"
:detail-enter="isView ? true : false"
:selectBox="false"
+ :colOpenShow="true"
:addTypeIdMultiple="true"
pageName="quotation"
:isBorder="true"
@@ -78,6 +79,7 @@
@getSelectArray="getSelectArray"
@emptyProductClick="emptyProductClick"
@clearupProduct="clearupProduct"
+ @selTableCol="selTableCol"
></CommonFormTableView>
</div>
<p class="tips tips_success" v-if="completely"><i class="el-icon-warning-outline"></i>{{ shipmentsMsg }}</p>
@@ -86,7 +88,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" size="small" :disabled="dissatisfy" @click="saveClick('form')">纭畾鍙戣揣</el-button>
+ <el-button type="primary" size="small" :disabled="dissatisfy" @click.stop="saveClick('form')">纭畾鍙戣揣</el-button>
<el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
</div>
</el-dialog>
@@ -96,7 +98,7 @@
<script>
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
import { getAllData } from "@/api/client/client"
-import { getProjectList,getDeliveryPrepareInfo,confirmOutput } from "@/api/sales/salesDetails"
+import { getProjectList,getDeliveryPrepareInfo,confirmOutput,getDeliveryPrepareInfoByWarehouse } from "@/api/sales/salesDetails"
import codeMixin from "@/components/makepager/mixin/codeMixin"
import { getSaleChanceList } from "@/api/sales/salesOpportunity"
import { getDataByType } from "@/api/data"
@@ -125,6 +127,17 @@
},
},
data() {
+ // 浜у搧淇℃伅
+ const productColumn = [
+ { label: "浜у搧缂栧彿", prop: "number",},
+ { label: "浜у搧鍚嶇О", prop: "name", min: 110 },
+ { label: "璁㈠崟鏁伴噺", prop: "orderAmount",min:110,},
+ { label: "璁㈠崟瀹屾垚鏁伴噺", min:120,prop: "finishAmount",},
+ { label: "鍙敤搴撳瓨", prop: "availableAmount",},
+ { label: "鏈彂璐ф暟閲�", prop: "leftAmount", min:120, },
+ { label: "鏈鍙戣揣鏁伴噺", prop: "outputAmount", min:120,inputFloat: true},
+ { label: "鍓╀綑鍙戣揣鏁伴噺", prop: "availableAmount",min:120,},
+ ]
return {
dialogWidth: "60%",
editConfig: this.editCommonConfig,
@@ -136,7 +149,15 @@
wechatOrderStatusOptions: [], // 寰俊璁㈠崟鐘舵��
currencyOptions: [{ id: 1, name: "浜烘皯甯�" }], // 甯佺
approvalWorkflowOptions: [], // 瀹℃壒娴佺▼
- productTableList: {},
+ productTableList: {
+ allcol: [],
+ showcol: ['浜у搧缂栧彿','浜у搧鍚嶇О', "璁㈠崟鏁伴噺", "璁㈠崟瀹屾垚鏁伴噺",],
+ tableData: [],
+ tableColumn: []
+ },
+ tableColumn: productColumn,
+ searchOptions: [],
+
showSummary: {
show: true,
total: true,
@@ -190,19 +211,14 @@
return time.getTime() > Date.now()
}
},
- shipmentsType:1,
- options: [{
- value: '1',
- label: '浠撳簱1--搴撳瓨涓嶈冻鐨勬儏鍐�'
- }, {
- value: '2',
- label: '浠撳簱1--搴撳瓨鍏呰冻鐨勬儏鍐�'
- }],
+ options: [],
value:"",
shipmentsList:[],
shipmentsMsg:"",
dissatisfy:false, // 涓�娆″彂璐�-涓嶈冻
completely:false, // 澶氭鍙戣揣锛屽厖瓒�
+ isCommonShow:true,
+ warehouseId:null,
}
},
mounted(){
@@ -212,11 +228,16 @@
created() {
this.$store.dispatch("geClient")
this.setTableForm()
+ this.handleRadioChange()
this.getCommonData()
- this.formInfo()
this.getUseSystemSet({ modeType: "xsmx" })
this.getProjectList()
this.getDeliveryPrepareInfo({
+ saleDetailID: this.editCommonConfig.infomation.saleDetailID,
+ saleDetailNumber: this.editCommonConfig.infomation.saleDetailNumber
+ })
+ this.getDeliveryPrepareInfoByWarehouse({
+ groupByWarehouse: true,
saleDetailID: this.editCommonConfig.infomation.saleDetailID,
saleDetailNumber: this.editCommonConfig.infomation.saleDetailNumber
})
@@ -224,7 +245,9 @@
watch: {
"editClientManageConfig.visible"(val) {
if (val) {
+ this.handleRadioChange()
this.formInfo()
+
}
}
},
@@ -267,12 +290,11 @@
this.$refs[formName].validate((valid) => {
if (valid) {
const params = this.saveParams()
- console.log(params,"鍙傛暟")
let isShipments=false
let shipmentsNum=false
this.shipmentsList.map((item)=>{
- if(this.shipmentsType===1){
- if(item.leftAmount<item.availableAmount&&item.leftAmount>0){
+ if(this.editConfig.infomation.deliverType===1){
+ if(item.leftAmount<=item.availableAmount&&item.leftAmount>0){
isShipments=false
}else if(item.leftAmount<=0){
shipmentsNum=true
@@ -284,20 +306,24 @@
isShipments=true
}else if(item.outputAmount===0){
shipmentsNum=true
- }else if(!item.outputAmount){
- shipmentsNum=true
}else if(item.leftAmount<=0){
isShipments=true
}else{
isShipments=false
}
}
- })
+ });
if(isShipments){
this.$message.warning("鍙戣揣鏁伴噺瓒呭嚭鏈彂璐ф暟閲忔垨瓒呭嚭褰撳墠鍙敤搴撳瓨")
- }else if(shipmentsNum){
+ }/*else if(shipmentsNum){
this.$message.warning("鍙戣揣鏁伴噺涓嶈兘涓�0")
- }else{
+ }*/else{
+ //杩囨护鎺変负绌虹殑鏁版嵁
+ params.products=params.products.filter(item=>item.outputAmount);
+ if(params.products.length===0){
+ this.$message.warning('娌℃湁婊¤冻鍙戣揣鏉′欢鐨勬槑缁嗭紝鏃犳硶鍙戣揣');
+ return;
+ }
confirmOutput(params).then((res)=>{
if(res&&res.code===200){
this.$message.success("鍙戣揣鎴愬姛!")
@@ -312,15 +338,16 @@
saveParams() {
let params = {
products:[],
- saleDetailNumber:this.editCommonConfig.infomation.saleDetailNumber
+ saleDetailNumber:this.editCommonConfig.infomation.saleDetailNumber,
+ warehouseId:this.warehouseId
}
this.shipmentsList.map((item)=>{
let obj={
number:item.number,
- outputAmount:this.shipmentsType===1?item.leftAmount:item.outputAmount // 鏈鍙戣揣鏁伴噺
+ outputAmount:this.editConfig.infomation.deliverType===1?item.leftAmount:item.outputAmount // 鏈鍙戣揣鏁伴噺
}
params.products.push(obj)
- })
+ });
return params
},
@@ -351,7 +378,6 @@
var restaurants = []
if (value === "client") {
restaurants = this.clientList
- console.log(restaurants, "瀹㈡埛鍗�")
} else if (value === "chance") {
restaurants = this.saleChancelist
} else if (value === "subbill") {
@@ -439,23 +465,51 @@
}
]
} else {
- this.tableData = this.editConfig.infomation.products
+ this.tableData = this.editConfig.infomation.products?this.editConfig.infomation.products:[]
this.tableData.map((item, index) => {
item.productId = index + 1
})
this.getQuotation(this.editConfig.infomation.saleChanceId, "鍏ㄩ儴浜у搧")
}
+ this.tableColumn=[
+ { label: "浜у搧缂栧彿", prop: "number", },
+ { label: "浜у搧鍚嶇О", prop: "name", min: 110 },
+ { label: "璁㈠崟鏁伴噺", prop: "orderAmount",},
+ { label: "璁㈠崟瀹屾垚鏁伴噺", min:120, prop: "finishAmount", }
+ ]
this.productTableList = {
tableData: this.tableData,
isReturn: true,
- tableColumn: [
- { label: "浜у搧缂栧彿", prop: "number" },
- { label: "浜у搧鍚嶇О", prop: "name", min: 110 },
- { label: "璁㈠崟鏁伴噺", prop: "orderAmount" },
- { label: "璁㈠崟瀹屾垚鏁伴噺", prop: "finishAmount" },
- // { label: "鍙敤搴撳瓨", prop: "unit" },
- ]
+ // tableColumn: [
+ // { label: "浜у搧缂栧彿", prop: "number",},
+ // { label: "浜у搧鍚嶇О", prop: "name",min: 110 },
+ // { label: "璁㈠崟鏁伴噺", prop: "orderAmount",},
+ // { label: "璁㈠崟瀹屾垚鏁伴噺", prop: "finishAmount",}
+ // ],
+ tableColumn: this.setColumnVisible(this.productTableList.showcol, this.tableColumn)
}
+ this.setTableList(this.productTableList)
+ },
+ setTableList(tableList) {
+ tableList.allcol = tableList.tableColumn.filter((ele) => !ele.default).map((ele) => ele.label)
+ this.searchOptions = []
+ for (let i = 0; i < tableList.tableColumn.length; i++) {
+ const label = tableList.tableColumn[i].label
+ const value = tableList.tableColumn[i].prop
+ this.searchOptions.push({ value: value, label: label })
+ }
+ },
+ setColumnVisible(showcol, tableColumn) {
+ return tableColumn.map((ele) => {
+ return {
+ ...ele,
+ isShowColumn: showcol.includes(ele.label)
+ }
+ })
+ },
+ selTableCol(val) {
+ this.productTableList.showcol = val
+ this.productTableList.tableColumn = this.setColumnVisible(val, this.tableColumn)
},
// 浜у搧鍒楄〃杈撳叆
inputContent(val, prop, row) {
@@ -529,18 +583,26 @@
}
},
// 閫夋嫨鍙戣揣鏂瑰紡
- handleRadioChange(value) {
+ handleRadioChange() {
+ let value=this.editConfig.infomation.deliverType
this.shipmentsList=[]
this.dissatisfy=false
this.completely=false
- if(value===1){
- this.productTableList.tableColumn=[
- { label: "浜у搧缂栧彿", prop: "number" },
- { label: "浜у搧鍚嶇О", prop: "name", min: 110 },
- { label: "璁㈠崟鏁伴噺", prop: "orderAmount" },
- { label: "璁㈠崟瀹屾垚鏁伴噺", prop: "finishAmount" },
- { label: "鍙敤搴撳瓨", prop: "availableAmount" },
+ this.isCommonShow=false;
+ this.$nextTick(()=>{
+ this.isCommonShow=true;
+ })
+ if(value==1){
+ this.productTableList.showcol= ['浜у搧缂栧彿','浜у搧鍚嶇О', "璁㈠崟鏁伴噺", "璁㈠崟瀹屾垚鏁伴噺","鍙敤搴撳瓨"]
+ this.productTableList.allcol= ["璁㈠崟鏁伴噺", "璁㈠崟瀹屾垚鏁伴噺","鍙敤搴撳瓨"]
+ this.tableColumn=[
+ { label: "浜у搧缂栧彿", prop: "number", },
+ { label: "浜у搧鍚嶇О", prop: "name",min: 110 },
+ { label: "璁㈠崟鏁伴噺", prop: "orderAmount",},
+ { label: "璁㈠崟瀹屾垚鏁伴噺", min:120, prop: "finishAmount", },
+ { label: "鍙敤搴撳瓨", prop: "availableAmount",},
]
+ this.productTableList.tableColumn=this.setColumnVisible(this.productTableList.showcol, this.tableColumn)
this.dissatisfy=false
let portion=0
// let noUsable=false
@@ -584,17 +646,20 @@
this.completely=false
this.completely=true
}
- }else if(value===2){
- this.productTableList.tableColumn= [
- { label: "浜у搧缂栧彿", prop: "number" },
- { label: "浜у搧鍚嶇О", prop: "name", min: 110 },
- { label: "璁㈠崟鏁伴噺", prop: "orderAmount" },
- { label: "璁㈠崟瀹屾垚鏁伴噺", prop: "finishAmount" },
- { label: "鍙敤搴撳瓨", prop: "availableAmount" },
- { label: "鏈彂璐ф暟閲�", prop: "leftAmount", },
- { label: "鏈鍙戣揣鏁伴噺", prop: "outputAmount", inputFloat: true,isRequird:true },
- { label: "鍓╀綑鍙戣揣鏁伴噺", prop: "availableAmount",},
+ }else if(value==2){
+ this.productTableList.showcol= ['浜у搧缂栧彿','浜у搧鍚嶇О', "璁㈠崟鏁伴噺", "璁㈠崟瀹屾垚鏁伴噺","鍙敤搴撳瓨","鏈彂璐ф暟閲�", "鏈鍙戣揣鏁伴噺","鍓╀綑鍙戣揣鏁伴噺",]
+ this.productTableList.allcol= [ "璁㈠崟鏁伴噺", "璁㈠崟瀹屾垚鏁伴噺","鍙敤搴撳瓨","鏈彂璐ф暟閲�", "鍓╀綑鍙戣揣鏁伴噺",]
+ this.tableColumn= [
+ { label: "浜у搧缂栧彿", prop: "number", },
+ { label: "浜у搧鍚嶇О", prop: "name", min: 110 ,},
+ { label: "璁㈠崟鏁伴噺", prop: "orderAmount", },
+ { label: "璁㈠崟瀹屾垚鏁伴噺", min:120, prop: "finishAmount" ,},
+ { label: "鍙敤搴撳瓨", prop: "availableAmount",},
+ { label: "鏈彂璐ф暟閲�", prop: "leftAmount", min:120, },
+ { label: "鏈鍙戣揣鏁伴噺", prop: "outputAmount", min:120,inputFloat: true},
+ { label: "鍓╀綑鍙戣揣鏁伴噺", prop: "availableAmount", min:120,},
]
+ this.productTableList.tableColumn=this.setColumnVisible(this.productTableList.showcol, this.tableColumn)
let portion=0
this.productTableList.tableData.map((item)=>{
item.availableAmount=Number(item.availableAmount)
@@ -627,7 +692,7 @@
this.shipmentsList=[]
if(res&&res.code===200){
this.productTableList.tableData=res.data||[]
- if(this.shipmentsType===1){
+ if(this.editConfig.infomation.deliverType===1){
let portion=0
this.productTableList.tableData.map((item)=>{
item.availableAmount=Number(item.availableAmount)
@@ -639,7 +704,6 @@
this.shipmentsList.push(item)
}
})
- console.log(portion,"portion2")
if(portion===0){// 娌℃湁浜у搧婊¤冻鍙戣揣鏉′欢
this.completely=false
this.dissatisfy=true
@@ -657,6 +721,44 @@
}
}
})
+ },
+ // 鎸変粨搴撹繘琛屽彂璐�
+ async getDeliveryPrepareInfoByWarehouse(params){
+ await getDeliveryPrepareInfoByWarehouse(params).then((res)=>{
+ this.options=res.data
+ })
+ },
+ // 閫夋嫨浠撳簱
+ optionsChange(val){
+ this.warehouseId=val.warehouseId
+ this.productTableList.tableData=val.storeInfoList||[]
+ if(this.editConfig.infomation.deliverType===1){
+ let portion=0
+ this.productTableList.tableData.map((item)=>{
+ item.availableAmount=Number(item.availableAmount)
+ item.leftAmount=Number(item.leftAmount)
+ item.finishAmount=Number(item.finishAmount)
+ item.orderAmount=Number(item.orderAmount)
+ if(item.availableAmount>=item.leftAmount&&item.availableAmount>0&&item.leftAmount>0){
+ portion++
+ this.shipmentsList.push(item)
+ }
+ })
+ if(portion===0){// 娌℃湁浜у搧婊¤冻鍙戣揣鏉′欢
+ this.completely=false
+ this.dissatisfy=true
+ this.shipmentsMsg="鍙敤搴撳瓨鎴栨湭鍙戣揣鏁伴噺涓�0鎴栧綋鍓嶅彲鐢ㄥ簱瀛樹笉婊¤冻鏈彂璐ф暟閲忥紝涓嶈兘瀹屾垚涓�娆″彂璐�"
+ }else if(portion>0&&portion<this.productTableList.tableData.length){
+ this.dissatisfy=false
+ this.completely=true
+ this.shipmentsMsg="鍙兘婊¤冻閮ㄥ垎鍙戣揣闇�姹傦紝鏄惁纭鍙戣揣"
+ // 閮ㄥ垎浜у搧婊¤冻鍙戣揣鏉′欢
+ }else{
+ this.dissatisfy=false
+ this.completely=true
+ this.shipmentsMsg="鑳芥弧瓒冲彂璐ч渶姹傦紝鐩存帴鍙戣揣鍚�"
+ }
+ }
}
}
}
--
Gitblit v1.8.0