Browse Source

Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui into master

qukaidi 4 years ago
parent
commit
fa8a714ddb

+ 89 - 0
src/api/kaihe/domesticTrade/myOrder.js

@@ -0,0 +1,89 @@
+// 查询航线详情列表
+import request from '@/utils/request'
+
+export function listCorps(data) {
+  return request({
+    url: 'khwarehouse/warehousebills/ruoYiVersionOrderList',
+    method: 'post',
+    data: data
+  })
+}
+export function listName(query) {
+  return request({
+    url: '/shipping/cntrno/getTCntrnoChange',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询港口详情详细
+export function getCorps(fId) {
+  return request({
+    url: '/shipping/address/' + fId,
+    method: 'get'
+  })
+}
+
+// 新增
+export function addyard(data) {
+  return request({
+    url: '/shipping/address',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改航线详情
+export function updateCorps(data) {
+  return request({
+    url: '/shipping/address/edit',
+    method: 'put',
+    data: data
+  })
+}
+// 状态修改
+export function changeCorpsStatus(fId, fStatus) {
+  const data = {
+    fId,
+    fStatus
+  }
+  return request({
+    url: '/shipping/route',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除客户详情
+export function delCorps(fId) {
+  return request({
+    url: '/shipping/route/' + fId,
+    method: 'delete'
+  })
+}
+
+// 导出客户详情
+export function exportCorps(query) {
+  return request({
+    url: '/shipping/route/export',
+    method: 'get',
+    params: query
+  })
+}
+
+//查询港口名称
+export function getyard(query) {
+  return request({
+    url: '/shipping/address/selectStorageName',
+    method: 'get',
+    params: query
+  })
+}
+//查询箱型
+export function getcntrName(query) {
+  return request({
+    url: '/shipping/cntr/selectRcntrName',
+    method: 'get',
+    params: query
+  })
+}

+ 99 - 0
src/api/kaihe/domesticTrade/orderInformation.js

@@ -0,0 +1,99 @@
+// 查询航线详情列表
+import request from '@/utils/request'
+
+export function listCorps(tCntrno) {
+  return request({
+    url: '/shipping/cntrno/updateTCntrno',
+    method: 'post',
+    data: {
+      tCntrno:tCntrno
+    }
+  })
+}
+
+export function postApproval(data) {
+  return request({
+    url: '/khwarehouse/warehousebills/ruoYiUpdateOrderMessage',
+    method: 'post',
+    data: data
+  })
+}
+// 查询港口详情详细
+export function getCorps(fId) {
+  return request({
+    url: '/shipping/address/' + fId,
+    method: 'get'
+  })
+}
+
+// 获取信息
+export function addmodify(data) {
+  return request({
+    url: '/khwarehouse/warehousebills/webVersionOrderDetails',
+    method: 'post',
+    data:data
+  })
+}
+
+// 修改航线详情
+export function updateCorps(data) {
+  return request({
+    url: '/shipping/address/edit',
+    method: 'put',
+    data: data
+  })
+}
+// 状态修改
+export function changeCorpsStatus(fId, fStatus) {
+  const data = {
+    fId,
+    fStatus
+  }
+  return request({
+    url: '/shipping/route',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除客户详情
+export function delCorps(fId) {
+  return request({
+    url: '/shipping/route/' + fId,
+    method: 'delete'
+  })
+}
+
+//集装箱类型
+export function getContainer(query) {
+  return request({
+    url: '/shipping/cntr/selectRcntrName',
+    method: 'get',
+    params: query
+  })
+}
+// 查询费用信息列表
+export function listFees(query) {
+  return request({
+    url: '/basicdata/fees/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询箱型
+export function getCntr(query) {
+  return request({
+    url: '/shipping/cntr/selectRcntrName',
+    method: 'get',
+    params: query
+  })
+}
+// 查询货物名称
+export function getGoodName(data) {
+  return request({
+    url: '/khwarehouse/warehousebills/getGoodName',
+    method: 'post',
+    data: data
+  })
+}

+ 682 - 0
src/views/kaihe/domesticTrade/myOrder/index.vue

@@ -0,0 +1,682 @@
+<template>
+
+  <div class="app-container">
+    <el-menu
+      :default-active="activeIndex"
+      class="el-menu-demo"
+      mode="horizontal"
+      @select="handleSelect"
+      text-color="#000"
+      active-text-color="#ffd04b">
+      <el-menu-item index="0">全部</el-menu-item>
+<!--      <el-menu-item index="1">新建</el-menu-item>-->
+<!--      <el-menu-item index="2">计划暂存</el-menu-item>-->
+<!--      <el-menu-item index="3">计划驳回审批</el-menu-item>-->
+      <el-menu-item index="1">计划提交审批</el-menu-item>
+<!--      <el-menu-item index="5">计划审批中</el-menu-item>-->
+      <el-menu-item index="2">计划审批通过</el-menu-item>
+      <el-menu-item index="3">配船暂存</el-menu-item>
+<!--      <el-menu-item index="8">配船驳回审批</el-menu-item>-->
+      <el-menu-item index="4">配船提交审批</el-menu-item>
+<!--      <el-menu-item index="10">配船审批中</el-menu-item>-->
+      <el-menu-item index="5">配船审批通过</el-menu-item>
+      <el-menu-item index="6">运单变更</el-menu-item>
+
+    </el-menu>
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" style="margin-top:20px">
+      <el-row>
+          <el-form-item label="订舱号" prop="fBillno">
+            <el-input size="small" width="240px" clearable v-model="queryParams.fBillno"/>
+          </el-form-item>
+        <el-form-item label="运输条款" prop="fServiceitems">
+          <el-select size="small" width="240px" clearable v-model="queryParams.fServiceitems">
+            <el-option
+              v-for="item in serviceitems"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="收货人" prop="fConsigneername">
+          <el-input size="small" width="240px" clearable v-model="queryParams.fConsigneername"/>
+        </el-form-item>
+        <el-form-item label="箱型" prop="fCntrid">
+          <el-select size="small" v-model="queryParams.fCntrid" clearable :remote-method="cntrRemoteMethod">
+            <el-option
+              v-for="(dict, index) in container"
+              :key="dict.fId"
+              :label="dict.fNo"
+              :value="dict.fId"
+            ></el-option>
+
+          </el-select>
+        </el-form-item>
+        <el-form-item label="箱量" prop="fCntrcount">
+          <el-input size="small" width="240px" clearable v-model="queryParams.fCntrcount"/>
+        </el-form-item>
+        <el-form-item label="装货时间" prop="fBsdate">
+          <el-date-picker
+            v-model="queryParams.fBsdate"
+            type="date"
+            placeholder="选择日期"
+            format="yyyy-MM-dd">
+          </el-date-picker>
+        </el-form-item>
+      </el-row>
+    </el-form>
+    <el-row :gutter="10" class="mb8">
+      <div style="float: left">
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </div>
+      <div class="tabSetting">
+          <right-toolbar
+            :showSearch.sync="showSearch"
+            @queryTable="getList"
+          ></right-toolbar>
+          <div style="margin: 0 12px">
+            <el-button
+              icon="el-icon-setting"
+              size="mini"
+              circle
+              @click="showSetting = !showSetting"
+            ></el-button>
+          </div>
+        </div>
+
+    </el-row>
+    <el-dialog title="提示" :visible.sync="showSetting" width="700px" v-dialogDrag>
+      <template slot="title">
+        <div class="avue-crud__dialog__header">
+            <span class="el-dialog__title">
+            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px"></span>
+            </span>
+        </div>
+      </template>
+      <div>配置排序列数据(拖动调整顺序)</div>
+      <div style="margin-left: 17px">
+        <el-checkbox
+          v-model="allCheck"
+          label="全选"
+          @change="allChecked"
+        ></el-checkbox>
+      </div>
+      <div style="padding: 4px; display: flex; justify-content: center">
+        <draggable
+          v-model="setRowList"
+          group="site"
+          animation="300"
+          @start="onStart"
+          @end="onEnd"
+          handle=".indraggable"
+        >
+          <transition-group>
+            <div
+              v-for="item in setRowList"
+              :key="item.surface"
+              class="listStyle"
+            >
+              <div style="width: 500px" class="indraggable">
+                <div class="progress" :style="{ width: item.width + 'px' }">
+                  <el-checkbox
+                    :label="item.name"
+                    v-model="item.checked"
+                    :true-label="0"
+                    :false-label="1"
+                  >{{ item.name }}
+                  </el-checkbox>
+                </div>
+              </div>
+              <el-input-number
+                v-model.number="item.width"
+                controls-position="right"
+                :min="1"
+                :max="500"
+                size="mini"
+              ></el-input-number>
+            </div>
+          </transition-group>
+        </draggable>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="showSetting = false">取 消</el-button>
+        <el-button @click="delRow" type="danger">重 置</el-button>
+        <el-button type="primary" @click="save()">确 定</el-button>
+      </span>
+    </el-dialog>
+    <el-table v-loading="loading" :data="corpsList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="行号" align="center" type="index" fixed/>
+      <el-table-column
+        v-for="(item, index) in getRowList"
+        :key="index"
+        :label="item.name"
+        :width="item.width"
+        :prop="item.label"
+        align="center"
+        :fixed="item.fixed"
+        :show-overflow-tooltip="true"
+        sortable
+      >
+        <template slot-scope="scope">
+          <span v-if="item.label == 'fBillno'">{{scope.row.fBillno}}</span>
+          <span v-if="item.label == 'fServiceitems'">{{scope.row.fServiceitems}}</span>
+          <span v-if="item.label == 'fConsigneername'">{{scope.row.fConsigneername}}</span>
+          <span v-if="item.label == 'fName'">{{scope.row.fName}}</span>
+          <span v-if="item.label == 'fNo'">{{scope.row.fNo}}</span>
+          <span v-if="item.label == 'fCntrcount'">{{scope.row.fCntrcount}}</span>
+          <span v-if="item.label == 'fBsdate'">{{scope.row.fBsdate}}</span>
+          <span v-if="item.label == 'fBillstatus'">{{scope.row.fBillstatus}}</span>
+          <span v-if="item.label == 'vslName'">{{scope.row.vslName}}</span>
+          <span v-if="item.label == 'voyNo'">{{scope.row.voyNo}}</span>
+          <span v-if="item.label == 'fMblno'">{{scope.row.fMblno}}</span>
+          <span v-if="item.label == 'corpName'">{{scope.row.corpName}}</span>
+          <span v-if="item.label == 'goodsName'">{{scope.row.goodsName}}</span>
+          <span v-if="item.label == 'createBy'">{{scope.row.createBy}}</span>
+          <span v-if="item.label == 'createTime'">{{ (scope.row.createTime).slice(0,10) }}</span>
+          <span v-if="item.label == 'loadportName'">{{scope.row.loadportName}}</span>
+          <span v-if="item.label == 'destportName'">{{scope.row.destportName}}</span>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="订舱号" align="center" prop="fBillno"/>-->
+<!--      <el-table-column label="运输条款" align="center" prop="fServiceitems" />-->
+<!--      <el-table-column label="收货人" align="center" prop="fConsigneername"/>-->
+<!--      <el-table-column label="航线" align="center" prop="fName"/>-->
+<!--      <el-table-column label="箱型" align="center" prop="fNo"/>-->
+<!--      <el-table-column label="箱量" align="center" prop="fCntrcount"/>-->
+<!--      <el-table-column label="装货时间" align="center" prop="fBsdate"/>-->
+      <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width" min-width="160px">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            v-hasPermi="['shipping:ctnprice:edit']"
+            @click="handleUpdate(scope.row)"
+          >查看</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            v-hasPermi="['shipping:items:remove']"
+            @click="handleDelete(scope.row)"
+          >移除</el-button>
+        </template>
+      </el-table-column>
+
+      <!--      <el-table-column-->
+<!--        class-name="small-padding fixed-width"-->
+<!--        v-for="(item,index) in boxDistributionName"-->
+<!--        :key="item.index"-->
+<!--        :label="item"-->
+<!--        :value="item.index"-->
+<!--        :prop="item"-->
+<!--      >-->
+<!--      </el-table-column>-->
+    </el-table>
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+  </div>
+</template>
+
+<script>
+  import { listCorps, getcntrName, delCorps, changeCorpsStatus,exportCorps } from "@/api/kaihe/domesticTrade/myOrder";
+  import Cookies from 'js-cookie'
+  import { addSet, resetModule, select } from '@/api/system/set'
+  import Vue from 'vue'
+  Vue.directive('dialogDrag', {
+    bind(el, binding, vnode, oldVnode) {
+      const dialogHeaderEl = el.querySelector('.el-dialog__header')
+      const dragDom = el.querySelector('.el-dialog')
+      const enlarge = el.querySelector('.enlarge')
+      dialogHeaderEl.style.cursor = 'move'
+
+      // 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);
+      const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null)
+      if(enlarge){
+        enlarge.onclick = (e) => {
+          dragDom.style.top = '0px'
+          dragDom.style.left = '0px'
+        }
+      }
+      dialogHeaderEl.onmousedown = (e) => {
+        // 鼠标按下,计算当前元素距离可视区的距离
+        const disX = e.clientX - dialogHeaderEl.offsetLeft
+        const disY = e.clientY - dialogHeaderEl.offsetTop
+
+        // 获取到的值带px 正则匹配替换
+        let styL, styT
+
+        // 注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px
+        if (sty.left.includes('%')) {
+          styL = +document.body.clientWidth * (+sty.left.replace(/\%/g, '') / 100)
+          styT = +document.body.clientHeight * (+sty.top.replace(/\%/g, '') / 100)
+        } else {
+          styL = +sty.left.replace(/\px/g, '')
+          styT = +sty.top.replace(/\px/g, '')
+        }
+
+        document.onmousemove = function(e) {
+          // 通过事件委托,计算移动的距离
+          const l = e.clientX - disX
+          const t = e.clientY - disY
+
+          // 移动当前元素
+
+          if ((t + styT) >= 0){
+            dragDom.style.top = `${t + styT}px`
+          }
+          dragDom.style.left = `${l + styL}px`
+          // 将此时的位置传出去
+          // binding.value({x:e.pageX,y:e.pageY})
+        }
+
+        document.onmouseup = function(e) {
+          document.onmousemove = null
+          document.onmouseup = null
+        }
+      }
+    }
+  })
+
+  export default {
+    name: "myOrder",
+    components: {
+    },
+    data() {
+      return {
+        activeIndex: '0',
+        setRowList: [],
+        getRowList: [],
+        tableDate: [
+          {
+            surface: "1",
+            label: "fBillno",
+            name: "订舱号",
+            fixed:"left",
+            checked: 0,
+            width: 120,
+          },
+          {
+            surface: "2",
+            label: "fServiceitems",
+            name: "运输条款",
+            fixed:"left",
+            checked: 0,
+            width: 120,
+          },
+          {
+            surface: "3",
+            label: "fConsigneername",
+            name: "收货人",
+            fixed:"left",
+            checked: 0,
+            width: 120,
+          },
+          {
+            surface: "4",
+            label: "fName",
+            name: "航线",
+            fixed:"left",
+            checked: 0,
+            width: 120,
+          },
+          {
+            surface: "5",
+            label: "fNo",
+            name: "箱型",
+            fixed:"left",
+            checked: 0,
+            width: 120,
+          },
+          {
+            surface: "6",
+            label: "fCntrcount",
+            name: "箱量",
+            fixed:"left",
+            checked: 0,
+            width: 120,
+          },
+          {
+            surface: "7",
+            label: "fBsdate",
+            name: "装货时间",
+            checked: 0,
+            width: 120,
+          },
+          {
+            surface: "8",
+            label: "fBillstatus",
+            name: "状态",
+            checked: 0,
+            width: 120,
+          },
+          {
+            surface: "9",
+            label: "vslName",
+            name: "船名",
+            checked: 0,
+            width: 120,
+          },
+          {
+            surface: "10",
+            label: "voyNo",
+            name: "航次",
+            checked: 0,
+            width: 120,
+          },
+          {
+            surface: "11",
+            label: "fMblno",
+            name: "提单号",
+            checked: 0,
+            width: 120,
+          },
+          {
+            surface: "12",
+            label: "corpName",
+            name: "订舱单位",
+            checked: 0,
+            width: 120,
+          },
+          {
+            surface: "13",
+            label: "goodsName",
+            name: "货名",
+            checked: 0,
+            width: 120,
+          },
+          {
+            surface: "14",
+            label: "createBy",
+            name: "订舱人",
+            checked: 0,
+            width: 120,
+          },
+          {
+            surface: "15",
+            label: "createTime",
+            name: "订舱时间",
+            checked: 0,
+            width: 120,
+          },
+          {
+            surface: "16",
+            label: "loadportName",
+            name: "起运港",
+            checked: 0,
+            width: 120,
+          },
+          {
+            surface: "17",
+            label: "destportName",
+            name: "目的港",
+            checked: 0,
+            width: 120,
+          },
+        ],
+        //自定义列宽
+        allCheck: false,
+        showSetting:false,
+        serviceitems:[],
+        container:[],
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 客户详情表格数据
+        corpsList: [],
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+        },
+      };
+    },
+    created() {
+      this.setRowList = this.tableDate;
+      this.getRowList = this.tableDate;
+      this.getList();
+      this.cntrRemoteMethod()
+      this.getDicts("f_serviceitems").then((response) => {
+        if (response.data) {
+          this.serviceitems = response.data;
+        }
+      });
+      // this.getRow()
+    },
+    activated() {
+      // this.getList()
+    },
+    methods: {
+      handleSelect(key, keyPath) {
+        console.log(key);
+        console.log(keyPath);
+        if(key === '0'){
+          this.queryParams = {
+            pageNum: 1,
+            pageSize: 10,
+          }
+        }else if(key === '1'){
+          this.queryParams.fBillstatus = 4
+        }else if(key === '2'){
+          this.queryParams.fBillstatus = 6
+        }else if(key === '3'){
+          this.queryParams.fBillstatus = 7
+        }else if(key === '4'){
+          this.queryParams.fBillstatus = 9
+        }else if(key === '5'){
+          this.queryParams.fBillstatus = 11
+        }else if(key === '6'){
+          this.queryParams.fBillstatus = 12
+        }
+        listCorps(this.queryParams).then(response => {
+          console.log(response)
+          this.corpsList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      //重置列表
+      delRow() {
+        this.data = {
+          tableName: "船舶信息",
+          userId: Cookies.get("userName"),
+        };
+        resetModule(this.data).then((res) => {
+          if (res.code == 200) {
+            this.showSetting = false;
+            this.setRowList = this.tableDate;
+            this.getRowList = this.tableDate;
+          }
+        });
+      },
+      //列设置全选
+      allChecked() {
+        if (this.allCheck == true) {
+          this.setRowList.map((e) => {
+            return (e.checked = 0);
+          });
+        } else {
+          this.setRowList.map((e) => {
+            return (e.checked = 1);
+          });
+        }
+      },
+      //查询列数据
+      getRow() {
+        let that = this;
+        this.data = {
+          tableName: "船舶信息",
+          userId: Cookies.get("userName"),
+        };
+        select(this.data).then((res) => {
+          if (res.data.length != 0) {
+            this.getRowList = res.data.filter((e) => e.checked == 0);
+            this.setRowList = res.data;
+            this.setRowList = this.setRowList.reduce((res, item) => {
+              res.push({
+                surface: item.surface,
+                label: item.label,
+                name: item.name,
+                checked: item.checked,
+                width: item.width,
+                fixed: item.fixed
+              });
+              return res;
+            }, []);
+          }
+        });
+      },
+      //保存列设置
+      save() {
+        this.showSetting = false;
+        this.data = {
+          tableName: "船舶信息",
+          userId: Cookies.get("userName"),
+          sysTableSetList: this.setRowList,
+        };
+        addSet(this.data).then((res) => {
+          this.getRowList = this.setRowList.filter((e) => e.checked == 0);
+        });
+      },
+      //开始拖拽事件
+      onStart() {
+        this.drag = true;
+      },
+      //拖拽结束事件
+      onEnd() {
+        this.drag = false;
+      },
+
+      //箱型下拉查询
+      cntrRemoteMethod() {
+        let queryParams = { pageNum: 1,};
+        getcntrName(queryParams).then(response=>{
+          console.log(response)
+          this.container = response.rows
+        })
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const fIds = row.fId || this.ids;
+        this.$confirm('是否确认删除客户详情编号为"' + fIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delCorps(fIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+      },
+
+      //查看跳转
+      handleUpdate(row){
+        console.log(row.fId)
+        let res = {}
+        res = {
+          fId:row.fId
+        }
+        this.$router.push({
+          path: "/domesticTrade/orderInformation",
+          query: { data: JSON.stringify(res) },
+        });
+
+      },
+      //模糊查询地点
+      addressMethod(){
+        let queryParams = { pageNum: 1,};
+        getaddress(queryParams).then(response=>{
+          this.addressOptions = response.rows
+        })
+      },
+      /** 查询客户详情列表 */
+      getList() {
+        listCorps(this.queryParams).then(response => {
+          console.log(response)
+          this.corpsList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+
+      // 从表重置
+      contList() {
+        this.contactList = []
+      },
+      // 状态修改
+      handleStatusChange(row) {
+        let text = row.fStatus === "0" ? "启用" : "停用";
+        this.$confirm('确认要"' + text + '""' + row.fName + '"吗?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return changeCorpsStatus(row.fId, row.fStatus);
+        }).then(() => {
+          this.msgSuccess(text + "成功");
+        }).catch(function() {
+          row.fStatus = row.fStatus === "0" ? "1" : "0";
+        });
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.fId)
+        this.single = selection.length!==1
+        this.multiple = !selection.length
+      },
+    }
+  };
+</script>
+<style lang="scss" scoped>
+.tabSetting {
+  display: flex;
+  justify-content: flex-end;
+}
+
+.listStyle {
+  display: flex;
+  border-top: 1px solid #dcdfe6;
+  border-left: 1px solid #dcdfe6;
+  border-right: 1px solid #dcdfe6;
+}
+
+.listStyle:last-child {
+  border-bottom: 1px solid #dcdfe6;
+}
+
+.progress {
+  display: flex;
+  align-items: center;
+  padding: 2px;
+  background-color: rgba(0, 0, 0, 0.05);
+  height: 100%;
+}
+
+</style>

+ 1785 - 0
src/views/kaihe/domesticTrade/orderInformation/index.vue

@@ -0,0 +1,1785 @@
+<template>
+  <div class="app-container">
+    <el-collapse v-model="activeNames" @change="">
+      <el-collapse-item title="基础资料" name="1">
+        <el-form ref="form" v-model="form" label-width="130px" size="mini" class="selectForm">
+          <el-row >
+            <el-col :span="6" >
+              <el-form-item label="提单号" prop="fMblno">
+                <el-input
+                  v-model="form.fMblno"
+                  :disabled="modify"
+                  size="small"
+                  style="width: 100%"
+                  placeholder="手工输入"
+                />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="起运港口" prop="loadportidName">
+                <el-input
+                  v-model="form.loadportidName"
+                  size="small"
+                  style="width: 100%"
+                  :disabled="doNot"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="目的港口" prop="destportidName">
+                <el-input
+                  v-model="form.destportidName"
+                  :disabled="doNot"
+                  size="small"
+                  style="width: 100%"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="预计装货时间" prop="fBsdate">
+                <el-date-picker
+                  v-model="form.fBsdate"
+                  type="date"
+                  size="small"
+                  :disabled="doNot"
+                  placeholder="选择日期"
+                  format="yyyy-MM-dd">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="运输条款" prop="serviceitemsName">
+                <el-input
+                  v-model="form.serviceitemsName"
+                  :disabled="doNot"
+                  size="small"
+                  style="width: 100%"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="付款方式" prop="paymodeName">
+                <el-input
+                  v-model="form.paymodeName"
+                  :disabled="doNot"
+                  size="small"
+                  style="width: 100%"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="售票方" prop="invoceobjName">
+                <el-input
+                  v-model="form.invoceobjName"
+                  :disabled="doNot"
+                  size="small"
+                  style="width: 100%"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="箱内签收单" prop="signName">
+                <el-input
+                  v-model="form.signName"
+                  :disabled="doNot"
+                  size="small"
+                  style="width: 100%"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="订舱人扣货" prop="detentioncargoName">
+                <el-input
+                  v-model="form.detentioncargoName"
+                  :disabled="doNot"
+                  style="width: 100%"
+                  size="small"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="14">
+              <el-form-item label="备注" prop="remarks">
+                <el-input
+                  v-model="form.remarks"
+                  :disabled="doNot"
+                  size="small"
+                  style="width: 75%"
+                >
+                </el-input>
+                <el-button type="primary" size="small" @click="check(1)">查看</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </el-collapse-item>
+      <el-collapse-item title="预计时间" name="2">
+        <el-form  v-model="estimatedTime" label-width="130px" size="mini">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="起运港口" prop="portofloadidName">
+                <el-input
+                  v-model="estimatedTime.portofloadidName"
+                  :disabled="doNot"
+                  size="small"
+                  style="width: 100%"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="中转港口" prop="portoftransshipmentName">
+                <el-input
+                  v-model="estimatedTime.portoftransshipmentName"
+                  :disabled="doNot"
+                  size="small"
+                  style="width: 100%"
+                />
+              </el-form-item>
+            </el-col>
+<!--            <el-col :span="6">-->
+<!--              <el-form-item label="预计中转抵港日期" prop="fMblno">-->
+<!--                <el-input-->
+<!--                  v-model="form.fMblno"-->
+<!--                  :disabled="doNot"-->
+<!--                  size="small"-->
+<!--                  style="width: 100%"-->
+<!--                  placeholder="手工输入"-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="6">-->
+<!--              <el-form-item label="预计中转开航日期" prop="fMblno">-->
+<!--                <el-input-->
+<!--                  v-model="form.fMblno"-->
+<!--                  :disabled="doNot"-->
+<!--                  size="small"-->
+<!--                  style="width: 100%"-->
+<!--                  placeholder="手工输入"-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+            <el-col :span="6">
+              <el-form-item label="目的港口" prop="portofdischargeidName">
+                <el-input
+                  v-model="estimatedTime.portofdischargeidName"
+                  :disabled="doNot"
+                  size="small"
+                  style="width: 100%"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="预计开航日期" prop="fEtd">
+                <el-input
+                  v-model="estimatedTime.fEtd"
+                  :disabled="doNot"
+                  size="small"
+                  style="width: 100%"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="预计抵港日期" prop="fEta">
+                <el-input
+                  v-model="estimatedTime.fEta"
+                  :disabled="doNot"
+                  size="small"
+                  style="width: 100%"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="提单号" prop="fEtd">
+                <el-input
+                  v-model="estimatedTime.fEtd"
+                  :disabled="doNot"
+                  size="small"
+                  style="width: 100%"
+                />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="船名" prop="fEtd">
+                <el-input
+                  v-model="estimatedTime.fEtd"
+                  :disabled="doNot"
+                  size="small"
+                  style="width: 100%"
+                />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="航次" prop="fEtd">
+                <el-input
+                  v-model="estimatedTime.fEtd"
+                  :disabled="doNot"
+                  size="small"
+                  style="width: 100%"
+                />
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+        </el-form>
+      </el-collapse-item>
+      <el-collapse-item title="收发货人信息" name="3">
+        <el-form  v-model="form" label-width="130px" size="mini">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="发货人全称" prop="fShippername">
+                <el-input
+                  v-model="form.fShippername"
+                  :disabled="doNot"
+                  size="small"
+                  style="width: 100%"
+                  placeholder="手工输入"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="发货人联系人" prop="fShipperattn">
+                <el-input
+                  v-model="form.fShipperattn"
+                  :disabled="doNot"
+                  style="width: 100%"
+                  size="small"
+                  placeholder="手工输入"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="发货人电话" prop="fShippertel">
+                <el-input
+                  v-model="form.fShippertel"
+                  :disabled="doNot"
+                  size="small"
+                  style="width: 100%"
+                  placeholder="手工输入"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="收货人全称" prop="fConsigneername">
+                <el-input
+                  v-model="form.fConsigneername"
+                  :disabled="doNot"
+                  size="small"
+                  style="width: 100%"
+                  placeholder="手工输入"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="收货人联系人" prop="fConsigneeattn">
+                <el-input
+                  v-model="form.fConsigneeattn"
+                  :disabled="doNot"
+                  style="width: 100%"
+                  size="small"
+                  placeholder="手工输入"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="收货人电话" prop="fConsigneetel">
+                <el-input
+                  v-model="form.fConsigneetel"
+                  :disabled="doNot"
+                  style="width: 100%"
+                  size="small"
+                  placeholder="手工输入"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </el-collapse-item>
+      <el-collapse-item title="费用信息" name="5" class="minHeight">
+        <el-form  v-model="form" label-width="130px" size="mini">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="是否办理保险" prop="insuranceName">
+                <el-input
+                  v-model="form.insuranceName"
+                  :disabled="doNot"
+                  size="small"
+                  style="width: 100%"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="保险货值(万元)" prop="fInsuranceamt">
+                <el-input
+                  v-model="form.fInsuranceamt"
+                  :disabled="doNot"
+                  style="width: 100%"
+                  size="small"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </el-collapse-item>
+      <el-collapse-item title="货物信息" name="4">
+        <el-table  :data="goodsList" style="width: 100%;" align="center">
+              <el-table-column label="行号" type="index" min-width="100px"/>
+              <el-table-column label="货物名称" prop="goodsName" min-width="100px"/>
+              <el-table-column label="货类" prop="typeidName" min-width="100px" />
+              <el-table-column label="包装类型" prop="packageName" min-width="100px"/>
+              <el-table-column label="箱型" prop="cntrName" min-width="100px"/>
+              <el-table-column label="箱量" prop="fCntrcount" min-width="100px"/>
+              <el-table-column label="单箱重量(吨)" prop="fCntrweight" min-width="120px"/>
+              <el-table-column label="箱态" prop="fCntrstatus" min-width="100px"/>
+              <el-table-column label="自备货柜" prop="fSoc" min-width="100px"/>
+              <el-table-column label="设置温度(℃)" prop="fTemperature" min-width="120px"/>
+              <el-table-column label="风门开度(%)" prop="fDraught" min-width="120px"/>
+              <el-table-column label="湿度设置(%)" prop="fHumidity" min-width="120px"/>
+              <el-table-column label="预冷要求" prop="fPrecooling" min-width="100px"/>
+              <el-table-column label="是否化学品" prop="ifdangerName" min-width="100px">
+                <template slot-scope="scope">
+                  <span>{{scope.row.ifdangerName}}</span>
+                  <el-button type="primary" size="small" @click="check(2)" style="margin-left: 5px;">查看</el-button>
+                </template>
+              </el-table-column>
+              <el-table-column label="备注" prop="remark" min-width="100px"/>
+        </el-table>
+      </el-collapse-item>
+      <el-collapse-item title="箱信息" name="6" class="minHeight">
+        <div
+          class="dialogTableTitle flex a-center jlr"
+          style="
+              display: flex;
+              justify-content: space-between;
+              align-items: center;
+              margin: 10px 0;
+              font-size: 16px;
+              font-weight: bolder;
+            "
+        >
+          <div>
+            <el-button
+              size="small"
+              type="primary"
+              :disabled="modify"
+              @click.prevent="addList()"
+            >新行
+            </el-button>
+            <!-- <el-button :disabled="browseStatus" @click.prevent="deleteRow(warehouseDrList)"
+            >删除
+          </el-button> -->
+            <el-button
+              type="primary"
+              size="small"
+              :disabled="modify"
+              @click="approval"
+            >保 存</el-button
+            >
+          </div>
+        </div>
+        <el-table :data="dataList" style="width: 100%;">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="序号" type="index" width="80"/>
+          <el-table-column label="箱号" align="center" prop="fCntrno">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.fCntrno" :disabled="scope.row.fManual == 0"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="铅封号" align="center" prop="fSealno">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.fSealno" :disabled="scope.row.fManual == 0"/>
+            </template>
+          </el-table-column>
+          <el-table-column prop="fCntrweight" label="单箱重量(吨)" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.fCntrweight" :disabled="scope.row.fManual == 0"/>
+            </template>
+          </el-table-column>
+          <el-table-column prop="fGoodsid" label="货名" align="center">
+            <template slot-scope="scope">
+              <el-select clearable v-model="scope.row.fGoodsid" :disabled="scope.row.fManual == 0">
+                <el-option
+                  v-for="item in goodsOptions"
+                  :key="item.fId"
+                  :label="item.fName"
+                  :value="item.fId"/>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column prop="fPackageid" label="包装类型" align="center">
+            <template slot-scope="scope">
+              <el-select clearable v-model="scope.row.fPackageid" :disabled="scope.row.fManual == 0">
+                <el-option
+                  v-for="dict in packgeOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"/>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column prop="fCntrid" label="箱型" align="center">
+            <template slot-scope="scope">
+              <el-select clearable v-model="scope.row.fCntrid" :disabled="scope.row.fManual == 0">
+                <el-option
+                v-for="item in cntrOptions"
+                :key="item.fId"
+                :label="item.fNo"
+                :value="item.fId"/>
+              </el-select>
+            </template>
+          </el-table-column>
+<!--          <el-table-column prop="fManual" label="来源" align="center">-->
+
+<!--            <template slot-scope="scope">-->
+<!--              <el-select clearable v-model="scope.row.fManual" :disabled="modify">-->
+<!--                <el-option />-->
+<!--              </el-select>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <el-table-column prop="address" label="操作" align="center">
+            <template slot-scope="scope">
+              <el-button size="small" :disabled="scope.row.fManual == 0" @click="deleteRow(scope.$index, dataList)">移除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-collapse-item>
+      <el-collapse-item>
+              <template slot="title">
+                <i class="el-icon-circle-plus"></i>应收费用
+              </template>
+              <div
+                class="dialogTableTitle flex a-center jlr"
+                style="
+                    display: flex;
+                    justify-content: space-between;
+                    align-items: center;
+                    margin: 10px 0;
+                  "
+              >
+                <div>
+                  <el-button
+                    size="small"
+                    type="primary"
+                    :disabled="modify"
+                    @click.prevent="addCollection()"
+                  >新行
+                  </el-button>
+                  <!-- <el-button :disabled="browseStatus" @click.prevent="deleteRow(warehouseDrList)"
+                  >删除
+                </el-button> -->
+                  <el-button
+                    type="primary"
+                    size="small"
+                    :disabled="modify"
+                    @click="approval"
+                  >保 存</el-button
+                  >
+                  <!-- <el-button @click.prevent="addAgreement()" type="warning">仓储费协议</el-button> -->
+                  <el-button
+                    size="small"
+                    @click.prevent="handleSelect(3)"
+                    :disabled="modify"
+                    type="danger"
+                  >导入协议</el-button
+                  >
+                </div>
+              </div>
+              <el-table
+                :data="warehouseDrList"
+                ref="table"
+                tooltip-effect="dark"
+                border
+                stripe
+                show-summary
+                @selection-change=""
+                :summary-method="warehouseDrSummaries"
+              >
+                <el-table-column type="selection" width="55" align="center" />
+                <el-table-column label="序号" type="index" width="80">
+                </el-table-column>
+                <el-table-column
+                  prop="fCorpid"
+                  header-align="center"
+                  align="center"
+                  width="180px"
+                  label="客户名称"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      v-model="scope.row.fCorpid"
+                      :disabled="modify || scope.row.fSrcTypeId != 0"/>
+<!--                    <el-select-->
+<!--                      v-model="scope.row.fCorpid"-->
+<!--                      filterable-->
+<!--                      remote-->
+<!--                      :disabled="modify"-->
+<!--                      placeholder="客户名称"-->
+<!--                    >-->
+<!--                      <el-option-->
+<!--                        v-for="(dict, index) in KHblnoOptions"-->
+<!--                        :key="index.fId"-->
+<!--                        :label="dict.fName"-->
+<!--                        :value="dict.fId"-->
+<!--                      ></el-option>-->
+<!--                    </el-select>-->
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="fFeeid"
+                  header-align="center"
+                  align="center"
+                  width="180px"
+                  label="费用名称"
+                >
+                  <template slot-scope="scope">
+                    <el-select
+                      v-model="scope.row.fFeeid"
+                      filterable
+                      remote
+                      :disabled="modify || scope.row.fSrcTypeId !== 0"
+                      :remote-method="fWRemoteMethod"
+                      @change="changeFeeId(scope.row)"
+                      placeholder="费用名称"
+                    >
+                      <el-option
+                        v-for="(dict, index) in fDNameOptions"
+                        :key="index.fId"
+                        :label="dict.fName"
+                        :value="dict.fId"
+                      ></el-option>
+                    </el-select>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="fFeeUnitid"
+                  header-align="center"
+                  align="center"
+                  width="180px"
+                  label="计价单位"
+                >
+                  <template slot-scope="scope">
+                    <el-select
+                      v-model="scope.row.fFeeUnitid"
+                      placeholder="请选择计价单位"
+                      @change="changeFeeUnit(scope.row)"
+                      clearable
+                      :disabled="modify || scope.row.fSrcTypeId !== 0"
+                    >
+                      <el-option
+                        v-for="(dict, index) in jFeetunitOptions"
+                        :key="index.dictValue"
+                        :label="dict.dictLabel"
+                        :value="dict.dictValue"
+                      />
+                    </el-select>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="fQty"
+                  header-align="center"
+                  align="center"
+                  width="130px"
+                  label="数量"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
+                      v-model="scope.row.fQty"
+                      placeholder="数量"
+                      :disabled="modify || scope.row.fSrcTypeId !== 0"
+                      @change="changeContractAmt(scope.row)"
+                      show-word-limit
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="fUnitprice"
+                  header-align="center"
+                  align="center"
+                  width="130px"
+                  label="单价"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
+                      v-model="scope.row.fUnitprice"
+                      placeholder="单价"
+                      :disabled="modify || scope.row.fSrcTypeId !== 0"
+                      @change="changeContractAmt(scope.row)"
+                      show-word-limit
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="fAmount"
+                  header-align="center"
+                  align="center"
+                  width="130px"
+                  label="金额"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      disabled
+                      oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
+                      v-model="scope.row.fAmount"
+                      placeholder="金额"
+                      show-word-limit
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="fStltypeid"
+                  header-align="center"
+                  align="center"
+                  width="130px"
+                  label="结算方式"
+                >
+                  <template slot-scope="scope">
+                    <el-select
+                      v-model="scope.row.fStltypeid"
+                      placeholder="请选择结算表票结、月结"
+                      :disabled="modify || scope.row.fSrcTypeId !== 0"
+                    >
+                      <el-option
+                        v-for="(dict, index) in fStltypeOptions"
+                        :key="index.dictValue"
+                        :label="dict.dictLabel"
+                        :value="parseInt(dict.dictValue)"
+                      ></el-option>
+                    </el-select>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="fCurrency"
+                  header-align="center"
+                  align="center"
+                  width="130px"
+                  label="币别"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      v-model="scope.row.fCurrency"
+                      :disabled="modify || scope.row.fSrcTypeId !== 0"
+                      placeholder="币别"
+                      show-word-limit
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="fExrate"
+                  header-align="center"
+                  align="center"
+                  width="130px"
+                  label="汇率"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      v-model="scope.row.fExrate"
+                      :disabled="modify || scope.row.fSrcTypeId !== 0"
+                      placeholder="汇率"
+                      show-word-limit
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="fTaxrate"
+                  header-align="center"
+                  align="center"
+                  width="130px"
+                  label="税率"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      v-model="scope.row.fTaxrate"
+                      :disabled="modify || scope.row.fSrcTypeId !== 0"
+                      placeholder="税率"
+                      show-word-limit
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="fSrcTypeId"
+                  header-align="center"
+                  align="center"
+                  width="130px"
+                  label="来源"
+                >
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.fSrcTypeId === 0">录入</span>
+                    <span v-if="scope.row.fSrcTypeId !== 0">协议</span>
+                  </template>
+                </el-table-column>
+
+                <el-table-column
+                  prop="remarks"
+                  header-align="center"
+                  align="center"
+                  width="150px"
+                  label="备注"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      v-model="scope.row.Remarks"
+                      :disabled="modify || scope.row.fSrcTypeId !== 0"
+                      placeholder="备注"
+                      show-word-limit
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  header-align="center"
+                  align="center"
+                  label="操作"
+                  width="200px"
+                >
+                  <template slot-scope="scope">
+                    <el-button
+                      @click.native.prevent="
+                          deleteRow(scope.$index, warehouseDrList)
+                        "
+                      size="small"
+                      :disabled="modify"
+                    >移除</el-button
+                    >
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-collapse-item>
+      <el-collapse-item>
+              <template slot="title">
+                <i class="el-icon-remove"></i>付款信息
+              </template>
+              <div
+                class="dialogTableTitle flex a-center jlr"
+                style="
+                    display: flex;
+                    justify-content: space-between;
+                    align-items: center;
+                    margin: 10px 0;
+                  "
+              >
+                <div>
+                  <el-button
+                    type="primary"
+                    :disabled="modify"
+                    @click.prevent="addpayment()"
+                    size="small"
+                  >新行
+                  </el-button>
+                  <el-button
+                    type="primary"
+                    size="small"
+                    @click="approval"
+                    :disabled="modify"
+                  >保 存</el-button
+                  >
+                  <el-button
+                    type="danger"
+                    size="small"
+                    @click.prevent="handleSelect(1)"
+                    :disabled="modify"
+                  >导入协议</el-button
+                  >
+                </div>
+              </div>
+              <el-table
+                :data="warehouseCrList"
+                ref="table"
+                tooltip-effect="dark"
+                border
+                stripe
+                show-summary
+                @selection-change=""
+                :summary-method="warehouseDrSummaries"
+              >
+                <el-table-column type="selection" width="55" align="center" />
+                <el-table-column label="序号" type="index" width="80">
+                </el-table-column>
+                <el-table-column
+                  prop="fCorpid"
+                  header-align="center"
+                  align="center"
+                  width="180px"
+                  label="客户名称"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      v-model="scope.row.fCorpid"
+                      :disabled="modify || scope.row.fSrcTypeId != 0"/>
+<!--                    <el-select-->
+<!--                      v-model="scope.row.fCorpid"-->
+<!--                      filterable-->
+<!--                      remote-->
+<!--                      :disabled="modify"-->
+<!--                      placeholder="客户名称"-->
+<!--                    >-->
+<!--                      <el-option-->
+<!--                        v-for="(dict, index) in KHblnoOptions"-->
+<!--                        :key="index.fId"-->
+<!--                        :label="dict.fName"-->
+<!--                        :value="dict.fId"-->
+<!--                      ></el-option>-->
+<!--                    </el-select>-->
+                  </template>
+                </el-table-column>
+          <el-table-column
+            prop="fFeeid"
+            header-align="center"
+            align="center"
+            width="180px"
+            label="费用名称"
+          >
+            <template slot-scope="scope">
+              <el-select
+                v-model="scope.row.fFeeid"
+                filterable
+                :disabled="modify || scope.row.fSrcTypeId !== 0"
+                remote
+                :remote-method="fWRemoteMethod"
+                @change="changeFeeId(scope.row)"
+                placeholder="费用名称"
+              >
+                <el-option
+                  v-for="(dict, index) in fCNameOptions"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
+                ></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="fFeeUnitid"
+            header-align="center"
+            align="center"
+            width="180px"
+            label="计价单位"
+          >
+            <template slot-scope="scope">
+              <el-select
+                v-model="scope.row.fFeeUnitid"
+                filterable
+                remote
+                @change="changeFeeUnit(scope.row)"
+                :disabled="modify || scope.row.fSrcTypeId !== 0"
+                :remote-method="corpsRemoteMethod"
+                placeholder="计价单位"
+              >
+                <el-option
+                  v-for="(dict, index) in jFeetunitOptions"
+                  :key="index.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="fQty"
+            header-align="center"
+            align="center"
+            width="150px"
+            label="数量"
+          >
+            <template slot-scope="scope">
+              <el-input
+                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
+                v-model="scope.row.fQty"
+                :disabled="modify || scope.row.fSrcTypeId !== 0"
+                @change="changeContractAmt(scope.row)"
+                placeholder="数量"
+                show-word-limit
+              />
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="fUnitprice"
+            header-align="center"
+            align="center"
+            width="150px"
+            label="单价"
+          >
+            <template slot-scope="scope">
+              <el-input
+                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
+                v-model="scope.row.fUnitprice"
+                :disabled="modify || scope.row.fSrcTypeId !== 0"
+                @change="changeContractAmt(scope.row)"
+                placeholder="单价"
+                show-word-limit
+              />
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="fAmount"
+            header-align="center"
+            align="center"
+            width="150px"
+            label="金额"
+          >
+            <template slot-scope="scope">
+              <el-input
+                disabled
+                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
+                v-model="scope.row.fAmount"
+                placeholder="金额"
+                show-word-limit
+              />
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="fStltypeid"
+            header-align="center"
+            align="center"
+            width="130px"
+            label="结算方式"
+          >
+            <template slot-scope="scope">
+              <el-select
+                v-model="scope.row.fStltypeid"
+                placeholder="请选择结算表票结、月结"
+                :disabled="modify || scope.row.fSrcTypeId !== 0"
+              >
+                <el-option
+                  v-for="(dict, index) in fStltypeOptions"
+                  :key="index.dictValue"
+                  :label="dict.dictLabel"
+                  :value="parseInt(dict.dictValue)"
+                ></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            prop="fCurrency"
+            header-align="center"
+            align="center"
+            width="150px"
+            label="币别"
+          >
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.fCurrency"
+                :disabled="modify || scope.row.fSrcTypeId !== 0"
+                placeholder="币别"
+                show-word-limit
+              />
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="fExrate"
+            header-align="center"
+            align="center"
+            width="150px"
+            label="汇率"
+          >
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.fExrate"
+                :disabled="modify || scope.row.fSrcTypeId !== 0"
+                placeholder="汇率"
+                show-word-limit
+              />
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="fTaxrate"
+            header-align="center"
+            align="center"
+            width="150px"
+            label="税率"
+          >
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.fTaxrate"
+                :disabled="modify || scope.row.fSrcTypeId !== 0"
+                placeholder="税率"
+                show-word-limit
+              />
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="fSrcTypeId"
+            header-align="center"
+            align="center"
+            width="130px"
+            label="来源"
+          >
+            <template slot-scope="scope">
+              <span v-if="scope.row.fSrcTypeId === 0">录入</span>
+              <span v-if="scope.row.fSrcTypeId !== 0">协议</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="remarks"
+            header-align="center"
+            align="center"
+            width="150px"
+            label="备注"
+          >
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.remarks"
+                :disabled="modify || scope.row.fSrcTypeId !== 0"
+                placeholder="备注"
+                show-word-limit
+              />
+            </template>
+          </el-table-column>
+          <el-table-column
+            header-align="center"
+            align="center"
+            width="200px"
+            label="操作"
+          >
+            <template slot-scope="scope">
+              <!-- <el-button size="small">审核费用</el-button> -->
+              <el-button
+                @click.native.prevent="
+                    deleteRoww(scope.$index, warehouseCrList)
+                  "
+                size="small"
+                :disabled="modify"
+              >移除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-collapse-item>
+    </el-collapse>
+
+
+
+    <div style="margin:60px;float: right">
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <approval-comments v-if="addOrUpdateVisib" ref="ApprovalComments" @refreshDataList="returnData"></approval-comments>
+      <el-button type="info" @click="modifyInfo">修改</el-button>
+      <el-button type="success" @click="approval">保 存</el-button>
+      <el-button type="success" @click="addOrUpdateHand(form)">审批</el-button>
+      <el-button type="primary" v-if="form.fBillstatus > 3" @click="addOrUpdateHandle(form)">查看审批</el-button
+      >
+    </div>
+<!--    附件查看-->
+    <el-dialog
+      title="查看附件"
+      :visible.sync="dialogVisible"
+      width="60%"
+      v-dialogDrag>
+      <el-table
+        :data="relevantAttachments"
+        ref="table"
+        tooltip-effect="dark"
+        border
+        stripe
+        style="width: 100%"
+        height="150"
+      >
+        <el-table-column label="序号" type="index" width="80">
+        </el-table-column>
+        <el-table-column
+          prop="fName"
+          header-align="center"
+          align="center"
+          width="250px"
+          label="附件名称"
+        >
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.fName"
+              placeholder="附件名称"
+              show-word-limit
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="createTime"
+          header-align="center"
+          align="center"
+          width="250px"
+          label="上传时间"
+        >
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.createTime"
+              disabled
+              placeholder="上传时间"
+            ></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="createBy"
+          header-align="center"
+          align="center"
+          width="150px"
+          label="上传人"
+        >
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.createBy"
+              disabled
+              placeholder="上传人"
+              show-word-limit
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="fUrl"
+          header-align="center"
+          align="center"
+          width="150px"
+          label="操作"
+        >
+          <template slot-scope="scope">
+            <!--          <el-upload-->
+            <!--            class="upload-demo"-->
+            <!--            :action="uploadImgUrl"-->
+            <!--            :on-success="(res,file)=>{handleSucces(scope,res,file)}"-->
+            <!--            :headers="headers"-->
+            <!--            style="width:25%;float: left"-->
+            <!--            :show-file-list="false"-->
+            <!--            :limit="1"-->
+            <!--          >-->
+            <!--            <el-button size="small" type="primary" style="margin-left:20px">点击上传</el-button>-->
+            <!--          </el-upload>-->
+            <el-button size="small" type="primary" @click="checkFile(scope)">查看</el-button>
+            <!--          <el-button size="small" type="primary" @click="deleteFile(scope)">删除</el-button>-->
+          </template>
+        </el-table-column>
+      </el-table>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { listCorps, addmodify, getCntr, postApproval, listFees,getGoodName} from '@/api/kaihe/domesticTrade/orderInformation'
+import Global from '@/layout/components/global'
+import { getToken } from '@/utils/auth'
+import Cookies from 'js-cookie'
+import draggable from 'vuedraggable'
+import Vue from 'vue'
+import AddOrUpdate from '@/views/viewApproval'
+import ApprovalComments from '@/views/startApproval'
+Vue.directive('dialogDrag', {
+  bind(el, binding, vnode, oldVnode) {
+    const dialogHeaderEl = el.querySelector('.el-dialog__header')
+    const dragDom = el.querySelector('.el-dialog')
+    const enlarge = el.querySelector('.enlarge')
+    dialogHeaderEl.style.cursor = 'move'
+
+    // 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);
+    const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null)
+    if(enlarge){
+      enlarge.onclick = (e) => {
+        dragDom.style.top = '0px'
+        dragDom.style.left = '0px'
+      }
+    }
+    dialogHeaderEl.onmousedown = (e) => {
+      // 鼠标按下,计算当前元素距离可视区的距离
+      const disX = e.clientX - dialogHeaderEl.offsetLeft
+      const disY = e.clientY - dialogHeaderEl.offsetTop
+
+      // 获取到的值带px 正则匹配替换
+      let styL, styT
+
+      // 注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px
+      if (sty.left.includes('%')) {
+        styL = +document.body.clientWidth * (+sty.left.replace(/\%/g, '') / 100)
+        styT = +document.body.clientHeight * (+sty.top.replace(/\%/g, '') / 100)
+      } else {
+        styL = +sty.left.replace(/\px/g, '')
+        styT = +sty.top.replace(/\px/g, '')
+      }
+
+      document.onmousemove = function(e) {
+        // 通过事件委托,计算移动的距离
+        const l = e.clientX - disX
+        const t = e.clientY - disY
+
+        // 移动当前元素
+
+        if ((t + styT) >= 0){
+          dragDom.style.top = `${t + styT}px`
+        }
+        dragDom.style.left = `${l + styL}px`
+        // 将此时的位置传出去
+        // binding.value({x:e.pageX,y:e.pageY})
+      }
+
+      document.onmouseup = function(e) {
+        document.onmousemove = null
+        document.onmouseup = null
+      }
+    }
+  }
+})
+
+export default {
+  name: 'orderInformation',
+  components: {
+    AddOrUpdate,
+    ApprovalComments,
+  },
+  data() {
+    return {
+      //字典表包装类型
+      packgeOptions:[],
+      //货名下拉
+      goodsOptions:[],
+      //箱型下拉
+      cntrOptions:[],
+      fTaxrate:"",
+      //结算方式
+      fStltypeOptions:[],
+      //计价单位
+      jFeetunitOptions:[],
+      //收付款费用名称字典表
+      fDNameOptions: [],
+      fCNameOptions: [],
+      warehouseCrList:[],
+      estimatedTime:{},
+      addOrUpdateVisible: false,
+      addOrUpdateVisib: false,
+      warehouseDrList:[],
+      goodsList:[],
+      dataList:[],
+      visible:false,
+      dataForm:{},
+      modify:true,
+      doNot:true,
+      activeNames: ["1","2","3","4","5","6"],
+      form:{},
+      uploadImgUrl: process.env.VUE_APP_BASE_API + '/common/upload', // 上传的图片服务器地址
+      relevantAttachments: [],
+      headers: { Authorization: 'Bearer ' + getToken() },
+      //集装箱尺码字典表
+      CntrsizeOptions: [],
+      //模糊查询箱类型
+      typeOptions: [],
+      //附件上传弹窗
+      dialogVisible: false,
+      //调箱动作字典表
+      boxActionOptions: [],
+      //集装箱主字典表
+      ownerOptions: [],
+      //模糊下拉查询地点
+      addressOptions: [],
+      //空重字典表
+      updateEFOptions: [],
+      //状态字典表
+      cntrstatusOptions: [],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 客户详情表格数据
+      corpsList: [],
+      // 查询参数
+      select: '',
+      querDate: [],
+      file: [],
+      row: []
+    }
+  },
+
+  //页面跳转后传递参数
+  activated() {
+    let formDate = JSON.parse(this.$route.query.data)
+    console.log(formDate)
+    // this.querDate = JSON.parse(this.$route.query.data)
+    if (formDate) {
+      addmodify(formDate).then(response => {
+        this.form = response.rows[0]
+        this.goodsList = response.rows[0].tWarehousebillsCntrList
+        this.estimatedTime = response.rows[0].tVoyageL
+        this.dataList = response.rows[0].tWarehousebillsCntritemsList
+        this.warehouseDrList = response.rows[0].tWarehousebillsfeesDr
+        this.warehouseCrList = response.rows[0].warehousebillsfeesCr
+        this.loading = false
+      })
+    }
+
+  },
+  created() {
+    // getContainer().then(response=>{
+    //   console.log(response)
+    // })
+    this.getDicts("data_unitfees").then((response) => {
+      if (response.data) {
+        this.jFeetunitOptions = response.data;
+      }
+    });
+    this.getDicts("data_stltype_type").then((response) => {
+      if (response.data) {
+        this.fStltypeOptions = response.data;
+      }
+    });
+    this.getDicts("tax_rate").then((response) => {
+      if (response.data) {
+        this.fTaxrate = response.data[0].dictValue;
+      }
+    });
+    this.getDicts("f_packageid").then((response) => {
+      console.log(response)
+      if (response.data) {
+        this.packgeOptions = response.data
+      }
+    });
+    this.cntrtypeRemoteMethod()
+    this.goodRemoteMethod()
+  },
+  methods: {
+    //货名下拉
+    goodRemoteMethod(){
+      let queryParams = { pageNum: 1 }
+      getGoodName(queryParams).then(response=>{
+        console.log(response)
+        this.goodsOptions = response.data
+
+      })
+    },
+    //箱型下拉获取
+    cntrtypeRemoteMethod(){
+      let queryParams = { pageNum: 1 }
+      getCntr(queryParams).then(response=>{
+        console.log(response)
+        this.cntrOptions = response.rows
+      })
+    },
+    //计价单位
+    corpsRemoteMethod(name) {
+      if (name == null || name === "") {
+        return false;
+      }
+      let queryParams = { pageNum: 1, fName: name, type: 1 };
+      listCorps(queryParams).then((response) => {
+        this.fMblnoOptions = response.rows;
+        this.KHblnoOptions = response.rows;
+        console.log(this.KHblnoOptions);
+      });
+    },
+
+    //应付信息新行
+    addpayment() {
+      this.warehouseCrList.push({
+        fCorpid: null,
+        fFeeid: null,
+        fFeeUnitid: "",
+        fQty: null,
+        fUnitprice: null,
+        fAmount: null,
+        fCurrency: "RMB",
+        fExrate: "1",
+        fTaxrate: this.fTaxrate,
+        fCxrate: null,
+        fRate: null,
+        remarks: null,
+        fMblno: this.form.fMblno,
+        fProductName: this.form.fProductName,
+        fMarks: this.form.fMarks,
+        fBusinessType: this.form.fBusinessType,
+        fSrcTypeId: 0,
+      })
+    },
+    // 数量计算
+    changeContractAmt(row) {
+      let fQty = 0;
+      let fUnitprice = 0;
+      if (row.fUnitprice) {
+        fUnitprice = row.fUnitprice;
+      }
+      if (row.fQty) {
+        fQty = row.fQty;
+      }
+      this.$set(row, "fAmount", Number(fUnitprice) * Number(fQty)).toFixed(2);
+    },
+
+    modifyInfo(){
+      this.modify = false
+      let queryParams = { pageNum: 1, fDc: "C" };
+      listFees(queryParams).then((response) => {
+        this.fCNameOptions = response.rows;
+        console.log(this.fCNameOptions)
+      });
+      let query = { pageNum: 1, fDc: "D" };
+      listFees(query).then((response) => {
+        this.fDNameOptions = response.rows;
+        console.log(this.fDNameOptions)
+      });
+    },
+    // 变更计价单位
+    changeFeeUnit(row) {
+      if (!row.fFeeUnitid) {
+        return false;
+      }
+      // if (row.fFeeUnitid === "2") {
+      //   console.log(row.fQty)
+      //   this.$set(row, "fQty", (this.fGrossweight / 1000).toFixed(2));
+      // } else if (row.fFeeUnitid === "1") {
+      //   this.$set(row, "fQty", this.fQty);
+      // } else if (row.fFeeUnitid === "3") {
+      //   this.$set(row, "fQty", (this.fNetweight / 1000).toFixed(2));
+      // } else if (row.fFeeUnitid === "7") {
+      //   this.$set(row, "fQty", this.fCntqty);
+      // } else {
+      //   this.$set(row, "fQty", 0);
+      // }
+      if (row.fUnitprice) {
+        this.$set(
+          row,
+          "fAmount",
+          parseFloat(Number(row.fUnitprice) * Number(row.fQty)).toFixed(2)
+        );
+      }
+    },
+
+    // 选择费用信息时获取计价单位
+    changeFeeId(row) {
+      for (let li in this.fWbuOptions) {
+        if (row.fFeeid === this.fWbuOptions[li].fId) {
+          this.$set(row, "fFeeUnitid", this.fWbuOptions[li].fFeeunitid + "");
+          this.changeFeeUnit(row);
+          break;
+        }
+      }
+    },
+    // 远程模糊查询费用名称
+    fWRemoteMethod(name) {
+      if (name == null || name === "") {
+        return false;
+      }
+      let queryParams = { pageNum: 1, fDc: "C", fName: name };
+      listFees(queryParams).then((response) => {
+        this.fCNameOptions = response.rows;
+      });
+      let query = { pageNum: 1, fDc: "D", fName: name };
+      listFees(query).then((response) => {
+        this.fDNameOptions = response.rows;
+      });
+    },
+
+    // 付款合计
+    warehouseDrSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "合计";
+          return;
+        }
+        const values = data.map((item) => Number(item[column.property]));
+        if (
+          column.property === "fUnitprice" ||
+          column.property === "fAmount" ||
+          column.property === "fQty" ||
+          column.property === "fQty"
+        ) {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index] = sums[index].toFixed(2);
+        }
+      });
+      return sums;
+    },
+    addOrUpdateHand(form) {
+      this.addOrUpdateVisib = true;
+      this.$nextTick(() => {
+        this.$refs.ApprovalComments.init(form.fId, 420);
+      });
+    },
+    //首页审批跳转关闭返回首页
+    cancelTwo() {
+      this.open = false;
+      let view = {
+        fullPath: "/domesticTrade/orderInformation?data=%7B%22fId%22%3A687%7D",
+        hash: "",
+        matched: Array(2),
+        meta: Object,
+        name: "OrderInformation",
+        params: Object,
+        path: "/domesticTrade/orderInformation",
+        query: Object,
+        title: "订单信息"
+      };
+      this.$router.push({ path: "/index" });
+      this.$store
+        .dispatch("tagsView/delView", view)
+        .then(({ visitedViews }) => {
+          if (this.isActive(view)) {
+            this.toLastView(visitedViews, view);
+          }
+        });
+      Global.$emit("removeCache", "closeSelectedTag", view);
+    },
+
+    // 查看审批流
+    getDataList() {
+      this.addOrUpdateVisible = false;
+    },
+    returnData() {
+      this.addOrUpdateVisib = false;
+      this.open = false;
+      this.cancelTwo();
+    },
+
+    addOrUpdateHandle() {
+      this.addOrUpdateVisible = true;
+      let id = "448";
+      let actId = "420";
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(this.form.fId, actId);
+      });
+    },
+
+    handleSelect(){},
+    //应收新行
+    addCollection(){
+      this.warehouseDrList.push({
+        fCorpid: null,
+        fFeeid: null,
+        fFeeUnitid: "",
+        fQty: null,
+        fUnitprice: null,
+        fAmount: null,
+        fCurrency: "RMB",
+        fExrate: "1",
+        fTaxrate: this.fTaxrate,
+        fCxrate: null,
+        fRate: null,
+        remarks: null,
+        fMblno: this.form.fMblno,
+        fProductName: this.form.fProductName,
+        fMarks: this.form.fMarks,
+        fBusinessType: this.form.fBusinessType,
+        fSrcTypeId: 0,
+      })
+    },
+    //提交审批
+    approval(){
+      if(!this.form.fMblno){
+        this.$message.error("请维护提单号")
+        return false
+      }
+      console.log(this.dataList)
+      if(this.dataList.length === 0){
+        this.$message.error("请维护箱信息")
+        return false
+      }
+      let form = {
+        fId:this.form.fId,
+        fMblno:this.form.fMblno
+      }
+      console.log(this.warehouseDrList)
+      let formData = new window.FormData();
+      formData.append("tWarehousebills",JSON.stringify(form))
+      formData.append("tWarehousebillsCntritems",JSON.stringify(this.dataList))
+      formData.append("tWarehousebillsfeesDr",JSON.stringify(this.warehouseDrList))
+      formData.append("tWarehousebillsfeesCr",JSON.stringify(this.warehouseCrList))
+
+      postApproval(formData).then(response=>{
+        this.msgSuccess("提交成功");
+        console.log(response)
+        if(response.data.tWarehouseBills){
+          this.form.fMblno = tWarehouseBills
+        }
+        if(response.data.tWarehousebillsCntritemsList){
+
+        }
+        if(response.data.warehousebillsfeesCrList){
+          this.warehouseCrList = response.data.warehousebillsfeesCrList
+          console.log(this.warehouseDrList)
+          for(let item in this.warehouseCrList){
+            // this.$set(this.warehouseDrList[item],'fFeeunitid',parseInt(this.warehouseDrList[item].fFeeunitid + ""))
+            this.$set(this.warehouseCrList[item],'fFeeUnitid',JSON.stringify(this.warehouseCrList[item].fFeeunitid))
+            console.log(typeof(this.warehouseDrList[item].fFeeunitid))
+          }
+        }
+        if(response.data.warehousebillsfeesDrList){
+          this.warehouseDrList = response.data.warehousebillsfeesDrList
+          console.log(this.warehouseDrList)
+            for(let item in this.warehouseDrList){
+              // this.$set(this.warehouseDrList[item],'fFeeunitid',parseInt(this.warehouseDrList[item].fFeeunitid + ""))
+              this.$set(this.warehouseDrList[item],'fFeeUnitid',JSON.stringify(this.warehouseDrList[item].fFeeunitid))
+              console.log(typeof(this.warehouseDrList[item].fFeeunitid))
+            }
+        }
+      })
+    },
+    //新行
+    addList(){
+      this.dataList.push({
+        fManual:'1',
+        fCntrno:null,
+        fSealno:null,
+        fCntrweight:null,
+        fGoodsid:null,
+        fPackageid:null,
+        fCntrid:null,
+      })
+    },
+    //查看附件
+    check(status){
+      this.dialogVisible = true
+      if(status === 1){
+        console.log(status)
+      }else{
+        console.log(status)
+      }
+    },
+    saveFile() {
+      this.row.accessoryList = this.file
+      this.dialogVisible = false
+      this.relevantAttachments = []
+      console.log(this.row)
+    },
+    deleteRow(index, rows) {
+      rows.splice(index, 1)
+    },
+    //提交修改数据
+    determine() {
+      let data = []
+      for (let item in this.select) {
+        console.log(this.select[item])
+        for (let li in this.corpsList) {
+          if (!this.select[item].foldSite) {
+            this.$message.error('请选择调入地点')
+            return false
+          } else if (!this.select[item].fOpctnstatus) {
+            this.$message.error('请选择调箱动态')
+            return false
+          } else {
+            if (!this.select[item].foldFUpdateef) {
+              this.select[item].foldFUpdateef = this.corpsList[li].updateEFName
+              this.$set(this.select[item], 'FUpdateef', this.corpsList[li].fUpdateef)
+            }
+            if (!this.select[item].foldFCntrstatus) {
+              this.select[item].foldFCntrstatus = this.corpsList[li].cntrstatusName
+              this.$set(this.select[item], 'FCntrstatus', this.corpsList[li].fCntrstatus)
+            }
+          }
+        }
+
+        data.push({
+          fId: this.select[item].fId,
+          foldSite: this.select[item].fold,
+          foldFUpdateef: this.select[item].FUpdateef,
+          foldFCntrstatus: this.select[item].FCntrstatus,
+          foldtime: this.select[item].foldtime,
+          fVsl: this.select[item].fVsl,
+          fVoy: this.select[item].fVoy,
+          fMblno: this.select[item].fMblno,
+          fOpctnstatus: this.select[item].boxAdjustmentAction,
+          remark: this.select[item].remark,
+          accessoryList: this.file
+        })
+      }
+
+      let tCntrno = data
+      listCorps(tCntrno).then(response => {
+        this.$message.success('提交成功')
+        // this.$router.push({
+        //   path: "/containerNews/boxDistribution",
+        // });
+        console.log(this.corpsList.length)
+        if (this.querDate) {
+          addmodify(this.querDate).then(response => {
+            this.corpsList = response.rows
+            this.loading = false
+            if (response.rows.length === 0) {
+              let view = {
+                fullPath: '/containerNews/modifyPage?data=%7B%22typeidName%22%3A%221%22,%22fUpdateaddress%22%3A%22%E5%B1%B1%E4%B8%9C%22%7D',
+                hash: '',
+                matched: Array(2),
+                meta: Object,
+                name: 'ModifyPage',
+                params: Object,
+                path: '/containerNews/modifyPage',
+                query: Object,
+                title: '修改页面'
+              }
+              this.$router.push({ path: '/containerNews/boxDistribution' })
+              this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
+                if (this.isActive(view)) {
+                  this.toLastView(visitedViews, view)
+                }
+              })
+              Global.$emit('removeCache', 'closeSelectedTag', view)
+            }
+
+          })
+        }
+        console.log(this.corpsList.length)
+      })
+    },
+    //多选框选中
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.fId)
+      this.select = selection
+      console.log(this.select)
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.tabSetting {
+  display: flex;
+  justify-content: flex-end;
+}
+
+.listStyle {
+  display: flex;
+  border-top: 1px solid #dcdfe6;
+  border-left: 1px solid #dcdfe6;
+  border-right: 1px solid #dcdfe6;
+}
+
+.listStyle:last-child {
+  border-bottom: 1px solid #dcdfe6;
+}
+
+.progress {
+  display: flex;
+  align-items: center;
+  padding: 2px;
+  background-color: rgba(0, 0, 0, 0.05);
+  height: 100%;
+}
+.el-form{
+  padding-top:20px;
+  //border-top:1px dashed #ccc;
+}
+
+.selectForm >>> .el-form-item__label{
+  font-size: 12px!important;
+}
+
+</style>
+<style lang="scss">
+.el-collapse-item__header{
+  font-size: 16px;
+  font-weight: bolder;
+  padding-left: 5px;
+  background-color: #f8f8f9;
+}
+.el-form-item__label{
+  font-size: 12px;
+}
+</style>

+ 2 - 0
src/views/system/auditConfiguration/index.vue

@@ -48,6 +48,8 @@
           <span v-if="scope.row.actId === 230">付费审批流程</span>
           <span v-if="scope.row.actId === 310">协议仓储费审批流程</span>
           <span v-if="scope.row.actId === 320">协议计划费审批流程</span>
+          <span v-if="scope.row.actId === 410">下单审批流程</span>
+          <span v-if="scope.row.actId === 420">配船审批流程</span>
         </template>
       </el-table-column>
       <el-table-column