From 8ef68fc0bf4c759b960b3c2e015723142b16fbe5 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Tue, 9 Sep 2025 11:25:28 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=94=B6=E6=AC=BE=E6=98=8E=E7=BB=86?=
=?UTF-8?q?=E5=AE=9A=E5=88=B6=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/emis/emisSettlePayRecord/index.vue | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/views/emis/emisSettlePayRecord/index.vue b/src/views/emis/emisSettlePayRecord/index.vue
index 7f23dcd2..8eb9e4d2 100644
--- a/src/views/emis/emisSettlePayRecord/index.vue
+++ b/src/views/emis/emisSettlePayRecord/index.vue
@@ -131,7 +131,6 @@
plain
icon="el-icon-download"
size="mini"
- :disabled="single"
@click="handleCustomExport"
v-hasPermi="['emis:emisSettlePayRecord:customExport']"
>定制导出
@@ -822,10 +821,10 @@ export default {
},
//定制导出
handleCustomExport(){
- let settleBillNo = this.selectList[0].settleBillNo;
+ let qParam=this.initQueryParams();
//获取选中
this.download('emis/emisSettlePayRecord/customExport', {
- 'settleBillNo':settleBillNo
+ ...qParam
}, `定制收款明细列表.xlsx`)
},
}
From 5f80518aab405600f262c53a154cbdf6fbfa80ff Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Tue, 9 Sep 2025 14:54:00 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=94=B6=E6=AC=BE?=
=?UTF-8?q?=E6=98=8E=E7=BB=86=E5=88=97=E8=A1=A8=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/emis/emisSettlePayRecord/index.vue | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/views/emis/emisSettlePayRecord/index.vue b/src/views/emis/emisSettlePayRecord/index.vue
index 8eb9e4d2..bfecc59b 100644
--- a/src/views/emis/emisSettlePayRecord/index.vue
+++ b/src/views/emis/emisSettlePayRecord/index.vue
@@ -182,6 +182,10 @@
+
+
+
+
@@ -192,16 +196,11 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
From b13bc01ae0915d99a15a211de245569062381346 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Wed, 10 Sep 2025 13:05:27 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=BC=8F=E7=BB=84=E6=89=B9=E6=AC=A1?=
=?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/emis/emisTmsSiteBatchMiss/index.vue | 21 +++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/views/emis/emisTmsSiteBatchMiss/index.vue b/src/views/emis/emisTmsSiteBatchMiss/index.vue
index c5b6fb28..28431f23 100644
--- a/src/views/emis/emisTmsSiteBatchMiss/index.vue
+++ b/src/views/emis/emisTmsSiteBatchMiss/index.vue
@@ -79,7 +79,15 @@
-
+
+
+
+
+
+
+
+
+
@@ -193,7 +201,9 @@
否
-
+
+
+
@@ -242,6 +252,10 @@ import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vu
import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+import EmpNamePicker3 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+import EmpNamePicker4 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+import EmpNamePicker5 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+
import {timeFormat} from '@/utils/dateUtils'
import confirmForm from "@/views/emis/emisTmsSiteBatchMiss/confirmForm.vue";
@@ -253,6 +267,9 @@ export default {
EmisSupplierPicker,
EmisSiteSimplePicker1,
EmisSiteSimplePicker2,
+ EmpNamePicker3,
+ EmpNamePicker4,
+ EmpNamePicker5,
TransLinePicker,
TransProductPicker,
EmpNamePicker1,
From c1e9f5d0aad5462dbfa91d5b5b222c9307cc0d06 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Wed, 10 Sep 2025 14:29:11 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E6=9D=83=E9=87=8D?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../emis/emisSpecialCalcWeight/index.vue | 28 +++++++++++++++----
1 file changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/views/emis/emisSpecialCalcWeight/index.vue b/src/views/emis/emisSpecialCalcWeight/index.vue
index 8f201810..3e3d5f29 100644
--- a/src/views/emis/emisSpecialCalcWeight/index.vue
+++ b/src/views/emis/emisSpecialCalcWeight/index.vue
@@ -26,6 +26,23 @@
/>
+
+
+
+
+
+
+
+
@@ -108,17 +125,17 @@
{{scope.row.prodName}}
-
-
-
+
+
+
-
-
+
+
@@ -230,6 +247,7 @@ export default {
prodName: null,
status: null,
carryType: null,
+ expireStatus:null,
},
};
},