修改禅道 新增模块

src/api/boxManagement/podComeback/index.js

@@ -0,0 +1,13 @@
+import request from '@/router/axios';
+//查询列表
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/blade-los/useboxplanitem/page',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}

src/api/iosBasicData/boxPlan/boxStatistics.js

@@ -0,0 +1,13 @@
+import request from '@/router/axios';
+//查询列表
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/blade-los/useboxplanitem/page',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}

src/api/iosBasicData/businessCenter/bookingCabin.js

@@ -60,6 +60,23 @@ export function submitBookingCabin(data) {
         data
     })
 }
+// 批量保存
+export const submitFeeList = (row) => {
+    return request({
+        url: '/api/blade-los/feecenter/submitList',
+        method: 'post',
+        data: row
+    })
+}
+//删除明细
+export const itemFeeRemove = (data) => {
+    return request({
+        url: '/api/blade-los/feecenter/remove',
+        method: 'post',
+        params: data
+
+    })
+}
 // 发送消息
 export function sendMessageBooking(data) {
     return request({

src/api/iosBasicData/podStation.js

@@ -23,7 +23,7 @@ export const listExport = (data) => {
 export const batchUpdatePodStation = (data) => {
     return request({
         url: '/api/blade-los/UpdatePodStation/batchUpdatePodStation',
-        method: 'get',
-        params: data
+        method: 'post',
+        data: data
     })
 }

src/enums/column-name.js

@@ -2168,6 +2168,12 @@ const columnName = [{
 }, {
   code: 505,
   name: '永发-用箱计划-用箱计划详情明细表'
+}, {
+  code: 506,
+  name: '永发-箱管-POD返场列表页'
+}, {
+  code: 507,
+  name: '永发-用箱计划-用箱统计列表页'
 }
 ]
 export const getColumnName = (key) => {

src/router/views/index.js

@@ -4265,7 +4265,7 @@ export default [{
   hidden: true,
   children: [{
     path: '/iosBasicData/podStation/index',
-    name: 'POD场站(F)',
+    name: 'POD场站',
     meta: {
       i18n: '/iosBasicData/podStation/index',
       keepAlive: true,
@@ -4302,17 +4302,45 @@ export default [{
   }]
 },
 {
-  path: '/iosBasicData/boxPlan/index',
+  path: '/iosBasicData/boxPlan/boxPlan/index',
   component: Layout,
   hidden: true,
   children: [{
-    path: '/iosBasicData/boxPlan/index',
+    path: '/iosBasicData/boxPlan/boxPlan/index',
     name: '用箱计划',
     meta: {
-      i18n: '/iosBasicData/boxPlan/index',
+      i18n: '/iosBasicData/boxPlan/boxPlan/index',
       keepAlive: true,
     },
-    component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/boxPlan/index')
+    component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/boxPlan/boxPlan/index')
   }]
-}
+}, 
+{
+  path: '/iosBasicData/boxPlan/boxStatistics/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/iosBasicData/boxPlan/boxStatistics/index',
+    name: '用箱统计',
+    meta: {
+      i18n: '/iosBasicData/boxPlan/boxStatistics/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/boxPlan/boxStatistics/index')
+  }]
+}, 
+{
+  path: '/boxManagement/podComeback/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/boxManagement/podComeback/index',
+    name: 'POD返场',
+    meta: {
+      i18n: '/boxManagement/podComeback/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/boxManagement/podComeback/index')
+  }]
+},
 ]

src/views/boxManagement/podComeback/index.vue

@@ -0,0 +1,446 @@
+<template>
+  <div>
+    <basic-container>
+      <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :search.sync="query"
+        v-model="form" id="out-table" :header-cell-class-name="headerClassName" ref="crud" @search-change="searchChange"
+        @search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
+        @size-change="sizeChange" @refresh-change="refreshChange"
+        @resetColumn="resetColumn('crud', 'option', 'optionBack', 506)"
+        @saveColumn="saveColumn('crud', 'option', 'optionBack', 506)" @on-load="onLoad">
+        <template slot="menuLeft">
+          <el-button type="success" size="small" :disabled="selectionList.length == 0"
+            @click="allClick('批量修改POD场站')">批量修改POD场站
+          </el-button>
+          <el-button type="warning" size="small" @click="outExport">导 出
+          </el-button>
+        </template>
+      </avue-crud>
+      <el-dialog append-to-body title="批量修改POD场站" :visible.sync="podDialog" width="30%" v-dialog-drag>
+        <span>
+          <avue-form v-if='podDialog' ref="form2" v-model="podForm" :option="podOption">
+            <tempalte slot="podStationCname">
+              <dic-select v-model="podForm.podStationCname" placeholder="场站" label="cnName" res="records"
+                :slotRight="true" rightLabel="code"
+                url="/blade-los/bcorps/selectList?current=1&size=5&corpTypeName=场站&status=0" :filterable="true"
+                :remote="true" dataName="cnName" @selectChange="dicChange('podStationCname', $event)"></dic-select>
+            </tempalte>
+          </avue-form>
+        </span>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="podDialog = false" size="mini">取 消</el-button>
+          <el-button type="primary" @click.stop="podSubmit" size="mini">确 定</el-button>
+        </span>
+      </el-dialog>
+    </basic-container>
+  </div>
+</template>
+
+<script>
+import { getList, batchUpdatePodStation } from "@/api/iosBasicData/podStation.js";
+import { defaultDate2 } from "@/util/date";
+import dicSelect from "@/components/dicSelect/main";
+import { getToken } from "@/util/auth";
+export default {
+  data() {
+    return {
+      podDialog: false,
+      podForm: {},
+      podOption: {
+        menuBtn: false,
+        span: 6,
+        disabled: false,
+        column: [
+          {
+            label: 'POD场站',
+            prop: 'podStationCname',
+            span: 24,
+            rules: [{
+              required: true,
+              message: " ",
+              trigger: "blur"
+            }],
+          }
+        ]
+      },
+      form: {},
+      query: {
+        whether: '0',
+        businessType:"SI",
+        actualEtaList: defaultDate2()
+      },
+      loading: false,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      selectionList: [],
+      option: {},
+      optionBack: {
+        height: 'auto',
+        calcHeight: 30,
+        menuWidth: 140,
+        menu: false,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 18,
+        border: true,
+        index: true,
+        addBtn: false,
+        viewBtn: false,
+        editBtn: false,
+        delBtn: false,
+        selection: true,
+        searchIcon: true,
+        align: 'center',
+        searchIndex: 3,
+        column: [
+          {
+            label: '客户',
+            prop: 'corpName',
+            overHidden: true,
+          },
+          {
+            label: '箱号',
+            prop: 'cntrNo',
+            overHidden: true,
+            search: true,
+          },
+          {
+            label: 'HB/L NO',
+            prop: 'hblno',
+            overHidden: true,
+            search: true,
+          },
+          {
+            label: 'POD场站',
+            prop: 'podStationCname',
+            overHidden: true,
+            search: true,
+            type: "select",
+            filterable: true,
+            remote: true,
+            dicUrl: "/api/blade-los/bcorps/selectList?current=1&size=5&corpTypeName=场站&status=0&cnName={{key}}",
+            props: {
+              label: "cnName",
+              value: "cnName",
+              desc: 'code',
+              res: "data.records"
+            }
+          },
+          {
+            label: 'MB/L NO',
+            prop: 'mblno',
+            overHidden: true,
+          },
+          {
+            label: 'ETA',
+            prop: 'eta',
+            width: 120,
+            hide: true,
+            search: true,
+            searchProp: 'actualEtaList',
+            overHidden: true,
+            type: "date",
+            searchRange: true,
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd"
+          },
+          // {
+          //   label: '单据类型',
+          //   prop: 'billType',
+          //   hide: true,
+          //   overHidden: true,
+          //   search: true,
+          //   type: 'select',
+          //   dicData: [
+          //     {
+          //       label: '直单',
+          //       value: 'DD'
+          //     },
+          //     {
+          //       label: '分单',
+          //       value: 'MH'
+          //     }
+          //   ]
+          // },
+          {
+            label: '船名',
+            prop: 'vesselCnName',
+            overHidden: true,
+            search: true,
+            type: "select",
+            filterable: true,
+            remote: true,
+            dicUrl: "/api/blade-los/bvessels/list?status=0&size=5&current=1&cnName={{key}}",
+            props: {
+              label: "cnName",
+              value: "cnName",
+              desc: 'code',
+              res: "data.records"
+            }
+          },
+          {
+            label: '航次',
+            prop: 'voyageNo',
+            overHidden: true,
+            search: true,
+          },
+          {
+            label: '起运港',
+            prop: 'polName',
+            overHidden: true,
+            search: true,
+            type: "select",
+            filterable: true,
+            remote: true,
+            dicUrl: "/api/blade-los/bports/list?status=0&size=5&current=1&cnName={{key}}",
+            props: {
+              label: "cnName",
+              value: "cnName",
+              desc: 'code',
+              res: "data.records"
+            }
+          },
+          {
+            label: '卸货港',
+            prop: 'podName',
+            overHidden: true,
+            search: true,
+            type: "select",
+            filterable: true,
+            remote: true,
+            dicUrl: "/api/blade-los/bports/list?status=0&size=5&current=1&cnName={{key}}",
+            props: {
+              label: "cnName",
+              value: "cnName",
+              desc: 'code',
+              res: "data.records"
+            }
+          },
+          {
+            label: '放箱号',
+            prop: 'containerNumber',
+            overHidden: true,
+          },
+          {
+            label: '箱属',
+            prop: 'boxBelongsTo',
+            overHidden: true,
+          },
+          {
+            label: '箱型',
+            prop: 'cntrTypeCode',
+            overHidden: true,
+          },
+            {
+            label: '是否录入',
+            prop: 'whether',
+            hide: true,
+            overHidden: true,
+            search: true,
+            type: 'select',
+            dicData: [{
+              label: '否',
+              value: '0'
+            }, {
+              label: '是',
+              value: '1'
+            }]
+          },
+        ]
+      },
+      data: [],
+    };
+  },
+  components: {
+    dicSelect
+  },
+  async created() {
+    this.option = await this.getColumnData(this.getColumnName(506), this.optionBack);
+  },
+  activated() {
+    setTimeout(() => {
+    }, 100);
+  },
+  methods: {
+    allClick(name) {
+      if (name == '批量修改POD场站') {
+        this.podForm = {}
+        this.podDialog = true
+      }
+    },
+    dicChange(name, row) {
+      if (name == 'podStationCname') {
+        if (row) {
+          this.podForm.podStationId = row.id
+          this.podForm.podStationCode = row.code
+          this.podForm.podStationEname = row.enName
+        } else {
+          this.podForm.podStationId = null
+          this.podForm.podStationCode = null
+          this.podForm.podStationEname = null
+          this.podForm.podStationCname = null
+        }
+      }
+    },
+    podSubmit() {
+      this.$refs["form2"].validate((valid, done) => {
+        done();
+        if (valid) {
+          // let ids = []
+          // for (let item of this.selectionList) {
+          //   ids.push(item.id)
+          // }
+          let obj = {
+            // ids: ids.join(','),
+            businessType: 'SI',
+            list: this.selectionList,
+            ...this.podForm,
+          }
+          const loading = this.$loading({
+            lock: true,
+            text: '加载中',
+            spinner: 'el-icon-loading',
+            background: 'rgba(255,255,255,0.7)'
+          });
+          batchUpdatePodStation(obj).then(res => {
+            this.$message.success("操作成功！");
+            this.refreshChange()
+            this.podDialog = false
+          }).finally(() => {
+            loading.close();
+          })
+        } else {
+          return false;
+        }
+      });
+
+
+    },
+    searchReset() {
+      this.query = this.$options.data().query;
+      this.onLoad(this.page);
+    },
+    // 搜索按钮点击
+    searchChange(params, done) {
+      this.page.currentPage = 1;
+      this.onLoad(this.page, this.query);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      let obj = {}
+      obj = {
+        ...Object.assign(params, this.query),
+      }
+      this.loading = true;
+      getList(page.currentPage, page.pageSize, obj).then(res => {
+        this.data = res.data.data.records;
+        this.page.total = res.data.data.total;
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout();
+          this.$refs.crud.dicInit();
+        });
+      }).finally(() => {
+        this.loading = false;
+      })
+    },
+    outExport() {
+      let config = { params: { ...this.query } }
+      if (config.params) {
+        for (const propName of Object.keys(config.params)) {
+          const value = config.params[propName];
+          if (value !== null && typeof (value) !== "undefined") {
+            if (value instanceof Array) {
+              for (const key of Object.keys(value)) {
+                let params = propName + '[' + key + ']';
+                config.params[params] = value[key]
+              }
+              delete config.params[propName]
+            }
+          }
+        }
+      }
+      const routeData = this.$router.resolve({
+        path: '/api/blade-los/UpdatePodStation/listExport',      //跳转目标窗口的地址
+        query: {
+          ...config.params,    //括号内是要传递给新窗口的参数
+          identification: this.url
+        }
+      })
+      window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+    },
+    //自定义列保存
+    async saveColumn(ref, option, optionBack, code) {
+      /**
+       * 已定义全局方法，直接使用，saveColumnData保存列数据方法,参数传值(表格名称，当前表格的option数据)
+       * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
+       * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
+       */
+      const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs[ref].$refs.dialogColumn.columnBox = false;
+      }
+    },
+    //自定义列重置
+    async resetColumn(ref, option, optionBack, code) {
+      this[option] = this[optionBack];
+      const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.$refs[ref].$refs.dialogColumn.columnBox = false;
+      }
+    },
+    // 更改表格颜色
+    headerClassName(tab) {
+      //颜色间隔
+      let back = ""
+      if (tab.columnIndex >= 0 && tab.column.level === 1) {
+        if (tab.columnIndex % 2 === 0) {
+          back = "back-one"
+        } else if (tab.columnIndex % 2 === 1) {
+          back = "back-two"
+        }
+      }
+      return back;
+    },
+
+  }
+}
+
+</script>
+
+<style lang="scss" scoped>
+::v-deep #out-table .back-one {
+  background: #ecf5ff !important;
+  text-align: center;
+}
+
+::v-deep #out-table .back-two {
+  background: #ecf5ff !important;
+  text-align: center;
+}
+
+.pointerClick {
+  cursor: pointer;
+  color: #1e9fff;
+}
+
+::v-deep .el-col-md-8 {
+  width: 24.33333%;
+}
+</style>

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

@@ -934,6 +934,7 @@
                                     :clearable="true" :disabled="detailData.seeDisabled" :buttonIf="false"
                                     :forParameter="{ key: 'id', label: 'code', value: 'code' }" placeholder="请选择服务方式"
                                     @remoteMethod="remoteMethod($event, 'serviceTerms')"
+                                    @corpChange="corpChange($event, 'serviceTerms')"
                                     @corpFocus="remoteMethod($event, 'serviceTerms')">
                                 </search-query>
                             </el-form-item>

src/views/iosBasicData/boxPlan/detailsPage.vue → src/views/iosBasicData/boxPlan/boxPlan/detailsPage.vue

@@ -12,10 +12,10 @@
           @click="inEdit">编 辑
         </el-button>
         <el-button class="el-button--small-yh" v-else style="margin-left: 6px;" type="primary" size="small"
-          :disabled="isSaveBtn" @click="submit">保 存
+          :disabled="isSaveBtn||form.status==1" @click="submit">保 存
         </el-button>
         <el-button class="el-button--small-yh" style="margin-left: 6px;" type="success" size="small"
-          :disabled="isSaveBtn" @click="submitUseBoxPlan">提 交
+          :disabled="isSaveBtn||form.status==1" @click="submitUseBoxPlan">提 交
         </el-button>
         <!-- <el-button v-if="form.status == '审核提交'" class="el-button--small-yh" style="margin-left: 6px;" type="danger"
           size="small" @click="revokeApplication">撤销单据请核
@@ -122,7 +122,7 @@ import {
   submitItemList,
   itemRemove,
   submitUseBoxPlan
-} from "@/api/iosBasicData/businessCenter/customerLetter.js";
+} from "@/api/iosBasicData/boxPlan/boxPlan.js";
 import dicSelect from "@/components/dicSelect/main";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
 import businessReports from "@/components/tradeAgency/businessReports.vue";

src/views/iosBasicData/boxPlan/index.vue → src/views/iosBasicData/boxPlan/boxPlan/index.vue

@@ -30,7 +30,7 @@
 </template>
 
 <script>
-import { getList, remove } from "@/api/iosBasicData/businessCenter/customerLetter.js";
+import { getList, remove } from "@/api/iosBasicData/boxPlan/boxPlan.js";
 import { getWorkDicts } from "@/api/system/dictbiz";
 import detailsPage from "./detailsPage";
 import { getToken } from "@/util/auth";
@@ -123,6 +123,8 @@ export default {
             prop: "startDate",
             width: "100",
             overHidden: true,
+            hide:true,
+            showColumn:false,
             search: true,
             type: "date",
             format: "yyyy-MM-dd",
@@ -133,6 +135,8 @@ export default {
             prop: "endDate",
             width: "100",
             overHidden: true,
+            hide:true,
+            showColumn:false,
             search: true,
             type: "date",
             format: "yyyy-MM-dd",

src/views/iosBasicData/boxPlan/boxStatistics/index.vue

@@ -0,0 +1,284 @@
+<template>
+  <div>
+    <basic-container>
+      <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :search.sync="query"
+        v-model="form" id="out-table" :header-cell-class-name="headerClassName" ref="crud" @search-change="searchChange"
+        @search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
+        @size-change="sizeChange" @refresh-change="refreshChange"
+        @resetColumn="resetColumn('crud', 'option', 'optionBack', 507)"
+        @saveColumn="saveColumn('crud', 'option', 'optionBack', 507)" @on-load="onLoad">
+        <template slot="menuLeft">
+          <!-- <el-button type="success" size="small" :disabled="selectionList.length == 0"
+            @click="allClick('批量修改POD场站')">批量修改POD场站
+          </el-button> -->
+          <el-button type="warning" size="small" @click="outExport">导 出
+          </el-button>
+        </template>
+      </avue-crud>
+    </basic-container>
+  </div>
+</template>
+
+<script>
+import { getList } from "@/api/iosBasicData/boxPlan/boxStatistics.js";
+import { defaultDate2 } from "@/util/date";
+import dicSelect from "@/components/dicSelect/main";
+import { getToken } from "@/util/auth";
+export default {
+  data() {
+    return {
+      form: {},
+      query: {},
+      loading: false,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      selectionList: [],
+      option: {},
+      optionBack: {
+        height: 'auto',
+        calcHeight: 30,
+        menuWidth: 140,
+        menu: false,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 18,
+        border: true,
+        index: true,
+        addBtn: false,
+        viewBtn: false,
+        editBtn: false,
+        delBtn: false,
+        selection: true,
+        searchIcon: true,
+        align: 'center',
+        searchIndex: 3,
+        column: [
+          {
+            label: "所属公司",
+            prop: "branchId",
+            overHidden: true,
+            hide: true,
+            showColumn: false,
+            search: true,
+            type: "select",
+            filterable: true,
+            dicUrl: "/api/blade-system/dept/lazy-list",
+            props: {
+              label: "deptName",
+              value: "id",
+            },
+          },
+          {
+            label: "所属公司",
+            prop: "branchName",
+            overHidden: true,
+          },
+          {
+            label: "年",
+            prop: "year",
+            overHidden: true,
+            hide: true,
+            showColumn: false,
+            search: true,
+            type: "year",
+            format: "yyyy",
+            valueFormat: "yyyy",
+          },
+          {
+            label: "WEEK",
+            prop: "week",
+            overHidden: true,
+            search: true,
+          },
+          {
+            label: "制单人",
+            prop: "createUserName",
+            overHidden: true,
+          }, {
+            label: "制单日期",
+            prop: "createTime",
+            type: "date",
+            overHidden: true,
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss"
+          }, {
+            label: "修改人",
+            prop: "updateUserName",
+            overHidden: true,
+          }, {
+            label: "修改日期",
+            prop: "updateTime",
+            type: "date",
+            overHidden: true,
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss"
+          },
+          {
+            label: "开始日期",
+            prop: "startDate",
+            width: "100",
+            overHidden: true,
+            hide: true,
+            showColumn: false,
+            search: true,
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd",
+          },
+          {
+            label: "结束日期",
+            prop: "endDate",
+            width: "100",
+            overHidden: true,
+            hide: true,
+            showColumn: false,
+            search: true,
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd",
+          },
+        ]
+      },
+      data: [],
+    };
+  },
+  components: {
+    dicSelect
+  },
+  async created() {
+    this.option = await this.getColumnData(this.getColumnName(507), this.optionBack);
+  },
+  activated() {
+    setTimeout(() => {
+    }, 100);
+  },
+  methods: {
+    searchReset() {
+      this.query = this.$options.data().query;
+      this.onLoad(this.page);
+    },
+    // 搜索按钮点击
+    searchChange(params, done) {
+      this.page.currentPage = 1;
+      this.onLoad(this.page, this.query);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      let obj = {}
+      obj = {
+        ...Object.assign(params, this.query),
+      }
+      this.loading = true;
+      getList(page.currentPage, page.pageSize, obj).then(res => {
+        this.data = res.data.data.records;
+        this.page.total = res.data.data.total;
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout();
+          this.$refs.crud.dicInit();
+        });
+      }).finally(() => {
+        this.loading = false;
+      })
+    },
+    outExport() {
+      let config = { params: { ...this.query } }
+      if (config.params) {
+        for (const propName of Object.keys(config.params)) {
+          const value = config.params[propName];
+          if (value !== null && typeof (value) !== "undefined") {
+            if (value instanceof Array) {
+              for (const key of Object.keys(value)) {
+                let params = propName + '[' + key + ']';
+                config.params[params] = value[key]
+              }
+              delete config.params[propName]
+            }
+          }
+        }
+      }
+      const routeData = this.$router.resolve({
+        path: '/api/blade-los/useboxplanitem/exportUseBoxPlanItem',      //跳转目标窗口的地址
+        query: {
+          ...config.params,    //括号内是要传递给新窗口的参数
+          identification: this.url
+        }
+      })
+      window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+    },
+    //自定义列保存
+    async saveColumn(ref, option, optionBack, code) {
+      /**
+       * 已定义全局方法，直接使用，saveColumnData保存列数据方法,参数传值(表格名称，当前表格的option数据)
+       * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
+       * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
+       */
+      const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs[ref].$refs.dialogColumn.columnBox = false;
+      }
+    },
+    //自定义列重置
+    async resetColumn(ref, option, optionBack, code) {
+      this[option] = this[optionBack];
+      const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.$refs[ref].$refs.dialogColumn.columnBox = false;
+      }
+    },
+    // 更改表格颜色
+    headerClassName(tab) {
+      //颜色间隔
+      let back = ""
+      if (tab.columnIndex >= 0 && tab.column.level === 1) {
+        if (tab.columnIndex % 2 === 0) {
+          back = "back-one"
+        } else if (tab.columnIndex % 2 === 1) {
+          back = "back-two"
+        }
+      }
+      return back;
+    },
+
+  }
+}
+
+</script>
+
+<style lang="scss" scoped>
+::v-deep #out-table .back-one {
+  background: #ecf5ff !important;
+  text-align: center;
+}
+
+::v-deep #out-table .back-two {
+  background: #ecf5ff !important;
+  text-align: center;
+}
+
+.pointerClick {
+  cursor: pointer;
+  color: #1e9fff;
+}
+
+::v-deep .el-col-md-8 {
+  width: 24.33333%;
+}
+</style>

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

@@ -24,7 +24,7 @@
           :disabled="isSaveBtn || form.issueStatus == 1 || form.status == 3" @click="submit">保 存
         </el-button>
         <el-button v-if="form.id" class="el-button--small-yh" style="margin-left: 6px;" type="success" size="small"
-          :disabled="form.issueStatus == 1" @click="allClick('生成订单')">生成订单
+          :disabled="form.issueStatus == 1||form.status == 1" @click="allClick('生成订单')">生成订单
         </el-button>
         <el-button v-if="form.id" class="el-button--small-yh" style="margin-left: 6px;" type="success" size="small"
           :disabled="form.status != 0 || form.issueStatus == 1" @click="application">运费申请
@@ -128,7 +128,8 @@
                     <el-col span="12">
                       <el-form-item label="ETD" prop="etd" :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
                         <el-date-picker v-model="form.etd" type="date" placeholder="请选择 ETD" :disabled="editDisabled"
-                          size="small" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 100%;">
+                          size="small" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 100%;"
+                          @selectChange="dicChange('ETD', $event)">
                         </el-date-picker>
                       </el-form-item>
                     </el-col>
@@ -247,11 +248,11 @@
                   @click="allClick('一键编辑')">一键编辑</el-button>
                 <el-button type="danger" plain size="small" :disabled="editDisabled || selectionList.length == 0"
                   @click="allClick('批量删除')">批量删除</el-button>
-                <el-button type="success" plain size="small" :disabled="editDisabled|| !form.id"
+                <el-button type="success" plain size="small" :disabled="editDisabled || form.preContainersList.length==0"
                   @click="allClick('提取价格')">提取价格</el-button>
               </template>
               <template slot="indexHeader" slot-scope="{row,index}">
-                <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="editDisabled" circle
+                <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="editDisabled|| !form.id" circle
                   @click="addRow()">
                 </el-button>
               </template>
@@ -272,11 +273,11 @@
             </avue-form>
           </trade-card>
         </el-tab-pane>
-        <el-tab-pane label="费用信息">
+        <el-tab-pane label="费用信息" v-if="false">
           <el-card
             v-show="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1 ? true : roleName.indexOf('应付查看') != -1"
             class="box-card" style="margin: 2px 0">
-            <avue-crud :option="feecOption" :data="form.feeCenterList" id="out-table" ref="crud2"
+            <avue-crud :option="feecOption" :data="form.feeCenterListC" id="out-table" ref="crud2"
               :header-cell-class-name="headerClassName" :row-style="{ height: '20px' }" :cell-style="{ padding: '0px' }"
               @selection-change="feecChange" @row-update="rowUpdate"
               @resetColumn="resetColumn('crud2', 'feecOption', 'feecOptionBack', 235.2)"
@@ -286,38 +287,37 @@
                   <i class="el-icon-coin"></i>
                   <span>应付费用</span>
                 </div>
-                <el-button type="info" plain size="small" :disabled="false" @click="allClick('费用一键保存')">一键保存</el-button>
-                <el-button type="info" plain size="small" :disabled="false" @click="allClick('费用一键编辑')">一键编辑</el-button>
+                <el-button type="info" plain size="small" :disabled="editDisabled || !form.id" @click="allClick('费用一键保存')">一键保存</el-button>
+                <el-button type="info" plain size="small" :disabled="editDisabled || !form.id" @click="allClick('费用一键编辑')">一键编辑</el-button>
                 <el-button type="danger" plain size="small" :disabled="selectionfeecList.length == 0"
                   @click="allClick('费用批量删除')">批量删除</el-button>
-                <el-button type="primary" plain size="small" :disabled="selectionfeecList.length == 0"
-                  @click="allClick('费用申请')">请核费用</el-button>
+                <!-- <el-button type="primary" plain size="small" :disabled="selectionfeecList.length == 0"
+                  @click="allClick('费用申请')">请核费用</el-button> -->
                 <!-- <el-button type="primary" plain size="small" @click="$refs.printC.openDialog()">打印账单</el-button> -->
               </template>
               <template slot="indexHeader" slot-scope="{row,index}">
-                <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="false" circle
+                <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="editDisabled || !form.id" circle
                   @click="feecAddRow()">
                 </el-button>
               </template>
               <template slot="index" slot-scope="{row,index}">
                 <span>{{ index + 1 }}</span>
               </template>
-              <template slot="billTypeForm" slot-scope="{row,index}">
-                <dic-select v-if="row.$cellEdit && !(row.automaticGenerated == 1)" v-model="row.billType" key="id"
-                  label="cnName" res="records" url="/blade-los/bcorpstypedefine/list?status=0&current=1&size=20"
-                  :filterable="true" :remote="true" dataName="cnName"
-                  @selectChange="rowDicChange('billType', $event, row, index)"></dic-select>
-                <span v-else>{{ row.billType }}</span>
+              <template slot="corpTypeForm" slot-scope="{row,index}">
+                <dic-select v-if="row.$cellEdit" v-model="row.corpType" key="id" label="cnName" res="records"
+                  url="/blade-los/bcorpstypedefine/list?status=0&current=1&size=20" :filterable="true" :remote="true"
+                  dataName="cnName" @selectChange="rowDicChange('corpType', $event, row, index)"></dic-select>
+                <span v-else>{{ row.corpType }}</span>
               </template>
               <template slot="cntrNoForm" slot-scope="{row,index}">
-                <dic-select v-if="row.$cellEdit && !(row.automaticGenerated == 1)" v-model="row.cntrNo" key="id"
-                  label="code" :mockData="form.tradingBoxItemsList" :filterable="true"></dic-select>
+                <dic-select v-if="row.$cellEdit" v-model="row.cntrNo" key="id" label="code"
+                  :mockData="form.tradingBoxItemsList" :filterable="true"></dic-select>
                 <span v-else>{{ row.cntrNo }}</span>
               </template>
               <template slot="corpCnNameForm" slot-scope="{ row,index }">
-                <dic-select v-if="row.$cellEdit && !(row.automaticGenerated == 1)" :key="updateSearchKey"
-                  v-model="row.corpCnName" placeholder="付费对象" label="shortName" res="records"
-                  :url="'/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=' + row.billType"
+                <dic-select v-if="row.$cellEdit" :key="row.corpType" v-model="row.corpCnName" placeholder="付费对象"
+                  label="shortName" res="records"
+                  :url="'/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=' + row.corpType"
                   :filterable="true" :remote="true" dataName="shortName"
                   @selectChange="rowDicChange('corpCnName', $event, row)" :slotRight="true"
                   rightLabel="code"></dic-select>
@@ -329,10 +329,9 @@
                 <span v-else>{{ row.corpCnName }}</span> -->
               </template>
               <template slot="feeCnNameForm" slot-scope="{ row }">
-                <dic-select v-if="row.$cellEdit && !(row.automaticGenerated == 1)" v-model="row.feeCnName" key="id"
-                  placeholder="费用名称" label="cnName" res="records" url="/blade-los/bfees/list?status=0&current=1&size=20"
-                  :filterable="true" :remote="true" dataName="cnName"
-                  @selectChange="rowDicChange('feeCnName', $event, row)"></dic-select>
+                <dic-select v-if="row.$cellEdit" v-model="row.feeCnName" key="id" placeholder="费用名称" label="cnName"
+                  res="records" url="/blade-los/bfees/list?status=0&current=1&size=20" :filterable="true" :remote="true"
+                  dataName="cnName" @selectChange="rowDicChange('feeCnName', $event, row)"></dic-select>
                 <span v-else>{{ row.feeCnName }}</span>
               </template>
               <template slot="curCodeForm" slot-scope="{ row }">
@@ -342,30 +341,28 @@
                 <span v-else>{{ row.curCode }}</span>
               </template>
               <template slot="exrateForm" slot-scope="{ row }">
-                <el-input-number v-if="row.$cellEdit && !(row.automaticGenerated == 1)" v-model="row.exrate"
-                  :controls="false" placeholder="请输入 汇率" size="small" style="width: 100%;"></el-input-number>
+                <el-input-number v-if="row.$cellEdit" v-model="row.exrate" :controls="false" placeholder="请输入 汇率"
+                  size="small" style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.exrate }}</span>
               </template>
               <template slot="unitNoForm" slot-scope="{row,index}">
-                <dic-select v-if="row.$cellEdit && !(row.automaticGenerated == 1)" v-model="row.unitNo" label="cnName"
+                <dic-select v-if="row.$cellEdit" v-model="row.unitNo" label="cnName"
                   url="/blade-los/bunits/listAll?status=0" :filterable="true"></dic-select>
                 <span v-else>{{ row.unitNo }}</span>
               </template>
               <template slot="priceForm" slot-scope="{ row }">
-                <el-input-number v-if="row.$cellEdit && !(row.automaticGenerated == 1)" v-model="row.price"
-                  :controls="false" placeholder="请输入 成本价" size="small" style="width: 100%;" :precision="2"
-                  @change="countChange(row)"></el-input-number>
+                <el-input-number v-if="row.$cellEdit" v-model="row.price" :controls="false" placeholder="请输入 成本价"
+                  size="small" style="width: 100%;" :precision="2" @change="countChange(row)"></el-input-number>
                 <span v-else>{{ row.price }}</span>
               </template>
               <template slot="quantityForm" slot-scope="{ row }">
-                <el-input-number v-if="row.$cellEdit && !(row.automaticGenerated == 1)" v-model="row.quantity"
-                  :controls="false" placeholder="请输入 成本价" size="small" style="width: 100%;" :precision="0"
-                  @change="countChange(row)"></el-input-number>
+                <el-input-number v-if="row.$cellEdit" v-model="row.quantity" :controls="false" placeholder="请输入 成本价"
+                  size="small" style="width: 100%;" :precision="0" @change="countChange(row)"></el-input-number>
                 <span v-else>{{ row.quantity }}</span>
               </template>
               <template slot="remarks" slot-scope="{ row }">
-                <el-input v-if="row.$cellEdit && !(row.automaticGenerated == 1)" v-model="row.remarks"
-                  placeholder="请输入 备注" size="small" style="width: 100%;"></el-input>
+                <el-input v-if="row.$cellEdit" v-model="row.remarks" placeholder="请输入 备注" size="small"
+                  style="width: 100%;"></el-input>
                 <span v-else>{{ row.remarks }}</span>
               </template>
               <template slot="menu" slot-scope="{ row, index }">
@@ -392,7 +389,7 @@
 </template>
 
 <script>
-import { submit, getDetail, submitBookingCabin, sendMessageBooking, copyAgent, pleaseCheck, repealCancel, submitItemList, itemRemove } from "@/api/iosBasicData/businessCenter/bookingCabin.js";
+import { submit, getDetail, submitBookingCabin, sendMessageBooking, copyAgent, pleaseCheck, repealCancel, submitItemList, itemRemove, submitFeeList, itemFeeRemove } from "@/api/iosBasicData/businessCenter/bookingCabin.js";
 import { losbfeestemplateGetListTemplate } from "@/api/iosBasicData/bills";
 import { losbfeestemplateDetail } from "@/api/iosBasicData/losbfeestemplate";
 import dicSelect from "@/components/dicSelect/main";
@@ -487,7 +484,7 @@ export default {
         mpaymode: 'PP',
         detail: {},
         preContainersList: [],
-        feeCenterList: [],
+        feeCenterListC: [],
         filesList: [],
       },
       polFeeList: [],
@@ -706,43 +703,43 @@ export default {
             fixed: true,
             headerslot: true,
           },
-          {
-            label: '账单状态',
-            prop: 'accStatus',
-            overHidden: true,
-            width: 80,
-            type: 'select',
-            dicData: [{
-              label: '未生成',
-              value: 0,
-            }, {
-              label: '已生成',
-              value: 1,
-            }],
-          },
-          {
-            label: '审核状态',
-            prop: 'auditStatus',
-            overHidden: true,
-            width: 80,
-            type: 'select',
-            dicData: [{
-              label: '录入',
-              value: '0',
-            }, {
-              label: '提交审核',
-              value: '1',
-            }, {
-              label: '审核中',
-              value: '2',
-            }, {
-              label: '审核通过',
-              value: '4',
-            }],
-          },
+          // {
+          //   label: '账单状态',
+          //   prop: 'accStatus',
+          //   overHidden: true,
+          //   width: 80,
+          //   type: 'select',
+          //   dicData: [{
+          //     label: '未生成',
+          //     value: 0,
+          //   }, {
+          //     label: '已生成',
+          //     value: 1,
+          //   }],
+          // },
+          // {
+          //   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",
+            prop: "corpType",
             width: 100,
             overHidden: true,
             cell: true,
@@ -772,15 +769,15 @@ export default {
               }
             ]
           },
-          {
-            label: "箱号",
-            prop: "cntrNo",
-            width: "100",
-            cell: true,
-            slot: true,
-            formslot: true,
-            overHidden: true,
-          },
+          // {
+          //   label: "箱号",
+          //   prop: "cntrNo",
+          //   width: "100",
+          //   cell: true,
+          //   slot: true,
+          //   formslot: true,
+          //   overHidden: true,
+          // },
           {
             label: "费用名称",
             prop: "feeCnName",
@@ -972,6 +969,15 @@ export default {
     this.saveLocalCurrency(this.deptId)
   },
   methods: {
+    countChange(row) {
+      if (row.curCode == this.getLocalCurrency()) {
+        row.amountCNY = _.round(_.multiply(row.price, row.quantity), 2)
+        row.amountUSD = 0
+      } else {
+        row.amountCNY = 0
+        row.amountUSD = _.round(_.multiply(row.price, row.quantity), 2)
+      }
+    },
     importData(row) {
       console.log(row)
       this.form.preContainersList.forEach(item => {
@@ -1007,6 +1013,47 @@ export default {
           el.teu = null
         }
       }
+      if (name == 'curCodeC') {
+        if (row) {
+          el.exrate = row.exratePayable
+          this.countChange(el)
+        } else {
+          el.exrate = null
+          el.amountCNY = 0
+          el.amountUSD = 0
+        }
+      }
+      if (name == 'feeCnName') {
+        if (row) {
+          el.feeId = row.id
+          el.feeCode = row.code
+        } else {
+          el.feeId = null
+          el.feeCode = null
+          el.feeCnName = null
+        }
+      }
+      if (name == 'corpType') {
+        el.corpId = null
+        el.corpCode = null
+        el.shortName = null
+        el.corpCnName = null
+        el.corpEnName = null
+      }
+      if (name == 'corpCnName') {
+        if (row) {
+          el.corpId = row.id
+          el.corpCode = row.code
+          el.shortName = row.shortName
+          el.corpEnName = row.enName
+        } else {
+          el.corpId = null
+          el.corpCode = null
+          el.shortName = null
+          el.corpCnName = null
+          el.corpEnName = null
+        }
+      }
     }
     ,
     async dicChange(name, row) {
@@ -1077,6 +1124,14 @@ export default {
           this.form.podNamePrint = null
         }
       }
+      if (name == 'ETD') {
+        if (row) {
+          await this.checkRate(null, row, null, 1, this.deptId)
+          this.form.feeCenterListC.forEach(item => {
+            item.exrate = this.getExchangeRate(item.curCode, 'C', 1)
+          })
+        }
+      }
     },
     rowEdit(row) {
     },
@@ -1094,14 +1149,30 @@ export default {
         return this.$message.error("请保存数据");
       }
       await this.checkRate(null, this.form.purchaseDate, null, 1, this.deptId)
-      this.form.feeCenterList.push({
+      this.form.feeCenterListC.push({
         pid: this.form.id,
-        feesType: 1,
         dc: 'C',
-        billType: '箱东',
-        corpId: this.form.purchaseCompanyId,
-        shortName: this.form.purchaseCompanyName,
-        corpCnName: this.form.purchaseCompanyName,
+        paymode: 'C',
+        sort: Number(this.form.feeCenterListC.length) + 1,
+        businessType: this.form.businessType, // 业务类型
+        billType: this.form.billType, // 单据类型
+        billNo: this.form.billNo, // 单据编号
+        billDate: this.form.etd,
+        branchId: this.form.branchId,
+        branchName: this.form.branchName,
+        corpId: this.form.corpId,
+        shortName: this.form.shortName,
+        corpCnName: this.form.corpCnName,
+        corpEnName: this.form.corpCnName,
+        etd: this.form.etd, // 开船日期
+        polId: this.form.polId, // 装货港 id
+        polCode: this.form.polCode, // 装货港代码
+        polCnName: this.form.polCnName, // 装货港中文名称
+        polEnName: this.form.polEnName, // 装货港英文名称
+        podId: this.form.podId,// 卸货港 id
+        podCode: this.form.podCode,// 卸货港代码
+        podCnName: this.form.podCnName, // 卸货港中文名称
+        podEnName: this.form.podEnName, // 卸货港英文名称
         curCode: this.getLocalCurrency(),
         exrate: this.getExchangeRate(this.getLocalCurrency(), 'C', 1),
         $cellEdit: true
@@ -1113,6 +1184,18 @@ export default {
     selectionChange(list) {
       this.selectionList = list;
     },
+    feecChange(list) {
+      let ids = []
+      list.forEach(e => {
+        ids.push(e.id)
+      })
+      if (ids.length) {
+        this.itemCIds = ids.join(',')
+      } else {
+        this.itemCIds = null
+      }
+      this.selectionfeecList = list;
+    },
     getDetails(id) {
       const loading = this.$loading({
         lock: true,
@@ -1121,8 +1204,18 @@ export default {
         background: 'rgba(255,255,255,0.7)'
       });
       getDetail({ id: id }).then(res => {
+        res.data.data.feeCenterListC.forEach(row => {
+          if (row.curCode == this.getLocalCurrency()) {
+            row.amountCNY = row.amount
+            row.amountUSD = 0
+          }
+          if (row.curCode != this.getLocalCurrency()) {
+            row.amountUSD = row.amount
+            row.amountCNY = 0
+          }
+        })
         this.form = res.data.data
-        if (res.data.data.issueStatus == 1 || res.data.data.status == 3) {
+        if (res.data.data.issueStatus == 1 || res.data.data.status >0) {
           // this.editButton = true
           this.editDisabled = true
           this.optionForm.disabled = true
@@ -1276,6 +1369,83 @@ export default {
           }
         })
       }
+      if (name == '费用一键保存') {
+        if (!this.form.feeCenterListC.length) {
+          return this.$message.error("请添加数据");
+        }
+        for (let row of this.form.feeCenterListC) {
+          row.amount = row.curCode == this.getLocalCurrency() ? row.amountCNY : row.amountUSD
+          row.amountNet = row.curCode == this.getLocalCurrency() ? row.amountCNY : row.amountUSD
+          if (!row.corpType || !row.corpCnName || !row.feeCnName || !row.curCode || !row.price || !row.quantity) {
+            this.$refs.crud2.rowCell(row, row.$index)
+            return this.$message.error("请完善费用明细");
+          }
+        }
+        const loading = this.$loading({
+          lock: true,
+          text: '加载中',
+          spinner: 'el-icon-loading',
+          background: 'rgba(255,255,255,0.7)'
+        });
+        submitFeeList(this.form.feeCenterListC).then(res => {
+          this.$message.success("保存成功");
+          this.getDetails(this.form.id)
+        }).finally(() => {
+          loading.close();
+        })
+      }
+      if (name == '费用一键编辑') {
+        for (let row of this.form.feeCenterListC) {
+          this.$set(row, "$cellEdit", true);
+        }
+      }
+      if (name == '费用批量删除') {
+        // for (let row of this.selectionfeecList) {
+        //   if (row.automaticGenerated == 1) {
+        //     return this.$message.error("系统自动生成的费用不允许删除");
+        //   }
+        //   if (row.stlPid && row.accStatus != 0) {
+        //     return this.$message.error("已生成账单，不允许删除");
+        //   }
+        //   if (row.stlPid && row.auditStatus != 0) {
+        //     return this.$message.error("已申请费用，不允许删除");
+        //   }
+        // }
+        let multiList = []
+        let arr = []
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          multiList = this.selectionfeecList
+          arr = this.form.feeCenterListC
+          // 获取有id 的数据
+          const itemsWithId = multiList.filter(item => item.id != null);
+          let arrIds = itemsWithId.map(item => item.id) // 获取id 数据
+          // 把选中的删除掉
+          multiList.forEach((item) => {
+            for (let index in arr) {
+              if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                arr.splice(Number(index), 1)
+              }
+            }
+          })
+          if (itemsWithId.length != 0) {
+            const loading = this.$loading({
+              lock: true,
+              text: '加载中',
+              spinner: 'el-icon-loading',
+              background: 'rgba(255,255,255,0.7)'
+            });
+            itemFeeRemove({ ids: arrIds.join(',') }).then(res => {
+              this.$message.success("删除成功");
+            }).finally(() => {
+              loading.close();
+            })
+          }
+        })
+      }
     },
     submit(type) {
       this.$refs["form"].validate((valid) => {
@@ -1287,6 +1457,14 @@ export default {
               return this.$message.error("请完善明细信息");
             }
           }
+          // for (let row of this.form.feeCenterListC) {
+          //   row.amount = row.curCode == this.getLocalCurrency() ? row.amountCNY : row.amountUSD
+          //   row.amountNet = row.curCode == this.getLocalCurrency() ? row.amountCNY : row.amountUSD
+          //   if (!row.corpType || !row.corpCnName || !row.feeCnName || !row.curCode || !row.price || !row.quantity) {
+          //     this.$refs.crud2.rowCell(row, row.$index)
+          //     return this.$message.error("请完善费用明细");
+          //   }
+          // }
           this.form.businessType = 'KHTS'
           this.form.billNoFormat = 'KHTS'
           this.form.businessTypeCode = 'KHTS'

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

@@ -146,13 +146,6 @@ export default {
                         },
                         overHidden: true,
                     },
-                    {
-                        label: 'HB/L NO',
-                        prop: "hblno",
-                        width: "100",
-                        search: true,
-                        overHidden: true,
-                    },
                     // {
                     //     label: "订单状态",
                     //     prop: "billStatus",

src/views/iosBasicData/costcenter/soc/detailsPage.vue

@@ -2797,9 +2797,9 @@ export default {
                 let obj = {
                     status: 0,
                     type: 'CBMB-POL',
-                    addressId: this.form.podId,
+                    // addressId: this.form.podId,
                     shippingCompanyId: this.form.shippingCompanyId,
-                    transportationTerms: this.form.transportationTerms,
+                    // transportationTerms: this.form.transportationTerms,
                 }
                 const loading = this.$loading({
                     lock: true,

src/views/iosBasicData/loloTemplate/feesTemplateItems.vue

@@ -799,7 +799,7 @@ export default {
                     this.form.addressId = row.id
                     this.form.addressCode = row.code
                 } else {
-                    this.form.podId = null
+                    this.form.addressId = null
                     this.form.addressCode = null
                     this.form.addressCname = null
                 }

src/views/iosBasicData/losbfeestemplate/feesTemplateItems.vue

@@ -833,7 +833,7 @@ export default {
                     this.form.addressId = row.id
                     this.form.addressCode = row.code
                 } else {
-                    this.form.podId = null
+                    this.form.addressId = null
                     this.form.addressCode = null
                     this.form.addressCname = null
                 }

src/views/iosBasicData/podStation/index.vue

@@ -65,6 +65,7 @@ export default {
       form: {},
       query: {
         whether: '0',
+        businessType:"SE",
         actualEtdList: defaultDate2()
       },
       loading: false,
@@ -79,10 +80,10 @@ export default {
         height: 'auto',
         calcHeight: 30,
         menuWidth: 140,
-        menu:false,
+        menu: false,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 24,
+        searchMenuSpan: 18,
         border: true,
         index: true,
         addBtn: false,
@@ -100,6 +101,18 @@ export default {
             overHidden: true,
           },
           {
+            label: '箱号',
+            prop: 'cntrNo',
+            overHidden: true,
+            search: true,
+          },
+          {
+            label: 'HB/L NO',
+            prop: 'hblno',
+            overHidden: true,
+            search: true,
+          },
+          {
             label: 'POD场站',
             prop: 'podStationCname',
             overHidden: true,
@@ -107,7 +120,7 @@ export default {
             type: "select",
             filterable: true,
             remote: true,
-            dicUrl: "/api/blade-los/bports/list?status=0&size=5&current=1&cnName={{key}}",
+            dicUrl: "/api/blade-los/bcorps/selectList?current=1&size=5&corpTypeName=场站&status=0&cnName={{key}}",
             props: {
               label: "cnName",
               value: "cnName",
@@ -116,34 +129,13 @@ export default {
             }
           },
           {
-            label: '是否录入',
-            prop: 'whether',
-            hide: true,
-            overHidden: true,
-            search: true,
-            type: 'select',
-            dicData: [{
-              label: '否',
-              value: '0'
-            }, {
-              label: '是',
-              value: '1'
-            }]
-          },
-
-          {
             label: 'MB/L NO',
             prop: 'mblno',
             overHidden: true,
           },
           {
-            label: 'HB/L NO',
-            prop: 'hblno',
-            overHidden: true,
-          },
-          {
             label: 'ETD',
-            prop: 'actualEtd',
+            prop: 'etd',
             width: 120,
             hide: true,
             search: true,
@@ -154,24 +146,24 @@ export default {
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd"
           },
-          {
-            label: '单据类型',
-            prop: 'billType',
-            hide: true,
-            overHidden: true,
-            search: true,
-            type: 'select',
-            dicData: [
-              {
-                label: '直单',
-                value: 'DD'
-              },
-              {
-                label: '分单',
-                value: 'MH'
-              }
-            ]
-          },
+          // {
+          //   label: '单据类型',
+          //   prop: 'billType',
+          //   hide: true,
+          //   overHidden: true,
+          //   search: true,
+          //   type: 'select',
+          //   dicData: [
+          //     {
+          //       label: '直单',
+          //       value: 'DD'
+          //     },
+          //     {
+          //       label: '分单',
+          //       value: 'MH'
+          //     }
+          //   ]
+          // },
           {
             label: '船名',
             prop: 'vesselCnName',
@@ -237,15 +229,25 @@ export default {
             overHidden: true,
           },
           {
-            label: '箱号',
-            prop: 'cntrNo',
-            overHidden: true,
-          },
-          {
             label: '箱型',
             prop: 'cntrTypeCode',
             overHidden: true,
-          }
+          },
+            {
+            label: '是否录入',
+            prop: 'whether',
+            hide: true,
+            overHidden: true,
+            search: true,
+            type: 'select',
+            dicData: [{
+              label: '否',
+              value: '0'
+            }, {
+              label: '是',
+              value: '1'
+            }]
+          },
         ]
       },
       data: [],
@@ -286,12 +288,14 @@ export default {
       this.$refs["form2"].validate((valid, done) => {
         done();
         if (valid) {
-          let ids = []
-          for (let item of this.selectionList) {
-            ids.push(item.id)
-          }
+          // let ids = []
+          // for (let item of this.selectionList) {
+          //   ids.push(item.id)
+          // }
           let obj = {
-            ids: ids.join(','),
+            // ids: ids.join(','),
+            businessType: 'SE',
+            list: this.selectionList,
             ...this.podForm,
           }
           const loading = this.$loading({

src/views/iosBasicData/podTemplate/feesTemplateItems.vue

@@ -710,7 +710,7 @@ export default {
                     this.form.addressId = row.id
                     this.form.addressCode = row.code
                 } else {
-                    this.form.podId = null
+                    this.form.addressId = null
                     this.form.addressCode = null
                     this.form.addressCname = null
                 }

src/views/iosBasicData/polTemplate/feesTemplateItems.vue

@@ -736,7 +736,7 @@ export default {
                     this.form.addressId = row.id
                     this.form.addressCode = row.code
                 } else {
-                    this.form.podId = null
+                    this.form.addressId = null
                     this.form.addressCode = null
                     this.form.addressCname = null
                 }