瀏覽代碼

修改费用明细 文件中心 调整合计格式

Qukatie 5 月之前
父節點
當前提交
7e161d9e8f

+ 1 - 1
src/views/iosBasicData/AirtransportExport/bills/assembly/filescenter.vue

@@ -269,7 +269,7 @@ export default {
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'url', res.link)
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'fileName', res.originalName)
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'fileExt', res.originalName)
-      this.$set(this.assemblyForm.filesList[this.selectIndex], 'serialNo', res.originalName.split('.')[0])
+      this.$set(this.assemblyForm.filesList[this.selectIndex], 'serialNo', this.selectIndex+1)
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'isImage',0)
       loading = false;
       done();

+ 1 - 1
src/views/iosBasicData/AirtransportImport/bills/assembly/filescenter.vue

@@ -269,7 +269,7 @@ export default {
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'url', res.link)
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'fileName', res.originalName)
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'fileExt', res.originalName)
-      this.$set(this.assemblyForm.filesList[this.selectIndex], 'serialNo', res.originalName.split('.')[0])
+      this.$set(this.assemblyForm.filesList[this.selectIndex], 'serialNo', this.selectIndex+1)
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'isImage',0)
       loading = false;
       done();

+ 2 - 2
src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -254,7 +254,7 @@
                         <span class="weightnum">${{ form.amountCrUsd || 0 }}</span>
                     </div>
                 </el-col>
-                <el-col :span="3">
+                <el-col :span="6">
                     <div class="bottomFlex" style="color: #6BBCD1">
                         <span>应付合计:</span>
                         <span class="weightnum">¥{{ form.amountCrLoc || 0 }}</span>
@@ -272,7 +272,7 @@
                         <span class="weightnum">${{ form.amountDrUsd || 0 }}</span>
                     </div>
                 </el-col>
-                <el-col :span="3">
+                <el-col :span="6">
                     <div class="bottomFlex" style="color: #81B337">
                         <span>应收合计:</span>
                         <span class="weightnum">¥{{ form.amountDrLoc || 0 }}</span>

+ 67 - 4
src/views/iosBasicData/OceanFreightImport/bills/assembly/feecenter.vue

@@ -209,7 +209,7 @@
                         plain size="small" :disabled="disabled || pleasereviewType" @click="copyfun('C')">生成应收
                     </el-button>
                     <el-button type="info" plain size="small" :disabled="disabled"
-                    @click="allClick('付费申请', 'C')">付费申请</el-button>
+                        @click="allClick('付费申请', 'C')">付费申请</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
                     <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary"
@@ -286,9 +286,8 @@
                     <span v-else>{{ row.price }}</span>
                 </template>
                 <template slot="quantity" slot-scope="{ row }">
-                    <el-input-number v-if="row.edit" v-model="row.quantity" size="small" :min="1"
-                        :controls="false" :precision="3" placeholder="请输入"
-                        @blur="quantityinputfun(row)"></el-input-number>
+                    <el-input-number v-if="row.edit" v-model="row.quantity" size="small" :min="1" :controls="false"
+                        :precision="3" placeholder="请输入" @blur="quantityinputfun(row)"></el-input-number>
                     <span v-else>{{ row.quantity }}</span>
                 </template>
                 <template slot="remarks" slot-scope="{ row }">
@@ -306,6 +305,70 @@
         <avue-crud v-show="assemblyForm.feeCenterAmendList.length > 0" id="out-table" class="box-card"
             :header-cell-class-name="headerClassName" ref="crud" :row-style="{ height: '16px' }"
             :cell-style="{ padding: '0px' }" :data="assemblyForm.feeCenterAmendList" :option="amendOption"></avue-crud>
+        <div v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('利润查看') != -1 || ((roleName.indexOf('应收修改') != -1 || roleName.indexOf('应收查看') != -1) && (roleName.indexOf('应付修改') != -1 || roleName.indexOf('应付查看') != -1))"
+            style="display: flex;align-items: center;justify-content: space-around">
+            <div style="width: 30%">
+                <div class="bottomFlex" style="justify-content: space-around">
+                    <div>
+                        <div style="color: #81B337">
+                            <span>Amend应收:</span>
+                            <span class="weightnum">¥{{ assemblyForm.amountDrAmend }}元</span>
+                        </div>
+                    </div>
+                    <div>
+                        <div style="color: #6BBCD1">
+                            <span>Amend应付:</span>
+                            <span class="weightnum">¥{{ assemblyForm.amountCrAmend }}元</span>
+                        </div>
+                    </div>
+                    <div class="bottomFlex">
+                        <span>Amend利润:</span>
+                        <span>¥{{ assemblyForm.amountProfitAmend }}元</span>
+                    </div>
+                </div>
+            </div>
+            <div style="width: 30%">
+                <div class="bottomFlex" style="justify-content: space-around">
+                    <div>
+                        <div style="color: #81B337">
+                            <span>Amend应收:</span>
+                            <span class="weightnum">${{ assemblyForm.amountDrUsdAmend }}元</span>
+                        </div>
+                    </div>
+                    <div>
+                        <div style="color: #6BBCD1">
+                            <span>Amend应付:</span>
+                            <span class="weightnum">${{ assemblyForm.amountCrUsdAmend }}元</span>
+                        </div>
+                    </div>
+                    <div class="bottomFlex">
+                        <span>Amend利润:</span>
+                        <span>${{ assemblyForm.amountProfitUsdAmend }}元</span>
+                    </div>
+                </div>
+            </div>
+            <div style="width: 30%">
+                <div class="bottomFlex" style="justify-content: space-around">
+                    <div>
+                        <div style="color: #81B337">
+                            <span>Amend应收:</span>
+                            <span class="weightnum">¥{{ assemblyForm.amountDrLocAmend }}元</span>
+                        </div>
+
+                    </div>
+                    <div>
+                        <div style="color: #6BBCD1">
+                            <span>Amend应付:</span>
+                            <span class="weightnum">¥{{ assemblyForm.amountCrLocAmend }}元</span>
+                        </div>
+                    </div>
+                    <div class="bottomFlex">
+                        <span>Amend利润:</span>
+                        <span>¥{{ assemblyForm.amountProfitLocAmend }}元</span>
+                    </div>
+                </div>
+            </div>
+        </div>
         <avue-crud id="out-table" class="box-card" :header-cell-class-name="headerClassName" ref="crud"
             :row-style="{ height: '16px' }" :cell-style="{ padding: '0px' }" :option="sumOption"
             :data="sumData"></avue-crud>

+ 1 - 1
src/views/iosBasicData/OceanFreightImport/bills/assembly/filescenter.vue

@@ -272,7 +272,7 @@ export default {
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'url', res.link)
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'fileName', res.originalName)
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'fileExt', res.originalName)
-      this.$set(this.assemblyForm.filesList[this.selectIndex], 'serialNo', res.originalName.split('.')[0])
+      this.$set(this.assemblyForm.filesList[this.selectIndex], 'serialNo',this.selectIndex+1)
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'isImage',0)
       loading = false;
       done();

+ 2 - 2
src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -274,7 +274,7 @@
                         <span class="weightnum">${{ form.amountCrUsd || 0 }}</span>
                     </div>
                 </el-col>
-                <el-col :span="3">
+                <el-col :span="6">
                     <div class="bottomFlex" style="color: #6BBCD1">
                         <span>应付合计:</span>
                         <span class="weightnum">¥{{ form.amountCrLoc || 0 }}</span>
@@ -292,7 +292,7 @@
                         <span class="weightnum">${{ form.amountDrUsd || 0 }}</span>
                     </div>
                 </el-col>
-                <el-col :span="3">
+                <el-col :span="6">
                     <div class="bottomFlex" style="color: #81B337">
                         <span>应收合计:</span>
                         <span class="weightnum">¥{{ form.amountDrLoc || 0 }}</span>

+ 64 - 0
src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -313,6 +313,70 @@
         <avue-crud v-show="assemblyForm.feeCenterAmendList.length > 0" id="out-table" class="box-card"
             :header-cell-class-name="headerClassName" ref="crud" :row-style="{ height: '16px' }"
             :cell-style="{ padding: '0px' }" :data="assemblyForm.feeCenterAmendList" :option="amendOption"></avue-crud>
+        <div v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('利润查看') != -1 || ((roleName.indexOf('应收修改') != -1 || roleName.indexOf('应收查看') != -1) && (roleName.indexOf('应付修改') != -1 || roleName.indexOf('应付查看') != -1))"
+            style="display: flex;align-items: center;justify-content: space-around">
+            <div style="width: 30%">
+                <div class="bottomFlex" style="justify-content: space-around">
+                    <div>
+                        <div style="color: #81B337">
+                            <span>Amend应收:</span>
+                            <span class="weightnum">¥{{ assemblyForm.amountDrAmend }}元</span>
+                        </div>
+                    </div>
+                    <div>
+                        <div style="color: #6BBCD1">
+                            <span>Amend应付:</span>
+                            <span class="weightnum">¥{{ assemblyForm.amountCrAmend }}元</span>
+                        </div>
+                    </div>
+                    <div class="bottomFlex">
+                        <span>Amend利润:</span>
+                        <span>¥{{ assemblyForm.amountProfitAmend }}元</span>
+                    </div>
+                </div>
+            </div>
+            <div style="width: 30%">
+                <div class="bottomFlex" style="justify-content: space-around">
+                    <div>
+                        <div style="color: #81B337">
+                            <span>Amend应收:</span>
+                            <span class="weightnum">${{ assemblyForm.amountDrUsdAmend }}元</span>
+                        </div>
+                    </div>
+                    <div>
+                        <div style="color: #6BBCD1">
+                            <span>Amend应付:</span>
+                            <span class="weightnum">${{ assemblyForm.amountCrUsdAmend }}元</span>
+                        </div>
+                    </div>
+                    <div class="bottomFlex">
+                        <span>Amend利润:</span>
+                        <span>${{ assemblyForm.amountProfitUsdAmend }}元</span>
+                    </div>
+                </div>
+            </div>
+            <div style="width: 30%">
+                <div class="bottomFlex" style="justify-content: space-around">
+                    <div>
+                        <div style="color: #81B337">
+                            <span>Amend应收:</span>
+                            <span class="weightnum">¥{{ assemblyForm.amountDrLocAmend }}元</span>
+                        </div>
+
+                    </div>
+                    <div>
+                        <div style="color: #6BBCD1">
+                            <span>Amend应付:</span>
+                            <span class="weightnum">¥{{ assemblyForm.amountCrLocAmend }}元</span>
+                        </div>
+                    </div>
+                    <div class="bottomFlex">
+                        <span>Amend利润:</span>
+                        <span>¥{{ assemblyForm.amountProfitLocAmend }}元</span>
+                    </div>
+                </div>
+            </div>
+        </div>
         <avue-crud id="out-table" class="box-card" :header-cell-class-name="headerClassName" ref="crud"
             :row-style="{ height: '16px' }" :cell-style="{ padding: '0px' }" :option="sumOption"
             :data="sumData"></avue-crud>

+ 1 - 1
src/views/iosBasicData/SeafreightExportF/bills/assembly/filescenter.vue

@@ -275,7 +275,7 @@ export default {
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'url', res.link)
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'fileName', res.originalName)
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'fileExt', res.originalName)
-      this.$set(this.assemblyForm.filesList[this.selectIndex], 'serialNo', res.originalName.split('.')[0])
+      this.$set(this.assemblyForm.filesList[this.selectIndex], 'serialNo',this.selectIndex+1)
       this.$set(this.assemblyForm.filesList[this.selectIndex], 'isImage',0)
       loading = false;
       done();

+ 63 - 60
src/views/iosBasicData/fininvoices/index.vue

@@ -99,6 +99,16 @@ export default {
             overHidden: true,
           },
           {
+            label: "制单人",
+            prop: "createUserName",
+            overHidden: true,
+          }, {
+            label: "制单日期",
+            prop: "createTime",
+            width:100,
+            overHidden: true,
+          },
+          {
             label: "发票日期",
             prop: "invoiceDate",
             overHidden: true,
@@ -146,26 +156,26 @@ export default {
             search: true,
             overHidden: true,
           },
-          {
-            label: "原发票号码",
-            prop: "origInvoiceNo",
-            width: 120,
-            overHidden: true,
-          },
+          // {
+          //   label: "原发票号码",
+          //   prop: "origInvoiceNo",
+          //   width: 120,
+          //   overHidden: true,
+          // },
           {
             label: "税务发票号码",
             prop: "taxInvoiceNo",
             width: 150,
             overHidden: true,
           },
+          // {
+          //   label: "全电发票",
+          //   prop: "invType",
+          //   overHidden: true,
+          // },
           {
-            label: "全电发票",
+            label: "发票类型",
             prop: "invType",
-            overHidden: true,
-          },
-          {
-            label: "普通发票/专用发票",
-            prop: "taxType",
             width: 160,
             overHidden: true,
           },
@@ -238,43 +248,36 @@ export default {
             overHidden: true
           },
           {
-            label: "船名",
-            prop: "vesselCnName",
+            label: "船名/航次",
+            prop: "vesselVoyno",
             search: true,
             searchOrder: 7,
             overHidden: true
           },
           {
-            label: "航次",
-            prop: "voyageNo",
-            search: true,
-            searchOrder: 8,
-            overHidden: true
-          },
-          {
             label: "客户英文名称",
             prop: "corpEnName",
             width: 120,
             overHidden: true,
           },
-          {
-            label: "客户开票单位名称",
-            prop: "corpInvoiceHeader",
-            width: 150,
-            overHidden: true,
-          },
+          // {
+          //   label: "客户开票单位名称",
+          //   prop: "corpInvoiceHeader",
+          //   width: 150,
+          //   overHidden: true,
+          // },
           {
             label: "开票单位中文名称",
             prop: "invCorpCnName",
             width: 160,
             overHidden: true,
           },
-          {
-            label: "开票单位英文名称",
-            prop: "invCorpEnName",
-            width: 150,
-            overHidden: true,
-          },
+          // {
+          //   label: "开票单位英文名称",
+          //   prop: "invCorpEnName",
+          //   width: 150,
+          //   overHidden: true,
+          // },
           {
             label: "开票单位税号",
             prop: "invCorpTaxNo",
@@ -392,21 +395,21 @@ export default {
             prop: "bookingNo",
             overHidden: true,
           },
-          {
-            label: "中文船名",
-            prop: "vesselCnName",
-            overHidden: true,
-          },
-          {
-            label: "英文船名",
-            prop: "vesselEnName",
-            overHidden: true,
-          },
-          {
-            label: "航次",
-            prop: "voyageNo",
-            overHidden: true,
-          },
+          // {
+          //   label: "中文船名",
+          //   prop: "vesselCnName",
+          //   overHidden: true,
+          // },
+          // {
+          //   label: "英文船名",
+          //   prop: "vesselEnName",
+          //   overHidden: true,
+          // },
+          // {
+          //   label: "航次",
+          //   prop: "voyageNo",
+          //   overHidden: true,
+          // },
           {
             label: "财务开始日期",
             prop: "accountDateFrom",
@@ -551,12 +554,12 @@ export default {
             width: "120",
             overHidden: true,
           },
-          {
-            label: "银行进账单出票人名称",
-            prop: "bankReceiptCorpName",
-            width: "160",
-            overHidden: true,
-          },
+          // {
+          //   label: "银行进账单出票人名称",
+          //   prop: "bankReceiptCorpName",
+          //   width: "160",
+          //   overHidden: true,
+          // },
           {
             label: "银行进账单出票银行",
             prop: "bankReceiptBankName",
@@ -569,12 +572,12 @@ export default {
             width: "160",
             overHidden: true,
           },
-          {
-            label: "银行进账单票据种类",
-            prop: "bankReceiptBillType",
-            width: "160",
-            overHidden: true,
-          },
+          // {
+          //   label: "银行进账单票据种类",
+          //   prop: "bankReceiptBillType",
+          //   width: "160",
+          //   overHidden: true,
+          // },
           {
             label: "银行进账单票据张数",
             prop: "bankReceiptBillCount",

+ 1 - 0
src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -1063,6 +1063,7 @@ export default {
             else if (name == 'bankReceiptAccountNo') {
                 for (let item of this.bankReceiptData) {
                     if (item.accountNo == value) {
+                        // this.$set(this.form, 'bankReceiptCorpName', item.accountName)
                         this.$set(this.form, 'bankReceiptAccountNo', item.accountNo)
                         this.$set(this.form, 'bankReceiptBankName', item.accountBank)
                     }

+ 38 - 67
src/views/iosBasicData/fininvoicesApplyfor/index.vue

@@ -78,7 +78,7 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 12,
+        searchMenuSpan: 18,
         border: true,
         index: true,
         viewBtn: true,
@@ -128,11 +128,15 @@ export default {
           {
             label: "单据日期",
             prop: "billDate",
-            rules: [{
-              required: true,
-              message: "请输入单据日期",
-              trigger: "blur"
-            }],
+            overHidden: true,
+          },
+          {
+            label: "制单人",
+            prop: "createUserName",
+            overHidden: true,
+          }, {
+            label: "制单日期",
+            prop: "createTime",
             overHidden: true,
           },
           {
@@ -147,7 +151,7 @@ export default {
             overHidden: true,
           },
           {
-            label: "单据日期",
+            label: "发票日期",
             prop: "invoiceDate",
             overHidden: true,
           },
@@ -188,27 +192,27 @@ export default {
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             searchDefaultTime: ["00:00:00", "23:59:59"],
           },
-          {
-            label: "原发票号码",
-            prop: "origInvoiceNo",
-            width: "120",
-            overHidden: true,
-          },
+          // {
+          //   label: "原发票号码",
+          //   prop: "origInvoiceNo",
+          //   width: "120",
+          //   overHidden: true,
+          // },
           {
             label: "税务发票号码",
             prop: "taxInvoiceNo",
             width: "150",
             overHidden: true,
           },
-          {
-            label: "全电发票",
-            prop: "invType",
-            overHidden: true,
-          },
+          // {
+          //   label: "全电发票",
+          //   prop: "invType",
+          //   overHidden: true,
+          // },
           {
             label: "发票类型",
             search: true,
-            prop: "taxType",
+            prop: "invType",
             width: "160",
             overHidden: true,
           },
@@ -251,19 +255,19 @@ export default {
             overHidden: true
           },
           {
-            label: "船名",
-            prop: "vesselCnName",
+            label: "船名/航次",
+            prop: "vesselVoyno",
             search: true,
             searchOrder: 7,
             overHidden: true
           },
-          {
-            label: "航次",
-            prop: "voyageNo",
-            search: true,
-            searchOrder: 8,
-            overHidden: true
-          },
+          // {
+          //   label: "航次",
+          //   prop: "voyageNo",
+          //   search: true,
+          //   searchOrder: 8,
+          //   overHidden: true
+          // },
           {
             label: "税率 %",
             prop: "taxRate",
@@ -290,18 +294,6 @@ export default {
             overHidden: true,
           },
           {
-            label: "客户英文名称",
-            prop: "corpEnName",
-            width: "120",
-            overHidden: true,
-          },
-          {
-            label: "开票单位英文名称",
-            prop: "invCorpEnName",
-            width: "150",
-            overHidden: true,
-          },
-          {
             label: "开票单位税号",
             prop: "invCorpTaxNo",
             width: "140",
@@ -409,21 +401,6 @@ export default {
             overHidden: true,
           },
           {
-            label: "中文船名",
-            prop: "vesselCnName",
-            overHidden: true,
-          },
-          {
-            label: "英文船名",
-            prop: "vesselEnName",
-            overHidden: true,
-          },
-          {
-            label: "航次",
-            prop: "voyageNo",
-            overHidden: true,
-          },
-          {
             label: "财务开始日期",
             prop: "accountDateFrom",
             width: "100",
@@ -561,12 +538,12 @@ export default {
             width: "120",
             overHidden: true,
           },
-          {
-            label: "银行进账单出票人名称",
-            prop: "bankReceiptCorpName",
-            width: "160",
-            overHidden: true,
-          },
+          // {
+          //   label: "银行进账单出票人名称",
+          //   prop: "bankReceiptCorpName",
+          //   width: "160",
+          //   overHidden: true,
+          // },
           {
             label: "银行进账单出票银行",
             prop: "bankReceiptBankName",
@@ -580,12 +557,6 @@ export default {
             overHidden: true,
           },
           {
-            label: "银行进账单票据种类",
-            prop: "bankReceiptBillType",
-            width: "160",
-            overHidden: true,
-          },
-          {
             label: "银行进账单票据张数",
             prop: "bankReceiptBillCount",
             width: "160",

+ 59 - 62
src/views/iosBasicData/fininvoicesOutput/index.vue

@@ -316,7 +316,7 @@ export default {
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 12,
+                searchMenuSpan: 18,
                 border: true,
                 index: true,
                 selection: true,
@@ -369,11 +369,15 @@ export default {
                     {
                         label: "单据日期",
                         prop: "billDate",
-                        rules: [{
-                            required: true,
-                            message: "请输入单据日期",
-                            trigger: "blur"
-                        }],
+                        overHidden: true,
+                    },
+                    {
+                        label: "制单人",
+                        prop: "createUserName",
+                        overHidden: true,
+                    },                {
+                        label: "制单日期",
+                        prop: "createTime",
                         overHidden: true,
                     },
                     {
@@ -388,7 +392,7 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "单据日期",
+                        label: "发票日期",
                         prop: "invoiceDate",
                         overHidden: true,
                     },
@@ -429,26 +433,26 @@ export default {
                         valueFormat: "yyyy-MM-dd HH:mm:ss",
                         searchDefaultTime: ["00:00:00", "23:59:59"],
                     },
-                    {
-                        label: "原发票号码",
-                        prop: "origInvoiceNo",
-                        width: "120",
-                        overHidden: true,
-                    },
+                    // {
+                    //     label: "原发票号码",
+                    //     prop: "origInvoiceNo",
+                    //     width: "120",
+                    //     overHidden: true,
+                    // },
                     {
                         label: "税务发票号码",
                         prop: "taxInvoiceNo",
                         width: "150",
                         overHidden: true,
                     },
-                    {
-                        label: "全电发票",
-                        prop: "invType",
-                        overHidden: true,
-                    },
+                    // {
+                    //     label: "全电发票",
+                    //     prop: "invType",
+                    //     overHidden: true,
+                    // },
                     {
                         label: "发票类型",
-                        prop: "taxType",
+                        prop: "invType",
                         width: "160",
                         search: true,
                         overHidden: true,
@@ -517,31 +521,24 @@ export default {
                         overHidden: true
                     },
                     {
-                        label: "船名",
-                        prop: "vesselCnName",
+                        label: "船名/航次",
+                        prop: "vesselVoyno",
                         search: true,
                         searchOrder: 7,
                         overHidden: true
                     },
                     {
-                        label: "航次",
-                        prop: "voyageNo",
-                        search: true,
-                        searchOrder: 8,
-                        overHidden: true
-                    },
-                    {
                         label: "客户英文名称",
                         prop: "corpEnName",
                         width: "120",
                         overHidden: true,
                     },
-                    {
-                        label: "开票单位英文名称",
-                        prop: "invCorpEnName",
-                        width: "150",
-                        overHidden: true,
-                    },
+                    // {
+                    //     label: "开票单位英文名称",
+                    //     prop: "invCorpEnName",
+                    //     width: "150",
+                    //     overHidden: true,
+                    // },
                     {
                         label: "开票单位税号",
                         prop: "invCorpTaxNo",
@@ -659,21 +656,21 @@ export default {
                         prop: "bookingNo",
                         overHidden: true,
                     },
-                    {
-                        label: "中文船名",
-                        prop: "vesselCnName",
-                        overHidden: true,
-                    },
-                    {
-                        label: "英文船名",
-                        prop: "vesselEnName",
-                        overHidden: true,
-                    },
-                    {
-                        label: "航次",
-                        prop: "voyageNo",
-                        overHidden: true,
-                    },
+                    // {
+                    //     label: "中文船名",
+                    //     prop: "vesselCnName",
+                    //     overHidden: true,
+                    // },
+                    // {
+                    //     label: "英文船名",
+                    //     prop: "vesselEnName",
+                    //     overHidden: true,
+                    // },
+                    // {
+                    //     label: "航次",
+                    //     prop: "voyageNo",
+                    //     overHidden: true,
+                    // },
                     {
                         label: "财务开始日期",
                         prop: "accountDateFrom",
@@ -812,12 +809,12 @@ export default {
                         width: "120",
                         overHidden: true,
                     },
-                    {
-                        label: "银行进账单出票人名称",
-                        prop: "bankReceiptCorpName",
-                        width: "160",
-                        overHidden: true,
-                    },
+                    // {
+                    //     label: "银行进账单出票人名称",
+                    //     prop: "bankReceiptCorpName",
+                    //     width: "160",
+                    //     overHidden: true,
+                    // },
                     {
                         label: "银行进账单出票银行",
                         prop: "bankReceiptBankName",
@@ -830,12 +827,12 @@ export default {
                         width: "160",
                         overHidden: true,
                     },
-                    {
-                        label: "银行进账单票据种类",
-                        prop: "bankReceiptBillType",
-                        width: "160",
-                        overHidden: true,
-                    },
+                    // {
+                    //     label: "银行进账单票据种类",
+                    //     prop: "bankReceiptBillType",
+                    //     width: "160",
+                    //     overHidden: true,
+                    // },
                     {
                         label: "银行进账单票据张数",
                         prop: "bankReceiptBillCount",
@@ -1108,7 +1105,7 @@ export default {
                 this.$refs.crud.toggleSelection();
                 this.$refs.crud.refreshTable();
             }
-            
+
         },
         // 分页
         currentChange(currentPage) {

+ 0 - 1
src/views/iosBasicData/reportClose/AEreportClose/assembly/feecenter.vue

@@ -1800,7 +1800,6 @@ export default {
                 }
             } else if (name == 'unitNo') {
                 // 计量单位
-                this.$set(row, name, value)
                 for (let item of this.unitNoData) {
                     if (item.code == value) {
                         // 按箱型

+ 1 - 0
src/views/tirePartsMall/purchasingManagement/financingProcurement/detailsPage.vue

@@ -831,6 +831,7 @@ export default {
                         filterable: true,
                         remote: true,
                         hide: true,
+                        showColumn: false,
                         overHidden: true,
                         type: 'select',
                         // dicData: [],

+ 2 - 1
src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/detailsPage.vue

@@ -362,10 +362,11 @@ export default {
                     prop: 'goodsId',
                     width: 200,
                     overHidden: true,
+                    hide: true,
+                    showColumn: false,
                     // disabled: false,
                     // filterable: true,
                     // remote: true,
-                    // hide: true,
                     // type: 'select',
                     // props: {
                     //     label: 'cname',