From b5ec40c9dde2cb391bac424a9763b6c6873bd04c Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Mon, 1 Sep 2025 15:22:32 +0800
Subject: [PATCH] vat

---
 src/views/modules/ecss/codelnotify.vue        | 25 ++++++++-
 src/views/modules/ecss/codelnotifyConfirm.vue | 54 +++++++++++++++++++
 src/views/modules/ecss/createDeclaration.vue  | 54 +++++++++++++++++++
 3 files changed, 131 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/ecss/codelnotify.vue b/src/views/modules/ecss/codelnotify.vue
index ffb8f82..f2ff45b 100644
--- a/src/views/modules/ecss/codelnotify.vue
+++ b/src/views/modules/ecss/codelnotify.vue
@@ -351,6 +351,11 @@
               <el-input v-model="updateDetailModel.ttlAmount" type="number" ></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'VAT'" >
+              <el-input v-model="updateDetailModel.vat"  ></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item :label="'价税合计'" >
               <el-input v-model="updateDetailModel.sumPrice" type="number" ></el-input>
@@ -366,7 +371,17 @@
               <el-input v-model="updateDetailModel.upc"  ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
+            <el-form-item :label="'Roll'" >
+              <el-input v-model="updateDetailModel.roll"  ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'Carton'" >
+              <el-input v-model="updateDetailModel.carton"  ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="18">
             <el-form-item :label="'Remark'" >
               <el-input v-model="updateDetailModel.remark"  ></el-input>
             </el-form-item>
@@ -812,7 +827,10 @@
           upc:'',
           remark:'',
           pn:'',
-          addFlag:''
+          addFlag:'',
+          carton:'',
+          vat:'',
+          roll:'',
         },
         activeName:'detail',
         columnList1: [
@@ -2118,6 +2136,9 @@
         this.updateDetailModel.upc=''
         this.updateDetailModel.remark=''
         this.updateDetailModel.pn=''
+        this.updateDetailModel.roll=''
+        this.updateDetailModel.carton=''
+        this.updateDetailModel.vat=''
         this.updateDetailModel.addFlag=0
         this.updateDetailModelFlag=true
       },
diff --git a/src/views/modules/ecss/codelnotifyConfirm.vue b/src/views/modules/ecss/codelnotifyConfirm.vue
index b6cb38c..fde3194 100644
--- a/src/views/modules/ecss/codelnotifyConfirm.vue
+++ b/src/views/modules/ecss/codelnotifyConfirm.vue
@@ -1340,6 +1340,24 @@
             fixed: '',
             columnWidth: 80
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 801001,
+            serialNumber: '801001Table2Remark',
+            tableId: "801001Table2",
+            tableName: "关务系统发货通知单明细",
+            columnProp: "vat",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "VAT",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 801002,
@@ -1412,6 +1430,42 @@
             fixed: '',
             columnWidth: 300
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 801001,
+            serialNumber: '801001Table2Remark',
+            tableId: "801001Table2",
+            tableName: "关务系统发货通知单明细",
+            columnProp: "roll",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "Roll",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 801001,
+            serialNumber: '801001Table2Remark',
+            tableId: "801001Table2",
+            tableName: "关务系统发货通知单明细",
+            columnProp: "carton",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "Carton",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },
         ],
         columnList3:[
           {
diff --git a/src/views/modules/ecss/createDeclaration.vue b/src/views/modules/ecss/createDeclaration.vue
index dfe7bbd..effc54a 100644
--- a/src/views/modules/ecss/createDeclaration.vue
+++ b/src/views/modules/ecss/createDeclaration.vue
@@ -1113,6 +1113,24 @@
             fixed: '',
             columnWidth: 80
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 801001,
+            serialNumber: '801001Table2Remark',
+            tableId: "801001Table2",
+            tableName: "关务系统发货通知单明细",
+            columnProp: "vat",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "VAT",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 801001,
@@ -1203,6 +1221,42 @@
             fixed: '',
             columnWidth: 300
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 801001,
+            serialNumber: '801001Table2Remark',
+            tableId: "801001Table2",
+            tableName: "关务系统发货通知单明细",
+            columnProp: "roll",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "Roll",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 801001,
+            serialNumber: '801001Table2Remark',
+            tableId: "801001Table2",
+            tableName: "关务系统发货通知单明细",
+            columnProp: "carton",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "Carton",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },
         ],
 
         currentRow:{},