货代amend报表海运进口，福达bug 2024-1-17

src/enums/column-name.js

@@ -13,6 +13,9 @@ const columnName = [{
 }, {
   code: 2.2,
   name: '出口采购订单-明细'
+},{
+  code: 2.3,
+  name: '出口采购订单-明细-待采购'
 }, {
   code: 3,
   name: '出口采购订单商品信息'
@@ -22,6 +25,9 @@ const columnName = [{
 }, {
   code: 5,
   name: '出口销售订单商品信息'
+},{
+  code: 5.1,
+  name: '出口销售订单商品信息-电商备货'
 }, {
   code: 6,
   name: '出口收货订单'

src/views/exportTrade/EcommerceStocking/components/goodsInfo.vue

@@ -411,7 +411,7 @@ export default {
   },
   async created() {
     this.tableOption = await this.getColumnData(
-      this.getColumnName(5),
+      this.getColumnName(5.1),
       tableOption
     );
     this.goodsOption = await this.getColumnData(
@@ -419,6 +419,12 @@ export default {
       goodsOption
     );
 
+      // 查看是否有admin 权限 没有admin的话按钮都不显示
+      if (JSON.parse(localStorage.getItem('saber-userInfo')).content.role_name.indexOf('运营') != -1) {
+          this.findObject(this.tableOption.column, "purchaseCost").hide = true;
+          this.findObject(this.tableOption.column, "purchaseAmount").hide = true;
+      }
+
     if (localStorage.getItem("roleName") == "贸易") {
       this.findObject(this.tableOption.column, "purchaseCost").hide = true;
       this.findObject(this.tableOption.column, "purchaseCost").showColumn = false;
@@ -1318,7 +1324,7 @@ export default {
     },
     async saveColumn() {
       const inSave = await this.saveColumnData(
-        this.getColumnName(5),
+        this.getColumnName(5.1),
         this.tableOption
       );
       if (localStorage.getItem("roleName") == "贸易") {
@@ -1347,7 +1353,7 @@ export default {
     async resetColumn() {
       this.tableOption = tableOption;
       const inSave = await this.delColumnData(
-        this.getColumnName(5),
+        this.getColumnName(5.1),
         tableOption
       );
       if (inSave) {

src/views/exportTrade/EcommerceStocking/config/customerContact.json

@@ -42,35 +42,34 @@
       "type": "sum"
     }
   ],
-  "column": [{
-      "label": "产品名称",
-      "prop": "cname",
+  "column": [
+    {
+      "label": "产品类别",
+      "prop": "priceCategory",
       "index": 1,
-      "width": 200,
       "span": 8,
+      "disabled": true,
       "overHidden": true
     },
     {
       "label": "产品编号",
       "prop": "code",
       "index": 2,
-      "width": 100,
       "span": 8,
       "disabled": true,
       "overHidden": true
     },
     {
-      "label": "产品类别",
-      "prop": "priceCategory",
+      "label": "产品名称",
+      "prop": "cname",
       "index": 3,
-      "width": 100,
       "span": 8,
-      "disabled": true,
       "overHidden": true
     },
     {
       "label": "英文名称",
       "prop": "ename",
+      "hide": true,
       "index": 4,
       "width": 200,
       "span": 12,
@@ -82,7 +81,8 @@
       "index": 5,
       "width": 100,
       "span": 12,
-      "overHidden": true
+      "overHidden": true,
+      "hide": true
     },
     {
       "label": "螺纹",
@@ -91,7 +91,8 @@
       "width": 100,
       "span": 6,
       "disabled": true,
-      "overHidden": true
+      "overHidden": true,
+      "hide": true
     },
     {
       "label": "介质",
@@ -100,7 +101,8 @@
       "width": 100,
       "span": 6,
       "disabled": true,
-      "overHidden": true
+      "overHidden": true,
+      "hide": true
     },
     {
       "label": "颜色",
@@ -109,7 +111,8 @@
       "width": 100,
       "span": 6,
       "disabled": true,
-      "overHidden": true
+      "overHidden": true,
+      "hide": true
     },
     {
       "label": "电压",
@@ -118,7 +121,8 @@
       "width": 100,
       "span": 6,
       "disabled": true,
-      "overHidden": true
+      "overHidden": true,
+      "hide": true
     },
     {
       "label": "产品属性",
@@ -126,7 +130,8 @@
       "index": 10,
       "width": 200,
       "span": 24,
-      "overHidden": true
+      "overHidden": true,
+      "hide": true
     },
     {
       "label": "特殊颜色",
@@ -135,7 +140,8 @@
       "width": 200,
       "span": 6,
       "disabled": true,
-      "overHidden": true
+      "overHidden": true,
+      "hide": true
     },
     {
       "label": "特殊处理",
@@ -144,6 +150,7 @@
       "width": 200,
       "span": 6,
       "disabled": true,
+      "hide": true,
       "overHidden": true
     },
     {
@@ -153,7 +160,8 @@
       "width": 200,
       "span": 6,
       "disabled": true,
-      "overHidden": true
+      "overHidden": true,
+      "hide": true
     },
     {
       "label": "阀门配件",
@@ -162,6 +170,7 @@
       "width": 200,
       "span": 6,
       "disabled": true,
+      "hide": true,
       "overHidden": true
     },
     {
@@ -171,6 +180,7 @@
       "width": 200,
       "span": 6,
       "disabled": true,
+      "hide": true,
       "overHidden": true
     },
     {
@@ -180,6 +190,7 @@
       "width": 200,
       "span": 6,
       "disabled": true,
+      "hide": true,
       "overHidden": true
     },
     {
@@ -189,6 +200,7 @@
       "width": 200,
       "span": 6,
       "disabled": true,
+      "hide": true,
       "overHidden": true
     },
     {
@@ -197,6 +209,7 @@
       "index": 18,
       "width": 200,
       "span": 24,
+      "hide": true,
       "overHidden": true
     },
     {
@@ -207,13 +220,13 @@
       "width": 100,
       "overHidden": true,
       "minRows": 2,
+      "hide": true,
       "span": 24
     },
     {
       "label": "数量",
       "prop": "orderQuantity",
       "index": 20,
-      "width": 100,
       "align": "right",
       "span": 6,
       "overHidden": true
@@ -222,7 +235,6 @@
       "label": "计价单位",
       "prop": "unit",
       "index": 21,
-      "width": 100,
       "overHidden": true,
       "span": 6,
       "type": "select",
@@ -239,6 +251,7 @@
       "width": 100,
       "align": "right",
       "span": 6,
+      "hide": true,
       "overHidden": true
     },
     {
@@ -248,6 +261,7 @@
       "width": 100,
       "align": "right",
       "span": 6,
+      "hide": true,
       "overHidden": true
     },
     {
@@ -257,6 +271,7 @@
       "width": 100,
       "align": "right",
       "span": 6,
+      "hide": true,
       "overHidden": true
     },
     {
@@ -266,6 +281,7 @@
       "width": 100,
       "span": 6,
       "align": "right",
+      "hide": true,
       "overHidden": true
     },
     {
@@ -275,6 +291,7 @@
       "width": 100,
       "span": 6,
       "align": "right",
+      "hide": true,
       "overHidden": true
     },
     {
@@ -283,6 +300,7 @@
       "index": 26,
       "width": 100,
       "span": 6,
+      "hide": true,
       "overHidden": true
     },
     {
@@ -294,7 +312,6 @@
       "span": 6,
       "disabled": true,
       "display": false,
-      "hide": true,
       "overHidden": true
     },
     {
@@ -306,7 +323,6 @@
       "span": 6,
       "disabled": true,
       "display": false,
-      "hide": true,
       "overHidden": true
     },
     {
@@ -329,7 +345,8 @@
       "align": "right",
       "span": 6,
       "disabled": true,
-      "overHidden": true
+      "overHidden": true,
+      "hide": true
     },
     {
       "label": "配件价格描述",
@@ -338,7 +355,8 @@
       "width": 120,
       "span": 6,
       "disabled": true,
-      "overHidden": true
+      "overHidden": true,
+      "hide": true
     },
     {
       "label": "供应商",
@@ -357,7 +375,8 @@
       "index": 33,
       "width": 100,
       "span": 6,
-      "overHidden": true
+      "overHidden": true,
+      "hide": true
     },
     {
       "label": "推荐理由",
@@ -365,7 +384,8 @@
       "index": 34,
       "width": 100,
       "overHidden": true,
-      "span": 6
+      "span": 6,
+      "hide": true
     },
     {
       "label": "产品价格",
@@ -375,7 +395,8 @@
       "align": "right",
       "span": 6,
       "disabled": true,
-      "overHidden": true
+      "overHidden": true,
+      "hide": true
     },
     {
       "label": "单品毛利率",
@@ -385,7 +406,8 @@
       "align": "right",
       "span": 6,
       "disabled": true,
-      "overHidden": true
+      "overHidden": true,
+      "hide": true
     },
     {
       "label": "发货数量",
@@ -395,7 +417,8 @@
       "align": "right",
       "span": 6,
       "disabled": true,
-      "overHidden": true
+      "overHidden": true,
+      "hide": true
     },
     {
       "label": "折扣",
@@ -404,7 +427,8 @@
       "width": 100,
       "align": "right",
       "span": 6,
-      "overHidden": true
+      "overHidden": true,
+      "hide": true
     },
     {
       "label": "税率",
@@ -413,7 +437,8 @@
       "width": 100,
       "align": "right",
       "span": 6,
-      "overHidden": true
+      "overHidden": true,
+      "hide": true
     },
     {
       "label": "备注",
@@ -421,7 +446,6 @@
       "type": "textarea",
       "minRows": 2,
       "index": 40,
-      "width": 100,
       "overHidden": true,
       "span": 12
     }

src/views/exportTrade/purchaseContract/index.vue

@@ -5,7 +5,9 @@
                 <el-tab-pane label="待采购" name="first"></el-tab-pane>
                 <el-tab-pane label="业务单据" name="second"></el-tab-pane>
             </el-tabs>
-            <avue-crud v-show="tabsType == 'first'" :option="procureOption" :data="procureData" @refresh-change="listBYStatusfun"  >
+            <avue-crud v-show="tabsType == 'first'" ref="procureCrud" :option="procureOption" :data="procureData" @refresh-change="listBYStatusfun"
+                       @resetColumn="resetColumnTwo('procureCrud', 'procureOption', 'procureOptionList', 2.3)"
+                       @saveColumn="saveColumnTwo('procureCrud', 'procureOption', 'procureOptionList', 2.3)">
                 <template slot-scope="scope" slot="menu">
                     <el-button type="text" size="small"
                                @click.stop="procureViewfun(scope.row)">采购
@@ -17,7 +19,7 @@
                 @search-change="searchChange" @current-change="currentChange" @size-change="sizeChange"
                 @refresh-change="refreshChange" @on-load="onLoad" :table-loading="loading" @saveColumn="saveColumn"
                 @resetColumn="resetColumn" :cell-style="cellStyle" @selection-change="selectionChange"
-                @expand-change="expandChange" @search-criteria-switch="searchCriteriaSwitch">
+                @expand-change="expandChange" @search-criteria-switch="searchCriteriaSwitch" >
                 <template slot-scope="{ row }" slot="expand">
                     <avue-crud ref="itemCrud" :data="row.itemData" :option="itemOption" :table-loading="row.itemLoading"
                                @resetColumn="resetColumnTwo('itemCrud', 'itemOption', 'itemOptionList', 2.2)"
@@ -225,6 +227,7 @@ import { getToken } from "@/util/auth";
 import {customerList} from "@/api/basicData/customerInformation";
 import { detail as companyDetail } from "@/api/basicData/customerInformation"
 import {getUser as nameUser} from "@/api/system/user"
+import tableOption from "@/views/exportTrade/EcommerceStocking/config/customerContact.json";
 
 export default {
     name: "customerInformation",
@@ -233,7 +236,8 @@ export default {
             tabsType:'first',
             procureData:[], // 待采购数据
             // 待采购配置
-            procureOption:{
+            procureOption:[],
+            procureOptionList:{
                 searchShow: true,
                 searchMenuSpan: 8,
                 border: true,
@@ -645,6 +649,7 @@ export default {
         this.option = await this.getColumnData(this.getColumnName(2), option);
         this.dialogOption = await this.getColumnData(this.getColumnName(2.1), this.dialogOptionList);
         this.itemOption = await this.getColumnData(this.getColumnName(2.2), this.itemOptionList);
+        this.procureOption = await this.getColumnData(this.getColumnName(2.3), this.procureOptionList);
         this.getWorkDicts("payment_term").then(res => {
             this.findObject(this.option.column, "paymentType").dicData = res.data.data;
         });
@@ -863,6 +868,7 @@ export default {
              * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
              * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
              */
+            console.log(875)
             const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
             if (inSave) {
                 this.$message.success("保存成功");
@@ -1000,7 +1006,7 @@ export default {
         async saveColumn() {
             const inSave = await this.saveColumnData(
                 this.getColumnName(2),
-                this.option
+                option
             );
             if (inSave) {
                 this.$nextTick(() => {

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

@@ -11,14 +11,14 @@
         </div>
 
         <div>
-            <PackingBusiness ref="PackingBusiness"
-                             :assemblyForm="assemblyForm"
-                             :detailData="detailData"
-                             :selectionList="selectionList"
-                             :pleasereviewType="pleasereviewType"
-                             @billsDetailfun="billsDetailfun"
-                             @allocationfun="allocationfun"
-                             @withdrawfun="withdrawfun"></PackingBusiness>
+            <!--<PackingBusiness ref="PackingBusiness"-->
+            <!--                 :assemblyForm="assemblyForm"-->
+            <!--                 :detailData="detailData"-->
+            <!--                 :selectionList="selectionList"-->
+            <!--                 :pleasereviewType="pleasereviewType"-->
+            <!--                 @billsDetailfun="billsDetailfun"-->
+            <!--                 @allocationfun="allocationfun"-->
+            <!--                 @withdrawfun="withdrawfun"></PackingBusiness>-->
         </div>
     </div>
 </template>

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

@@ -245,62 +245,6 @@
                                 </el-col>
                             </el-row>
                         </el-form-item>
-                        <el-form-item label="交货地" prop="placeDeliveryName" >
-                        <span slot="label">
-                            <span style="color: #1e9fff">交货地</span>
-                        </span>
-                            <el-row>
-                                <el-col :span="16">
-                                    <search-query :datalist="placeDeliveryData"
-                                                  :selectValue="assemblyForm.placeDeliveryName"
-                                                  :filterable="true"
-                                                  :clearable="true"
-                                                  :remote="true"
-                                                  :disabled="detailData.seeDisabled"
-                                                  :buttonIf="false"
-                                                  :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                                  @remoteMethod="remoteMethod($event,'placeDelivery')"
-                                                  @corpChange="corpChange($event,'placeDelivery')"
-                                                  @corpFocus="remoteMethod($event,'placeDelivery')" >
-                                    </search-query>
-                                </el-col>
-                                <el-col :span="7">
-                                    <span style="padding-left: 20px"></span>
-                                    <el-input type="age" style="width: 100%;" v-model="assemblyForm.placeDeliveryNamePrint"
-                                              size="small" autocomplete="off"
-                                              :disabled="detailData.seeDisabled"
-                                              clearable placeholder="交货地" ></el-input>
-                                </el-col>
-                            </el-row>
-                        </el-form-item>
-                        <el-form-item label="中转港" prop="potEnName" >
-                        <span slot="label">
-                            <span style="color: #1e9fff">中转港</span>
-                        </span>
-                            <el-row>
-                                <el-col :span="16">
-                                    <search-query :datalist="potData"
-                                                  :selectValue="assemblyForm.potEnName"
-                                                  :filterable="true"
-                                                  :clearable="true"
-                                                  :remote="true"
-                                                  :disabled="detailData.seeDisabled"
-                                                  :buttonIf="false"
-                                                  :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                                  @remoteMethod="remoteMethod($event,'pot')"
-                                                  @corpChange="corpChange($event,'pot')"
-                                                  @corpFocus="remoteMethod($event,'pot')" >
-                                    </search-query>
-                                </el-col>
-                                <el-col :span="7">
-                                    <span style="padding-left: 20px"></span>
-                                    <el-input type="age" style="width: 100%;" v-model="assemblyForm.potNamePrint"
-                                              size="small" autocomplete="off"
-                                              :disabled="detailData.seeDisabled"
-                                              clearable placeholder="中转港" ></el-input>
-                                </el-col>
-                            </el-row>
-                        </el-form-item>
                     </el-row>
                 </el-col>
                 <el-col :span="16">
@@ -371,6 +315,17 @@
                                             placeholder="选择日期">
                             </el-date-picker>
                         </el-form-item>
+                        <el-form-item label="ETA" prop="eta" >
+                                <span slot="label">
+                                    <span style="color: #1e9fff">ETA</span>
+                                </span>
+                            <el-date-picker v-model="assemblyForm.eta"
+                                            clearable type="date" size="small"
+                                            :disabled="detailData.seeDisabled"
+                                            value-format="yyyy-MM-dd HH:mm:ss"
+                                            placeholder="选择日期">
+                            </el-date-picker>
+                        </el-form-item>
                         <div>
                             <el-form-item label="船名" prop="vesselCnName" label-width="90px" >
                             <span slot="label">
@@ -425,40 +380,6 @@
                                           @corpFocus="remoteMethod($event,'carrier')" >
                             </search-query>
                         </el-form-item>
-                        <el-form-item label="船司约号" prop="carrierArgreementNo" >
-                        <span slot="label">
-                            <span style="color: #1e9fff">船司约号</span>
-                        </span>
-                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.carrierArgreementNo"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled"
-                                      clearable placeholder="请选择船司约号" ></el-input>
-                        </el-form-item>
-                        <el-form-item label="订舱代理" prop="bookingAgentCnName" >
-                        <span slot="label">
-                            <span style="color: #1e9fff">订舱代理</span>
-                        </span>
-                            <el-col :span="9" style="margin-left: -10px">
-                                <search-query :datalist="bookingAgentData"
-                                              :selectValue="assemblyForm.bookingAgentCnName"
-                                              :filterable="true"
-                                              :clearable="true"
-                                              :remote="true"
-                                              :disabled="detailData.seeDisabled"
-                                              :buttonIf="false"
-                                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                              @remoteMethod="remoteMethod($event,'bookingAgent')"
-                                              @corpChange="corpChange($event,'bookingAgent')"
-                                              @corpFocus="remoteMethod($event,'bookingAgent')">
-                                </search-query>
-                            </el-col>
-                            <el-col :span="15">
-                                <el-input type="age" style="width: 100%;margin-left: 20px;" v-model="assemblyForm.bookingAgentEnName"
-                                          size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled"
-                                          clearable placeholder="订舱代理" ></el-input>
-                            </el-col>
-                        </el-form-item>
                         <div>
                             <el-col :span="12">
                                 <el-form-item label="件数" prop="quantity" label-width="80px"
@@ -475,7 +396,7 @@
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="包装" prop="packingUnit" label-width="50px"
-                                              :rules="[{required: true,message: '',trigger: 'blur' }]"  >
+                                              :rules="[{required: true,message: '',trigger: 'blur' }]" >
                                 <span slot="label">
                                     <span style="color: #1e9fff">包装</span>
                                 </span>
@@ -534,104 +455,51 @@
             </el-row>
 
             <el-row :gutter="0">
-                <el-col :span="12">
-                    <el-form-item label="COLOADER" prop="coloaderCnName" >
+                <el-col :span="8">
+                    <el-form-item label="航线" prop="lineCnName" >
                         <span slot="label">
-                            <span style="color: #1e9fff">COLOADER</span>
+                            <span style="color: #1e9fff">航线</span>
                         </span>
-                        <search-query :datalist="coloaderCnNameData"
-                                      :selectValue="assemblyForm.coloaderCnName"
+                        <search-query :datalist="lineData"
+                                      :selectValue="assemblyForm.lineCnName"
                                       :filterable="true"
                                       :clearable="true"
                                       :remote="true"
                                       :disabled="detailData.seeDisabled"
-                                      :buttonIf="true"
-                                      :addIf="true"
-                                      @addJump="addJump"
+                                      :buttonIf="false"
                                       :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                      @remoteMethod="remoteMethod($event,'coloaderCnName')"
-                                      @corpChange="corpChange($event,'coloaderCnName')"
-                                      @corpFocus="remoteMethod($event,'coloaderCnName')" >
-                            <bcorps></bcorps>
-                            <!--<bcorpstypedefine></bcorpstypedefine>-->
+                                      @remoteMethod="remoteMethod($event,'line')"
+                                      @corpChange="corpChange($event,'line')"
+                                      @corpFocus="remoteMethod($event,'line')" >
                         </search-query>
                     </el-form-item>
-                </el-col>
-                <el-col :span="12">
                     <el-row>
                         <el-col :span="12">
-                            <el-form-item label="航线" prop="lineCnName" >
+                            <el-form-item label="业务编号" prop="billNo">
                                 <span slot="label">
-                                    <span style="color: #1e9fff">航线</span>
+                                    <span style="color: #1e9fff">业务编号</span>
                                 </span>
-                                <search-query :datalist="lineData"
-                                              :selectValue="assemblyForm.lineCnName"
-                                              :filterable="true"
-                                              :clearable="true"
-                                              :remote="true"
-                                              :disabled="detailData.seeDisabled"
-                                              :buttonIf="false"
-                                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                              @remoteMethod="remoteMethod($event,'line')"
-                                              @corpChange="corpChange($event,'line')"
-                                              @corpFocus="remoteMethod($event,'line')" >
-                                </search-query>
+                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.billNo"
+                                          size="small" autocomplete="off"
+                                          :disabled="true"
+                                          clearable placeholder="业务编号" ></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="订舱日期" prop="bookingDate">
+                            <el-form-item label="创建日期" prop="billNo">
                                 <span slot="label">
-                                    <span style="color: #1e9fff">订舱日期</span>
+                                    <span style="color: #1e9fff">创建日期</span>
                                 </span>
-                                <el-date-picker v-model="assemblyForm.bookingDate" clearable style="width: 100%"
-                                                type="date" size="small" :disabled="detailData.seeDisabled"
-                                                value-format="yyyy-MM-dd HH:mm:ss"
-                                                placeholder="选择日期">
+                                <el-date-picker v-model="assemblyForm.createTime" clearable style="width: 100%;"
+                                                type="date" size="small" :disabled="true"
+                                                value-format="yyyy-MM-dd HH:mm"
+                                                placeholder="创建日期">
                                 </el-date-picker>
                             </el-form-item>
                         </el-col>
                     </el-row>
-
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="6">
-                    <el-form-item label="FORWARDING" prop="bookingRemarks" >
-                        <span slot="label">
-                            <span style="color: #1e9fff">FORWARDING</span>
-                        </span>
-                        <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.forwarding"
-                                  size="small" autocomplete="off"
-                                  :disabled="detailData.seeDisabled" rows="3"
-                                  clearable placeholder="FORWARDING"
-                                  @blur="textareaBlur('FORWARDING')" ></el-input>
-                    </el-form-item>
                 </el-col>
-                <el-col :span="6">
-                    <el-form-item label="订舱备注" prop="bookingRemarks" >
-                        <span slot="label">
-                            <span style="color: #1e9fff">订舱备注</span>
-                        </span>
-                        <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.bookingRemarks"
-                                  size="small" autocomplete="off"
-                                  :disabled="detailData.seeDisabled" rows="3"
-                                  clearable placeholder="订舱备注"
-                                  @blur="textareaBlur('bookingRemarks')" ></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="SI备注" prop="siRemarks" >
-                        <span slot="label">
-                           <span style="color: #1e9fff">SI备注</span>
-                        </span>
-                        <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.siRemarks"
-                                  size="small" autocomplete="off"
-                                  :disabled="detailData.seeDisabled" rows="3"
-                                  clearable placeholder="SI备注"
-                                  @blur="textareaBlur('siRemarks')" ></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
+                <el-col :span="16">
                     <el-form-item label="备注" prop="remarks" >
                         <span slot="label">
                             <span style="color: #1e9fff">备注</span>
@@ -644,6 +512,7 @@
                     </el-form-item>
                 </el-col>
             </el-row>
+
         </el-form>
 
 
@@ -878,10 +747,6 @@ import {NdayDate} from "@/util/date";
                 podData:[],
                 // 目的地
                 destinationData:[],
-                // 交货地
-                placeDeliveryData:[],
-                // 中转港
-                potData:[],
                 // 货物类别
                 cargoTypeData:[
                     {
@@ -905,39 +770,15 @@ import {NdayDate} from "@/util/date";
                 vesselData:[],
                 // 包装
                 packingUnitData:[],
-                // 订舱代理数据
-                bookingAgentData:[],
                 // 航线
                 lineData:[],
-                // COLOADER
-                coloaderCnNameData:[],
 
                 marksIndex:1
             }
         },
         created() {
-            // // 往来单位
-            // this.hshipperBcorpsListfun()
-            // this.hconsigneeBcorpsListfun()
-            // this.hnotifyBcorpsListfun()
-            // this.hnotify2BcorpsListfun()
-            // this.bookingAgentBcorpsListfun()
-            // // 港口接口
-            // this.placeReceiptBportsListfun()
-            // this.polBportsListfun()
-            // this.podBportsListfun()
-            // this.destinationBportsListfun()
-            // this.placeDeliveryBportsListfun()
-            // // 货物
-            // this.commodityBcommodityListfun()
-            // // 包装
-            // this.packingUnitBpackagesListfun()
             // // 船公司
             this.carrierBcorpslistByTypefun()
-            // // 船名
-            // this.vesselBvesselsListfun()
-            // // 航线
-            // this.lineBlinesListfun()
         },
         methods:{
             // 件数聚焦
@@ -962,8 +803,8 @@ import {NdayDate} from "@/util/date";
             },
             // 远程搜索
             remoteMethod(value,name){
-                let arr = ['hshipper','hconsignee','hnotify','hnotify2','bookingAgent']
-                let portArr = ['placeReceipt','pol','pod','destination','placeDelivery','pot']
+                let arr = ['hshipper','hconsignee','hnotify','hnotify2']
+                let portArr = ['placeReceipt','pol','pod','destination']
                 if (arr.indexOf(name) != -1) {
                     this[name + 'BcorpsListfun'](value)
                 }
@@ -987,17 +828,13 @@ import {NdayDate} from "@/util/date";
                 else if (name == 'line') {
                     this.lineBlinesListfun(value)
                 }
-                // COLOADER
-                else if (name == 'coloaderCnName') {
-                    this.bcorpstypedefineListfun(value)
-                }
                 else {}
             },
             // 选择框的回调
             corpChange(value,name) {
                 let arr = ['hshipper','hconsignee','hnotify','hnotify2']
-                let portArr = ['placeReceipt','destination','placeDelivery']
-                let cnPorArr = ['pol','pod','pot']
+                let portArr = ['placeReceipt','destination']
+                let cnPorArr = ['pol','pod']
                 if (arr.indexOf(name) != -1) {
                     for(let item of this[name + 'Data']) {
                         if (item.cnName == value) {
@@ -1085,17 +922,6 @@ import {NdayDate} from "@/util/date";
                         }
                     }
                 }
-                // 订舱代理
-                else if (name == 'bookingAgent') {
-                    for(let item of this[name + 'Data']) {
-                        if (item.cnName == value) {
-                            this.$set(this.assemblyForm,'bookingAgentId',item.id)
-                            this.$set(this.assemblyForm,'bookingAgentCnName',item.cnName)
-                            this.$set(this.assemblyForm,'bookingAgentEnName',item.enName)
-                            this.$set(this.assemblyForm,'bookingRemarks',item.remarks)
-                        }
-                    }
-                }
                 // 航线
                 else if (name == 'line') {
                     for(let item of this[name + 'Data']) {
@@ -1106,16 +932,6 @@ import {NdayDate} from "@/util/date";
                         }
                     }
                 }
-                // COLOADER
-                else if (name == 'coloaderCnName') {
-                    for(let item of this.coloaderCnNameData) {
-                        if (item.cnName == value) {
-                            this.$set(this.assemblyForm,'coloaderId',item.id)
-                            this.$set(this.assemblyForm,'coloaderCnName',item.cnName)
-                            this.$set(this.assemblyForm,'coloaderEnName',item.enName)
-                        }
-                    }
-                }
                 else if (name == 'cargoType') {
                     this.$set(this.assemblyForm,'cargoType',value)
                     if (value == 'danger') {
@@ -1346,34 +1162,6 @@ import {NdayDate} from "@/util/date";
                     })
                 })
             },
-            // 交货地
-            placeDeliveryBportsListfun(enName){
-                bportsList(1,10,{enName}).then(res=>{
-                    this.placeDeliveryData = res.data.data.records.map(item=>{
-                        item.enName = item.enName + ' - ' + item.code
-                        return item
-                    })
-                })
-            },
-            // 中转港
-            potBportsListfun(enName){
-                bportsList(1,10,{enName}).then(res=>{
-                    this.potData = res.data.data.records.map(item=>{
-                        item.enName = item.enName + ' - ' + item.code
-                        return item
-                    })
-                })
-            },
-            // 获取类别 COLOADER 数据
-            bcorpstypedefineListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
-                    this.coloaderCnNameData = res.data.data.records.map(item=>{
-                        item.cnName = item.cnName + ' - ' + item.code
-                        return item
-                    })
-                })
-            },
             // 包装数据
             packingUnitBpackagesListfun(cnName) {
                 bpackagesList(1,10,{cnName}).then(res=>{
@@ -1399,13 +1187,6 @@ import {NdayDate} from "@/util/date";
                     })
                 })
             },
-            // 订舱代理
-            bookingAgentBcorpsListfun(cnName){
-                let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                getBcorpslistByType(1,10,{cnName,corpType}).then(res=>{
-                    this.bookingAgentData = res.data.data.records
-                })
-            },
             // 航线数据
             lineBlinesListfun(cnName){
                 blinesList(1,10,{cnName}).then(res=>{

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

@@ -28,12 +28,12 @@
                    icon="el-icon-delete"
                    plain
                    :disabled="seeDisabled"
-                   @click.stop="handleDelete">删 除
-        </el-button>
-        <el-button type="primary" size="small" :disabled="seeDisabled" @click="batchSavefun" >批量保存</el-button>
-        <el-button type="success" size="small" plain :disabled="seeDisabled"
-                   @click.stop="equalDistribution">均分箱量
+                   @click.stop="handleDelete">一键删除
         </el-button>
+        <el-button type="primary" size="small" :disabled="seeDisabled" @click="batchSavefun" >一键保存</el-button>
+        <!--<el-button type="success" size="small" plain :disabled="seeDisabled"-->
+        <!--           @click.stop="equalDistribution">均分箱量-->
+        <!--</el-button>-->
       </template>
         <template slot-scope="scope" slot="menu">
             <el-button

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

@@ -117,38 +117,6 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="截单时间" prop="cyTrailerTime" >
-                        <span slot="label">
-                            <span style="color: #1e9fff">截单时间</span>
-                        </span>
-                        <el-date-picker
-                            v-model="assemblyForm.cyTrailerTime"
-                            type="date"
-                            style="width: 100%;"
-                            value-format="yyyy-MM-dd HH:mm"
-                            size="small"
-                            :disabled="detailData.seeDisabled"
-                            placeholder="选择截单时间">
-                        </el-date-picker>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="截港时间" prop="cyReturnTime" >
-                        <span slot="label">
-                            <span style="color: #1e9fff">截港时间</span>
-                        </span>
-                        <el-date-picker
-                            v-model="assemblyForm.cyReturnTime"
-                            type="date"
-                            style="width: 100%;"
-                            value-format="yyyy-MM-dd HH:mm"
-                            size="small"
-                            :disabled="detailData.seeDisabled"
-                            placeholder="选择截港时间">
-                        </el-date-picker>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
                     <el-form-item label="签单方式" prop="issueType" >
                         <span slot="label">
                             <span style="color: #1e9fff">签单方式</span>
@@ -200,52 +168,6 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="HB/L付款地点" prop="hpayplace" >
-                        <span slot="label">
-                            <span style="color: #1e9fff">HB/L付款地点</span>
-                        </span>
-                        <search-query :datalist="hpayplaceData"
-                                      :selectValue="assemblyForm.hpayplace"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :disabled="detailData.seeDisabled"
-                                      :buttonIf="false"
-                                      :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                      @remoteMethod="remoteMethod($event,'hpayplace')"
-                                      @corpChange="corpChange($event,'hpayplace')"
-                                      @corpFocus="remoteMethod($event,'hpayplace')" >
-                        </search-query>
-                        <!--<el-input type="age" style="width: 100%;" v-model="assemblyForm.hpayplace"-->
-                        <!--          size="small" autocomplete="off"-->
-                        <!--          :disabled="detailData.seeDisabled"-->
-                        <!--          clearable placeholder="请输入HB/L付款地点" ></el-input>-->
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="MB/L付款地点" prop="mPayplace" >
-                        <span slot="label">
-                            <span style="color: #1e9fff">MB/L付款地点</span>
-                        </span>
-                        <search-query :datalist="mpayplaceData"
-                                      :selectValue="assemblyForm.mpayplace"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :disabled="detailData.seeDisabled"
-                                      :buttonIf="false"
-                                      :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                      @remoteMethod="remoteMethod($event,'mpayplace')"
-                                      @corpChange="corpChange($event,'mpayplace')"
-                                      @corpFocus="remoteMethod($event,'mpayplace')" >
-                        </search-query>
-                        <!--<el-input type="age" style="width: 100%;" v-model="assemblyForm.mPayplace"-->
-                        <!--          size="small" autocomplete="off"-->
-                        <!--          :disabled="detailData.seeDisabled"-->
-                        <!--          clearable placeholder="请输入MB/L付款地点" ></el-input>-->
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
                     <el-form-item label="服务方式" prop="serviceTerms" >
                         <span slot="label">
                             <span style="color: #1e9fff">服务方式</span>
@@ -262,12 +184,12 @@
                         </search-query>
                     </el-form-item>
                 </el-col>
+                <el-col :span="5">
+                    <el-button size="small" style="width: 100%;margin-left: 30px;" type="primary" @click="inttraAdd">发送INTTRA EDI</el-button>
+                </el-col>
             </el-row>
             <el-row >
                 <el-col :span="6">
-                    <el-button size="small" style="width: 100%;" type="primary" @click="inttraAdd">发送INTTRA EDI</el-button>
-                </el-col>
-                <el-col :span="6">
                     <el-form-item label="签单日期" prop="issueDate" >
                         <span slot="label">
                             <span style="color: #1e9fff">签单日期</span>
@@ -284,9 +206,9 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="退舱日期" prop="bookingWithdrawTime" >
+                    <el-form-item label="换单日期" prop="bookingWithdrawTime" >
                         <span slot="label">
-                            <span style="color: #1e9fff">退舱日期</span>
+                            <span style="color: #1e9fff">换单日期</span>
                         </span>
                         <el-date-picker
                             v-model="assemblyForm.bookingWithdrawTime"
@@ -295,45 +217,10 @@
                             value-format="yyyy-MM-dd HH:mm"
                             size="small"
                             :disabled="detailData.seeDisabled"
-                            placeholder="退舱日期">
+                            placeholder="换单日期">
                         </el-date-picker>
                     </el-form-item>
                 </el-col>
-                <el-col span="6">
-                    <el-form-item label="签单地点" prop="issueAt" >
-                        <span slot="label">
-                            <span style="color: #1e9fff">签单地点</span>
-                        </span>
-                        <search-query :datalist="issueAtData"
-                                      :selectValue="assemblyForm.issueAt"
-                                      :filterable="true"
-                                      :clearable="true"
-                                      :remote="true"
-                                      :disabled="detailData.seeDisabled"
-                                      :buttonIf="false"
-                                      :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                      @remoteMethod="remoteMethod($event,'issueAt')"
-                                      @corpChange="corpChange($event,'issueAt')"
-                                      @corpFocus="remoteMethod($event,'issueAt')" >
-                        </search-query>
-                        <!--<el-input type="age" style="width: 100%;" v-model="assemblyForm.issueAt"-->
-                        <!--          size="small" autocomplete="off"-->
-                        <!--          :disabled="detailData.seeDisabled"-->
-                        <!--          clearable placeholder="请输入签单地点" ></el-input>-->
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="6">
-                    <el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled" v-model="assemblyForm.isLargeCargo">大件货</el-checkbox>
-                </el-col>
-                <el-col :span="6">
-                    <div>
-                        <el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled" v-model="assemblyForm.isNeedLand">陆运</el-checkbox>
-                        <el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled" v-model="assemblyForm.isNeedDeclare">需报关</el-checkbox>
-                        <el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled" v-model="assemblyForm.isNeedIq">需三检</el-checkbox>
-                    </div>
-                </el-col>
                 <el-col :span="6">
                     <el-form-item label="箱数或件数大写" prop="quantityPackingDescr" label-width="100px">
                         <span slot="label">
@@ -443,12 +330,6 @@
                 cyContactsData:[], // 场站联系人
                 // 服务方式
                 serviceTermsData:[],
-                // HB/L付款地点数据
-                hpayplaceData:[],
-                // MB/L付款地点
-                mpayplaceData:[],
-                // 签单地点
-                issueAtData:[],
                 // INTTRA EDI弹窗
                 inttraVisible:false,
                 inttraTitle:'',
@@ -505,7 +386,6 @@
             remoteMethod(value,name){
                 let inttraArr = ['inttraDoorTo','inttraToDoor']
                 let numberOfArr = ['numberOfObl','numberOfCopy']
-                let payplaceArr = ['hpayplace','mpayplace','issueAt']
                 if (name == 'cy') {
                     this.cyBcorpslistByType(value)
                 }else if (inttraArr.indexOf(name) != -1) {
@@ -526,10 +406,6 @@
                 else if (name == 'serviceTerms') {
                     this.serviceTermsWorkDicts()
                 }
-                // HB/L付款状态 MB/L 付款状态
-                else if (payplaceArr.indexOf(name) != -1) {
-                    this[name + 'BportsListfun'](value)
-                }
                 else {}
             },
             // 选择框的回调
@@ -687,24 +563,6 @@
                     this.serviceTermsData = res.data.data
                 })
             },
-            // HB/L 付款地点
-            hpayplaceBportsListfun(enName){
-                bportsList(1,10,{enName}).then(res=>{
-                    this.hpayplaceData = res.data.data.records
-                })
-            },
-            // MB/L 付款地点
-            mpayplaceBportsListfun(enName){
-                bportsList(1,10,{enName}).then(res=>{
-                    this.mpayplaceData = res.data.data.records
-                })
-            },
-            // 签单地点
-            issueAtBportsListfun(enName){
-                bportsList(1,10,{enName}).then(res=>{
-                    this.issueAtData = res.data.data.records
-                })
-            },
 
 
         }

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

@@ -230,15 +230,15 @@
                                                      @billsDetailfun="billsDetailfun(form.id)">
                                     </DistributionBox>
                                 </el-tab-pane>
-                                <el-tab-pane label="MB/L信息" name="third">
-                                    <mbinformation :assemblyForm="form" :detailData="detailData"></mbinformation>
-                                </el-tab-pane>
+                                <!--<el-tab-pane label="MB/L信息" name="third">-->
+                                <!--    <mbinformation :assemblyForm="form" :detailData="detailData"></mbinformation>-->
+                                <!--</el-tab-pane>-->
                                 <el-tab-pane label="报表管理" name="fourth">
                                     <reports :id="form.id" :assemblyForm="form" :disabled="detailData.seeDisabled" businessValue="HYCK"></reports>
                                 </el-tab-pane>
-                                <el-tab-pane label="EDI CODE" name="sixth">
-                                    <edicode :assemblyForm="form" :detailData="detailData"></edicode>
-                                </el-tab-pane>
+                                <!--<el-tab-pane label="EDI CODE" name="sixth">-->
+                                <!--    <edicode :assemblyForm="form" :detailData="detailData"></edicode>-->
+                                <!--</el-tab-pane>-->
                                 <el-tab-pane label="文件中心" name="seventh">
                                     <filescenter :assemblyForm="form" :detailData="detailData"></filescenter>
                                 </el-tab-pane>
@@ -356,7 +356,8 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                     billDate:dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00', // 单据日期 默认 当天
                     operatorName:JSON.parse(localStorage.getItem('saber-userInfo')).content.user_name, // OP 默认登录人
                     operatorId:JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id, // OP 默认登录人
-                    businessType:'SE', // 业务类型 默认 海运出口
+                    businessType:'SI', // 业务类型 默认 海运出口
+                    seaType:'I', // 进出口 默认出口 E=出口 I=进口"
                     billType:'DD', // 单据类型 默认 直单
                     accDeptName:'',// 核算部门 默认登录人的部门
                     issueType:'正本', // 签单方式 默认 正本
@@ -366,7 +367,6 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                     srcType:'OWN', // 业务来源默认公司   来源 内容 默认登录人所属公司
                     numberOfObl:'THREE', // 正本份数 默认 THREE
                     numberOfCopy:'ONE', // 副本份数 默认 ONE
-                    seaType:'E', // 进出口 默认出口 E=出口 I=进口"
                     cargoType:'dry', // 货物类型默认普货
                     marks:'N/M',
                     filesList:[], // 文件中心
@@ -526,20 +526,20 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                                 },
                             },
                         ],
-                        [
-                            {
-                                label: "业务编号",
-                                text:"业务编号",
-                                prop: "billNo",
-                                disabled:true,
-                            },
-                            {
-                                label: "创建日期",
-                                prop: "createTime",
-                                type:'date',
-                                disabled:true,
-                            },
-                        ],
+                        // [
+                        //     {
+                        //         label: "业务编号",
+                        //         text:"业务编号",
+                        //         prop: "billNo",
+                        //         disabled:true,
+                        //     },
+                        //     {
+                        //         label: "创建日期",
+                        //         prop: "createTime",
+                        //         type:'date',
+                        //         disabled:true,
+                        //     },
+                        // ],
                         [
                             {
                                 label: "OP",  // 操作id 用户管理下拉 模糊搜索
@@ -734,14 +734,6 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                     this.form.polNamePrint = res.data.data.polEnName
                     // 签单地点 默认 装货港
                     this.$set(this.form,'issueAt',this.form.polEnName)
-                    // 主单单付费地点 默认  如果主单付费方式 为PP 取装货港 如果主单付费地点为CC 取卸货港
-                    if (this.form.mpaymode == 'PP') {
-                        this.$set(this.form,'mpayplace',this.form.polEnName)
-                    }
-                    // 分单单付费地点 默认  如果分单付费方式 为PP 取装货港 如果分单付费地点为CC 取卸货港
-                    if (this.form.hpaymode == 'PP') {
-                        this.$set(this.form,'hpayplace',this.form.polEnName)
-                    }
                 })
             },
             // 获取用户管理数据
@@ -767,7 +759,6 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                     console.log(res,789)
                     this.columnforfun('mpaymode').dicData = res.data.data
                     this.columnforfun('hpaymode').dicData = res.data.data
-                    console.log(this.columnforfun('hpaymode'),792)
                 })
             },
             // 获取核算部分数据 // 机构管理接口
@@ -802,12 +793,6 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                     this.$set(this.form,'corpAttnEmail',res.data.data.records[0].email)
                 })
             },
-            // 获取地点信息
-            getBlocationsListfun(cnName){
-                getBlocationsList(1,10,{cnName}).then(res=>{
-                    this.columnforfun('mPayplace').dicData = res.data.data.records
-                })
-            },
             // 获取业务来源数据
             srcTypeWorkDictsfun(){
                 getWorkDicts('src_type_los').then(res=>{
@@ -868,8 +853,6 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                     this.getLazylistfun(value)
                 }else if (name == 'corpCnName') {
                     this.getBcorpsListfun(value)
-                }else if (name == 'mPayplace') {
-                    this.getBlocationsListfun(value)
                 }else if (name == 'corpAttnName') {
                     this.getBcorpsattnListfun(value)
                 }else if (name == 'srcType') {
@@ -1022,32 +1005,13 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                         }
                     }
                 }
-                else if (name == 'coloaderCnName') {
-                    for(let item of this.columnforfun('coloaderCnName').dicData) {
-                        if (item.cnName == value) {
-                            this.$set(this.form,'coloaderId',item.id)
-                            this.$set(this.form,'coloaderCnName',item.cnName)
-                            this.$set(this.form,'coloaderEnName',item.enName)
-                        }
-                    }
-                }
                 else if (name == 'mpaymode') {
                     // 主单付费方式
                     this.form[name] = value
-                    if (value == 'PP') {
-                        this.$set(this.form,'mpayplace',this.form.polEnName?this.form.polEnName.split(' - ')[0]:'')
-                    }else {
-                        this.$set(this.form,'mpayplace',this.form.podEnName?this.form.podEnName.split(' - ')[0]:'')
-                    }
                 }
                 else if (name == 'hpaymode') {
                     // 分单付费方式
                     this.form[name] = value
-                    if (value == 'PP') {
-                        this.$set(this.form,'hpayplace',this.form.polEnName.split(' - ')[0])
-                    }else {
-                        this.$set(this.form,'hpayplace',this.form.podEnName.split(' - ')[0])
-                    }
                 }
                 else {
                     this.form[name] = value
@@ -1248,8 +1212,22 @@ import {editypesList} from "@/api/iosBasicData/editypes";
             },
             // 主表保存接口大保存
             billsSubmitfun(){
-                this.form.billNoFormat = 'HYCK'
-                this.form.businessTypeCode = 'HYCK'
+                if (this.form.cargoType = 'dry') {
+                    // 普货
+                    this.form.billNoFormat = 'HYJK-PH'
+                    this.form.businessTypeCode = 'HYJK-PH'
+                }else if (this.form.cargoType = 'danger'){
+                    // 危险品
+                    this.form.billNoFormat = 'HYJK-WXP'
+                    this.form.businessTypeCode = 'HYJK-WXP'
+                }else if (this.form.cargoType = 'reefer') {
+                    // 冻柜
+                    this.form.billNoFormat = 'HYJK-DG'
+                    this.form.businessTypeCode = 'HYJK-DG'
+                }else {
+                    this.form.billNoFormat = 'HYJK'
+                    this.form.businessTypeCode = 'HYJK'
+                }
                 // 把拼接的数据拆开 开始 🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒
                 this.searchSplit()
                 // 把拼接的数据拆开 结束 💩💩💩💩💩💩💩💩💩💩💩💩💩💩
@@ -1552,10 +1530,6 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                 if (this.form.hnotify2CnName) {
                     this.form.hnotify2CnName = this.form.hnotify2CnName.split(' - ')[0]
                 }
-                // COLOADER
-                if (this.form.coloaderCnName) {
-                    this.form.coloaderCnName = this.form.coloaderCnName.split(' - ')[0]
-                }
                 // 船公司
                 if (this.form.carrierCnName) {
                     this.form.carrierCnName = this.form.carrierCnName.split(' - ')[0]
@@ -1580,16 +1554,6 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                     this.form.destinationName = this.form.destinationName.split(' - ')[0]
                     this.form.destinationNamePrint = this.form.destinationNamePrint.split(' - ')[0]
                 }
-                // 交货地
-                if (this.form.placeDeliveryName) {
-                    this.form.placeDeliveryName = this.form.placeDeliveryName.split(' - ')[0]
-                    this.form.placeDeliveryNamePrint = this.form.placeDeliveryNamePrint.split(' - ')[0]
-                }
-                // 中转港
-                if (this.form.potEnName) {
-                    this.form.potEnName = this.form.potEnName.split(' - ')[0]
-                    this.form.potNamePrint = this.form.potNamePrint.split(' - ')[0]
-                }
                 // 船名
                 if (this.form.vesselCnName) {
                     this.form.vesselCnName = this.form.vesselCnName.split(' - ')[0]
@@ -1618,13 +1582,6 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                 if (this.form.hnotify2CnName) {
                     this.form.hnotify2CnName = this.form.hnotify2CnName + ' - ' + this.form.hnotify2Code
                 }
-                // COLOADER
-                if (this.form.coloaderCnName) {
-                    let corpType = '1712285382575398914,1712285645314990082,1712285842321448962,1712286433378574338'
-                    getBcorpslistByType(1,10,{cnName:this.form.coloaderCnName,corpType}).then(res=>{
-                        this.form.coloaderCnName = this.form.coloaderCnName + ' - ' + res.data.data.records[0].code
-                    })
-                }
                 // 船公司
                 if (this.form.carrierCnName) {
                     let corpType = '1712286570540703745'
@@ -1653,16 +1610,6 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                     this.form.destinationName = this.form.destinationName + ' - ' + this.form.destinationCode
                     this.form.destinationNamePrint = this.form.destinationNamePrint + ' - ' + this.form.destinationCode
                 }
-                // 交货地
-                if (this.form.placeDeliveryName) {
-                    this.form.placeDeliveryName = this.form.placeDeliveryName + ' - ' + this.form.placeDeliveryCode
-                    this.form.placeDeliveryNamePrint = this.form.placeDeliveryNamePrint + ' - ' + this.form.placeDeliveryCode
-                }
-                // 中转港
-                if (this.form.potEnName) {
-                    this.form.potEnName = this.form.potEnName + ' - ' + this.form.potCode
-                    this.form.potNamePrint = this.form.potNamePrint + ' - ' + this.form.potCode
-                }
                 // 船名
                 if (this.form.vesselCnName) {
                     getBvesselsList(1,10,{cnName:this.form.vesselCnName}).then(res=>{

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

@@ -1534,7 +1534,12 @@ import { getDeptTree } from "@/api/system/dept";
         // 列表获取数据
       onLoad(page, params = {}) {
         this.loading = true;
-        billsList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+
+        billsList(page.currentPage, page.pageSize, {
+            ...Object.assign(params, this.query),
+            businessType:'SI',
+            seaType:'I',
+        }).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records.map(item=>{

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

@@ -1268,8 +1268,22 @@ import {editypesList} from "@/api/iosBasicData/editypes";
             },
             // 主表保存接口大保存
             billsSubmitfun(){
-                this.form.billNoFormat = 'HYCK'
-                this.form.businessTypeCode = 'HYCK'
+                if (this.form.cargoType = 'dry') {
+                    // 普货
+                    this.form.billNoFormat = 'HYCK-PH'
+                    this.form.businessTypeCode = 'HYCK-PH'
+                }else if (this.form.cargoType = 'danger'){
+                    // 危险品
+                    this.form.billNoFormat = 'HYCK-WXP'
+                    this.form.businessTypeCode = 'HYCK-WXP'
+                }else if (this.form.cargoType = 'reefer') {
+                    // 冻柜
+                    this.form.billNoFormat = 'HYCK-DG'
+                    this.form.businessTypeCode = 'HYCK-DG'
+                }else {
+                    this.form.billNoFormat = 'HYCK'
+                    this.form.businessTypeCode = 'HYCK'
+                }
                 // 把拼接的数据拆开 开始 🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒
                 this.searchSplit()
                 // 把拼接的数据拆开 结束 💩💩💩💩💩💩💩💩💩💩💩💩💩💩

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

@@ -1534,7 +1534,11 @@ import { getDeptTree } from "@/api/system/dept";
         // 列表获取数据
       onLoad(page, params = {}) {
         this.loading = true;
-        billsList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        billsList(page.currentPage, page.pageSize, {
+            ...Object.assign(params, this.query),
+            businessType:'SE',
+            seaType:'E',
+        }).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records.map(item=>{

src/views/iosBasicData/amends/amendsDetails.vue

@@ -646,9 +646,18 @@ export default {
         // 向上添加数据
         upwardAddfun(dc) {
             if (dc == 'D') {
-                this.form.feeCenterList.unshift(...this.multipleChoiceDArr)
+                for (let item of this.multipleChoiceDArr) {
+                    item.amendSrcItemId = item.id
+                    delete item.id
+                    this.form.feeCenterList.unshift(item)
+                }
             } else {
-                this.form.feeCenterList.unshift(...this.multipleChoiceCArr)
+                for (let item of this.multipleChoiceCArr) {
+                    item.amendSrcItemId = item.id
+                    delete item.id
+                    this.form.feeCenterList.unshift(item)
+                }
+                // this.form.feeCenterList.unshift(...this.multipleChoiceCArr)
             }
         },
         // 选择弹窗的数据
@@ -685,7 +694,7 @@ export default {
             delete this.form.accountDate
             this.form.feeCenterListC = row.feeCenterListC.map(item => {
                 item.accStatus = 0
-                delete item.id
+                // delete item.id
                 delete item.pid
                 delete item.accAmount
                 delete item.accBillId
@@ -761,7 +770,7 @@ export default {
             })
             this.form.feeCenterListD = row.feeCenterListD.map(item => {
                 item.accStatus = 0
-                delete item.id
+                // delete item.id
                 delete item.pid
                 delete item.accAmount
                 delete item.accBillId