From b2aec134e1461742836ec69d67dd3d8e9b422c6e Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Wed, 20 Aug 2025 17:08:09 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E8=B4=A7=E7=89=A9=E7=BB=84=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E5=A4=8D=E5=88=B6=E4=BF=AE=E6=94=B9=E4=BA=BA=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=BD=91=E7=82=B9=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue index e7640977..525af74b 100644 --- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue +++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue @@ -902,6 +902,13 @@ export default { } else { this.isDoing=true; try{ + if(this.isCopy){ + this.form.updateTime = null; + this.form.updateBy = null; + this.form.updateByName = null; + this.form.updateSite = null; + this.form.updateSiteName = null; + } let res=await addAllEmisTmsSiteBatch(this.form); this.isDoing=false; this.$modal.msgSuccess("新增成功"); From 6c87ce1b1c68a54c37aa650225f3edd4201d2910 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Thu, 21 Aug 2025 11:30:37 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E5=AF=84=E4=BB=B6=E7=BD=91=E7=82=B9?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue | 2 +- src/views/emis/emisWaybill/waybillGot.vue | 2 +- src/views/emis/emisWaybill/waybillModify.vue | 2 +- src/views/emis/emisWaybill/waybillRecord.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue b/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue index e80f8ac4..a2fe31a5 100644 --- a/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue +++ b/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue @@ -152,7 +152,7 @@ if(key==null && val==null){ this.defaultItems=[...this.optionItems] }else{ - // this.onChange(); + this.onChange(); } }); }, diff --git a/src/views/emis/emisWaybill/waybillGot.vue b/src/views/emis/emisWaybill/waybillGot.vue index 21bdee53..db5f41b2 100644 --- a/src/views/emis/emisWaybill/waybillGot.vue +++ b/src/views/emis/emisWaybill/waybillGot.vue @@ -839,7 +839,7 @@ import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePick import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue'; import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue'; import EmisUserSimplePicker3 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue'; -import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue'; +import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker2.vue'; import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue'; import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue'; diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue index d762c6c0..3ab5d4d3 100644 --- a/src/views/emis/emisWaybill/waybillModify.vue +++ b/src/views/emis/emisWaybill/waybillModify.vue @@ -839,7 +839,7 @@ import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePick import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue'; import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue'; import EmisUserSimplePicker3 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue'; -import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue'; +import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker2.vue'; import SeaSiteSimplePicker0 from '@/views/emis/EmisBaseTools/SeaSiteSimplePicker.vue'; import SeaSiteSimplePicker1 from '@/views/emis/EmisBaseTools/SeaSiteSimplePicker.vue'; diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue index 3f274843..b589f1f4 100644 --- a/src/views/emis/emisWaybill/waybillRecord.vue +++ b/src/views/emis/emisWaybill/waybillRecord.vue @@ -841,7 +841,7 @@ import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePick import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue'; import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue'; import EmisUserSimplePicker3 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue'; -import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue'; +import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker2.vue'; import SeaSiteSimplePicker0 from '@/views/emis/EmisBaseTools/SeaSiteSimplePicker.vue'; import SeaSiteSimplePicker1 from '@/views/emis/EmisBaseTools/SeaSiteSimplePicker.vue'; From c3b6f7df1cabc2f0ca6f7ad8873b154e78953fbb Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Thu, 21 Aug 2025 15:08:13 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E7=90=86=E8=B5=94=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/emis/emisCreditSalesmen.js | 9 + src/views/emis/emisCreditSalesmen/index.vue | 28 +- .../emisWaybill/CreditSendWaybillList.vue | 2 +- .../SatisfyMoneySendWaybillList .vue | 607 ++++++++++++++++++ 4 files changed, 643 insertions(+), 3 deletions(-) create mode 100644 src/views/emis/emisWaybill/SatisfyMoneySendWaybillList .vue diff --git a/src/api/emis/emisCreditSalesmen.js b/src/api/emis/emisCreditSalesmen.js index 1b0c08fe..17c8de83 100644 --- a/src/api/emis/emisCreditSalesmen.js +++ b/src/api/emis/emisCreditSalesmen.js @@ -42,3 +42,12 @@ export function delEmisCreditSalesmen(id) { method: 'delete' }) } + +//理赔金额明细 +export function getEmisCreditSalesmenDetail(params) { + return request({ + url: '/emis/emisCreditSalesmen/getSalesSatisfyDetail', + method: 'get', + params: params + }) +} diff --git a/src/views/emis/emisCreditSalesmen/index.vue b/src/views/emis/emisCreditSalesmen/index.vue index e665fdcf..eaa6e0fe 100644 --- a/src/views/emis/emisCreditSalesmen/index.vue +++ b/src/views/emis/emisCreditSalesmen/index.vue @@ -40,7 +40,7 @@ slot-scope="slotProps" :height="(slotProps.contentHeight)+'px'" ref="refTable" - storageName="emisCreditSalesmenList_main_250426" + storageName="emisCreditSalesmenList_main_250820" border stripe size="small" @@ -108,7 +108,7 @@ @@ -126,6 +126,11 @@
{{ scope.row.overTermMoney }}
 + + + @@ -204,7 +232,7 @@ import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue'; import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue'; import {timeFormat} from '@/utils/dateUtils' - +import confirmForm from "@/views/emis/emisTmsSiteBatchMiss/confirmForm.vue"; export default { name: "EmisTmsSiteBatchMiss", @@ -217,7 +245,8 @@ export default { TransLinePicker, TransProductPicker, EmpNamePicker1, - EmpNamePicker2 + EmpNamePicker2, + confirmForm }, dicts: ['emis_payment_type'], data() { @@ -230,6 +259,7 @@ export default { single: true, // 非多个禁用 multiple: true, + confirmDisabled:true, // 显示搜索条件 showSearch: true, // 创建时间搜索 @@ -243,6 +273,7 @@ export default { currentId:null, openForm: false, + openConfirmForm: false, titleForm: "", // 弹出展示层 @@ -268,6 +299,7 @@ export default { missCount:null, sendSiteCode:null }, + billCodeList:[] // 选中的单号 }; }, created() { @@ -327,6 +359,7 @@ export default { this.single = selection.length!==1 this.multiple = !selection.length this.selectList = selection + this.confirmDisabled = selection.length ===0; }, // 排序 查询字段是表格中字段名字 动态取值排序顺序 handleSortChange(column) { @@ -482,6 +515,17 @@ export default { if (j === 'paymentType') { return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]); } + if(j === 'blManual'){ + if(v[j] == 1){ + return '系统审核完成'; + } + else if(v[j] == 2){ + return '人工审核完成'; + } + else if(v[j] == 3){ + return '无需组批次'; + } + } return v[j] })) }, @@ -494,6 +538,19 @@ export default { dateTimeChange(value){ this.dateTimeRange=value; }, + //确认组批次完成 + handleConfirm(){ + //有选中值 + this.openConfirmForm= true; + //获取选择数据的 运单号 + this.billCodeList=[]; + this.selectList.forEach(item=>{ + this.billCodeList.push(item.billCode); + }) + }, + handleCancel(){ + this.openConfirmForm= false; + } } }; From 990198639c927c9a2081205ec34fc66b0be942ea Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Thu, 21 Aug 2025 17:46:47 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E7=90=86=E8=B5=94=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/emis/emisCreditSalesmen.js | 9 + src/api/emis/emisTmsSiteBatchMiss.js | 9 + src/views/emis/emisCreditSalesmen/index.vue | 28 +- .../emis/emisTmsSiteBatchMiss/confirmForm.vue | 97 +++ src/views/emis/emisTmsSiteBatchMiss/index.vue | 61 +- .../SatisfyMoneySendWaybillList .vue | 607 ++++++++++++++++++ 6 files changed, 807 insertions(+), 4 deletions(-) create mode 100644 src/views/emis/emisTmsSiteBatchMiss/confirmForm.vue create mode 100644 src/views/emis/emisWaybill/SatisfyMoneySendWaybillList .vue diff --git a/src/api/emis/emisCreditSalesmen.js b/src/api/emis/emisCreditSalesmen.js index 1b0c08fe..17c8de83 100644 --- a/src/api/emis/emisCreditSalesmen.js +++ b/src/api/emis/emisCreditSalesmen.js @@ -42,3 +42,12 @@ export function delEmisCreditSalesmen(id) { method: 'delete' }) } + +//理赔金额明细 +export function getEmisCreditSalesmenDetail(params) { + return request({ + url: '/emis/emisCreditSalesmen/getSalesSatisfyDetail', + method: 'get', + params: params + }) +} diff --git a/src/api/emis/emisTmsSiteBatchMiss.js b/src/api/emis/emisTmsSiteBatchMiss.js index 268dd23e..6ce5a6ae 100644 --- a/src/api/emis/emisTmsSiteBatchMiss.js +++ b/src/api/emis/emisTmsSiteBatchMiss.js @@ -42,3 +42,12 @@ export function delEmisTmsSiteBatchMiss(id) { method: 'delete' }) } + +// 确认组批次完成 +export function confirmBatch(data) { + return request({ + url: '/emis/emisTmsSiteBatchMiss/confirmBatch', + method: 'post', + data: data + }) +} diff --git a/src/views/emis/emisCreditSalesmen/index.vue b/src/views/emis/emisCreditSalesmen/index.vue index e665fdcf..eaa6e0fe 100644 --- a/src/views/emis/emisCreditSalesmen/index.vue +++ b/src/views/emis/emisCreditSalesmen/index.vue @@ -40,7 +40,7 @@ slot-scope="slotProps" :height="(slotProps.contentHeight)+'px'" ref="refTable" - storageName="emisCreditSalesmenList_main_250426" + storageName="emisCreditSalesmenList_main_250820" border stripe size="small" @@ -108,7 +108,7 @@ @@ -126,6 +126,11 @@
{{ scope.row.overTermMoney }}
 + + + @@ -204,7 +232,7 @@ import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue'; import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue'; import {timeFormat} from '@/utils/dateUtils' - +import confirmForm from "@/views/emis/emisTmsSiteBatchMiss/confirmForm.vue"; export default { name: "EmisTmsSiteBatchMiss", @@ -217,7 +245,8 @@ export default { TransLinePicker, TransProductPicker, EmpNamePicker1, - EmpNamePicker2 + EmpNamePicker2, + confirmForm }, dicts: ['emis_payment_type'], data() { @@ -230,6 +259,7 @@ export default { single: true, // 非多个禁用 multiple: true, + confirmDisabled:true, // 显示搜索条件 showSearch: true, // 创建时间搜索 @@ -243,6 +273,7 @@ export default { currentId:null, openForm: false, + openConfirmForm: false, titleForm: "", // 弹出展示层 @@ -268,6 +299,7 @@ export default { missCount:null, sendSiteCode:null }, + billCodeList:[] // 选中的单号 }; }, created() { @@ -327,6 +359,7 @@ export default { this.single = selection.length!==1 this.multiple = !selection.length this.selectList = selection + this.confirmDisabled = selection.length ===0; }, // 排序 查询字段是表格中字段名字 动态取值排序顺序 handleSortChange(column) { @@ -482,6 +515,17 @@ export default { if (j === 'paymentType') { return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]); } + if(j === 'blManual'){ + if(v[j] == 1){ + return '系统审核完成'; + } + else if(v[j] == 2){ + return '人工审核完成'; + } + else if(v[j] == 3){ + return '无需组批次'; + } + } return v[j] })) }, @@ -494,6 +538,19 @@ export default { dateTimeChange(value){ this.dateTimeRange=value; }, + //确认组批次完成 + handleConfirm(){ + //有选中值 + this.openConfirmForm= true; + //获取选择数据的 运单号 + this.billCodeList=[]; + this.selectList.forEach(item=>{ + this.billCodeList.push(item.billCode); + }) + }, + handleCancel(){ + this.openConfirmForm= false; + } } }; diff --git a/src/views/emis/emisWaybill/SatisfyMoneySendWaybillList .vue b/src/views/emis/emisWaybill/SatisfyMoneySendWaybillList .vue new file mode 100644 index 00000000..f170118f --- /dev/null +++ b/src/views/emis/emisWaybill/SatisfyMoneySendWaybillList .vue @@ -0,0 +1,607 @@ + + + + + From e64747594e35d1e606b9b2011e2a2b3b15284457 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Fri, 22 Aug 2025 14:57:53 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E7=BB=84=E6=89=B9=E6=AC=A1=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=A8=A1=E5=9D=97=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E3=80=81=E5=8F=96=E6=B6=88=E7=A1=AE=E8=AE=A4=E6=89=B9=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/tpl/import_site_batch.xlsx | Bin 10028 -> 10710 bytes src/api/emis/emisTmsSiteBatchMiss.js | 8 ++++ src/views/emis/emisTmsSiteBatchMiss/index.vue | 36 +++++++++++++++++- 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/public/static/tpl/import_site_batch.xlsx b/public/static/tpl/import_site_batch.xlsx index 2022c70d0ed28767830191863425162a7c5e7fad..578dab16f85261a4acee63b80399be137efba9cc 100644 GIT binary patch literal 10710 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 delta 7684 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 GyZ;03(5E&4 diff --git a/src/api/emis/emisTmsSiteBatchMiss.js b/src/api/emis/emisTmsSiteBatchMiss.js index 6ce5a6ae..85d999d7 100644 --- a/src/api/emis/emisTmsSiteBatchMiss.js +++ b/src/api/emis/emisTmsSiteBatchMiss.js @@ -51,3 +51,11 @@ export function confirmBatch(data) { data: data }) } +// 取消确认批次 +export function cancelConfirmBatch(data) { + return request({ + url: '/emis/emisTmsSiteBatchMiss/cancelConfirmBatch', + method: 'post', + data: data + }) +} diff --git a/src/views/emis/emisTmsSiteBatchMiss/index.vue b/src/views/emis/emisTmsSiteBatchMiss/index.vue index 9d38b119..c5b6fb28 100644 --- a/src/views/emis/emisTmsSiteBatchMiss/index.vue +++ b/src/views/emis/emisTmsSiteBatchMiss/index.vue @@ -134,8 +134,18 @@ size="mini" @click="handleConfirm" :disabled="confirmDisabled" + v-hasPermi="['emis:emisTmsSiteBatchMiss:confirm']" >确认组批次完成 + + 取消确认批次 + @@ -212,7 +222,8 @@