From 80354673d1ffb9a9a138586ec133c0d04ea1136c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <14166000+zhangtonghai@user.noreply.gitee.com> Date: Mon, 15 Apr 2024 08:55:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E8=BF=90=E5=87=BA=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ds-wms-client-web/package.json | 1 + ds-wms-client-web/src/main.ts | 2 + .../src/views/operation/seaexport/asd.json | 39 +- .../operation/seaexport/detail/index.vue | 157 +- .../detail/modules/cargoInfo copy.vue | 1079 ----- .../seaexport/detail/modules/cargoInfo.vue | 910 +++- .../seaexport/detail/modules/ediMore.vue | 220 +- .../detail/modules/goodsTable copy.vue | 2393 +++++++++++ .../seaexport/detail/modules/goodsTable.vue | 3795 ++++++++--------- .../seaexport/detail/modules/mailingInfo.vue | 61 +- .../seaexport/detail/modules/rightContent.vue | 1330 +++--- .../seaexport/detail/modules/sedOrder.vue | 1166 ++--- .../views/operation/seaexport/detail/rules.js | 90 +- .../seaexport/detail/style/cargoInfo.less | 2 +- .../seaexport/detail/style/sedOrder.less | 2 +- .../src/views/operation/seaexport/index.vue | 306 +- 16 files changed, 6585 insertions(+), 4968 deletions(-) delete mode 100644 ds-wms-client-web/src/views/operation/seaexport/detail/modules/cargoInfo copy.vue create mode 100644 ds-wms-client-web/src/views/operation/seaexport/detail/modules/goodsTable copy.vue diff --git a/ds-wms-client-web/package.json b/ds-wms-client-web/package.json index cea623f0..13e14e7a 100644 --- a/ds-wms-client-web/package.json +++ b/ds-wms-client-web/package.json @@ -157,6 +157,7 @@ "vite-plugin-vue-setup-extend": "^0.4.0", "vite-plugin-windicss": "^1.8.4", "vite-ssg": "^0.23.1", + "vue-easytable": "^2.27.1", "vue-eslint-parser": "^8.3.0", "vue-tsc": "^1.8.11" }, diff --git a/ds-wms-client-web/src/main.ts b/ds-wms-client-web/src/main.ts index 09937a86..2ccb36f8 100644 --- a/ds-wms-client-web/src/main.ts +++ b/ds-wms-client-web/src/main.ts @@ -19,7 +19,9 @@ import '/@/styles/element/index.scss' import ElementPlus from 'element-plus' import 'element-plus/dist/index.css' + import 'vxe-table/lib/style.css' + if (isDevMode()) { import('ant-design-vue/es/style') } diff --git a/ds-wms-client-web/src/views/operation/seaexport/asd.json b/ds-wms-client-web/src/views/operation/seaexport/asd.json index a64746db..9e7affe7 100644 --- a/ds-wms-client-web/src/views/operation/seaexport/asd.json +++ b/ds-wms-client-web/src/views/operation/seaexport/asd.json @@ -1,20 +1,25 @@ [ + { "FieldName": "MBLNO", "FieldValue": "1", "ConditionalType": 1 }, { "ConditionalList": [ + { "Key": 0, "Value": { "FieldName": "Cntr10", "FieldValue": "equal", "ConditionalType": 2 } }, { - "Key": -1, - "Value": { - "FieldName": "id", - "FieldValue": "2", - "ConditionalType": 0 - } + "Key": 0, + "Value": { "FieldName": "MasterNo", "FieldValue": "contains", "ConditionalType": 12412 } }, { "Key": 0, "Value": { - "FieldName": "name", - "FieldValue": "2", - "ConditionalType": 0 + "ConditionalList": [ + { + "Key": 0, + "Value": { "FieldName": "BSNO", "FieldValue": "GreaterThan", "ConditionalType": 1 } + }, + { + "Key": 0, + "Value": { "FieldName": "BusinessDate", "FieldValue": "equal", "ConditionalType": 2 } + } + ] } }, { @@ -22,20 +27,16 @@ "Value": { "ConditionalList": [ { - "Key": -1, + "Key": 1, "Value": { - "FieldName": "price", - "FieldValue": "1", - "ConditionalType": 0 + "FieldName": "BusinessStatus", + "FieldValue": "GreaterThanOrEqual", + "ConditionalType": 3 } }, { - "Key": 0, - "Value": { - "FieldName": "CustomId", - "FieldValue": "1", - "ConditionalType": 0 - } + "Key": 1, + "Value": { "FieldName": "Yard", "FieldValue": "equal", "ConditionalType": 4 } } ] } diff --git a/ds-wms-client-web/src/views/operation/seaexport/detail/index.vue b/ds-wms-client-web/src/views/operation/seaexport/detail/index.vue index 0163c9bb..dfdad703 100644 --- a/ds-wms-client-web/src/views/operation/seaexport/detail/index.vue +++ b/ds-wms-client-web/src/views/operation/seaexport/detail/index.vue @@ -5,7 +5,7 @@ :class="!Showtabs ? 'Showtabs' : ''" :tabBarStyle="tabBarStyle" :activeKey="tabActiveKey" - :animated="Object.keys($refs).includes('sedOrder') ? false : true" + :animated="Object.keys($refs).includes('RefsedOrder') ? false : true" @change="changeTab" > @@ -82,7 +82,7 @@ @changeDetail="changeDetailFun" >
+ + + +
@@ -186,6 +204,10 @@ import basicInfo from './modules/basicInfo.vue' import mailingInfo from './modules/mailingInfo.vue' import cargoInfo from './modules/cargoInfo.vue' + import goodsTable from './modules/goodsTable.vue' + import ediMore from './modules/ediMore.vue' + import rightContent from './modules/rightContent.vue' + import sedOrder from './modules/sedOrder.vue' const initDetail = { id: 0, parentId: 0, @@ -397,15 +419,15 @@ const inChildLoading = ref(false) const scrollTop = ref(0) const iframe = ref() - const rightContent = ref() + const RefrightContent = ref() const excuteRules = ref([]) const excuteRulesType = ref('') - const sedOrder = ref() - const goodsTable = ref() + const RefsedOrder = ref() + const RefgoodsTable = ref() const RefbasicInfo = ref() const RefmailingInfo = ref() const RefcargoInfo = ref() - const ediMore = ref() + const RefediMore = ref() const mainOrderActiveKey = ref('1-1') const ediRules = ref(rules.ediRules) const checkFrom = ref([]) @@ -483,9 +505,9 @@ isCopy: isCopy.value, id: id.value, } - if (Object.keys(that.$refs).includes('sedOrder')) { - const secActive = sedOrder.value.$data.editIndex - hisData.secActive = secActive + if (Object.keys(that.$refs).includes('RefsedOrder')) { + const secActive = RefsedOrder.value.$data.editIndex + hisData.RefsedOrder = secActive } historyData.value[`copy-${id.value}`] = hisData } else if (route.query.addNum) { @@ -500,9 +522,9 @@ isCopy: isCopy.value, // id: id.value } - if (Object.keys(that.$refs).includes('sedOrder')) { - const secActive = sedOrder.value.$data.editIndex - hisData.secActive = secActive + if (Object.keys(that.$refs).includes('RefsedOrder')) { + const secActive = RefsedOrder.value.$data.editIndex + hisData.RefsedOrder = secActive } historyData.value[`add-${route.query.addNum}`] = hisData } else { @@ -517,8 +539,8 @@ isCopy: isCopy.value, id: id.value, } - if (Object.keys(that.$refs).includes('sedOrder')) { - const secActive = sedOrder.value.$data.editIndex + if (Object.keys(that.$refs).includes('RefsedOrder')) { + const secActive = RefsedOrder.value.$data.editIndex hisData.secActive = secActive } historyData.value[id.value] = hisData @@ -554,8 +576,8 @@ isCopy: isCopy.value, id: id.value, } - if (Object.keys(this.$refs).includes('sedOrder')) { - const secActive = sedOrder.value.$data.editIndex + if (Object.keys(this.$refs).includes('RefsedOrder')) { + const secActive = RefsedOrder.value.$data.editIndex hisData.secActive = secActive } if (!route.query.copyId) { @@ -575,8 +597,8 @@ isCopy: isCopy.value, // id: id.value } - if (Object.keys(that.$refs).includes('sedOrder')) { - const secActive = sedOrder.value.$data.editIndex + if (Object.keys(that.$refs).includes('RefsedOrder')) { + const secActive = RefsedOrder.value.$data.editIndex hisData.secActive = secActive } historyData.value[`add-${route.query.addNum}`] = hisData @@ -592,8 +614,8 @@ isCopy: isCopy.value, id: id.value, } - if (Object.keys(that.$refs).includes('sedOrder')) { - const secActive = sedOrder.value.$data.editIndex + if (Object.keys(that.$refs).includes('RefsedOrder')) { + const secActive = RefsedOrder.value.$data.editIndex hisData.secActive = secActive } historyData.value[id.value] = hisData @@ -642,17 +664,17 @@ setTimeout(() => { if (bookingDetails.value.hbList && bookingDetails.value.hbList.length > 0) { Showtabs.value = true - if (Object.keys(that.$refs).includes('sedOrder')) { - sedOrder.value.init(bookingDetails.value.hbList) + if (Object.keys(that.$refs).includes('RefsedOrder')) { + RefsedOrder.value.init(bookingDetails.value.hbList) } } else { Showtabs.value = false - if (Object.keys(that.$refs).includes('sedOrder')) { - sedOrder.value.init([]) + if (Object.keys(that.$refs).includes('RefsedOrder')) { + RefsedOrder.value.init([]) } } if (Object.keys(that.$refs).includes('goodsTable')) { - goodsTable.value.init() + RefgoodsTable.value.init() } }, 200) setTimeout(() => { @@ -689,17 +711,17 @@ setTimeout(() => { if (bookingDetails.value.hbList && bookingDetails.value.hbList.length > 0) { Showtabs.value = true - if (Object.keys(that.$refs).includes('sedOrder')) { - sedOrder.value.init(bookingDetails.value.hbList) + if (Object.keys(that.$refs).includes('RefsedOrder')) { + RefsedOrder.value.init(bookingDetails.value.hbList) } } else { Showtabs.value = false - if (Object.keys(that.$refs).includes('sedOrder')) { - sedOrder.value.init([]) + if (Object.keys(that.$refs).includes('RefsedOrder')) { + RefsedOrder.value.init([]) } } if (Object.keys(that.$refs).includes('goodsTable')) { - goodsTable.value.init() + RefgoodsTable.value.init() } }, 200) setTimeout(() => { @@ -767,17 +789,17 @@ setTimeout(() => { if (bookingDetails.value.hbList && bookingDetails.value.hbList.length > 0) { Showtabs.value = true - if (Object.keys(that.$refs).includes('sedOrder')) { - sedOrder.value.init(bookingDetails.value.hbList) + if (Object.keys(that.$refs).includes('RefsedOrder')) { + RefsedOrder.value.init(bookingDetails.value.hbList) } } else { Showtabs.value = false - if (Object.keys(that.$refs).includes('sedOrder')) { - sedOrder.value.init([]) + if (Object.keys(that.$refs).includes('RefsedOrder')) { + RefsedOrder.value.init([]) } } if (Object.keys(that.$refs).includes('goodsTable')) { - goodsTable.value.init() + RefgoodsTable.value.init() } }, 200) setTimeout(() => { @@ -910,7 +932,7 @@ } function handleSaveService(data) { if (route.query.id) { - rightContent.value.saveServiceBasic(data) + RefrightContent.value.saveServiceBasic(data) } } function changeDetailFun(data) { @@ -931,15 +953,15 @@ bookingDetails.value.cntrtotal = str } function handleRefshTable() { - goodsTable.value.loadingTable = true + RefgoodsTable.value.loadingTable = true GetCtnListRefsh({ orderId: bookingDetails.value.id }).then((res) => { if (res.success) { bookingDetails.value.ctnInputs = res.data - goodsTable.value.init() + RefgoodsTable.value.init() } else { notification.error({ message: res.message, duration: 3 }) } - goodsTable.value.loadingTable = false + RefgoodsTable.value.loadingTable = false }) } function changeTotalFun(data) { @@ -989,7 +1011,7 @@ function changeTab(e) { tabActiveKey.value = e setTimeout(() => { - sedOrder.value.init(bookingDetails.value.hbList) + RefsedOrder.value.init(bookingDetails.value.hbList) }, 100) } function refreshPage() { @@ -1006,7 +1028,7 @@ } setTimeout(() => { init() - rightContent.value.init() + RefrightContent.value.init() }, 100) } function init() { @@ -1027,11 +1049,11 @@ getFilter() getDefaultVal() setTimeout(() => { - if (Object.keys(that.$refs).includes('sedOrder')) { - sedOrder.value.init([]) + if (Object.keys(that.$refs).includes('RefsedOrder')) { + RefsedOrder.value.init([]) } if (Object.keys(that.$refs).includes('goodsTable')) { - goodsTable.value.init() + RefgoodsTable.value.init() } detailsLoadOver.value = true }, 200) @@ -1318,7 +1340,7 @@ tabActiveKey.value = '2' Showtabs.value = true setTimeout(() => { - sedOrder.value.init(bookingDetails.value.hbList) + RefsedOrder.value.init(bookingDetails.value.hbList) }, 200) } function removeOrderFun() { @@ -1362,7 +1384,7 @@ bookingDetails.value.cntrtotal = slots[0].ctN_STAT bookingDetails.value.startETA = slots[0].eta that.$forceUpdate() - goodsTable.value.init() + RefgoodsTable.value.init() } function handleSaveCtnList(data, slots) { const arr = [] @@ -1373,7 +1395,7 @@ }) bookingDetails.value.ctnInputs = arr bookingDetails.value.slots = slots - goodsTable.value.init() + RefgoodsTable.value.init() } function handleSetCtnList() { bookingDetails.value.slots = [] @@ -1454,9 +1476,9 @@ notification.error({ message: '保存失败，请检查必填项', duration: 3 }) return false } - if (ediMore.value) { + if (RefediMore.value) { let ediFrom = true - ediMore.value.$refs.ediFrom.validate((valid) => { + RefediMore.value.$refs.ediFrom.validate((valid) => { ediFrom = valid }) if (!ediFrom) { @@ -1601,7 +1623,7 @@ setTimeout(() => { inAddSave.value = false getRightAll() - rightContent.value.init() + RefrightContent.value.init() }, 2000) } else if (that.$route.query.mblno === that.bookingDetails.mblno) { that.isCopy = false @@ -1690,7 +1712,7 @@ kindpkgs = item.kindpkgs }) const refsh = () => { - goodsTable.value.handleRefsh() + RefgoodsTable.value.handleRefsh() } const check = () => { if (bookingDetails.value.id !== 0) { @@ -1882,8 +1904,8 @@ isCopy: isCopy.value, id: id.value, } - if (Object.keys(that.$refs).includes('sedOrder')) { - const secActive = sedOrder.value.$data.editIndex + if (Object.keys(that.$refs).includes('RefsedOrder')) { + const secActive = RefsedOrder.value.$data.editIndex hisData.secActive = secActive } historyData.value[`copyMore-${id.value}`] = hisData @@ -1901,13 +1923,13 @@ Showtabs.value = true } if (!hasHbList.value && bookingDetails.value.hbList.length > 0) { - sedOrder.value.init(bookingDetails.value.hbList) + RefsedOrder.value.init(bookingDetails.value.hbList) hasHbList.value = true } else { - sedOrder.value.init([]) + RefsedOrder.value.init([]) } if (bookingDetails.value.ctnInputs.length > 0) { - goodsTable.value.init() + RefgoodsTable.value.init() } }, 1200) that.$forceUpdate() @@ -2130,6 +2152,25 @@ lastPages[key] = $data appStore.setneedSavePages(lastPages) } + function changeHBFun(data) { + const arr = [] + data.map((item: any) => { + arr.push(item.isNoSave) + }) + if (arr.includes(true)) { + bookingDetails.value.hbList = data + checkSaveFun({ type: 'hbList', hasChange: true }) + } else { + checkSaveFun({ type: 'hbList', hasChange: false }) + } + } + function sedOrderRemoveFun(sedData) { + bookingDetails.value.hbList = sedData + if (sedData.length === 0) { + Showtabs.value = false + tabActiveKey.value = '1' + } + } - diff --git a/ds-wms-client-web/src/views/operation/seaexport/detail/modules/cargoInfo.vue b/ds-wms-client-web/src/views/operation/seaexport/detail/modules/cargoInfo.vue index 28173b0c..d3b0eb2a 100644 --- a/ds-wms-client-web/src/views/operation/seaexport/detail/modules/cargoInfo.vue +++ b/ds-wms-client-web/src/views/operation/seaexport/detail/modules/cargoInfo.vue @@ -29,7 +29,7 @@ >
Marks & Nos.(标记与号码)
- +
+ +
+
+
+ + Description of Goods (包装种类与货名)
+ + + + +
+
+
货物标志
+ + + +
+
+
HS编码
+ + + +
+
+ +
+ +
+
{{ + num.length + }}
+
+
+ + + + + +
+ + +
+ + + + + + + + + + +
+ + + KGS +
+ + + + +
+ + + CBM +
+ + + + + + + 件数大写: + +
+ +
+
+ +
+
{{ + num.length + }}
+
+
+
+ +
+
{{ + num.length + }}
+
+
+
+ + +
+ + +
+ +
+
总计：{{ pkgstotalRes }}
+ + + +
+ +
+
总计：{{ kgstotalRes }} / KGS
+ + + +
+ +
+
总计：{{ cbmtotalRes }} / CBM
+ +
+ + diff --git a/ds-wms-client-web/src/views/operation/seaexport/detail/modules/goodsTable.vue b/ds-wms-client-web/src/views/operation/seaexport/detail/modules/goodsTable.vue index 9a8dee17..8dfe2f29 100644 --- a/ds-wms-client-web/src/views/operation/seaexport/detail/modules/goodsTable.vue +++ b/ds-wms-client-web/src/views/operation/seaexport/detail/modules/goodsTable.vue @@ -76,7 +76,7 @@
- 加载中 ...
- 暂无数据 -