修改财务管理 海运进出口费用 发票申请 付费申请修改限制规则 新加字段 客户托书 客户订舱 修改必填项

src/api/iosBasicData/fininvoices.js

@@ -41,6 +41,14 @@ export const fininvoicesSubmit = (row) => {
     data: row
   })
 }
+export const fininvoicesAdd = (row) => {
+  return request({
+    url: '/api/blade-los/fininvoices/add',
+    method: 'post',
+    data: row
+  })
+}
+
 // 付费申请删除从表数据
 export const feeItemsSynchronize = (data) => {
   return request({

src/api/iosBasicData/finstlbills.js

@@ -39,7 +39,13 @@ export const finstlbillsSubmit = (row) => {
     data: row
   })
 }
-
+export const finstlbillsAdd = (row) => {
+  return request({
+    url: '/api/blade-los/finstlbills/add',
+    method: 'post',
+    data: row
+  })
+}
 
 // 检索
 export const finstlbillsListAccBill = (params) => {

src/components/feeModify/main.vue

@@ -21,6 +21,13 @@
               @selectChange="dicChange('shortNameUpdate', $event)" :slotRight="true" rightLabel="code"
               :disabled="newOption.disabled"></dic-select>
           </template>
+          <template slot="generationCorpCnNameUpdate">
+            <dic-select v-model="newForm.generationCorpCnNameUpdate" placeholder="代收客户" label="cnName" res="records"
+              url="/blade-los/bcorps/listByType?status=0&current=1&size=5&corpTypeName=国内直接客户,国内同行及代理,国外直接客户,国外同行及代理"
+              :filterable="true" :remote="true" dataName="cnName"
+              @selectChange="dicChange('generationCorpCnNameUpdate', $event)" :slotRight="true" rightLabel="code"
+              :disabled="newOption.disabled"></dic-select>
+          </template>
           <!-- <template slot="billShortNameUpdate">
             <dic-select v-model="newForm.billShortNameUpdate" placeholder="客户名称" label="shortName" res="records"
               url="/blade-los/bcorps/selectList?status=0&current=1&size=5" :filterable="true" :remote="true"
@@ -117,6 +124,10 @@ export default {
             label: "结算单位",
             prop: "shortName",
           },
+          {
+            label: "代收客户",
+            prop: "generationCorpCnName",
+          },
           // {
           //   label: "客户名称",
           //   prop: "billShortName",
@@ -171,6 +182,10 @@ export default {
             prop: "shortNameUpdate",
           },
           {
+            label: "代收客户",
+            prop: "generationCorpCnNameUpdate",
+          },
+          {
             label: "费用名称",
             prop: "feeCnNameUpdate",
           },
@@ -282,6 +297,9 @@ export default {
           corpCnNameUpdate: row.corpCnName,
           corpEnNameUpdate: row.corpEnName,
           shortNameUpdate: row.shortName,
+          generationCorpIdUpdate: row.generationCorpId,
+          generationCorpEnNameUpdate: row.generationCorpEnName,
+          generationCorpCnNameUpdate: row.generationCorpCnName,
           // billCorpIdUpdate: row.billCorpId,
           // billCorpCnNameUpdate: row.billCorpCnName,
           // billCorpEnNameUpdate: row.billCorpEnName,
@@ -419,11 +437,28 @@ export default {
           this.newForm.corpIdUpdate = row.id
           this.newForm.corpCnNameUpdate = row.cnName
           this.newForm.corpEnNameUpdate = row.enName
+          this.newForm.generationCorpIdUpdate = row.bookingAgentId
+          this.newForm.generationCorpEnNameUpdate = row.bookingAgentEnName
+          this.newForm.generationCorpCnNameUpdate = row.bookingAgentCnName
         } else {
           this.newForm.corpIdUpdate = null
           this.newForm.corpCnNameUpdate = null
           this.newForm.corpEnNameUpdate = null
           this.newForm.shortNameUpdate = null
+          this.newForm.generationCorpIdUpdate = null
+          this.newForm.generationCorpEnNameUpdate = null
+          this.newForm.generationCorpCnNameUpdate = null
+        }
+      }
+      if (name == 'generationCorpCnNameUpdate') {
+        if (row) {
+          this.newForm.generationCorpIdUpdate = row.id
+          this.newForm.generationCorpEnNameUpdate = row.enName
+          this.newForm.generationCorpCnNameUpdate = row.cnName
+        } else {
+          this.newForm.generationCorpIdUpdate = null
+          this.newForm.generationCorpEnNameUpdate = null
+          this.newForm.generationCorpCnNameUpdate = null
         }
       }
       if (name == 'billShortNameUpdate') {

src/page/index/tags.vue

@@ -484,7 +484,7 @@ export default {
         if (tag.label == "贸易代理(T)") {
           this.$store.commit("OUT_MYDLT_STATUS")
         }
-        if (tag.label == "发票申请(F)") {
+        if (tag.label == "发票申请(F)"||tag.label == "发票申请(N)") {
           this.$store.commit("OUT_FINAPP_DETAIL")
         }
         this.$store.commit("DEL_TAG", tag);

src/store/modules/ifdetail.js

@@ -805,7 +805,7 @@ const ifdetail = {
       if (tag.label == '贸易代理(T)') {
         state.mydlTStatus = true
       }
-      if (tag.label == '发票申请(F)') {
+      if (tag.label == '发票申请(F)'||tag.label == '发票申请(N)') {
         state.finappStatus = true
       }
     }

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

@@ -78,7 +78,7 @@
                     <el-button v-if="isFeeEditC" type="primary" plain size="small"
                         :disabled="disabled || pleasereviewType" @click="copyfun('D')">生成应付</el-button>
                     <el-button v-if="isFeeEditD" type="primary" plain size="small"
-                        :disabled="disabled || pleasereviewType" @click="allClick('发票申请', 'D')">发票申请</el-button>
+                        @click="allClick('发票申请', 'D')">发票申请</el-button>
                     <el-button type="primary" plain size="small" :disabled="disabled || selectionDList.length == 0"
                         @click="allClick('D费用申请')">请核费用</el-button>
                     <el-button type="danger" plain size="small" :disabled="disabled || selectionDList.length == 0"
@@ -115,6 +115,14 @@
                         @selectChange="rowDicChange('shortName', $event, row)"></dic-select>
                     <span v-else>{{ row.shortName }}</span>
                 </template>
+                <template slot="generationCorpCnName" slot-scope="{ row,index }">
+                    <dic-select v-if="row.edit" v-model="row.generationCorpCnName" placeholder="代收客户" label="cnName"
+                        res="records" :slotRight="true" rightLabel="code"
+                        url="/blade-los/bcorps/listByType?status=0&current=1&size=5&corpTypeName=国内直接客户,国内同行及代理,国外直接客户,国外同行及代理"
+                        :filterable="true" :remote="true" dataName="cnName"
+                        @selectChange="rowDicChange('generationCorpCnName', $event, row)"></dic-select>
+                    <span v-else>{{ row.generationCorpCnName }}</span>
+                </template>
                 <!-- <template slot="corpCnName" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="corpCnNameData" :selectValue="row.shortName"
                         :filterable="true" :clearable="true" :remote="true" :buttonIf="false"
@@ -231,8 +239,7 @@
                     <el-button v-if="isFeeEditC" type="primary" 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>
+                    <el-button type="info" plain size="small" @click="allClick('付费申请', 'C')">付费申请</el-button>
                     <el-button type="primary" plain size="small" :disabled="disabled || selectionCList.length == 0"
                         @click="allClick('C费用申请')">请核费用</el-button>
                     <el-button type="danger" plain size="small" :disabled="disabled || selectionCList.length == 0"
@@ -279,7 +286,7 @@
                         label="shortName" res="records" :slotRight="true" rightLabel="code"
                         :url="'/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=' + row.corpType"
                         :filterable="true" :remote="true" dataName="shortName"
-                        @selectChange="rowDicChange('shortName', $event, row)"></dic-select>
+                        @selectChange="rowDicChange('shortNameC', $event, row)"></dic-select>
                     <span v-else>{{ row.shortName }}</span>
                 </template>
                 <template slot="feeCnName" slot-scope="{ row }">
@@ -624,7 +631,10 @@
         <reportContainer ref="reportContainer"></reportContainer>
         <mail-component ref="mailComponentRef" />
         <extraction-cost ref="extractionCost" @getData="getData" />
-        <fee-modify ref="feeModify" :form="assemblyForm" @updateDetail="updateDetail" :curCodeDate="assemblyForm.actualEta?assemblyForm.actualEta+' 00:00:00':null"  url="/iosBasicData/OceanFreightImport/bills/index" pageStatus="this.$store.getters.approvalDetails" pageLabel="海运进口(F)"></fee-modify>
+        <fee-modify ref="feeModify" :form="assemblyForm" @updateDetail="updateDetail"
+            :curCodeDate="assemblyForm.actualEta ? assemblyForm.actualEta + ' 00:00:00' : null"
+            url="/iosBasicData/OceanFreightImport/bills/index" pageStatus="this.$store.getters.approvalDetails"
+            pageLabel="海运进口(F)"></fee-modify>
         <fee-modify-view ref="feeModifyView" :form="assemblyForm"></fee-modify-view>
     </div>
 </template>
@@ -1091,6 +1101,12 @@ export default {
                     overHidden: true,
                 },
                 {
+                    label: "代收客户",
+                    prop: "generationCorpCnName",
+                    width: "120",
+                    overHidden: true,
+                },
+                {
                     label: "费用简称",
                     prop: "feeCnName",
                     width: "100",
@@ -1612,11 +1628,41 @@ export default {
                     el.shortName = row.shortName
                     el.corpEnName = row.enName
                     el.corpCnName = row.cnName
+                    el.generationCorpId = row.bookingAgentId
+                    el.generationCorpEnName = row.bookingAgentEnName
+                    el.generationCorpCnName = row.bookingAgentCnName
                 } else {
                     el.corpId = null
                     el.shortName = null
                     el.corpCnName = null
                     el.corpEnName = null
+                    el.generationCorpId = null
+                    el.generationCorpEnName = null
+                    el.generationCorpCnName = null
+                }
+            }
+            if (name == 'shortNameC') {
+                if (row) {
+                    el.corpId = row.id
+                    el.shortName = row.shortName
+                    el.corpEnName = row.enName
+                    el.corpCnName = row.cnName
+                } else {
+                    el.corpId = null
+                    el.shortName = null
+                    el.corpCnName = null
+                    el.corpEnName = null
+                }
+            }
+            if (name == 'generationCorpCnName') {
+                if (row) {
+                    el.generationCorpId = row.id
+                    el.generationCorpEnName = row.enName
+                    el.generationCorpCnName = row.cnName
+                } else {
+                    el.generationCorpId = null
+                    el.generationCorpEnName = null
+                    el.generationCorpCnName = null
                 }
             }
             if (name == 'corpType') {
@@ -3220,10 +3266,11 @@ export default {
                     });
                 } else {
                     this.$router.push({
-                        path: `/iosBasicData/PaymentApplication/index`,
+                        path: `/iosBasicData/financialManagement/PaymentApplication/index`,
                         query: {
                             mblno: this.assemblyForm.mblno,
                             corpCnName: this.selectionCList[0].corpCnName,
+                            corpEnName: this.selectionCList[0].corpEnName,
                             corpId: this.selectionCList[0].corpId
                         }
                     })
@@ -3234,17 +3281,18 @@ export default {
                 if (this.selectionDList.length != this.selectionDList.filter(e => e.corpCnName == this.selectionDList[0].corpCnName).length) return this.$message.error("请选择相同的结算单位");
                 if (this.selectionDList.filter(e => e.auditStatus != 4).length) return this.$message.error("请选择审核通过的费用");
                 if (this.$store.getters.finappStatus) {
-                    this.$alert("发票申请(F)页面已存在,请关闭发票申请(F)再进行操作", "温馨提示", {
+                    this.$alert("发票申请页面已存在,请关闭发票申请再进行操作", "温馨提示", {
                         confirmButtonText: "确定",
                         type: 'warning',
                         callback: action => { }
                     });
                 } else {
                     this.$router.push({
-                        path: `/iosBasicData/fininvoicesApplyfor/index`,
+                        path: `/iosBasicData/financialManagement/fininvoicesApplyfor/index`,
                         query: {
                             mblno: this.assemblyForm.mblno,
                             corpCnName: this.selectionDList[0].corpCnName,
+                            corpEnName: this.selectionDList[0].corpEnName,
                             corpId: this.selectionDList[0].corpId
                         }
                     })
@@ -3416,7 +3464,7 @@ export default {
                     if (row.auditStatus == 0) {
                         return this.$message.error("未申请费用，不允许撤销");
                     }
-                       if (row.auditStatus > 2) {
+                    if (row.auditStatus > 2) {
                         return this.$message.error("费用已经审核通过,请使用申请修改和删除功能!");
                     }
                 }

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

@@ -40,9 +40,9 @@
       <template slot-scope="scope" slot="menu">
         <el-link type="primary" style="font-size: 12px" icon="el-icon-view" :underline="false"
           @click="addedData(1, scope)">查看详情&nbsp;&nbsp;</el-link>
-        <el-link type="primary" style="font-size: 12px" icon="el-icon-edit" :underline="false" :disabled="disabled"
+        <el-link type="primary" style="font-size: 12px" icon="el-icon-edit" :underline="false"
           @click="addedData(2, scope)">编 辑&nbsp;&nbsp;</el-link>
-        <el-link type="primary" style="font-size: 12px" icon="el-icon-delete" :underline="false" :disabled="disabled"
+        <el-link type="primary" style="font-size: 12px" icon="el-icon-delete" :underline="false"
           @click="rowDel(scope.row)">删 除</el-link>
         <el-link type="primary" :disabled="scope.row.status == 1"
           @click="handleReportPreview(scope.row.url, scope.row)">预览报表</el-link>

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

@@ -4,9 +4,9 @@
             <el-row :gutter="20">
                 <el-col span="8">
                     <el-row>
-                        <el-form-item label="发货人" prop="hshipperCnName" >
+                        <el-form-item label="发货人" prop="hshipperCnName">
                             <span slot="label">
-                                <span style="color: #1e9fff">{{$t("sea118n.shipper")}}</span>
+                                <span style="color: #1e9fff">{{ $t("sea118n.shipper") }}</span>
                             </span>
                             <div>
                                 <el-col :span="16">
@@ -38,7 +38,7 @@
                         </div>
                         <el-form-item label="收货人" prop="hconsigneeCnName">
                             <span slot="label">
-                                <span style="color: #1e9fff">{{$t("sea118n.cnee")}}</span>
+                                <span style="color: #1e9fff">{{ $t("sea118n.cnee") }}</span>
                             </span>
                             <div>
                                 <el-col :span="16">
@@ -81,7 +81,7 @@
                         </div>
                         <el-form-item label="通知人" prop="hnotifyCnName">
                             <span slot="label">
-                                <span style="color: #1e9fff">{{$t("sea118n.notify")}}</span>
+                                <span style="color: #1e9fff">{{ $t("sea118n.notify") }}</span>
                             </span>
                             <div>
                                 <el-col :span="16">
@@ -132,7 +132,7 @@
                         <div>
                             <el-form-item label="国外代理" prop="foreignAgencyCnName">
                                 <span slot="label">
-                                    <span style="color: #1e9fff">{{$t("sea118n.agent")}}</span>
+                                    <span style="color: #1e9fff">{{ $t("sea118n.agent") }}</span>
                                 </span>
                                 <div>
                                     <el-col :span="16">
@@ -232,7 +232,7 @@
                     <el-col :span="12">
                         <el-row>
                             <div>
-                                <span style="font-size: 14px;color: #1e9fff">{{$t("sea118n.marks")}}</span>
+                                <span style="font-size: 14px;color: #1e9fff">{{ $t("sea118n.marks") }}</span>
                             </div>
                             <div style="margin-top: 4px">
                                 <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.marks" size="small"
@@ -265,9 +265,9 @@
                             </div>-->
                             <div style="margin-top: 4px">
                                 <el-form-item label="货描" prop="cargoType" label-width="50px"
-                                :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
+                                    :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
                                     <span slot="label">
-                                        <span style="color: #1e9fff">{{$t("sea118n.descOfGoods")}}</span>
+                                        <span style="color: #1e9fff">{{ $t("sea118n.descOfGoods") }}</span>
                                     </span>
                                     <!--<el-col :span="5">-->
                                     <!--    <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="assemblyForm.isLargeCargo">大件货</el-checkbox>-->
@@ -300,7 +300,7 @@
                                         <avue-crud :data="delData" :option="delOption"
                                             :table-loading="loading"></avue-crud>
                                         <span style="color:rgb(76, 158, 68);text-decoration: underline;"
-                                            slot="reference">{{$t("sea118n.pol")}}</span>
+                                            slot="reference">{{ $t("sea118n.pol") }}</span>
                                     </el-popover>
                                 </span>
                                 <el-row>
@@ -333,7 +333,7 @@
                                             :table-loading="loading"></avue-crud>
                                         <!-- <el-button slot="reference">click 激活</el-button> -->
                                         <span style="color:rgb(76, 158, 68);text-decoration: underline;"
-                                            slot="reference">{{$t("sea118n.pod")}}</span>
+                                            slot="reference">{{ $t("sea118n.pod") }}</span>
                                     </el-popover>
                                     <!-- <span style="color: #1e9fff">卸货港</span> -->
                                 </span>
@@ -367,7 +367,7 @@
                                             :table-loading="loading"></avue-crud>
                                         <!-- <el-button slot="reference">click 激活</el-button> -->
                                         <span style="color:rgb(76, 158, 68);text-decoration: underline;"
-                                            slot="reference">{{$t("sea118n.placeDelivery")}}</span>
+                                            slot="reference">{{ $t("sea118n.placeDelivery") }}</span>
                                     </el-popover>
                                     <!-- <span style="color: #1e9fff">交货地</span> -->
                                 </span>
@@ -1066,9 +1066,17 @@
                                     :disabled="detailData.seeDisabled"></dic-select>
                             </el-form-item>
                         </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="邮箱" prop="fileEmail">
+                                <span slot="label">
+                                    <span style="color: #1e9fff">邮箱</span>
+                                </span>
+                                <el-input style="width: 100%;" size="small" v-model="assemblyForm.fileEmail"
+                                    :disabled="detailData.seeDisabled" placeholder="文件联络人邮箱"></el-input>
+                            </el-form-item>
+                        </el-col>
                     </el-row>
                 </el-col>
-
             </el-row>
         </el-form>
 

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

@@ -56,8 +56,7 @@
                         <span>应收费用</span>
                     </div>
                     <el-button v-if="isFeeEditD" type="danger" plain size="small"
-                        :disabled="!selectionDList.length || disabled"
-                        @click="batchDelete('D')">一键删除
+                        :disabled="!selectionDList.length || disabled" @click="batchDelete('D')">一键删除
                     </el-button>
                     <!-- <el-button v-if="isFeeEditD" type="success" plain size="small"
                         :disabled="!selectionDList.length || disabled || pleasereviewType"
@@ -79,16 +78,16 @@
                     <el-button v-if="isFeeEditC" type="primary" plain size="small"
                         :disabled="disabled || pleasereviewType" @click="copyfun('D')">生成应付</el-button>
                     <el-button v-if="isFeeEditD" type="primary" plain size="small"
-                        :disabled="disabled || pleasereviewType" @click="allClick('发票申请', 'D')">发票申请</el-button>
+                        @click="allClick('发票申请', 'D')">发票申请</el-button>
                     <el-button type="primary" plain size="small" :disabled="disabled || selectionDList.length == 0"
                         @click="allClick('D费用申请')">请核费用</el-button>
                     <el-button type="danger" plain size="small" :disabled="disabled || selectionDList.length == 0"
                         @click="allClick('D撤销请核')">撤销请核</el-button>
-                    <el-button type="primary" plain size="small" :disabled="selectionDList.length != 1||showLock"
+                    <el-button type="primary" plain size="small" :disabled="selectionDList.length != 1 || showLock"
                         @click="allClick('D申请修改')">申请修改</el-button>
-                    <el-button type="success" plain size="small" :disabled="selectionDList.length != 1||showLock"
+                    <el-button type="success" plain size="small" :disabled="selectionDList.length != 1 || showLock"
                         @click="allClick('D申请删除')">申请删除</el-button>
-                    <el-button type="danger" plain size="small" :disabled="selectionDList.length != 1||showLock"
+                    <el-button type="danger" plain size="small" :disabled="selectionDList.length != 1 || showLock"
                         @click="allClick('D取消申请')">取消申请</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
@@ -116,6 +115,14 @@
                         @selectChange="rowDicChange('shortName', $event, row)"></dic-select>
                     <span v-else>{{ row.shortName }}</span>
                 </template>
+                <template slot="generationCorpCnName" slot-scope="{ row,index }">
+                    <dic-select v-if="row.edit" v-model="row.generationCorpCnName" placeholder="代收客户" label="cnName"
+                        res="records" :slotRight="true" rightLabel="code"
+                        url="/blade-los/bcorps/listByType?status=0&current=1&size=5&corpTypeName=国内直接客户,国内同行及代理,国外直接客户,国外同行及代理"
+                        :filterable="true" :remote="true" dataName="cnName"
+                        @selectChange="rowDicChange('generationCorpCnName', $event, row)"></dic-select>
+                    <span v-else>{{ row.generationCorpCnName }}</span>
+                </template>
                 <!-- <template slot="corpCnName" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="corpCnNameData" :selectValue="row.shortName"
                         :filterable="true" :clearable="true" :remote="true" :buttonIf="false"
@@ -210,8 +217,7 @@
                         <span>应付费用</span>
                     </div>
                     <el-button v-if="isFeeEditC" type="danger" plain size="small"
-                        :disabled="!selectionCList.length || disabled"
-                        @click="batchDelete('C')">一键删除
+                        :disabled="!selectionCList.length || disabled" @click="batchDelete('C')">一键删除
                     </el-button>
                     <!-- <el-button v-if="isFeeEditC" type="primary" plain size="small"
                         :disabled="!selectionCList.length || disabled || pleasereviewType"
@@ -235,19 +241,18 @@
                     <el-button v-if="isFeeEditC" type="primary" 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>
+                    <el-button type="info" plain size="small" @click="allClick('付费申请', 'C')">付费申请</el-button>
                     <el-button type="primary" plain size="small" :disabled="disabled || selectionCList.length == 0"
                         @click="allClick('C费用申请')">请核费用</el-button>
                     <el-button type="danger" plain size="small" :disabled="disabled || selectionCList.length == 0"
                         @click="allClick('C撤销请核')">撤销请核</el-button>
                     <!-- <el-button type="success" plain size="small" :disabled="disabled"
                         @click="allClick('提取成本')">提取成本</el-button> -->
-                    <el-button type="primary" plain size="small" :disabled="selectionCList.length != 1||showLock"
+                    <el-button type="primary" plain size="small" :disabled="selectionCList.length != 1 || showLock"
                         @click="allClick('C申请修改')">申请修改</el-button>
-                    <el-button type="success" plain size="small" :disabled="selectionCList.length != 1||showLock"
+                    <el-button type="success" plain size="small" :disabled="selectionCList.length != 1 || showLock"
                         @click="allClick('C申请删除')">申请删除</el-button>
-                    <el-button type="danger" plain size="small" :disabled="selectionCList.length != 1||showLock"
+                    <el-button type="danger" plain size="small" :disabled="selectionCList.length != 1 || showLock"
                         @click="allClick('C取消申请')">取消申请</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
@@ -283,7 +288,7 @@
                         label="shortName" res="records" :slotRight="true" rightLabel="code"
                         :url="'/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=' + row.corpType"
                         :filterable="true" :remote="true" dataName="shortName"
-                        @selectChange="rowDicChange('shortName', $event, row)"></dic-select>
+                        @selectChange="rowDicChange('shortNameC', $event, row)"></dic-select>
                     <span v-else>{{ row.shortName }}</span>
                 </template>
                 <template slot="feeCnName" slot-scope="{ row }">
@@ -630,7 +635,10 @@
         <reportContainer ref="reportContainer"></reportContainer>
         <mail-component ref="mailComponentRef" />
         <extraction-cost ref="extractionCost" @getData="getData" />
-        <fee-modify ref="feeModify" :form="assemblyForm" @updateDetail="updateDetail" :curCodeDate="assemblyForm.etd?assemblyForm.etd+' 00:00:00':null" url="/iosBasicData/SeafreightExportF/bills/index" pageStatus="this.$store.getters.approvalDetails" pageLabel="海运出口(F)"></fee-modify>
+        <fee-modify ref="feeModify" :form="assemblyForm" @updateDetail="updateDetail"
+            :curCodeDate="assemblyForm.etd ? assemblyForm.etd + ' 00:00:00' : null"
+            url="/iosBasicData/SeafreightExportF/bills/index" pageStatus="this.$store.getters.approvalDetails"
+            pageLabel="海运出口(F)"></fee-modify>
         <fee-modify-view ref="feeModifyView" :form="assemblyForm"></fee-modify-view>
     </div>
 </template>
@@ -1067,6 +1075,12 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "代收客户",
+                        prop: "generationCorpCnName",
+                        width: "120",
+                        overHidden: true,
+                    },
+                    {
                         label: "费用简称",
                         prop: "feeCnName",
                         width: "100",
@@ -1614,6 +1628,25 @@ export default {
                     el.shortName = row.shortName
                     el.corpEnName = row.enName
                     el.corpCnName = row.cnName
+                    el.generationCorpId = row.bookingAgentId
+                    el.generationCorpEnName = row.bookingAgentEnName
+                    el.generationCorpCnName = row.bookingAgentCnName
+                } else {
+                    el.corpId = null
+                    el.shortName = null
+                    el.corpCnName = null
+                    el.corpEnName = null
+                    el.generationCorpId = null
+                    el.generationCorpEnName = null
+                    el.generationCorpCnName = null
+                }
+            }
+            if (name == 'shortNameC') {
+                if (row) {
+                    el.corpId = row.id
+                    el.shortName = row.shortName
+                    el.corpEnName = row.enName
+                    el.corpCnName = row.cnName
                 } else {
                     el.corpId = null
                     el.shortName = null
@@ -1621,6 +1654,17 @@ export default {
                     el.corpEnName = null
                 }
             }
+            if (name == 'generationCorpCnName') {
+                if (row) {
+                    el.generationCorpId = row.id
+                    el.generationCorpEnName = row.enName
+                    el.generationCorpCnName = row.cnName
+                } else {
+                    el.generationCorpId = null
+                    el.generationCorpEnName = null
+                    el.generationCorpCnName = null
+                }
+            }
             if (name == 'corpType') {
                 if (row.cnName == '国内直接客户' || row.cnName == '国内同行及代理' || row.cnName == '国外直接客户') {
                     el.corpId = this.assemblyForm.corpId
@@ -3076,10 +3120,11 @@ export default {
                     });
                 } else {
                     this.$router.push({
-                        path: `/iosBasicData/PaymentApplication/index`,
+                        path: `/iosBasicData/financialManagement/PaymentApplication/index`,
                         query: {
                             mblno: this.assemblyForm.mblno,
                             corpCnName: this.selectionCList[0].corpCnName,
+                            corpEnName: this.selectionCList[0].corpEnName,
                             corpId: this.selectionCList[0].corpId
                         }
                     })
@@ -3090,7 +3135,7 @@ export default {
                 if (this.selectionDList.length != this.selectionDList.filter(e => e.corpCnName == this.selectionDList[0].corpCnName).length) return this.$message.error("请选择相同的结算单位");
                 if (this.selectionDList.filter(e => e.auditStatus != 4).length) return this.$message.error("请选择审核通过的费用");
                 if (this.$store.getters.finappStatus) {
-                    this.$alert("发票申请(F)页面已存在,请关闭发票申请(F)再进行操作", "温馨提示", {
+                    this.$alert("发票申请页面已存在,请关闭发票申请再进行操作", "温馨提示", {
                         confirmButtonText: "确定",
                         type: 'warning',
                         callback: action => {
@@ -3098,10 +3143,11 @@ export default {
                     });
                 } else {
                     this.$router.push({
-                        path: `/iosBasicData/fininvoicesApplyfor/index`,
+                        path: `/iosBasicData/financialManagement/fininvoicesApplyfor/index`,
                         query: {
                             mblno: this.assemblyForm.mblno,
                             corpCnName: this.selectionDList[0].corpCnName,
+                            corpEnName: this.selectionDList[0].corpEnName,
                             corpId: this.selectionDList[0].corpId
                         }
                     })

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

@@ -40,9 +40,9 @@
       <template slot-scope="scope" slot="menu">
         <el-link type="primary" style="font-size: 12px" icon="el-icon-view" :underline="false"
           @click="addedData(1, scope)">查看详情&nbsp;&nbsp;</el-link>
-        <el-link type="primary" style="font-size: 12px" icon="el-icon-edit" :underline="false" :disabled="disabled"
+        <el-link type="primary" style="font-size: 12px" icon="el-icon-edit" :underline="false"
           @click="addedData(2, scope)">编 辑&nbsp;&nbsp;</el-link>
-        <el-link type="primary" style="font-size: 12px" icon="el-icon-delete" :underline="false" :disabled="disabled"
+        <el-link type="primary" style="font-size: 12px" icon="el-icon-delete" :underline="false"
           @click="rowDel(scope.row)">删 除</el-link>
         <el-link type="primary" :disabled="scope.row.status == 1"
           @click="handleReportPreview(scope.row.url, scope.row)">预览报表</el-link>

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

@@ -988,7 +988,7 @@ export default {
                         overHidden: true
                     },
                     {
-                        label: this.$t("sea118n.ctnrTypeQty"),
+                        label: this.$t("sea118n.cargoType"),
                         prop: 'billOfLadingStatus',
                         overHidden: true,
                         width:100,

src/views/iosBasicData/businessCenter/customerBooking/detailsPage.vue

@@ -310,7 +310,8 @@
                     </el-col>
                   </el-row>
                   <el-row>
-                    <el-form-item label="邮箱" prop="fileEmail">
+                    <el-form-item label="邮箱" prop="fileEmail"
+                      :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
                       <el-input style="width: 100%;" size="small" v-model="form.fileEmail" :disabled="editDisabled"
                         placeholder="文件联络人邮箱"></el-input>
                     </el-form-item>

src/views/iosBasicData/businessCenter/customerLetter/detailsPage.vue

@@ -1182,6 +1182,12 @@ export default {
           item.costPrice = row.hc40Cost
         }
       })
+      
+      this.form.carrierId=row.actualShippingCompanyId
+      this.form.carrierCode=row.actualShippingCompanyCode
+      this.form.carrierEnName=row.actualShippingCompanyEname
+      this.form.carrierCnName=row.actualShippingCompanyCname
+      this.form.carrierArgreementNo=row.actualShippingCompanyAbbreviation
       this.submit()
     },
     textareaBlur(name, row) {

src/views/iosBasicData/financialManagement/PaymentApplication/detailsPage.vue

@@ -235,7 +235,7 @@ import {
     finstlbillsDetail,
     listAccBillV2,
     finstlbillsSubmit, feeItemsSynchronize, settlementApproveV1, srevokeSettlementApproveV1,
-    feeItemsDelete, finstlbillslistAccBillByCorp,
+    feeItemsDelete, finstlbillslistAccBillByCorp, finstlbillsAdd
 } from '@/api/iosBasicData/finstlbills'
 import finstlbillsitems from "@/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue";
 import { dateFormat } from "@/util/date";
@@ -766,6 +766,13 @@ export default {
             this.optionForm.disabled = true
             this.getDetail(this.detailData.id)
         }
+        if (this.$route.query.mblno || this.$route.query.corpId) {
+            this.search.mblno = this.$route.query.mblno
+            this.form.corpId = this.$route.query.corpId
+            this.form.corpCnName = this.$route.query.corpCnName
+            this.form.corpEnName = this.$route.query.corpEnName
+            this.form.corpArgreementNo = this.$route.query.corpEnName
+        }
         this.$nextTick(() => {
             this.$refs.crud2.dicInit();
         });
@@ -868,6 +875,13 @@ export default {
                 if (!this.form.corpId) {
                     return this.$message.error('请填写付费对象')
                 }
+                this.form.billNoFormat = 'FFSQ'
+                this.form.businessTypeCode = 'FFSQ'
+                this.form.businessType = 'FFSQ' // 结算单
+                let obj = {
+                    ...this.form
+                }
+                finstlbillsAdd(obj)
                 this.finstlbillslistAccBillV1fun()
             }
         },
@@ -1183,7 +1197,7 @@ export default {
             let obj = {
                 ...this.form
             }
-            finstlbillsSubmit(obj).then(res => {
+            finstlbillsAdd(obj).then(res => {
                 this.finstlbillslistAccBillV1fun()
             })
         },

src/views/iosBasicData/financialManagement/computationCenter/detailsPage.vue

@@ -241,6 +241,7 @@ import {
     revokeSettlementV1,
     feeItemsDelete,
     finstlbillslistAccBillByCorp,
+    finstlbillsAdd
 } from '@/api/iosBasicData/finstlbills'
 import expand from "@/components/basic-container/expand.vue";
 import finstlbillsitems from "@/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue";
@@ -866,6 +867,13 @@ export default {
                 if (!this.form.corpId) {
                     return this.$message.error('请填写结算单位')
                 }
+                this.form.billNoFormat = 'STL'
+                this.form.businessTypeCode = 'STL'
+                this.form.businessType = 'STL' // 结算
+                let obj = {
+                    ...this.form
+                }
+                finstlbillsAdd(obj)
                 this.finstlbillslistAccBillV1fun()
             }
         },
@@ -1267,7 +1275,7 @@ export default {
             let obj = {
                 ...this.form
             }
-            finstlbillsSubmit(obj).then(res => {
+            finstlbillsAdd(obj).then(res => {
                 this.finstlbillslistAccBillV1fun()
             })
         },

src/views/iosBasicData/financialManagement/fininvoicesApplyfor/detailsPage.vue

@@ -251,6 +251,7 @@ import {
     fininvoicesDetail,
     revokeFinInvoicesV1,
     fininvoicesSubmit,
+    fininvoicesAdd
 } from "@/api/iosBasicData/fininvoices";
 import expand from "@/components/basic-container/expand.vue";
 import finstlbillsitems from "@/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue";
@@ -813,6 +814,13 @@ export default {
             this.optionForm.disabled = true
             this.getDetail(this.detailData.id)
         }
+        if (this.$route.query.mblno || this.$route.query.corpId) {
+            this.search.mblno = this.$route.query.mblno
+            this.form.corpId = this.$route.query.corpId
+            this.form.corpCnName = this.$route.query.corpCnName
+            this.form.corpEnName = this.$route.query.corpEnName
+            this.form.corpArgreementNo = this.$route.query.corpEnName
+        }
         this.$nextTick(() => {
             this.$refs.crud2.dicInit();
         });
@@ -915,6 +923,13 @@ export default {
                 if (!this.form.corpId) {
                     return this.$message.error('请填写结算单位')
                 }
+                this.form.billNoFormat = 'FPSQ'
+                this.form.businessTypeCode = 'FPSQ'
+                this.form.type = '申请'
+                let obj = {
+                    ...this.form
+                }
+                fininvoicesAdd(obj)
                 this.finstlbillslistAccBillV1fun()
             }
         },
@@ -1230,7 +1245,7 @@ export default {
             let obj = {
                 ...this.form
             }
-            fininvoicesSubmit(obj).then(res => {
+            fininvoicesAdd(obj).then(res => {
                 this.finstlbillslistAccBillV1fun()
             })
         },

src/views/iosBasicData/financialManagement/fininvoicesOutput/detailsPage.vue

@@ -255,7 +255,8 @@ import {
     revokeFinInvoicesV1,
     fininvoicesSubmit,
     generateFinInvoicesV1,
-    revokeGenerateFinInvoicesV1
+    revokeGenerateFinInvoicesV1,
+    fininvoicesAdd
 } from "@/api/iosBasicData/fininvoices";
 import expand from "@/components/basic-container/expand.vue";
 import finstlbillsitems from "@/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue";
@@ -929,6 +930,13 @@ export default {
                 if (!this.form.corpId) {
                     return this.$message.error('请填写结算单位')
                 }
+                this.form.billNoFormat = 'XXFP'
+                this.form.businessTypeCode = 'XXFP'
+                this.form.type = '销项'
+                let obj = {
+                    ...this.form
+                }
+                fininvoicesAdd(obj)
                 this.finstlbillslistAccBillV1fun()
             }
         },
@@ -1300,7 +1308,7 @@ export default {
             let obj = {
                 ...this.form
             }
-            fininvoicesSubmit(obj).then(res => {
+            fininvoicesAdd(obj).then(res => {
                 this.finstlbillslistAccBillV1fun()
             })
         },

src/views/iosBasicData/financialManagement/finstlbills/detailsPage.vue

@@ -221,7 +221,7 @@ import {
     finstlbillsDetail,
     listAccBillV2,
     finstlbillsSubmit, feeItemsSynchronize, confirmReconciliationV1, revokeReconciliationV1,
-    feeItemsDelete, finstlbillslistAccBillByCorp,
+    feeItemsDelete, finstlbillslistAccBillByCorp, finstlbillsAdd
 } from '@/api/iosBasicData/finstlbills'
 import expand from "@/components/basic-container/expand.vue";
 import finstlbillsitems from "@/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue";
@@ -822,12 +822,19 @@ export default {
             if (!this.form.id) {
                 return this.$message.error("请保存数据");
             }
+            finstlbillsAdd(obj)
             if (!this.form.corpId && (this.search.hblno || this.search.mblno)) {
                 this.finstlbillslistAccBillByCorpfun()
             } else {
                 if (!this.form.corpId) {
                     return this.$message.error('请填写对账单位')
                 }
+                this.form.billNoFormat = 'HYDZ'
+                this.form.businessTypeCode = 'HYDZ'
+                this.form.businessType = 'CHK' // 对账
+                let obj = {
+                    ...this.form
+                }
                 this.finstlbillslistAccBillV1fun()
             }
         },
@@ -1138,7 +1145,7 @@ export default {
             let obj = {
                 ...this.form
             }
-            finstlbillsSubmit(obj).then(res => {
+            finstlbillsAdd(obj).then(res => {
                 this.finstlbillslistAccBillV1fun()
             })
         },

src/views/ow/owTask/detailsPage.vue

@@ -3348,29 +3348,29 @@ export default {
           })
         })
       }
-      if (name == 'D发票申请') {
-        if (this.selectionfeedList.length == 0) return this.$message.error("请选择费用");
-        if (this.selectionfeedList.length != this.selectionfeedList.filter(e => e.corpCnName == this.selectionfeedList[0].corpCnName).length) return this.$message.error("请选择相同的结算单位");
-        if (this.selectionfeedList.filter(e => e.auditStatus != 4).length) return this.$message.error("请选择审核通过的费用");
-        if (this.$store.getters.finappStatus) {
-          this.$alert("发票申请(F)页面已存在,请关闭发票申请(F)再进行操作", "温馨提示", {
-            confirmButtonText: "确定",
-            type: 'warning',
-            callback: action => {
-            }
-          });
-        } else {
-          this.$router.push({
-            path: `/iosBasicData/fininvoicesApplyfor/index`,
-            query: {
-              // mblno: this.form.mblno,
-              corpCnName: this.selectionfeedList[0].corpCnName,
-              corpId: this.selectionfeedList[0].corpId
-            }
-          })
-        }
+      // if (name == 'D发票申请') {
+      //   if (this.selectionfeedList.length == 0) return this.$message.error("请选择费用");
+      //   if (this.selectionfeedList.length != this.selectionfeedList.filter(e => e.corpCnName == this.selectionfeedList[0].corpCnName).length) return this.$message.error("请选择相同的结算单位");
+      //   if (this.selectionfeedList.filter(e => e.auditStatus != 4).length) return this.$message.error("请选择审核通过的费用");
+      //   if (this.$store.getters.finappStatus) {
+      //     this.$alert("发票申请(F)页面已存在,请关闭发票申请(F)再进行操作", "温馨提示", {
+      //       confirmButtonText: "确定",
+      //       type: 'warning',
+      //       callback: action => {
+      //       }
+      //     });
+      //   } else {
+      //     this.$router.push({
+      //       path: `/iosBasicData/fininvoicesApplyfor/index`,
+      //       query: {
+      //         // mblno: this.form.mblno,
+      //         corpCnName: this.selectionfeedList[0].corpCnName,
+      //         corpId: this.selectionfeedList[0].corpId
+      //       }
+      //     })
+      //   }
 
-      }
+      // }
       if (name == 'D费用申请') {
         for (let row of this.selectionfeedList) {
           if (!row.id) {
@@ -3416,7 +3416,7 @@ export default {
         if (this.selectionfeedList.length != this.selectionfeedList.filter(e => e.corpCnName == this.selectionfeedList[0].corpCnName).length) return this.$message.error("请选择相同的结算单位");
         if (this.selectionfeedList.filter(e => e.auditStatus != 4).length) return this.$message.error("请选择审核通过的费用");
         if (this.$store.getters.finappStatus) {
-          this.$alert("发票申请(F)页面已存在,请关闭发票申请(F)再进行操作", "温馨提示", {
+          this.$alert("发票申请页面已存在,请关闭发票申请再进行操作", "温馨提示", {
             confirmButtonText: "确定",
             type: 'warning',
             callback: action => {
@@ -3424,10 +3424,11 @@ export default {
           });
         } else {
           this.$router.push({
-            path: `/iosBasicData/fininvoicesApplyfor/index`,
+            path: `/iosBasicData/financialManagement/fininvoicesApplyfor/index`,
             query: {
               // mblno: this.form.mblno,
               corpCnName: this.selectionfeedList[0].corpCnName,
+              corpEnName: this.selectionfeedList[0].corpEnName,
               corpId: this.selectionfeedList[0].corpId
             }
           })
@@ -3447,10 +3448,11 @@ export default {
           });
         } else {
           this.$router.push({
-            path: `/iosBasicData/PaymentApplication/index`,
+            path: `/iosBasicData/financialManagement/PaymentApplication/index`,
             query: {
-              mblno: this.form.mblno,
+              // mblno: this.form.mblno,
               corpCnName: this.selectionfeecList[0].corpCnName,
+              corpEnName: this.selectionfeecList[0].corpEnName,
               corpId: this.selectionfeecList[0].corpId
             }
           })