From f84ab725507a2938f987a485c31536f280677111 Mon Sep 17 00:00:00 2001 From: sunzehua Date: Tue, 4 Jul 2023 10:22: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/views/main/BookingLedger/detail/index.vue | 10 + .../detail/modules/goodsTable.vue | 45 ++- .../main/Taskmanage/TaskmanageList/index.vue | 144 +++++----- src/views/system/ServiceItems/addForm.vue | 98 +++++++ src/views/system/ServiceItems/editForm.vue | 116 ++++++++ src/views/system/ServiceItems/index.vue | 259 ++++++++++++++++++ 6 files changed, 581 insertions(+), 91 deletions(-) create mode 100644 src/views/system/ServiceItems/addForm.vue create mode 100644 src/views/system/ServiceItems/editForm.vue create mode 100644 src/views/system/ServiceItems/index.vue diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue index abc733a..6539fdf 100644 --- a/src/views/main/BookingLedger/detail/index.vue +++ b/src/views/main/BookingLedger/detail/index.vue @@ -432,6 +432,7 @@ export default { ...mapGetters([ 'bookingList', 'needSavePages', + 'ctnallList', 'hasbookingDetail', 'bookingGridOptions', 'carrierList', @@ -1312,6 +1313,15 @@ export default { this.$message.loading({ content: '保存中, 请勿切换页面...' }) this.setSET_SAVEFLAG(true) console.log('== vuex 开始保存==', this.inBookingDetailsSave) + _data.ctnInputs.map((item, index) => { + if (!item.ctncode) { + this.ctnallList.forEach(ite => { + if (item.ctnall === ite.name) { + item.ctncode = ite.code + } + }) + } + }) BookingOrderSave(_data) .then(res => { if (res.success) { diff --git a/src/views/main/BookingLedger/detail/modules/goodsTable.vue b/src/views/main/BookingLedger/detail/modules/goodsTable.vue index d0df04d..096acde 100644 --- a/src/views/main/BookingLedger/detail/modules/goodsTable.vue +++ b/src/views/main/BookingLedger/detail/modules/goodsTable.vue @@ -119,6 +119,24 @@ export default { return { id: this.$route.query.id, rowKeyName: 'rowKey', + cellAutofillOption: { + directionX: false, + directionY: true, + afterAutofill: ({ + direction, + sourceSelectionRangeIndexes, + targetSelectionRangeIndexes, + sourceSelectionData, + targetSelectionData + }) => { + console.log('direction::', direction); + console.log('sourceSelectionRangeIndexes::', sourceSelectionRangeIndexes); + console.log('targetSelectionRangeIndexes::', targetSelectionRangeIndexes); + console.log('sourceSelectionData::', sourceSelectionData); + console.log('targetSelectionData::', targetSelectionData); + console.log('---'); + } + }, cellSelectionOption: { // disble cell selection enable: true @@ -842,7 +860,6 @@ export default { clickHighlight: false, hoverHighlight: false }, - cellAutofillOption: true, checkboxOption: { hideSelectAll: false, // 可控属性 @@ -1530,7 +1547,7 @@ export default { this.tableData[cntrnoArr.indexOf(item.CNTRNO)] = { rowKey: lastNum + index, ctnall: item.CTNALL, - CtnCode: item.CtnCode, + ctncode: item.CtnCode, ctnnum: this.tableData[cntrnoArr.indexOf(item.CNTRNO)].ctnnum, cntrno: item.CNTRNO, sealno: item.SEALNO, @@ -1550,7 +1567,7 @@ export default { ctnnum: '1', cntrno: item.CNTRNO, sealno: item.SEALNO, - CtnCode: item.CtnCode, + ctncode: item.CtnCode, pkgs: item.PKGS, kindpkgs: kindpkgsOld || item.KINDPKGS, kgs: item.KGS, @@ -1646,17 +1663,17 @@ export default { this.totalPkgs = totalPkgs this.totalKgs = totalKgs.toFixed(2) this.totalCbm = totalCbm.toFixed(2) - data.forEach(item => { - if (!this.tableData[this.selectArr[0]].pkgs) { - item.pkgs = '' - } - if (!this.tableData[this.selectArr[0]].kgs) { - item.kgs = '' - } - if (!this.tableData[this.selectArr[0]].cbm) { - item.cbm = '' - } - }) + data.forEach(item => { + if (!this.tableData[this.selectArr[0]].pkgs) { + item.pkgs = '' + } + if (!this.tableData[this.selectArr[0]].kgs) { + item.kgs = '' + } + if (!this.tableData[this.selectArr[0]].cbm) { + item.cbm = '' + } + }) this.tableData = data this.$forceUpdate() } else { diff --git a/src/views/main/Taskmanage/TaskmanageList/index.vue b/src/views/main/Taskmanage/TaskmanageList/index.vue index 5800dc9..b2bfae4 100644 --- a/src/views/main/Taskmanage/TaskmanageList/index.vue +++ b/src/views/main/Taskmanage/TaskmanageList/index.vue @@ -10,10 +10,7 @@
- {{ item.name }}({{ item.total }}) + {{ item.name }}({{ item.total }})
@@ -27,8 +24,7 @@ v-for="(threeLevel, tindex) in levelTree" :key="`0-0-${tindex}`" :title="`${threeLevel.name} (${threeLevel.total})`" - :show-icon="false" - /> + :show-icon="false" /> @@ -40,8 +36,7 @@ class="icon" :icon="levelreLoading ? 'loading' : 'reload'" size="small" - @click="getCurrentTotalStat" - > + @click="getCurrentTotalStat"> 点击重新加载 @@ -60,8 +55,7 @@ :xl="5.5" :key="findex" v-show="(findex < 4 && !advanced) || advanced" - class="from-label" - > + class="from-label"> + @selectFirst="getSelectFirst"> @@ -98,22 +91,10 @@
@@ -145,8 +124,7 @@ ok-text="是" cancel-text="否" @confirm="SendEmailFun" - @cancel="cancelFun" - > + @cancel="cancelFun"> 批量转发 + @cancel="cancelFun"> 批量下载 @@ -165,8 +142,7 @@ ok-text="是" cancel-text="否" @confirm="laraPaperCalc" - @cancel="cancelFun" - > + @cancel="cancelFun"> 页数计算 @@ -176,8 +152,7 @@ ok-text="是" cancel-text="否" @confirm="copyPrintFun" - @cancel="cancelFun" - > + @cancel="cancelFun"> COPY打印 + @cancel="cancelFun"> COPY下载 + @cancel="cancelFun"> 正本下载 + @cancel="cancelFun"> LARA登记 - LARA记录 + LARA记录 @@ -314,8 +274,7 @@ :confirmLoading="sendEmailModelconfirm" :maskClosable="false" @ok="handleSendEmail" - @cancel="handleSendEmailCancel" - > + @cancel="handleSendEmailCancel"> + :wrapperCol="wrapperCol"> @@ -344,8 +302,7 @@ md: { span: 5 } }" :wrapperCol="wrapperCol" - @cancel="handlePaperCalcCancel" - > + @cancel="handlePaperCalcCancel">
@@ -381,8 +338,7 @@ @click="FnCilckTemplateType(item.id)" class="items" :span="11" - :offset="index % 2 == 0 ? 0 : 1" - > + :offset="index % 2 == 0 ? 0 : 1"> ·{{ item.displayName }} @@ -404,8 +360,7 @@ :formAllData="formMoreData" type="from" @ok="submitForm" - v-if="formMoreData" - > + v-if="formMoreData"> + v-if="formMoreTableData">
时间{{ bcFile.executeTime }}
@@ -478,7 +432,7 @@ export default { }, data() { return { - tableHeight:0, + tableHeight: 0, templateType: [], bcFileFlag: false, bcFile: {}, @@ -1055,6 +1009,7 @@ export default { changeNextLevel() { this.getList({ status: this.activeNextKey }) this.$set(this.gridOptions, 'loading', true) + this.formRes.status = this.activeNextKey this.levelTree = this.selectTreeLevel(this.levelTreeAll, this.activeNextKey, this.activeTopKey) this.activeTreeKey = [] }, @@ -1094,7 +1049,10 @@ export default { setTimeout(() => { if (data.status && data.status !== 'Retransmit') { this.activeNextKey = data.status - this.changeNextLevel() + this.$set(this.gridOptions, 'loading', true) + this.formRes.status = this.activeNextKey + this.levelTree = this.selectTreeLevel(this.levelTreeAll, this.activeNextKey, this.activeTopKey) + this.activeTreeKey = [] // statusList this.levelNext.map((item, index) => { if (item.code === data.status) { @@ -1388,7 +1346,7 @@ export default { }) return res[0].name }, - cancelFun() {}, + cancelFun() { }, // 取消 removeFun() { const select = this.$refs.xGrid.getCheckboxRecords() @@ -1725,72 +1683,90 @@ export default { /deep/ .ant-tabs-bar { margin-bottom: 0 !important; } + /deep/ .ant-tabs-tab { padding: 8px !important; margin-right: 8px !important; } + /deep/ .ant-form-item { display: flex; } + .nav-title { width: 100%; + .icon { float: right; } } + .table-page-search-submitButtons { width: 100%; display: block; text-align: right; } + .nav-bottom { width: 100%; text-align: right; padding-top: 20px; + .icon { font-size: 12px; } } + .list-btn { margin-right: 10px; + .iconfont { margin-right: 8px; } } + .task-tit { color: @primary-color; cursor: pointer; } + .nav-loading { width: 100%; height: 100px; line-height: 100px; text-align: center; + .tip { margin-left: 10px; } } + .operate-btn { width: 30px; text-align: center; display: inline-block; + &:nth-of-type(1) { color: @primary-color; } } + .icon-tip { font-size: 12px; color: @primary-color; } + .nav-title { .ant-radio-button-wrapper { padding: 0 10px; text-align: center; } } + .nav-top { width: 100%; height: 100%; + // position: relative; .nav-top-tip { // position: absolute; @@ -1807,31 +1783,37 @@ export default { // border-radius: 50%; } } + .nav-box { padding: 20px 14px; background: #fff; border-radius: 2px; } + .nav-no-data { height: 84px; line-height: 84px; text-align: center; margin-top: 20px; + i { display: block; line-height: 60px; font-size: 32px; color: #aaa; } + span { display: block; line-height: 24px; color: #999; } } + .tab-btn { cursor: pointer; } + // .downLoad-err-alert{ // position:fixed; // top: 80px; @@ -1851,30 +1833,37 @@ export default { box-sizing: border-box; background: #f7f8fe; border: 1px dashed #cdcdcd; + p { margin: 0; + &:nth-child(2) { margin-left: 35px; } + span { color: #ff6646; } } } + .PrintMainBox { width: 100%; max-height: 50vh; overflow-y: auto; margin-top: 5px; + .items { padding-left: 1rem; height: 2.5rem; line-height: 2.5rem; border-bottom: 1px solid #ebebeb; cursor: pointer; + &:hover { color: #2f54eb; } + span { font-weight: bolder; margin-right: 0.6rem; @@ -1882,6 +1871,7 @@ export default { } } } + .bcfile-title { border-bottom: 1px dashed black; padding-bottom: 5px; diff --git a/src/views/system/ServiceItems/addForm.vue b/src/views/system/ServiceItems/addForm.vue new file mode 100644 index 0000000..80608f0 --- /dev/null +++ b/src/views/system/ServiceItems/addForm.vue @@ -0,0 +1,98 @@ + + diff --git a/src/views/system/ServiceItems/editForm.vue b/src/views/system/ServiceItems/editForm.vue new file mode 100644 index 0000000..9378fe2 --- /dev/null +++ b/src/views/system/ServiceItems/editForm.vue @@ -0,0 +1,116 @@ + + diff --git a/src/views/system/ServiceItems/index.vue b/src/views/system/ServiceItems/index.vue new file mode 100644 index 0000000..2e385ef --- /dev/null +++ b/src/views/system/ServiceItems/index.vue @@ -0,0 +1,259 @@ +/* eslint-disable eqeqeq */ + + +