客户托书修改状态 新加订舱反驳功能

结算单位新加禁用规则
 客户订舱 保存模板修改编编码
 业务利润新加字段和检索条件
 发票申请新加检索
 销项发票上传附件修改同步按钮
 海运进出口恢复按钮控制
 海运出口修改国际化

src/api/iosBasicData/businessCenter/bookingCabin.js

@@ -60,6 +60,14 @@ export function submitBookingCabin(data) {
         data
     })
 }
+//驳回
+export function rejectBooking(data) {
+    return request({
+        url: '/api/blade-los/bookingCabin/rejectBooking',
+        method: 'post',
+        data
+    })
+}
 // 批量保存
 export const submitFeeList = (row) => {
     return request({

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

@@ -83,11 +83,11 @@
                         @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 || disabled"
                         @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 || disabled"
                         @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 || disabled"
                         @click="allClick('D取消申请')">取消申请</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
@@ -246,11 +246,11 @@
                         @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 || disabled"
                         @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 || disabled"
                         @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 || disabled"
                         @click="allClick('C取消申请')">取消申请</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">

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

@@ -86,11 +86,11 @@
                         @click="allClick('D费用申请')">{{ $t("btn118n.applyFee") }}</el-button>
                     <el-button type="danger" plain size="small" :disabled="disabled || selectionDList.length == 0"
                         @click="allClick('D撤销请核')">{{ $t("btn118n.unApplyFee") }}</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 || disabled"
                         @click="allClick('D申请修改')">{{ $t("btn118n.applyModify") }}</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 || disabled"
                         @click="allClick('D申请删除')">{{ $t("btn118n.applyDelete") }}</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 || disabled"
                         @click="allClick('D取消申请')">{{ $t("btn118n.unAplly") }}</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
@@ -254,11 +254,11 @@
                         @click="allClick('C撤销请核')">{{ $t("btn118n.unApplyFee") }}</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 || disabled"
                         @click="allClick('C申请修改')">{{ $t("btn118n.applyModify") }}</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 || disabled"
                         @click="allClick('C申请删除')">{{ $t("btn118n.applyDelete") }}</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 || disabled"
                         @click="allClick('C取消申请')">{{ $t("btn118n.unAplly") }}</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">

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

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

src/views/iosBasicData/bcorps/detailsPage.vue

@@ -35,7 +35,7 @@
               <el-option v-for="(item, index) in field103Options" :key="index" :label="item.label"
                 :value="item.value" :disabled="item.disabled"></el-option>
             </el-select> -->
-              <el-input v-model="formData.code" placeholder="请输入客户编号" clearable :style="{ width: '100%' }">
+              <el-input v-model="formData.code" placeholder="请输入客户编号" clearable :style="{ width: '100%' }" :disabled="formData.count>0">
               </el-input>
             </el-form-item>
           </el-col>
@@ -45,13 +45,13 @@
               <el-option v-for="(item, index) in field104Options" :key="index" :label="item.label"
                 :value="item.value" :disabled="item.disabled"></el-option>
             </el-select> -->
-              <el-input v-model="formData.shortName" placeholder="请输入客户简称" clearable :style="{ width: '100%' }">
+              <el-input v-model="formData.shortName" placeholder="请输入客户简称" clearable :style="{ width: '100%' }"  :disabled="formData.count>0">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="16">
             <el-form-item label="客户名称" prop="cnName">
-              <el-input v-model="formData.cnName" placeholder="请输入客户名称" clearable :style="{ width: '100%' }">
+              <el-input v-model="formData.cnName" placeholder="请输入客户名称" clearable :style="{ width: '100%' }"  :disabled="formData.count>0">
               </el-input>
             </el-form-item>
           </el-col>
@@ -63,7 +63,7 @@
           </el-col>
           <el-col :span="16">
             <el-form-item label="英文名称" prop="enName">
-              <el-input v-model="formData.enName" placeholder="请输入英文名称" clearable :style="{ width: '100%' }">
+              <el-input v-model="formData.enName" placeholder="请输入英文名称" clearable :style="{ width: '100%' }"  :disabled="formData.count>0">
               </el-input>
             </el-form-item>
           </el-col>

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

@@ -1984,9 +1984,9 @@ export default {
               callback: (res) => {
                 res.done()
                 console.log(res)
-                this.form.businessType = 'KHTS'
-                this.form.billNoFormat = 'KHTS'
-                this.form.businessTypeCode = 'KHTS'
+                this.form.businessType = 'KHDC'
+                this.form.billNoFormat = 'DCMB'
+                this.form.businessTypeCode = 'KHDC'
                 let obj = {
                   ...this.form,
                   templatesName: res.data.templatesName

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

@@ -22,6 +22,7 @@
                             <el-tab-pane label="草稿" name="1"></el-tab-pane>
                             <el-tab-pane label="已提交" name="2"></el-tab-pane>
                             <el-tab-pane label="已成交" name="5"></el-tab-pane>
+                            <el-tab-pane label="订舱驳回" name="7"></el-tab-pane>
                             <el-tab-pane label="全部" name="0"></el-tab-pane>
                         </el-tabs>
                     </div>
@@ -267,6 +268,12 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "箱型/箱量",
+                        prop: "quantityCntrDescr",
+                        width: "120",
+                        overHidden: true
+                    },
+                    {
                         label: '件数',
                         prop: "quantity",
                         width: "100",

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

@@ -31,6 +31,9 @@
         <el-button v-if="form.status == 1" class="el-button--small-yh" style="margin-left: 6px;" type="danger"
           size="small" @click="revokeApplication">撤销单据请核
         </el-button>
+        <el-button v-if="form.issueStatus == 2" class="el-button--small-yh" style="margin-left: 6px;" type="danger"
+          size="small" @click="allClick('订舱驳回')">订舱驳回
+        </el-button>
         <el-dropdown style="line-height: 0" v-if="importTemplate == 1">
           <el-button size="small" type="warning" style="margin-left: 8px" :disabled="form.status > 0 || showLock">
             导入模板<i class="el-icon-arrow-down el-icon--right"></i>
@@ -288,7 +291,7 @@
                       </el-form-item>
                     </el-col>
                     <el-col span="12">
-                       <el-form-item label="SI备注" prop="siRemarks">
+                      <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>
@@ -465,7 +468,7 @@
 </template>
 
 <script>
-import { submit, getDetail, submitBookingCabin, sendMessageBooking, copyAgent, pleaseCheck, repealCancel, submitItemList, itemRemove, submitFeeList, itemFeeRemove } from "@/api/iosBasicData/businessCenter/bookingCabin.js";
+import { submit, getDetail, submitBookingCabin, sendMessageBooking, copyAgent, pleaseCheck, repealCancel, submitItemList, itemRemove, submitFeeList, itemFeeRemove, rejectBooking } from "@/api/iosBasicData/businessCenter/bookingCabin.js";
 import { losbfeestemplateGetListTemplate } from "@/api/iosBasicData/bills";
 import { losbfeestemplateDetail } from "@/api/iosBasicData/losbfeestemplate";
 import dicSelect from "@/components/dicSelect/main";
@@ -1182,12 +1185,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.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) {
@@ -1699,6 +1702,59 @@ export default {
           }
         })
       }
+      if (name == '订舱驳回') {
+        this.$DialogForm.show({
+          title: '订舱驳回',
+          width: '30%',
+          menuPosition: 'right',
+          option: {
+            submitText: '确定',
+            emptyText: '取消',
+            span: 24,
+            column: [{
+              label: "驳回原因",
+              prop: "reason",
+              type: 'textarea',
+              rows: 5,
+              rules: [{
+                required: true,
+                message: "请输入驳回原因",
+                trigger: "blur",
+
+              }],
+            }]
+          },
+          beforeClose: (done) => {
+            done()
+          },
+          callback: (res) => {
+            res.done()
+            this.$confirm('是否确认订舱驳回?', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              let obj = {
+                ...this.form,
+                reason: res.data.reason,
+              }
+              const loading = this.$loading({
+                lock: true,
+                text: '加载中',
+                spinner: 'el-icon-loading',
+                background: 'rgba(255,255,255,0.7)'
+              });
+              rejectBooking(obj).then(res => {
+                this.$message.success("操作成功！");
+                this.getDetail(this.form.id)
+              }).finally(() => {
+                loading.close();
+              })
+              res.close()
+            })
+          }
+        })
+      }
     },
     submit(type) {
       this.$refs["form"].validate((valid) => {

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

@@ -21,6 +21,7 @@
                             <el-tab-pane label="受理" name="3"></el-tab-pane> -->
                             <el-tab-pane label="待确认" name="4"></el-tab-pane>
                             <el-tab-pane label="已生成" name="5"></el-tab-pane>
+                            <el-tab-pane label="订舱驳回" name="7"></el-tab-pane>
                             <el-tab-pane label="全部" name="0"></el-tab-pane>
                         </el-tabs>
                     </div>
@@ -184,18 +185,24 @@ export default {
                         },
                     },
                     {
-                        label: "生成状态",
+                        label: "单据状态",
                         prop: "issueStatus",
                         width: "80",
                         overHidden: true,
                         // search: true,
                         type: 'select',
                         dicData: [{
-                            label: '否',
+                            label: '录入',
                             value: '0',
                         }, {
-                            label: '是',
+                            label: '已生成',
                             value: '1',
+                        }, {
+                            label: '待确认',
+                            value: '2',
+                        }, {
+                            label: '订舱驳回',
+                            value: '6',
                         }],
                     },
                     {

src/views/iosBasicData/financeProfit/index.vue

@@ -234,6 +234,19 @@ export default {
                         },
                     },
                     {
+                        label: "箱属",
+                        prop: "boxBelongsTo",
+                        overHidden: true,
+                        search: true,
+                        type: 'select',
+                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxBelongsTo",
+                        props: {
+                            label: "dictValue",
+                            value: "dictValue"
+                        },
+                        searchOrder: 1.4
+                    },
+                    {
                         label: "业务编号",
                         prop: "billNo",
                         overHidden: true,

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

@@ -541,7 +541,7 @@ export default {
                 calcHeight: 30,
                 menuWidth: 60,
                 searchShow: true,
-                searchMenuSpan: 18,
+                searchMenuSpan: 12,
                 searchIcon: true,
                 searchIndex: 3,
                 tip: false,
@@ -595,6 +595,14 @@ export default {
                         search: true,
                         overHidden: true
                     },
+                    
+                    {
+                        label: '对账单号',
+                        prop: 'checkBillNo',
+                        search: true,
+                        hide: true,
+                        disabled: false
+                    },
                     {
                         label: "收付",
                         prop: "accountDc",
@@ -959,6 +967,7 @@ export default {
                 accountDc: null,
                 feeCnName: null,
                 curCode: null,
+                checkBillNo:null,
                 businessDateStart: null,
                 businessDateEnd: null,
                 vesselCnName: null,
@@ -1289,6 +1298,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.checkBillNo = this.search.checkBillNo
             obj.vesselCnName = this.search.vesselEnName // 中文船名
             obj.voyageNo = this.search.voyageNo // 航次
             obj.feeCnName = this.search.feeCnName//
@@ -1313,6 +1323,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.checkBillNo = this.search.checkBillNo
             obj.vesselCnName = this.search.vesselEnName // 中文船名
             obj.voyageNo = this.search.voyageNo // 航次
             obj.feeCnName = this.search.feeCnName//

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

@@ -210,7 +210,7 @@
                 <el-tab-pane label="文件中心">
                     <containerTitle title="上传附件"></containerTitle>
                     <c-upload :data="form.fileList" :enumerationValue="76" deleteUrl="/api/blade-los/filescenter/remove"
-                        display :pId="form.id" @upDate="upDate" :saveBtn="true"></c-upload>
+                        display :pId="form.id" @upDate="upDate" :saveBtn="true" :sysBtn="true"></c-upload>
                 </el-tab-pane>
             </el-tabs>
         </div>