修改财务管理bug 客户托书 客户订舱新加字段 海运进出口 列表页 加EDI OW 启用新加必填

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

@@ -73,6 +73,17 @@
                             </el-dropdown-item>
                         </el-dropdown-menu>
                     </el-dropdown>
+                    <el-dropdown style="line-height: 0">
+                        <el-button size="small" type="success" style="margin-right: 8px"
+                            :disabled="selectionList.length == 0">
+                            发送 SI EDI<i class="el-icon-arrow-down el-icon--right"></i>
+                        </el-button>
+                        <el-dropdown-menu slot="dropdown">
+                            <el-dropdown-item v-for="item in ediData_SI" :key="item.id"
+                                @click.native="editypesSendingEdifun(item)">{{ item.cnName }}
+                            </el-dropdown-item>
+                        </el-dropdown-menu>
+                    </el-dropdown>
                     <div style="margin-top: 10px">
                         <el-tabs type="card" v-model="query.billStatus" @tab-click="handleClick">
 
@@ -163,7 +174,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>{{
@@ -285,6 +296,7 @@ export default {
         return {
             billOfLadingStatusData: [],
             ediData_SO: [],
+            ediData_SI: [], // 获取的 SI edi 数据
             roleName: [],
             dcDic: [
                 {
@@ -1528,7 +1540,7 @@ export default {
     },
     methods: {
         editypesListfun() {
-            editypesList(1, 1000).then(res => {
+            editypesList(1, 1000, { type: "HYJK" }).then(res => {
                 console.log("EDI", res.data.data.records);
                 this.ediData = res.data.data.records;
                 this.ediData_SO = res.data.data.records.filter(

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

@@ -80,7 +80,7 @@
                         {{ $t("btn118n.apply") }}
                     </el-button>
 
-                    <!-- <el-dropdown style="line-height: 0">
+                    <el-dropdown style="line-height: 0">
                         <el-button size="small" type="success" style="margin-right: 8px"
                             :disabled="selectionList.length == 0">
                             发送 SO EDI<i class="el-icon-arrow-down el-icon--right"></i>
@@ -90,8 +90,8 @@
                                 @click.native="editypesSendingEdifun(item)">{{ item.cnName }}
                             </el-dropdown-item>
                         </el-dropdown-menu>
-                    </el-dropdown> -->
-                    <!-- <el-dropdown style="line-height: 0">
+                    </el-dropdown>
+                    <el-dropdown style="line-height: 0">
                         <el-button size="small" type="success" style="margin-right: 8px"
                             :disabled="selectionList.length == 0">
                             发送 SI EDI<i class="el-icon-arrow-down el-icon--right"></i>
@@ -101,7 +101,7 @@
                                 @click.native="editypesSendingEdifun(item)">{{ item.cnName }}
                             </el-dropdown-item>
                         </el-dropdown-menu>
-                    </el-dropdown> -->
+                    </el-dropdown>
                     <div style="margin-top: 10px">
                         <el-tabs type="card" v-model="query.billStatus" @tab-click="handleClick">
                             <el-tab-pane v-if="!(roleName.indexOf('总部中心') >= 0)" :label='$t("sea118n.entering")' name="0">
@@ -1848,7 +1848,7 @@ export default {
         },
         // 获取EDI列表数据
         editypesListfun() {
-            editypesList(1, 1000).then(res => {
+            editypesList(1, 1000, { type: "HYCK" }).then(res => {
                 console.log("EDI", res.data.data.records);
                 this.ediData = res.data.data.records;
                 this.ediData_SO = res.data.data.records.filter(

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

@@ -316,11 +316,20 @@
                     </el-form-item>
                   </el-row>
                   <el-row>
-                    <el-form-item label="订舱备注" prop="cyRemarks">
-                      <el-input type="textarea" style="width: 100%;" v-model="form.cyRemarks" size="small"
-                        autocomplete="off" :disabled="editDisabled" :rows="2" clearable placeholder="请输入场站备注"
-                        @change="textareaBlur('cyRemarks', $event)"></el-input>
-                    </el-form-item>
+                    <el-col span="12">
+                      <el-form-item label="订舱备注" prop="cyRemarks">
+                        <el-input type="textarea" style="width: 100%;" v-model="form.cyRemarks" size="small"
+                          autocomplete="off" :disabled="editDisabled" :rows="2" clearable placeholder="请输入备注"
+                          @change="textareaBlur('cyRemarks', $event)"></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col span="12">
+                      <el-form-item label="SI备注" prop="siRemarks">
+                        <el-input type="textarea" style="width: 100%;" v-model="form.siRemarks" size="small"
+                          autocomplete="off" :disabled="editDisabled" :rows="2" clearable placeholder="请输入备注"
+                          @change="textareaBlur('siRemarks', $event)"></el-input>
+                      </el-form-item>
+                    </el-col>
                   </el-row>
                 </el-col>
               </el-row>

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

@@ -236,8 +236,9 @@
                     </el-col>
                     <el-col span="12">
                       <el-form-item label="货类" prop="cargoType"
-                      :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
-                        <el-select v-model="form.cargoType" style="width: 100%;" placeholder="请选择 货类" :disabled="editDisabled" size="small">
+                        :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
+                        <el-select v-model="form.cargoType" style="width: 100%;" placeholder="请选择 货类"
+                          :disabled="editDisabled" size="small">
                           <el-option v-for="item in cargoTypeData" :key="item.value" :label="item.label"
                             :value="item.value">
                           </el-option>
@@ -276,15 +277,23 @@
                             :disabled="editDisabled"></dic-select>
                         </div>
                       </el-form-item>
-
                     </el-col>
                   </el-row>
                   <el-row>
-                    <el-form-item label="订舱备注" prop="cyRemarks">
-                      <el-input type="textarea" style="width: 100%;" v-model="form.cyRemarks" size="small"
-                        autocomplete="off" :disabled="editDisabled" :rows="2" clearable placeholder="请输入场站备注"
-                        @change="textareaBlur('cyRemarks', $event)"></el-input>
-                    </el-form-item>
+                    <el-col span="12">
+                      <el-form-item label="订舱备注" prop="cyRemarks">
+                        <el-input type="textarea" style="width: 100%;" v-model="form.cyRemarks" size="small"
+                          autocomplete="off" :disabled="editDisabled" :rows="2" clearable placeholder="请输入备注"
+                          @change="textareaBlur('cyRemarks', $event)"></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col span="12">
+                       <el-form-item label="SI备注" prop="siRemarks">
+                        <el-input type="textarea" style="width: 100%;" v-model="form.siRemarks" size="small"
+                          autocomplete="off" :disabled="editDisabled" :rows="2" clearable placeholder="请输入备注"
+                          @change="textareaBlur('siRemarks', $event)"></el-input>
+                      </el-form-item>
+                    </el-col>
                   </el-row>
                 </el-col>
               </el-row>

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

@@ -536,7 +536,7 @@ export default {
                     },
                     {
                         label: '对账单号',
-                        prop: 'checkNo',
+                        prop: 'checkBillNo',
                         search: true,
                         hide: true,
                         disabled: false
@@ -875,7 +875,7 @@ export default {
             this.search = {
                 mblno: null,
                 hblno: null,
-                checkNo: null,
+                checkBillNo: null,
                 accountNo: null,
                 businessNo: null,
                 accountDc: null,
@@ -1177,7 +1177,15 @@ export default {
             this.$set(this.form, 'corpEnName', row.enName)
             this.$set(this.form, 'corpArgreementNo', row.enName)
             this.retrievePopupsType = false
-            this.finstlbillslistAccBillV1fun()
+            this.form.billNoFormat = 'FFSQ'
+            this.form.businessTypeCode = 'FFSQ'
+            this.form.businessType = 'FFSQ' // 结算单
+            let obj = {
+                ...this.form
+            }
+            finstlbillsSubmit(obj).then(res => {
+                this.finstlbillslistAccBillV1fun()
+            })
         },
         // 检索出的弹窗
         finstlbillslistAccBillByCorpfun() {
@@ -1192,7 +1200,7 @@ export default {
             obj.curCode = this.search.curCode // 币别
             obj.mblno = this.search.mblno // MB/L NO
             obj.hblno = this.search.hblno // HB/L NO
-            obj.checkNo = this.search.checkNo
+            obj.checkBillNo = this.search.checkBillNo
             obj.accBillNo = this.search.accountNo // 账单编号  ACCT NO
             obj.billNo = this.search.businessNo // 单据编号  JOB NO
             obj.vesselEnName = this.search.vesselEnName // 中文船名
@@ -1216,7 +1224,7 @@ export default {
             obj.curCode = this.search.curCode // 币别
             obj.mblno = this.search.mblno // MB/L NO
             obj.hblno = this.search.hblno // HB/L NO
-            obj.checkNo = this.search.checkNo
+            obj.checkBillNo = this.search.checkBillNo
             obj.accBillNo = this.search.accountNo // 账单编号  ACCT NO
             obj.billNo = this.search.businessNo // 单据编号  JOB NO
             obj.vesselEnName = this.search.vesselEnName // 中文船名

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

@@ -17,9 +17,6 @@
                 </el-button>
                 <el-button type="success" size="small" :disabled="!form.id" plain @click="newbill">新建账单
                 </el-button>
-                <el-button size="small" type="danger" plain :disabled="!form.id"
-                    v-if="form.requestNo && form.status == 0" @click="allClick('撤销生成')">撤销生成
-                </el-button>
                 <el-button size="small" type="danger" plain :disabled="!form.id || editPower"
                     v-if="form.status == '1' || form.status == '4' || (form.status == '3' && roleName.indexOf('admin') != -1)"
                     @click="allClick('撤销结算')">撤销结算
@@ -86,6 +83,9 @@
                                         <el-button v-if="!form.requestNo" size="small" type="danger"
                                             style="margin-left: 10px" :disabled="editDisabled" @click="allDelete">全部删除
                                         </el-button>
+                                        <el-button size="small" type="danger" :disabled="!form.id"
+                                            v-if="form.requestNo && form.status == 0" @click="allClick('撤销生成')">全部删除
+                                        </el-button>
                                         <span style="font-size:18px;font-weight:600;margin-left:10px;">
                                             <span style="color: #67C23A;margin-right: 10px;">
                                                 应收本币:{{ form.amountDr || 0 }}元
@@ -1261,7 +1261,15 @@ export default {
             this.$set(this.form, 'corpEnName', row.enName)
             this.$set(this.form, 'corpArgreementNo', row.enName)
             this.retrievePopupsType = false
-            this.finstlbillslistAccBillV1fun()
+            this.form.billNoFormat = 'STL'
+            this.form.businessTypeCode = 'STL'
+            this.form.businessType = 'STL' // 结算
+            let obj = {
+                ...this.form
+            }
+            finstlbillsSubmit(obj).then(res => {
+                this.finstlbillslistAccBillV1fun()
+            })
         },
         // 检索出的弹窗
         finstlbillslistAccBillByCorpfun() {

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

@@ -504,19 +504,19 @@ export default {
                     return this.$message.error('请选择相同的往来单位')
                 }
             }
-            this.$confirm("确定将选择数据结算?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            }).then(() => {
-                let arrId = this.selectionList.map(item => {
-                    return item.id
-                })
-                this.isShow = false
-                this.$nextTick(() => {
-                    this.$refs.settlementDetailsRef.generateFinStlBillsfun(arrId.join(','), this.tabsValue)
-                })
-            })
+            // this.$confirm("确定将选择数据结算?", {
+            //     confirmButtonText: "确定",
+            //     cancelButtonText: "取消",
+            //     type: "warning"
+            // }).then(() => {
+            //     let arrId = this.selectionList.map(item => {
+            //         return item.id
+            //     })
+            //     this.isShow = false
+            //     this.$nextTick(() => {
+            //         this.$refs.settlementDetailsRef.generateFinStlBillsfun(arrId.join(','), this.tabsValue)
+            //     })
+            // })
             this.$DialogForm.show({
                 title: '生成结算单',
                 width: '30%',

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

@@ -106,16 +106,13 @@
                                             <!-- <span style="color:#F56C6C;">总行数:{{
                                                 form.finInvoicesItemsList.length }}</span> -->
                                             <span style="color: #67C23A;margin-right: 10px;">
-                                                应收本币:{{ form.amountDr || 0 }}元
+                                                开票本币:{{ form.amountCny || 0 }}元
                                             </span>
                                             <span style="color: #E6A23C;margin-right: 10px;">
-                                                应付本币:{{ form.amountCr || 0 }}元
+                                                开票外币:{{ form.amountUsd || 0 }}元
                                             </span>
                                             <span style="color: #67C23A;margin-right: 10px;">
-                                                应收外币:{{ form.amountDrUsd || 0 }}元
-                                            </span>
-                                            <span style="color: #E6A23C;margin-right: 10px;">
-                                                应付外币:{{ form.amountCrUsd || 0 }}元
+                                                开票本币合计:{{ form.amountLoc || 0 }}元
                                             </span>
                                         </span>
                                     </template>
@@ -378,15 +375,10 @@ export default {
                         type: 'select',
                         dicData: [
                             {
-                                label: '全部',
-                                value: null
-                            }, {
                                 label: '收',
                                 value: 'D'
-                            }, {
-                                label: '付',
-                                value: 'C'
-                            }],
+                            }
+                        ],
                         disabled: false
                     },
                     {
@@ -1232,7 +1224,15 @@ export default {
             this.$set(this.form, 'corpEnName', row.enName)
             this.$set(this.form, 'corpArgreementNo', row.enName)
             this.retrievePopupsType = false
-            this.finstlbillslistAccBillV1fun()
+            this.form.billNoFormat = 'FPSQ'
+            this.form.businessTypeCode = 'FPSQ'
+            this.form.type = '申请'
+            let obj = {
+                ...this.form
+            }
+            fininvoicesSubmit(obj).then(res => {
+                this.finstlbillslistAccBillV1fun()
+            })
         },
         // 检索出的弹窗
         finstlbillslistAccBillByCorpfun() {

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

@@ -17,9 +17,6 @@
                 </el-button>
                 <el-button type="success" size="small" :disabled="!form.id" plain @click="newbill">新建销项发票
                 </el-button>
-                <el-button size="small" type="danger" plain :disabled="!form.id" v-if="form.applyNo && form.status == 0"
-                    @click="allClick('撤销生成')">撤销发票
-                </el-button>
                 <el-button size="small" type="danger" plain :disabled="!form.id" v-if="form.status == 3"
                     @click="allClick('发票撤销')">发票撤销
                 </el-button>
@@ -105,20 +102,20 @@
                                         <el-button v-if="!form.applyNo" size="small" type="danger"
                                             style="margin-left: 10px" :disabled="editDisabled" @click="allDelete">全部删除
                                         </el-button>
+                                        <el-button size="small" type="danger" :disabled="!form.id"
+                                            v-if="form.applyNo && form.status == 0" @click="allClick('撤销生成')">全部删除
+                                        </el-button>
                                         <span style="font-size:18px;font-weight:600;margin-left:10px;">
                                             <!-- <span style="color:#F56C6C;">总行数:{{
                                                 form.finInvoicesItemsList.length }}</span> -->
                                             <span style="color: #67C23A;margin-right: 10px;">
-                                                应收本币:{{ form.amountDr || 0 }}元
+                                                开票本币:{{ form.amountCny || 0 }}元
                                             </span>
                                             <span style="color: #E6A23C;margin-right: 10px;">
-                                                应付本币:{{ form.amountCr || 0 }}元
+                                                开票外币:{{ form.amountUsd || 0 }}元
                                             </span>
                                             <span style="color: #67C23A;margin-right: 10px;">
-                                                应收外币:{{ form.amountDrUsd || 0 }}元
-                                            </span>
-                                            <span style="color: #E6A23C;margin-right: 10px;">
-                                                应付外币:{{ form.amountCrUsd || 0 }}元
+                                                开票本币合计:{{ form.amountLoc || 0 }}元
                                             </span>
                                         </span>
                                     </template>
@@ -383,14 +380,8 @@ export default {
                         type: 'select',
                         dicData: [
                             {
-                                label: '全部',
-                                value: null
-                            }, {
                                 label: '收',
                                 value: 'D'
-                            }, {
-                                label: '付',
-                                value: 'C'
                             }],
                         disabled: false
                     },
@@ -839,7 +830,7 @@ export default {
             if (this.form.applyNo) {
                 this.editDisabled = true
                 this.optionForm.column.forEach(item => {
-                    if (item.prop == 'invoiceDate' || item.prop == 'exrate') {
+                    if (item.prop == 'invoiceDate' || item.prop == 'taxInvoiceNo' || item.prop == 'exrate') {
                         item.disabled = false
                     } else {
                         item.disabled = true
@@ -1275,7 +1266,7 @@ export default {
                 if (res.data.data.applyNo) {
                     this.editDisabled = true
                     this.optionForm.column.forEach(item => {
-                        if (item.prop == 'invoiceDate' || item.prop == 'exrate') {
+                        if (item.prop == 'invoiceDate' || item.prop == 'taxInvoiceNo' || item.prop == 'exrate') {
                             item.disabled = false
                         } else {
                             item.disabled = true
@@ -1303,7 +1294,15 @@ export default {
             this.$set(this.form, 'corpEnName', row.enName)
             this.$set(this.form, 'corpArgreementNo', row.enName)
             this.retrievePopupsType = false
-            this.finstlbillslistAccBillV1fun()
+            this.form.billNoFormat = 'XXFP'
+            this.form.businessTypeCode = 'XXFP'
+            this.form.type = '销项'
+            let obj = {
+                ...this.form
+            }
+            fininvoicesSubmit(obj).then(res => {
+                this.finstlbillslistAccBillV1fun()
+            })
         },
         // 检索出的弹窗
         finstlbillslistAccBillByCorpfun() {
@@ -1315,6 +1314,7 @@ export default {
             obj.branchName = this.form.branchName
             obj.corpCnName = this.form.corpId ? this.form.corpId : null
             obj.isExchangeToCny = this.form.isExchangeToCny
+            obj.isDk = this.form.isDk
             obj.dc = this.search.accountDc // 收付 D=收 C=付
             obj.curCode = this.search.curCode // 币别
             obj.mblno = this.search.mblno // MB/L NO
@@ -1337,6 +1337,7 @@ export default {
             obj.branchName = this.form.branchName
             obj.corpCnName = this.form.corpId // 结算单位
             obj.isExchangeToCny = this.form.isExchangeToCny
+            obj.isDk = this.form.isDk
             obj.dc = this.search.accountDc // 收付 D=收 C=付
             obj.curCode = this.search.curCode // 币别
             obj.mblno = this.search.mblno // MB/L NO

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

@@ -1132,7 +1132,15 @@ export default {
             this.$set(this.form, 'corpEnName', row.enName)
             this.$set(this.form, 'corpArgreementNo', row.enName)
             this.retrievePopupsType = false
-            this.finstlbillslistAccBillV1fun()
+            this.form.billNoFormat = 'HYDZ'
+            this.form.businessTypeCode = 'HYDZ'
+            this.form.businessType = 'CHK' // 对账
+            let obj = {
+                ...this.form
+            }
+            finstlbillsSubmit(obj).then(res => {
+                this.finstlbillslistAccBillV1fun()
+            })
         },
         // 检索出的弹窗
         finstlbillslistAccBillByCorpfun() {
@@ -1142,7 +1150,7 @@ export default {
             obj.type = '1'
             obj.branchId = this.form.branchId
             obj.branchName = this.form.branchName
-            obj.corpCnName = this.form.corpId?this.form.corpId:null // 对账单位
+            obj.corpCnName = this.form.corpId ? this.form.corpId : null // 对账单位
             obj.dc = this.search.accountDc // 收付 D=收 C=付
             obj.curCode = this.search.curCode // 币别
             obj.mblno = this.search.mblno // MB/L NO

src/views/ow/owPut/detailsPage.vue

@@ -3068,6 +3068,9 @@ export default {
         if (this.form.whetherEnable == '是') {
           return this.$message.error("请勿重复启用");
         }
+        if (!this.form.polStationCname) {
+          return this.$message.error("请选择起运港提/送箱场站");
+        }
         this.form.cyTextOne = this.form.cyText
         this.activationForm = {
           containerNumber: this.form.containerNumber,

src/views/ow/owTask/detailsPage.vue

@@ -45,8 +45,8 @@
           <trade-card title="基础信息">
             <avue-form :option="optionForm" v-model="form" ref="form">
               <tempalte slot="purchaseCompanyName">
-                <dic-select v-model="form.purchaseCompanyName" placeholder="provider" key="id" label="shortName" res="records"
-                  @selectChange="dicChange('purchaseCompanyName', $event)"
+                <dic-select v-model="form.purchaseCompanyName" placeholder="provider" key="id" label="shortName"
+                  res="records" @selectChange="dicChange('purchaseCompanyName', $event)"
                   :disabled="editDisabled || (fixData && form.whetherEnable == '是')"
                   url="/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=箱东" :filterable="true"
                   :remote="true" dataName="shortName" :slotRight="true" rightLabel="code">
@@ -1990,6 +1990,26 @@ export default {
             headerslot: true,
           },
           {
+            label: '审核状态',
+            prop: 'auditStatus',
+            overHidden: true,
+            width: 80,
+            type: 'select',
+            dicData: [{
+              label: '录入',
+              value: '0',
+            }, {
+              label: '提交审核',
+              value: '1',
+            }, {
+              label: '审核中',
+              value: '2',
+            }, {
+              label: '审核通过',
+              value: '4',
+            }],
+          },
+          {
             label: "类别",
             prop: "billType",
             width: "100",
@@ -2498,7 +2518,7 @@ export default {
           this.form.purchaseCompanyName = null
         }
       }
-      if(name=='ownerName'){
+      if (name == 'ownerName') {
         if (row) {
           this.form.ownerId = row.id
         } else {
@@ -3042,6 +3062,9 @@ export default {
         if (this.form.whetherEnable == '是') {
           return this.$message.error("请勿重复启用");
         }
+        if (!this.form.polStationCname) {
+          return this.$message.error("请选择起运港提/送箱场站");
+        }
         this.form.cyTextOne = this.form.cyText
         this.activationForm = {
           containerNumber: this.form.containerNumber,