From 2260b47026088827f177bec0931ded0fd73d97ba Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期二, 26 三月 2024 10:48:43 +0800
Subject: [PATCH] 销售明细单发货弹窗样式优化
---
src/views/sales/salesDetails/shipmentsDialog.vue | 141 +++++++++++++++++++++++++++++++---------------
1 files changed, 95 insertions(+), 46 deletions(-)
diff --git a/src/views/sales/salesDetails/shipmentsDialog.vue b/src/views/sales/salesDetails/shipmentsDialog.vue
index 99b4e18..79dcc11 100644
--- a/src/views/sales/salesDetails/shipmentsDialog.vue
+++ b/src/views/sales/salesDetails/shipmentsDialog.vue
@@ -12,7 +12,7 @@
ref="form"
:model="editConfig.infomation"
:rules="rules"
- label-position="right"
+ label-position="left"
label-width="10%"
size="mini"
style="height: 60vh; overflow-x: hidden"
@@ -69,15 +69,10 @@
:selectBox="false"
:addTypeIdMultiple="true"
pageName="quotation"
+ :isBorder="true"
:detailEnter="true"
- :isOperate="
- (autoCodeHeadersObj.Bjd == 'yes' && editConfig.infomation.quotation_number) ||
- autoCodeHeadersObj.Bjd != 'yes'
- ? true
- : false
- "
- :quotationNumber="autoCodeHeadersObj.Bjd == 'yes' ? editConfig.infomation.quotation_number : ''"
:product-table-list="productTableList"
+ :isOperate="true"
@inputContent="inputContent"
@addProductClick="addProductClick"
@getSelectArray="getSelectArray"
@@ -277,8 +272,10 @@
let shipmentsNum=false
this.shipmentsList.map((item)=>{
if(this.shipmentsType===1){
- if(item.leftAmount<item.availableAmount){
+ if(item.leftAmount<item.availableAmount&&item.leftAmount>0){
isShipments=false
+ }else if(item.leftAmount<=0){
+ shipmentsNum=true
}else{
isShipments=true
}
@@ -289,6 +286,8 @@
shipmentsNum=true
}else if(!item.outputAmount){
shipmentsNum=true
+ }else if(item.leftAmount<=0){
+ isShipments=true
}else{
isShipments=false
}
@@ -544,26 +543,42 @@
]
this.dissatisfy=false
let portion=0
+ // let noUsable=false
this.productTableList.tableData.map((item)=>{
- if(item.availableAmount>=item.leftAmount&&item.availableAmount>0){
+ item.availableAmount=Number(item.availableAmount)
+ item.leftAmount=Number(item.leftAmount)
+ item.finishAmount=Number(item.finishAmount)
+ item.orderAmount=Number(item.orderAmount)
+ console.log(item,"item")
+ if(item.availableAmount>=item.leftAmount&&item.availableAmount>0&&item.leftAmount>0){
portion++
this.shipmentsList.push(item)
}
+ // if(item.availableAmount<item.leftAmount){
+ // noUsable=true
+ // }
+ })
if(portion===0){// 娌℃湁浜у搧婊¤冻鍙戣揣鏉′欢
this.completely=false
this.dissatisfy=true
- this.shipmentsMsg="褰撳墠浠撳簱搴撳瓨涓嶈冻,涓嶈兘瀹屾垚涓�娆″彂璐�"
+ // if(noUsable){
+ // this.shipmentsMsg="鍙敤搴撳瓨涓嶆弧瓒虫湭鍙戣揣鏁伴噺,鏃犳硶鍙戣揣"
+ // }else{
+ // }
+ this.shipmentsMsg="鍙敤搴撳瓨鎴栨湭鍙戣揣鏁伴噺涓�0鎴栧綋鍓嶅彲鐢ㄥ簱瀛樹笉婊¤冻鏈彂璐ф暟閲忥紝涓嶈兘瀹屾垚涓�娆″彂璐�"
+
}else if(portion>0&&portion<this.productTableList.tableData.length){// 閮ㄥ垎浜у搧婊¤冻鍙戣揣鏉′欢
this.dissatisfy=false
this.completely=true
this.shipmentsMsg="鍙兘婊¤冻閮ㄥ垎鍙戣揣闇�姹傦紝鏄惁纭鍙戣揣"
- }else if(portion===this.productTableList.tableData.length){// 鍏呭垎婊¤冻
+ }else if(portion!==0){
this.dissatisfy=false
this.completely=true
+ console.log(portion,"portion")
this.shipmentsMsg="鑳芥弧瓒冲彂璐ч渶姹傦紝鐩存帴鍙戣揣鍚�"
}
- })
+
if(portion===this.productTableList.tableData.length){ // 鍏ㄩ儴婊¤冻鍙戣揣鏉′欢
this.dissatisfy=false
this.completely=false
@@ -582,24 +597,28 @@
]
let portion=0
this.productTableList.tableData.map((item)=>{
- if(item.availableAmount>0){
+ item.availableAmount=Number(item.availableAmount)
+ item.leftAmount=Number(item.leftAmount)
+ item.finishAmount=Number(item.finishAmount)
+ item.orderAmount=Number(item.orderAmount)
+ if(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 if(portion===this.productTableList.tableData.length){
- this.dissatisfy=false
- this.completely=true
- this.shipmentsMsg="鑳芥弧瓒冲彂璐ч渶姹傦紝鐩存帴鍙戣揣鍚�"
- }
})
+ 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 if(portion===this.productTableList.tableData.length){
+ this.dissatisfy=false
+ this.completely=true
+ this.shipmentsMsg="鑳芥弧瓒冲彂璐ч渶姹傦紝鐩存帴鍙戣揣鍚�"
+ }
}
},
// 浜у搧鍏ュ簱淇℃伅
@@ -611,25 +630,30 @@
if(this.shipmentsType===1){
let portion=0
this.productTableList.tableData.map((item)=>{
- if(item.availableAmount>=item.leftAmount&&item.availableAmount>0){
+ 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 if(portion===this.productTableList.tableData.length){
- this.dissatisfy=false
- this.completely=true
- this.shipmentsMsg="鑳芥弧瓒冲彂璐ч渶姹傦紝鐩存帴鍙戣揣鍚�"
- }
})
+ console.log(portion,"portion2")
+ 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="鑳芥弧瓒冲彂璐ч渶姹傦紝鐩存帴鍙戣揣鍚�"
+ }
}
}
})
@@ -648,6 +672,9 @@
}
}
.basic-info {
+ padding: 0px 20px ;
+ .product-view{
+ }
.basic-info-title {
background-color: #f4f8fe;
padding-left: 10px;
@@ -683,7 +710,6 @@
.tips{
font-size: 16px;
display: flex;
- margin-left: 20px;
i{
font-size: 24px;
margin-right: 10px;
@@ -710,10 +736,33 @@
background-color: #f5f5f5;
height: 55px;
line-height: 55px;
+ text-align: right !important;
}
- .el-input__inner {
- text-align: left;
- }
+ // .el-input__inner {
+ // text-align: left;
+ // }
}
+ .el-table tr {
+ background-color: #fff;
+ }
+ .el-table th.el-table__cell.is-leaf{
+ background-color: #F1F3F8 !important;
+ }
+ .el-dialog__footer{
+ text-align: right !important;
+ padding-right: 20px;
+ }
+ .el-dialog__header {
+ background: #f5f7fa;
+ height: 50px !important;
+ line-height: 50px !important;
+ padding: 0;
+ font-weight: 600 !important;
+ font-size: 15px !important;
+ padding-left: 20px !important;
+ }
+ // .el-table{
+ // border: 1px solid #e1e1e1;
+ // }
}
</style>
--
Gitblit v1.8.0