修改bug

src/components/dicSelect/main.vue

@@ -9,7 +9,7 @@
                     :value="item[keyValue ? keyValue : label]">
                 </el-option>
             </el-select>
-            <el-button v-if="searchShow" icon="el-icon-search" size="small" @click="open()" />
+            <el-button v-if="searchShow" icon="el-icon-search" size="small" :disabled="disabled" @click="open()" />
         </div>
         <el-dialog title="客户" :visible.sync="dialogVisible" width="70%" :before-close="false" @closed="closed"
             append-to-body>

src/components/trade-card/main.vue

@@ -15,7 +15,7 @@
       </div>
     </div>
     <div class="basic-container" :style="styleName" :class="{ 'basic-container--block': block }">
-      <el-card class="basic-container__card">
+      <el-card class="basic-container__card" style="padding: 0 px;">
         <el-collapse-transition>
           <div v-show="show">
             <slot></slot>
@@ -136,4 +136,7 @@ export default {
     padding-top: 6px;
   }
 }
+::v-deep .el-card__body{
+    padding: 0px;
+}
 </style>

src/components/tradeAgency/fee-info.vue

@@ -743,6 +743,7 @@ export default {
                         pid: this.form.id,
                         dc: type,
                         accStatus: 0,
+                        auditStatus:'0',
                         businessType: this.form.businessType,
                         billNo: this.form.businessNo,
                         billDate: this.form.businessDate,
@@ -754,6 +755,7 @@ export default {
                         pid: this.form.id,
                         dc: type,
                         accStatus: 0,
+                        auditStatus:'0',
                         businessType: this.form.businessType,
                         billNo: this.form.businessNo,
                         billDate: this.form.businessDate,
@@ -774,6 +776,7 @@ export default {
                         pid: this.form.id,
                         dc: type,
                         accStatus: 0,
+                        auditStatus:'0',
                         businessType: this.form.businessType,
                         billNo: this.form.businessNo,
                         billDate: this.form.businessDate,
@@ -785,6 +788,7 @@ export default {
                         pid: this.form.id,
                         dc: type,
                         accStatus: 0,
+                        auditStatus:'0',
                         businessType: this.form.businessType,
                         billNo: this.form.businessNo,
                         billDate: this.form.businessDate,
@@ -942,12 +946,21 @@ export default {
             if (name == '一键编辑') {
                 if (type == 'D') {
                     this.form.feeCenterListD.forEach(e => {
-                        this.$set(e, '$cellEdit', true)
+                        if (e.accStatus == 0) {
+                            if(e.auditStatus=='0'){
+                                this.$set(e, '$cellEdit', true)
+                            }
+                           
+                        }
                     })
                 }
                 if (type == 'C') {
                     this.form.feeCenterListC.forEach(e => {
-                        this.$set(e, '$cellEdit', true)
+                        if (e.accStatus == 0) {
+                            if(e.auditStatus=='0'){
+                                this.$set(e, '$cellEdit', true)
+                            }
+                        }
                     })
                 }
             }
@@ -956,9 +969,11 @@ export default {
                 let arr = []
                 for (let index in this.selectionDList) {
                     if (this.selectionDList[index].accStatus == 1) return this.$message.error("第" + (Number(this.selectionDList[index].$index) + 1) + "行不允许删除");
+                    if (this.selectionDList[index].auditStatus != '0') return this.$message.error("第" + (Number(this.selectionDList[index].$index) + 1) + "行不允许删除");
                 }
                 for (let index in this.selectionCList) {
                     if (this.selectionCList[index].accStatus == 1) return this.$message.error("第" + (Number(this.selectionCList[index].$index) + 1) + "行不允许删除");
+                    if (this.selectionCList[index].auditStatus != '0') return this.$message.error("第" + (Number(this.selectionCList[index].$index) + 1) + "行不允许删除");
                 }
                 if (type == 'D') {
                     this.$confirm("确定将选择数据删除?", {

src/components/tradeAgency/fee-infosimple.vue

@@ -62,10 +62,12 @@
                 <span v-else>{{ row.stlExrate }}</span>
             </tempalte>
             <template slot-scope="{type,size,row,index}" slot="menu">
-                <el-button v-if="row.feeCnName == '预付款'" size="small" type="text" :disabled="disabled" @click="tip(row, index)">{{ row.$cellEdit
-                    ?
-                    '保 存' : '编 辑' }}</el-button>
-                <el-button v-if="row.feeCnName == '预付款'" size="small" type="text" :disabled="disabled" @click="rowDel(row, index)">删
+                <el-button v-if="row.feeCnName == '预付款'" size="small" type="text" :disabled="disabled"
+                    @click="tip(row, index)">{{ row.$cellEdit
+                        ?
+                        '保 存' : '编 辑' }}</el-button>
+                <el-button v-if="row.feeCnName == '预付款'" size="small" type="text" :disabled="disabled"
+                    @click="rowDel(row, index)">删
                     除</el-button>
             </template>
 
@@ -713,7 +715,9 @@ export default {
             if (name == '一键编辑') {
                 if (type == 'C') {
                     this.form.feeCenterListC.forEach(e => {
-                        this.$set(e, '$cellEdit', true)
+                        if (e.accStatus == 0) {
+                            this.$set(e, '$cellEdit', true)
+                        }
                     })
                 }
             }
@@ -722,6 +726,7 @@ export default {
                 let arr = []
                 for (let index in this.selectionCList) {
                     if (this.selectionCList[index].feeType == 1 || this.selectionCList[index].feeType == 2) return this.$message.error("第" + (Number(this.selectionCList[index].$index) + 1) + "行不允许删除");
+                    if (this.selectionCList[index].accStatus == 1) return this.$message.error("第" + (Number(this.selectionCList[index].$index) + 1) + "行不允许删除");
                 }
                 if (type == 'C') {
                     this.$confirm("确定将选择数据删除?", {

src/components/tradeAgency/fee-oceanFreight.vue

@@ -1059,12 +1059,16 @@ export default {
             if (name == '一键编辑') {
                 if (type == 'D') {
                     this.form.feeCenterListD.forEach(e => {
-                        this.$set(e, '$cellEdit', true)
+                        if (e.accStatus == 0) {
+                            this.$set(e, '$cellEdit', true)
+                        }
                     })
                 }
                 if (type == 'C') {
                     this.form.feeCenterListC.forEach(e => {
-                        this.$set(e, '$cellEdit', true)
+                        if (e.accStatus == 0) {
+                            this.$set(e, '$cellEdit', true)
+                        }
                     })
                 }
             }

src/views/basicData/customerInformation/configuration/mainList.json

@@ -4,7 +4,7 @@
   "tip": false,
   "stripe": true,
   "searchShow": true,
-  "searchMenuSpan": 8,
+  "searchMenuSpan": 24,
   "dialogWidth": "60%",
   "tree": true,
   "border": true,
@@ -130,6 +130,21 @@
       },
       "filterable": true,
       "overHidden": true
+    },
+    {
+      "label": "国家",
+      "prop": "country",
+      "search": true,
+      "index": 12,
+      "width": 130,
+      "type": "select",
+      "dicData": [],
+      "props": {
+        "label": "dictValue",
+        "value": "dictValue"
+      },
+      "filterable": true,
+      "overHidden": true
     }
   ]
 }

src/views/basicData/customerInformation/index.vue

@@ -222,6 +222,9 @@ export default {
       this.findObject(this.option.column, "adminProfiles").dicData =
         res.data.data;
     });
+    this.getWorkDicts("country_name").then(res => {
+      this.findObject(this.option.column, "country").dicData =res.data.data;
+    });
   },
   activated() {
     if (this.$route.query.corpName) {

src/views/iosBasicData/AirtransportExport/bills/billsDetails.vue

@@ -1938,13 +1938,18 @@ export default {
 }
 
 .margintop {
-    margin-top: 10px;
+    margin-top: 0px;
 }
 
 ::v-deep.el-form-item {
     margin-bottom: 0;
 }
-
+::v-deep .basic-container .el-card__body{
+    padding: 6px 20px;
+}
+::v-deep .el-tabs__header{
+    margin: 0 0 5px;
+}
 .isShow {
     display: none;
 }

src/views/iosBasicData/AirtransportImport/bills/billsDetails.vue

@@ -1935,13 +1935,18 @@ export default {
 }
 
 .margintop {
-    margin-top: 10px;
+    margin-top: 0px;
 }
 
 ::v-deep.el-form-item {
     margin-bottom: 0;
 }
-
+::v-deep .basic-container .el-card__body{
+    padding: 6px 20px;
+}
+::v-deep .el-tabs__header{
+    margin: 0 0 5px;
+}
 .isShow {
     display: none;
 }

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -642,7 +642,7 @@ export default {
                 this.form.billNoFormat = 'STL'
                 this.form.businessTypeCode = 'STL'
                 this.form.businessType = 'STL' // 结算单
-                this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(',') : '' // 业务类型
+                this.form.businessTypes = Array.isArray(this.form.businessTypes) ? this.form.businessTypes.join(',') : this.form.businessTypes // 业务类型
                 this.form.businessDateStart = this.form.businessDateStart ? this.form.businessDateStart.slice(0, 10) + ' 00:00:00' : null // 财务开始日期
                 this.form.businessDateEnd = this.form.businessDateEnd ? this.form.businessDateEnd.slice(0, 10) + ' 00:00:00' : null // 财务开始日期
                 this.form.billDate = this.form.billDate ? this.form.billDate.slice(0, 10) + ' 00:00:00' : null
@@ -1034,7 +1034,7 @@ export default {
         // 结算确认
         finstlbillsConfirmSettlementfun() {
             this.pageLoading = true
-            this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(',') : '' // 业务类型
+            this.form.businessTypes = Array.isArray(this.form.businessTypes) ? this.form.businessTypes.join(',') : this.form.businessTypes // 业务类型
             this.form.businessDateStart = this.form.businessDateStart ? this.form.businessDateStart.slice(0, 10) + ' 00:00:00' : null // 财务开始日期
             this.form.businessDateEnd = this.form.businessDateEnd ? this.form.businessDateEnd.slice(0, 10) + ' 00:00:00' : null // 财务开始日期
             this.form.billDate = this.form.billDate ? this.form.billDate.slice(0, 10) + ' 00:00:00' : null
@@ -1048,6 +1048,7 @@ export default {
                 this.finstlbillsDetailfun(res.data.data.id)
             }).finally(() => {
                 this.pageLoading = false
+                this.saveLoading = false
             })
         },
         // 生成凭证
@@ -1089,6 +1090,7 @@ export default {
                     this.finstlbillsDetailfun(res.data.data.id)
                 }).finally(() => {
                     this.pageLoading = false
+                    this.saveLoading = false
                 })
             })
         },

src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue

@@ -1937,13 +1937,18 @@ export default {
 }
 
 .margintop {
-    margin-top: 10px;
+    margin-top: 0px !important;
 }
 
 ::v-deep.el-form-item {
     margin-bottom: 0;
 }
-
+::v-deep .basic-container .el-card__body{
+    padding: 6px 20px;
+}
+::v-deep .el-tabs__header{
+    margin: 0 0 5px;
+}
 .isShow {
     display: none;
 }

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -2156,8 +2156,10 @@ export default {
 </script>
 
 <style scoped  lang="scss">
+
 ::v-deep .el-tabs--border-card>.el-tabs__content{
     padding:4px !important;
+
 }
 .scrollable-container {
     height: 84vh;
@@ -2180,13 +2182,18 @@ export default {
 }
 
 .margintop {
-    margin-top: 10px;
+    margin-top: 0px !important;
 }
 
 ::v-deep.el-form-item {
     margin-bottom: 0;
 }
-
+::v-deep .basic-container .el-card__body{
+    padding: 6px 20px;
+}
+::v-deep .el-tabs__header{
+    margin: 0 0 5px;
+}
 .isShow {
     display: none;
 }

src/views/iosBasicData/advanceCharge/detailsPage.vue

@@ -19,20 +19,20 @@
                         <dic-select v-model="form.corpName" placeholder="客户" key="id" label="cnName" res="records"
                             url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true" :remote="true"
                             dataName="cnName" @selectChange="dicChange('corpName', $event)"
-                            :disabled="editDisabled"></dic-select>
+                            :disabled="form.advanceChargeItemList.length>0"></dic-select>
                     </tempalte>
                     <tempalte slot="advancePaymentBalance">
                         <el-input-number v-model="form.advancePaymentBalance"
                             @change="dicChange('advancePaymentBalance', form)" :controls="false" placeholder="请输入 预付款余额"
-                            size="small" style="width: 100%;"></el-input-number>
+                            size="small" style="width: 100%;" :disabled="form.advanceChargeItemList.length>0"></el-input-number>
                     </tempalte>
                     <tempalte slot="inOverpayment">
                         <el-input-number v-model="form.inOverpayment" @change="dicChange('inOverpayment', form)"
-                            :controls="false" placeholder="请输入 增加金额" size="small" style="width: 100%;"></el-input-number>
+                            :controls="false" placeholder="请输入 增加金额" size="small" style="width: 100%;" :disabled="form.advanceChargeItemList.length>0"></el-input-number>
                     </tempalte>
                     <tempalte slot="outOverpaymen">
                         <el-input-number v-model="form.outOverpaymen" @change="dicChange('outOverpaymen', form)"
-                            :controls="false" placeholder="请输入 消费金额" size="small" style="width: 100%;"></el-input-number>
+                            :controls="false" placeholder="请输入 消费金额" size="small" style="width: 100%;" :disabled="form.advanceChargeItemList.length>0"></el-input-number>
                     </tempalte>
                 </avue-form>
             </trade-card>
@@ -164,6 +164,11 @@ export default {
                         overHidden: true
                     },
                     {
+                        label: "生成时间",
+                        prop: "createTime",
+                        overHidden: true
+                    },
+                    {
                         label: "备注",
                         prop: "remarks",
                         overHidden: true

src/views/iosBasicData/advanceCharge/index.vue

@@ -120,6 +120,12 @@ export default {
     async created() {
         this.option = await this.getColumnData(this.getColumnName(399), this.optionBack);
     },
+    activated() {
+        this.$nextTick(() => {
+            this.$refs.crud.doLayout();
+            this.$refs.crud.dicInit();
+        });
+    },
     methods: {
         addButton() {
             this.isShow = false

src/views/iosBasicData/aeamends/amendsDetails.vue

@@ -1445,4 +1445,7 @@ export default {
     font-size: 16px;
     color: #54BCBD;
 }
+::v-deep .el-card__body{
+    padding: 6px 20px;
+}
 </style>

src/views/iosBasicData/aiamends/amendsDetails.vue

@@ -1457,4 +1457,7 @@ export default {
     font-size: 16px;
     color: #54BCBD;
 }
+::v-deep .el-card__body{
+    padding: 6px 20px;
+}
 </style>

src/views/iosBasicData/seamends/amendsDetails.vue

@@ -1489,4 +1489,7 @@ export default {
     font-size: 16px;
     color: #54BCBD;
 }
+::v-deep .el-card__body{
+    padding: 6px 20px;
+}
 </style>

src/views/iosBasicData/siamends/amendsDetails.vue

@@ -1461,4 +1461,7 @@ export default {
     font-size: 16px;
     color: #54BCBD;
 }
+::v-deep .el-card__body{
+    padding: 6px 20px;
+}
 </style>

src/views/tradeAgency/oceanFreightImport/detailsPage.vue

@@ -526,6 +526,11 @@ export default {
                         type: "date",
                         format: "yyyy-MM-dd",
                         valueFormat: "yyyy-MM-dd",
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }]
                     },
                     {
                         label: "船公司",
@@ -1931,9 +1936,10 @@ export default {
             this.$refs["form"].validate((valid, done) => {
                 done();
                 if (valid) {
-                    for (let row in this.form.preContainersList) {
+                    for (let row of this.form.preContainersList) {
+                        console.log(row)
                         if (!row.cntrTypeCode || !row.boxNo || !row.goodsName || !row.goodsType || !row.quantity || !row.netWeight || !row.price) {
-                            return this.$message.error((!row.cntrTypeCode ? "箱型," : '') + (!row.boxNo ? "箱号," : '') + (!row.goodsName ? "品名," : '') + (!row.goodsType ? "类型," : '') + (!row.quantity ? "件数," : '') + (!row.netWeight ? "重量," : '') + (!row.price ? "单价" : '') + "不能为空");
+                            return this.$message.error("箱信息:"+(!row.cntrTypeCode ? "箱型," : '') + (!row.boxNo ? "箱号," : '') + (!row.goodsName ? "品名," : '') + (!row.goodsType ? "类型," : '') + (!row.quantity ? "件数," : '') + (!row.netWeight ? "重量," : '') + (!row.price ? "单价" : '') + "不能为空");
                         }
                     }
                     if (this.$refs.feeInfo.submitValidate()) {
@@ -2116,4 +2122,7 @@ export default {
 .el-table--small th {
     padding: 2px !important;
 }
+::v-deep .el-card__body{
+    padding: 3px 10px;
+}
 </style>

src/views/tradeAgency/tradeAgency/detailsPage.vue

@@ -208,6 +208,12 @@
                         <el-button size="small" style="margin-right: 8px" :disabled="!form.id"
                             @click="$refs.print.openDialog()">打印账单
                         </el-button>
+                        <!-- <el-button type="info" size="small" :disabled="editDisabled || !form.id"
+                            @click="allClick('生成申请收款')">生成货款收款
+                        </el-button>
+                        <el-button type="warning" size="small" :disabled="editDisabled || !form.id"
+                            @click="allClick('生成申请付款')">生成货款付款
+                        </el-button> -->
                         <el-dropdown>
                             <el-button type="danger" size="small" :disabled="editDisabled || !form.id">
                                 生成应付<i class="el-icon-arrow-down el-icon--right"></i>
@@ -383,7 +389,7 @@
 </template>
 
 <script>
-import { submit, getDetail, removeItem, checkAgent, revokeCheckAgent, copyAgent, generateDownPaymentBill, generateBalancePaymentBill, generatePayment, revokeApplyForPayment, confirmationNotification, generateFreightForwarder, balancePayment } from "@/api/tradeAgency/tradeAgency";
+import { submit, getDetail, removeItem, checkAgent, revokeCheckAgent, copyAgent, generateDownPaymentBill, generateBalancePaymentBill, generatePayment, revokeApplyForPayment, confirmationNotification, generateFreightForwarder, balancePayment, applyForPaymentList } from "@/api/tradeAgency/tradeAgency";
 import { bcurrencyGetExrate } from "@/api/iosBasicData/rateManagement";
 import feeInfo from "@/components/tradeAgency/fee-info";
 import dicSelect from "@/components/dicSelect/main";
@@ -1913,6 +1919,32 @@ export default {
                     loading.close();
                 })
             }
+            if (name == '生成申请付款') {
+                const loading = this.$loading({
+                    lock: true,
+                    text: '加载中',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(255,255,255,0.7)'
+                });
+                applyForPaymentList({ ids: this.form.id, dc: 'C' }).then(res => {
+                    // this.getDetails(tshis.form.id)
+                }).finally(() => {
+                    loading.close();
+                })
+            }
+            if (name == '生成申请收款') {
+                const loading = this.$loading({
+                    lock: true,
+                    text: '加载中',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(255,255,255,0.7)'
+                });
+                applyForPaymentList({ ids: this.form.id, dc: 'D' }).then(res => {
+                    // this.getDetails(this.form.id)
+                }).finally(() => {
+                    loading.close();
+                })
+            }
         },
         submit(type) {
             this.$refs["form"].validate((valid, done) => {
@@ -2130,4 +2162,7 @@ export default {
 .el-table--small th {
     padding: 2px !important;
 }
+::v-deep .el-card__body{
+    padding: 3px 10px;
+}
 </style>