修改费用和导入细节

src/views/iosBasicData/OceanFreightImport/bills/assembly/feecenter.vue

@@ -59,14 +59,14 @@
                         :disabled="!selectionDList.length || disabled || pleasereviewType"
                         @click="batchDelete('D')">一键删除
                     </el-button>
-                    <el-button v-if="isFeeEditD" type="success" plain size="small"
+                    <!-- <el-button v-if="isFeeEditD" type="success" plain size="small"
                         :disabled="!selectionDList.length || disabled || pleasereviewType"
                         @click="GenerateBillsfun('D')">生成账单
                     </el-button>
                     <el-button v-if="isFeeEditD" type="danger" plain size="small"
                         :disabled="!selectionDList.length || disabled || pleasereviewType"
                         @click="RevokingBillsfun('D')">撤销账单
-                    </el-button>
+                    </el-button> -->
                     <el-button type="primary" plain size="small" @click="printingCostsfun('D')">打印账单</el-button>
                     <el-button v-if="isFeeEditD" type="success" plain size="small"
                         :disabled="!this.assemblyForm.id || disabled || pleasereviewType"
@@ -203,14 +203,14 @@
                         :disabled="!selectionCList.length || disabled || pleasereviewType"
                         @click="batchDelete('C')">一键删除
                     </el-button>
-                    <el-button v-if="isFeeEditC" type="primary" plain size="small"
+                    <!-- <el-button v-if="isFeeEditC" type="primary" plain size="small"
                         :disabled="!selectionCList.length || disabled || pleasereviewType"
                         @click="GenerateBillsfun('C')">生成账单
                     </el-button>
                     <el-button v-if="isFeeEditC" type="danger" plain size="small"
                         :disabled="!selectionCList.length || disabled || pleasereviewType"
                         @click="RevokingBillsfun('C')">撤销账单
-                    </el-button>
+                    </el-button> -->
                     <el-button type="primary" plain size="small" @click="printingCostsfun('C')">打印账单</el-button>
                     <el-button v-if="isFeeEditC" type="success" plain size="small"
                         :disabled="!this.assemblyForm.id || disabled || pleasereviewType"
@@ -759,13 +759,13 @@ export default {
                     //     width: "100",
                     //     overHidden: true,
                     // },
-                    {
-                        label: "核算要素",
-                        prop: "elementsCnName",
-                        width: "120",
-                        hide: true,
-                        overHidden: true,
-                    },
+                    // {
+                    //     label: "核算要素",
+                    //     prop: "elementsCnName",
+                    //     width: "120",
+                    //     hide: true,
+                    //     overHidden: true,
+                    // },
                     {
                         label: "付费申请金额",
                         prop: "appliedAmount",
@@ -1069,13 +1069,13 @@ export default {
                     //     width: "100",
                     //     overHidden: true,
                     // },
-                    {
-                        label: "核算要素",
-                        prop: "elementsCnName",
-                        width: "120",
-                        hide: true,
-                        overHidden: true,
-                    },
+                    // {
+                    //     label: "核算要素",
+                    //     prop: "elementsCnName",
+                    //     width: "120",
+                    //     hide: true,
+                    //     overHidden: true,
+                    // },
                     {
                         label: "付费申请金额",
                         prop: "appliedAmount",
@@ -1268,13 +1268,13 @@ export default {
                     //     width: "100",
                     //     overHidden: true,
                     // },
-                    {
-                        label: "核算要素",
-                        prop: "elementsCnName",
-                        width: "120",
-                        hide: true,
-                        overHidden: true,
-                    },
+                    // {
+                    //     label: "核算要素",
+                    //     prop: "elementsCnName",
+                    //     width: "120",
+                    //     hide: true,
+                    //     overHidden: true,
+                    // },
                     {
                         label: "付费申请金额",
                         prop: "appliedAmount",
@@ -1453,14 +1453,14 @@ export default {
                     value: 'polCnName',
                 },
                 {
-                    name: '目的港',
-                    value: 'destinationNamePrint',
+                    name: '卸货港',
+                    value: 'podCnName',
                     // 判断条件，多条件，只支持 or
-                    vif: [{
-                        name: 'carrierId',
-                        value: 11207, // ONE 海洋网联船务(中国)有限公司
-                        op: '!=',
-                    }],
+                    // vif: [{
+                    //     name: 'carrierId',
+                    //     value: 11207, // ONE 海洋网联船务(中国)有限公司
+                    //     op: '!=',
+                    // }],
                 },
                 {
                     name: '交货地',
@@ -2090,9 +2090,9 @@ export default {
             if (!row.feeId) {
                 sum += ` 序号${index + 1}费用简称`
             }
-            if (!row.elementsId) {
-                sum += ` 序号${index + 1}核算要素`
-            }
+            // if (!row.elementsId) {
+            //     sum += ` 序号${index + 1}核算要素`
+            // }
             if (!row.curCode) {
                 sum += ` 序号${index + 1}币种`
             }
@@ -2168,9 +2168,9 @@ export default {
                 if (!item.feeId) {
                     sum += ` 序号${item.$index + 1}费用简称`
                 }
-                if (!item.elementsId) {
-                    sum += ` 序号${item.$index + 1}核算要素`
-                }
+                // if (!item.elementsId) {
+                //     sum += ` 序号${item.$index + 1}核算要素`
+                // }
                 if (!item.curCode) {
                     sum += ` 序号${item.$index + 1}币种`
                 }
@@ -2811,13 +2811,13 @@ export default {
             //     }
             // }
             for (let item of this.assemblyForm.feeCenterListD) {
-                if (!item.corpId || !item.feeId || !item.elementsId || !item.curCode) {
-                    sum += `应收第${item.$index + 1}行${!item.corpId ? ' 结算单位' : ''}${!item.feeId ? ' 费用简称' : ''}${!item.elementsId ? ' 核算要素' : ''}${!item.curCode ? ' 币种' : ''}`
+                if (!item.corpId || !item.feeId || !item.curCode) {
+                    sum += `应收第${item.$index + 1}行${!item.corpId ? ' 结算单位' : ''}${!item.feeId ? ' 费用简称' : ''}${!item.curCode ? ' 币种' : ''}`
                 }
             }
             for (let item of this.assemblyForm.feeCenterListC) {
-                if (!item.corpId || !item.feeId || !item.elementsId || !item.curCode) {
-                    sum += `应付第${item.$index + 1}行${!item.corpId ? ' 结算单位' : ''}${!item.feeId ? ' 费用简称' : ''}${!item.elementsId ? ' 核算要素' : ''}${!item.curCode ? ' 币种' : ''}`
+                if (!item.corpId || !item.feeId || !item.curCode) {
+                    sum += `应付第${item.$index + 1}行${!item.corpId ? ' 结算单位' : ''}${!item.feeId ? ' 费用简称' : ''}${!item.curCode ? ' 币种' : ''}`
                 }
             }
             if (sum != '请输入') {

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

@@ -40,8 +40,11 @@
                     </el-button>
                     <el-button type="warning" size="small" @click="outExport">导 出
                     </el-button>
-                    <el-button type="primary" size="small" @click="templateImport"
-                        :disabled="!selectionList.length">费用模板
+                    <el-button type="primary" size="small" @click="templateImport('D')"
+                        :disabled="!selectionList.length">费用模板(收)
+                    </el-button>
+                    <el-button type="warning" size="small" @click="templateImport('C')"
+                        :disabled="!selectionList.length">费用模板(付)
                     </el-button>
                     <el-button type="success" size="small" @click="checkBills" :disabled="!selectionList.length">单据请核
                     </el-button>
@@ -117,7 +120,7 @@
                 <template slot="eta" slot-scope="scope">
                     <span>{{
                         scope.row.eta ? scope.row.eta.slice(0, 10) : ""
-                        }}</span>
+                    }}</span>
                 </template>
                 <template slot="updateTime" slot-scope="scope">
                     <span>{{
@@ -275,28 +278,33 @@ export default {
                 // selection: true,
                 column: [
                     {
+                        label: '类别',
+                        prop: 'type',
+                        overHidden: true,
+                    },
+                    {
                         label: '费用',
                         prop: 'feeCnName',
                         overHidden: true,
                     },
                     {
-                        label: '箱型',
+                        label: '计量单位',
                         prop: 'unitNo',
                         overHidden: true,
                     },
                     {
-                        label: '销售价',
+                        label: '单价',
                         prop: 'salesPrice',
                         overHidden: true,
                     },
                     {
-                        label: '成本价',
-                        prop: 'costPrice',
+                        label: '币别',
+                        prop: 'curCode',
                         overHidden: true,
                     },
                     {
-                        label: '币别',
-                        prop: 'curCode',
+                        label: '结算单位',
+                        prop: 'corpCnName',
                         overHidden: true,
                     },
                 ]
@@ -1460,7 +1468,7 @@ export default {
                 loading.close();
             })
         },
-        templateImport() {
+        templateImport(dc) {
             for (let item of this.selectionList) {
                 if (item.status != 0) {
                     return this.$message.error("单据已提交审核,请勿重复操作");
@@ -1473,12 +1481,13 @@ export default {
                 }
             }
             this.templateId = null
-            this.dc = null
+            this.dc = dc
             this.templateData = []
             this.templateList = []
             this.templateDialog = true
             let obj = {
                 status: 0,
+                dc:this.dc,
                 type: 'HYJK',
                 shippingCompanyId: this.selectionList[0].carrierId,
             }

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation/precontainers.vue

@@ -449,10 +449,13 @@ export default {
             // let obj = {
             //     containerNumberItemList: 
             // }
-            for (let item of this.containerNumberItemList) {
-                if (!(item.occupyNum > 0)) {
-                    return this.$message.error("占用箱量必须大于0!");
-                }
+            // for (let item of ) {
+            //     if (!(item.occupyNum > 0)) {
+            //         return this.$message.error("占用箱量必须大于0!");
+            //     }
+            // }
+            if(this.containerNumberItemList.filter(item=>item.occupyNum > 0).length==0){
+                return this.$message.error("至少有一条占用箱量大于0!");
             }
             selectedContainerNumber(this.containerNumberItemList).then(res => {
                 this.$message.success("操作成功!");

src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -59,14 +59,14 @@
                         :disabled="!selectionDList.length || disabled || pleasereviewType"
                         @click="batchDelete('D')">一键删除
                     </el-button>
-                    <el-button v-if="isFeeEditD" type="success" plain size="small"
+                    <!-- <el-button v-if="isFeeEditD" type="success" plain size="small"
                         :disabled="!selectionDList.length || disabled || pleasereviewType"
                         @click="GenerateBillsfun('D')">生成账单
                     </el-button>
                     <el-button v-if="isFeeEditD" type="danger" plain size="small"
                         :disabled="!selectionDList.length || disabled || pleasereviewType"
                         @click="RevokingBillsfun('D')">撤销账单
-                    </el-button>
+                    </el-button> -->
                     <el-button type="primary" plain size="small" @click="printingCostsfun('D')">打印账单</el-button>
                     <el-button v-if="isFeeEditD" type="success" plain size="small"
                         :disabled="!this.assemblyForm.id || disabled || pleasereviewType"
@@ -203,14 +203,14 @@
                         :disabled="!selectionCList.length || disabled || pleasereviewType"
                         @click="batchDelete('C')">一键删除
                     </el-button>
-                    <el-button v-if="isFeeEditC" type="primary" plain size="small"
+                    <!-- <el-button v-if="isFeeEditC" type="primary" plain size="small"
                         :disabled="!selectionCList.length || disabled || pleasereviewType"
                         @click="GenerateBillsfun('C')">生成账单
                     </el-button>
                     <el-button v-if="isFeeEditC" type="danger" plain size="small"
                         :disabled="!selectionCList.length || disabled || pleasereviewType"
                         @click="RevokingBillsfun('C')">撤销账单
-                    </el-button>
+                    </el-button> -->
                     <el-button type="primary" plain size="small" @click="printingCostsfun('C')">打印账单</el-button>
                     <el-button v-if="isFeeEditC" type="success" plain size="small"
                         :disabled="!this.assemblyForm.id || disabled || pleasereviewType"
@@ -759,13 +759,13 @@ export default {
                     //     width: "100",
                     //     overHidden: true,
                     // },
-                    {
-                        label: "核算要素",
-                        prop: "elementsCnName",
-                        width: "120",
-                        hide: true,
-                        overHidden: true,
-                    },
+                    // {
+                    //     label: "核算要素",
+                    //     prop: "elementsCnName",
+                    //     width: "120",
+                    //     hide: true,
+                    //     overHidden: true,
+                    // },
                     {
                         label: "付费申请金额",
                         prop: "appliedAmount",
@@ -1055,13 +1055,13 @@ export default {
                     //     width: "100",
                     //     overHidden: true,
                     // },
-                    {
-                        label: "核算要素",
-                        prop: "elementsCnName",
-                        width: "120",
-                        hide: true,
-                        overHidden: true,
-                    },
+                    // {
+                    //     label: "核算要素",
+                    //     prop: "elementsCnName",
+                    //     width: "120",
+                    //     hide: true,
+                    //     overHidden: true,
+                    // },
                     {
                         label: "付费申请金额",
                         prop: "appliedAmount",
@@ -1240,13 +1240,13 @@ export default {
                     //     width: "100",
                     //     overHidden: true,
                     // },
-                    {
-                        label: "核算要素",
-                        prop: "elementsCnName",
-                        width: "120",
-                        hide: true,
-                        overHidden: true,
-                    },
+                    // {
+                    //     label: "核算要素",
+                    //     prop: "elementsCnName",
+                    //     width: "120",
+                    //     hide: true,
+                    //     overHidden: true,
+                    // },
                     {
                         label: "付费申请金额",
                         prop: "appliedAmount",
@@ -1425,14 +1425,14 @@ export default {
                     value: 'polCnName',
                 },
                 {
-                    name: '目的港',
-                    value: 'destinationNamePrint',
+                    name: '卸货港',
+                    value: 'podCnName',
                     // 判断条件，多条件，只支持 or
-                    vif: [{
-                        name: 'carrierId',
-                        value: 11207, // ONE 海洋网联船务(中国)有限公司
-                        op: '!=',
-                    }],
+                    // vif: [{
+                    //     name: 'carrierId',
+                    //     value: 11207, // ONE 海洋网联船务(中国)有限公司
+                    //     op: '!=',
+                    // }],
                 },
                 {
                     name: '交货地',
@@ -2062,9 +2062,9 @@ export default {
             if (!row.feeId) {
                 sum += ` 序号${index + 1}费用简称`
             }
-            if (!row.elementsId) {
-                sum += ` 序号${index + 1}核算要素`
-            }
+            // if (!row.elementsId) {
+            //     sum += ` 序号${index + 1}核算要素`
+            // }
             if (!row.curCode) {
                 sum += ` 序号${index + 1}币种`
             }
@@ -2140,9 +2140,9 @@ export default {
                 if (!item.feeId) {
                     sum += ` 序号${item.$index + 1}费用简称`
                 }
-                if (!item.elementsId) {
-                    sum += ` 序号${item.$index + 1}核算要素`
-                }
+                // if (!item.elementsId) {
+                //     sum += ` 序号${item.$index + 1}核算要素`
+                // }
                 if (!item.curCode) {
                     sum += ` 序号${item.$index + 1}币种`
                 }
@@ -2783,13 +2783,13 @@ export default {
             //     }
             // }
             for (let item of this.assemblyForm.feeCenterListD) {
-                if (!item.corpId || !item.feeId || !item.elementsId || !item.curCode) {
-                    sum += `应收第${item.$index + 1}行${!item.corpId ? ' 结算单位' : ''}${!item.feeId ? ' 费用简称' : ''}${!item.elementsId ? ' 核算要素' : ''}${!item.curCode ? ' 币种' : ''}`
+                if (!item.corpId || !item.feeId  || !item.curCode) {
+                    sum += `应收第${item.$index + 1}行${!item.corpId ? ' 结算单位' : ''}${!item.feeId ? ' 费用简称' : ''}${!item.curCode ? ' 币种' : ''}`
                 }
             }
             for (let item of this.assemblyForm.feeCenterListC) {
-                if (!item.corpId || !item.feeId || !item.elementsId || !item.curCode) {
-                    sum += `应付第${item.$index + 1}行${!item.corpId ? ' 结算单位' : ''}${!item.feeId ? ' 费用简称' : ''}${!item.elementsId ? ' 核算要素' : ''}${!item.curCode ? ' 币种' : ''}`
+                if (!item.corpId || !item.feeId  || !item.curCode) {
+                    sum += `应付第${item.$index + 1}行${!item.corpId ? ' 结算单位' : ''}${!item.feeId ? ' 费用简称' : ''}${!item.curCode ? ' 币种' : ''}`
                 }
             }
             if (sum != '请输入') {

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

@@ -35,8 +35,11 @@
                     </el-button>
                     <el-button type="warning" size="small" @click="outExport">导 出
                     </el-button>
-                    <el-button type="primary" size="small" @click="templateImport"
-                        :disabled="!selectionList.length">费用模板
+                    <el-button type="primary" size="small" @click="templateImport('D')"
+                        :disabled="!selectionList.length">费用模板(收)
+                    </el-button>
+                    <el-button type="warning" size="small" @click="templateImport('C')"
+                        :disabled="!selectionList.length">费用模板(付)
                     </el-button>
                     <el-button type="success" size="small" @click="checkBills" :disabled="!selectionList.length">单据请核
                     </el-button>
@@ -282,10 +285,6 @@
                         </el-scrollbar>
                     </el-col>
                     <el-col :span="19">
-                        <div style="margin: 2px 0;">
-                            <avue-select v-model="dc" placeholder="请选择收付" type="tree" :dic="dcDic"
-                                size="mini"></avue-select>
-                        </div>
                         <avue-crud :data="templateList" :option="templateOption"></avue-crud>
                     </el-col>
                 </el-row>
@@ -382,30 +381,36 @@ export default {
                 // selection: true,
                 column: [
                     {
+                        label: '类别',
+                        prop: 'type',
+                        overHidden: true,
+                    },
+                    {
                         label: '费用',
                         prop: 'feeCnName',
                         overHidden: true,
                     },
                     {
-                        label: '箱型',
+                        label: '计量单位',
                         prop: 'unitNo',
                         overHidden: true,
                     },
                     {
-                        label: '销售价',
+                        label: '单价',
                         prop: 'salesPrice',
                         overHidden: true,
                     },
                     {
-                        label: '成本价',
-                        prop: 'costPrice',
+                        label: '币别',
+                        prop: 'curCode',
                         overHidden: true,
                     },
                     {
-                        label: '币别',
-                        prop: 'curCode',
+                        label: '结算单位',
+                        prop: 'corpCnName',
                         overHidden: true,
                     },
+
                 ]
             },
             templateDialog: false,
@@ -1597,7 +1602,7 @@ export default {
                 loading.close();
             })
         },
-        templateImport() {
+        templateImport(dc) {
             for (let item of this.selectionList) {
                 if (item.status != 0) {
                     return this.$message.error("单据已提交审核,请勿重复操作");
@@ -1610,13 +1615,14 @@ export default {
                 }
             }
             this.templateId = null
-            this.dc = null
+            this.dc = dc
             this.templateData = []
             this.templateList = []
             this.templateDialog = true
             let obj = {
                 status: 0,
                 type: 'HYCK',
+                dc:this.dc,
                 shippingCompanyId: this.selectionList[0].carrierId,
             }
             const loading = this.$loading({

src/views/iosBasicData/losbfeestemplate/feesTemplateItems.vue

@@ -52,14 +52,14 @@
                         <span>{{ index + 1 }}</span>
                     </template>
                     <template slot="corpCnNameForm" slot-scope="{ row }">
-                        <dic-select v-if="row.$cellEdit" v-model="row.corpCnName" key="id" label="cnName" res="records"
+                        <dic-select v-if="row.$cellEdit" v-model="row.corpCnName" label="cnName" res="records"
                             url="/blade-los/bcorps/selectList?status=0&current=1&size=20" :filterable="true"
                             :remote="true" dataName="cnName" :disabled="row.corpType"
                             @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
                         <span v-else>{{ row.corpCnName }}</span>
                     </template>
                     <template slot="corpTypeForm" slot-scope="{row,index}">
-                        <dic-select v-if="row.$cellEdit" v-model="row.corpType" key="id" label="dictValue"
+                        <dic-select v-if="row.$cellEdit" v-model="row.corpType" label="dictValue"
                             :disabled="row.corpCnName" url="/blade-system/dict-biz/dictionary?code=corp_type"
                             :filterable="true" @selectChange="rowDicChange('corpType', $event, row)"></dic-select>
                         <span v-else>{{ row.corpType }}</span>
@@ -1006,6 +1006,10 @@ export default {
                         }
                     })
                 }
+                res.data.data.feesTemplateItemsList.forEach(item => {
+                    item.corpCnName = item.corpCnName ? item.corpCnName : null
+                    item.corpType = item.corpType ? item.corpType : null
+                })
                 this.form = res.data.data;
             }).finally(() => {
                 this.pageLoading = false

src/views/iosBasicData/losbfeestemplate/index.vue

@@ -179,12 +179,14 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 24,
+        searchMenuSpan: 12,
         border: true,
         index: true,
         viewBtn: false,
         selection: true,
         dialogClickModal: false,
+        searchIcon: true,
+        searchIndex: 3,
         menuWidth: 220,
         column: [
           // {
@@ -198,6 +200,26 @@ export default {
           //   }]
           // },
           {
+            label: "收/付",
+            prop: "dc",
+            width: "60",
+            overHidden: true,
+            search: true,
+            type: 'select',
+            dicData: [{
+              label: '收',
+              value: 'D'
+            }, {
+              label: '付',
+              value: 'C'
+            }],
+            rules: [{
+              required: true,
+              message: "请选择收/付",
+              trigger: "blur"
+            }]
+          },
+          {
             label: "模版编号",
             prop: "code",
             width: "120",
@@ -233,6 +255,17 @@ export default {
           {
             label: "船公司",
             prop: "shippingCompanyCname",
+            search: true,
+            type: "select",
+            filterable: true,
+            remote: true,
+            dicUrl:
+              "/api/blade-los/bcorps/listByType?cnName={{key}}",
+            props: {
+              label: "cnName",
+              value: "cnName",
+              res: "data.records"
+            },
             overHidden: true
           },
           {
@@ -599,6 +632,10 @@ export default {
         this.page.total = data.total;
         this.data = data.records;
         this.loading = false;
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout();
+          this.$refs.crud.dicInit();
+        });
         this.selectionClear();
       });
     },
@@ -668,4 +705,8 @@ export default {
 ::v-deep .el-dialog__body {
   padding: 0 20px 10px 20px !important;
 }
+
+/deep/ .el-col-md-8 {
+  width: 24.33333%;
+}
 </style>