diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue
index 1a7558d..d87aeca 100644
--- a/src/views/modules/proofing/requestForProofing.vue
+++ b/src/views/modules/proofing/requestForProofing.vue
@@ -235,7 +235,7 @@
-
+
CS
@@ -251,7 +251,7 @@
-
+ `
@@ -2597,9 +2597,14 @@ export default {
this.$refs.modalForm.validate((valid, obj) => {
if (!valid) {
- Object.keys(obj).forEach(val => {
- this.$message.warning(obj[val][0].message)
- })
+ let i = 1;
+ for (let key in obj) {
+ this.$message.error(obj[key][0].message);
+ if (i === 1){
+ return
+ }
+ i++;
+ }
} else {
if (this.projectPartListSelections.length <= 0) {
this.$message.warning('请选择项目料号')
diff --git a/src/views/modules/quote/detail/primary/quoteDetailCost.vue b/src/views/modules/quote/detail/primary/quoteDetailCost.vue
index fc84562..aab1205 100644
--- a/src/views/modules/quote/detail/primary/quoteDetailCost.vue
+++ b/src/views/modules/quote/detail/primary/quoteDetailCost.vue
@@ -131,7 +131,13 @@ export default {
// if (this.selectionChecked.includes('包装&运输')){
// this.quoteDetail.totalCost += this.quoteDetail.otherCost;
// }
+ // 计算成本
this.computedTotalPartCost();
+ // let val = 0;
+ // let editInput = this.editInput.toLowerCase();
+ // if (editInput === 'va'){
+ // val = this.quoteDetail.quoteProfitRate
+ // }
this.computeProfitAmount();
this.computeCurrencyTotalCost();
},
diff --git a/src/views/modules/quote/detail/quoteDetail.vue b/src/views/modules/quote/detail/quoteDetail.vue
index 6dbf07f..9de21c1 100644
--- a/src/views/modules/quote/detail/quoteDetail.vue
+++ b/src/views/modules/quote/detail/quoteDetail.vue
@@ -665,6 +665,9 @@ export default {
exportName: '报价条目明细'+this.dayjs().format('YYYYMMDDHHmmss'),
exportHeader: ["报价条目明细"],
exportFooter: [],
+
+ againVisible:false,
+ againRow:{},
}
},
methods:{
@@ -846,22 +849,40 @@ export default {
this.$refs.tool.handleQueryQuoteDetailTool();
}
},
- againQuoteDetail(row){
- let params = {
- ...row
- }
- this.queryLoading = true;
- againQuoteDetail(params).then(({data})=>{
- if (data && data.code === 0){
- this.handleQueryQuoteDetail();
- this.$message.success(data.msg);
+ handleAgainQuoteDetail(row){
+ this.againRow = row;
+ this.againVisible = true;
+ },
+ againQuoteDetail(){
+ this.$refs.againForm.validate((valid,obj) => {
+ if (valid){
+ this.queryLoading = true;
+ this.saveLoading = true;
+ againQuoteDetail(this.againRow).then(({data})=>{
+ if (data && data.code === 0){
+ this.againVisible = false
+ this.handleQueryQuoteDetail();
+ this.$message.success(data.msg);
+ }else {
+ this.$message.warning(data.msg);
+ }
+ this.queryLoading = false;
+ this.saveLoading = false;
+ }).catch((error)=>{
+ this.$message.error(error);
+ this.queryLoading = false;
+ this.saveLoading = false;
+ })
}else {
- this.$message.warning(data.msg);
- this.queryLoading = false;
+ let i = 1;
+ for (let key in obj) {
+ this.$message.error(obj[key][0].message);
+ if (i === 1){
+ return
+ }
+ i++;
+ }
}
- }).catch((error)=>{
- this.$message.error(error);
- this.queryLoading = false;
})
},
handleQueryPartList(){
@@ -1040,7 +1061,8 @@ export default {
删除
- 复制明细
+
+ 复制明细
详情
@@ -1197,6 +1219,37 @@ export default {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+