From 63e0a49eb5c260f964072925f530da84a50d0973 Mon Sep 17 00:00:00 2001 From: sunzehua Date: Fri, 14 Jul 2023 12:04:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modular/system/appManage.js | 24 + src/views/main/BookingLedger/detail/index.vue | 6 +- .../detail/modules/cargoInfo.vue | 7 +- .../detail/modules/goodsTable.vue | 11 +- .../detail/modules/rightContent.vue | 2 +- src/views/main/BookingLedger/list/index.vue | 11 +- src/views/system/ServiceFlow/addForm.vue | 464 +++++++++++++----- 7 files changed, 398 insertions(+), 127 deletions(-) diff --git a/src/api/modular/system/appManage.js b/src/api/modular/system/appManage.js index a070ade..7bb8077 100644 --- a/src/api/modular/system/appManage.js +++ b/src/api/modular/system/appManage.js @@ -242,3 +242,27 @@ export function ServiceWorkFlowBaseGetPage (parameter) { data: parameter }) } + +export function projectQueryList (parameter) { + return axios({ + url: '/ServiceProject/QueryList', + method: 'get', + params: parameter + }) +} + +export function QueryActivitiesList (parameter) { + return axios({ + url: '/ServiceWorkFlowBase/QueryActivitiesList', + method: 'get', + params: parameter + }) +} + +export function QueryListStatus (parameter) { + return axios({ + url: '/StatusSkuBase/QueryList', + method: 'get', + params: parameter + }) +} diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue index 41d2184..b5d3f2c 100644 --- a/src/views/main/BookingLedger/detail/index.vue +++ b/src/views/main/BookingLedger/detail/index.vue @@ -1058,7 +1058,7 @@ export default { }) .then(res => { this.$message.destroy() - this.setDeatilsFun(res) + this.setDeatilsFun(res, false) }) .catch(err => { console.log(err) @@ -1303,11 +1303,13 @@ export default { this.setSET_SAVEFLAG(true) _data.ctnInputs.map((item, index) => { if (!item.ctncode) { - this.ctnallList.forEach(ite => { + if (this.ctnallList) { + this.ctnallList.forEach(ite => { if (item.ctnall === ite.name) { item.ctncode = ite.code } }) + } } }) BookingOrderSave(_data) diff --git a/src/views/main/BookingLedger/detail/modules/cargoInfo.vue b/src/views/main/BookingLedger/detail/modules/cargoInfo.vue index 758bb07..5725b03 100644 --- a/src/views/main/BookingLedger/detail/modules/cargoInfo.vue +++ b/src/views/main/BookingLedger/detail/modules/cargoInfo.vue @@ -53,10 +53,11 @@
- Description of Goods (包装种类与货名)
+ style="cursor: pointer;color: black;margin: 0px;" + class="copy-btn iconfont icon-bianji"> + Description of Goods (包装种类与货名)
{ - this.tableData.map((item, index) => { - item.kindpkgs = this.packageList[val].name || '' - }) - }, 300) this.$forceUpdate() } else { row['kindpkgs'] = '' @@ -1183,9 +1178,9 @@ export default { this.id = this.$route.query.id } - // if (this.$route.name === 'BookingDetail') { - // // this.init() - // } + if (this.$route.name === 'BookingDetail') { + this.init() + } } }, totalKgs() { diff --git a/src/views/main/BookingLedger/detail/modules/rightContent.vue b/src/views/main/BookingLedger/detail/modules/rightContent.vue index 9bb19ea..2310e8f 100644 --- a/src/views/main/BookingLedger/detail/modules/rightContent.vue +++ b/src/views/main/BookingLedger/detail/modules/rightContent.vue @@ -974,7 +974,6 @@ export default { bookingId: this.$route.query.id, item: [] } - console.log(this.details.goodsStatus, 132213) this.details.goodsStatus.forEach(item => { if (item.finishTime || item.remark) { ApiData.item.push(item) @@ -1000,6 +999,7 @@ export default { this.booGoodsStatusItem = res.data this.$emit('inGoodsSave', true) this.details.goodsStatus = res.data + this.$store.commit('SET_SAVENEEDNUMBER', this.details.id) setTimeout(() => { this.$emit('inGoodsSave', false) }, 400) diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue index ba54137..463e044 100644 --- a/src/views/main/BookingLedger/list/index.vue +++ b/src/views/main/BookingLedger/list/index.vue @@ -141,7 +141,7 @@ v-bind="gridOptions" row-class-name="line-box" :height="tableHeight" - :row-config="{ isHover: true }" + :row-config="{ isHover: true,isCurrent: true }" :checkbox_config="{ checkField: 'checked' }" :checkbox-config="{ highlight: true }" :scroll-x="{ gt: 10, oSize: 10, enabled: false }" @@ -1033,6 +1033,10 @@ export default { } item.bookstatus = bookstatus item.refshYzitemLoad = false + item.dzmarkLoading = false + item.czmarkLoading = false + item.rowCzMark = false + item.rowDzMark = false item.atdLoading = false let hasGoods = 0 item.goodsStatusList.map((gitem, gindex) => { @@ -3565,3 +3569,8 @@ export default { background: #fff3e0 !important; } + diff --git a/src/views/system/ServiceFlow/addForm.vue b/src/views/system/ServiceFlow/addForm.vue index 1c06931..ab031f5 100644 --- a/src/views/system/ServiceFlow/addForm.vue +++ b/src/views/system/ServiceFlow/addForm.vue @@ -1,118 +1,321 @@ +