From 7e36c5dd4a110407a5cb5210c9cd4f2098b8c595 Mon Sep 17 00:00:00 2001 From: qiezi <15576055375@163.com> Date: Mon, 2 Sep 2024 16:10:32 +0800 Subject: [PATCH] 2024-09-02 --- src/api/quotation/quoteDetail.js | 4 + src/views/modules/code/item/itemValue.vue | 111 +++++++++++++----- .../sellForQuotation/quoteDetail.vue | 13 +- 3 files changed, 96 insertions(+), 32 deletions(-) diff --git a/src/api/quotation/quoteDetail.js b/src/api/quotation/quoteDetail.js index 924d6bc..baff346 100644 --- a/src/api/quotation/quoteDetail.js +++ b/src/api/quotation/quoteDetail.js @@ -7,3 +7,7 @@ export const saveQuoteDetail = (data)=>createAPI(`/quote/detail/save`,'post',dat export const updateQuoteDetail = (data)=>createAPI(`/quote/detail/update`,'post',data) export const removeQuoteDetail = (data)=>createAPI(`/quote/detail/remove`,'post',data) + +export const getQuoteDetailBomById = (data) => createAPI(`/quote/detail/bom`,'post',data) + +export const getQuoteDetailRoutingById = (data) => createAPI('/quote/detail/routing','post',data) diff --git a/src/views/modules/code/item/itemValue.vue b/src/views/modules/code/item/itemValue.vue index 006b8d4..b565b7e 100644 --- a/src/views/modules/code/item/itemValue.vue +++ b/src/views/modules/code/item/itemValue.vue @@ -12,7 +12,7 @@ import { } from "../../../../api/code/codeConditionHeader"; import {searchCodeItemDefs, searchCodeItemDefsSeq} from "../../../../api/code/codeItemDef"; import { - codeConditionDetailList, + codeConditionDetailList, editConditionDetailList, removeConditionDetailList, saveConditionDetailList } from "../../../../api/code/codeConditionDetail"; @@ -100,6 +100,7 @@ export default { SQLStatementExecuteCalculate:undefined, SQLStatementExecuteConditionId:undefined, SQLStatementExecuteValueItemNo:undefined, + SQLStatementExecuteFlag:'N', }, saveItemValueList:[], saveItemValueListDialog:false, @@ -372,16 +373,17 @@ export default { }) }, clickConditionDetailBtn(){ - this.itemDefModalVisible = true; this.conditionDetailModal.site = this.itemValue.site; this.conditionDetailModal.itemNo = this.itemValue.itemNo; this.conditionDetailModal.conditionId = this.conditionHeaders[this.conditionHeaderIndex].conditionId; this.searchCodeItemDefs(); + this.itemDefModalVisible = true; }, closeConditionDetail(){ Object.keys(this.conditionDetailModal).forEach(key => { this.conditionDetailModal[key] = undefined; }); + this.conditionDetailModal.SQLStatementExecuteFlag = 'N'; }, changeItemDef(val){ let params = { @@ -394,16 +396,11 @@ export default { saveConditionDetail(){ this.$refs.formConditionDetail.validate((valid,obj) => { if (valid){ - saveConditionDetailList(this.conditionDetailModal).then(({data})=>{ - if (data && data.code === 0){ - this.$message.success(data.msg) - this.codeConditionDetailList(); - }else { - this.$message.warning(data.msg) - } - }).catch((error)=>{ - this.$message.error(error) - }) + if (this.conditionDetailModal.seqNo){ + this.handleUpdateConditionDetail(); + }else { + this.handleSaveConditionDetail(); + } }else { Object.keys(obj).forEach(key => { this.$message.error(obj[key][0].message); @@ -412,6 +409,31 @@ export default { } }) }, + handleSaveConditionDetail(){ + saveConditionDetailList(this.conditionDetailModal).then(({data})=>{ + if (data && data.code === 0){ + this.$message.success(data.msg) + this.codeConditionDetailList(); + }else { + this.$message.warning(data.msg) + } + }).catch((error)=>{ + this.$message.error(error) + }) + }, + handleUpdateConditionDetail(){ + editConditionDetailList(this.conditionDetailModal).then(({data})=>{ + if (data && data.code === 0){ + this.$message.success(data.msg) + this.codeConditionDetailList(); + this.itemDefModalVisible = false; + }else { + this.$message.warning(data.msg) + } + }).catch((error)=>{ + this.$message.error(error) + }) + }, codeConditionDetailList(){ let params = { itemNo: this.itemValue.itemNo, @@ -428,6 +450,11 @@ export default { this.$message.error(error) }) }, + handleEditConditionDetail(){ + this.conditionDetailModal = {...this.conditionDetails[this.selectionDetailIndex]} + this.searchCodeItemDefs(); + this.itemDefModalVisible = true + }, removeConditionDetailList(){ this.$confirm(`确定要删除条件"${this.conditionDetails[this.selectionDetailIndex].SQLStatementExecuteCalculate === 1 ? '并且' : '或者' }(${this.conditionDetails[this.selectionDetailIndex].itemDesc}=${this.conditionDetails[this.selectionDetailIndex].itemValue})"吗？`, '提示', { confirmButtonText: '确定', @@ -566,7 +593,11 @@ export default {
- {{ `${o.SQLStatementExecuteCalculate === '1' ? '并且' : '或者' }(${o.itemDesc}=${o.itemValue})` }} + + 并且 {{`(${o.itemDesc}=${o.itemValue})`}} + 或者 {{`(${o.itemDesc}=${o.itemValue})`}} + 并且 .. { {{`(${o.itemDesc}=${o.itemValue})`}} + .. }
@@ -574,6 +605,9 @@ export default {
新增
+
+ 编辑 +
删除
@@ -653,27 +687,42 @@ export default { - - - - - - - -
- -
- - - - - - - + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + 添加括号 - 应用 + 应用 + 确定 关闭 diff --git a/src/views/modules/quotation/sellForQuotation/quoteDetail.vue b/src/views/modules/quotation/sellForQuotation/quoteDetail.vue index b388c1f..da79010 100644 --- a/src/views/modules/quotation/sellForQuotation/quoteDetail.vue +++ b/src/views/modules/quotation/sellForQuotation/quoteDetail.vue @@ -1017,6 +1017,9 @@ export default { this.projectPartDialogFlag = true }, handleToBom(row){ + let params = { + + } }, handleToRouting(row){ @@ -1043,7 +1046,15 @@ export default { 编辑 删除 删除 - + + + 更多 + + + BOM + Routing + +