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

src/api/fleet/carManage.js

@@ -54,4 +54,4 @@ export function deleted(fId) {
     url: '/fleet/carManage/' + fId,
     method: 'delete'
   })
-}
+}

src/api/jiGang/index.js

@@ -0,0 +1,63 @@
+import request from '@/utils/request'
+
+// 查询客户详情列表
+export function listCorps(query) {
+  return request({
+    // url: '/basicdata/corps/selectCustomerDriverList',
+    url: '/basicdata/corps/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询客户详情列表
+export function listCorps_s() {
+  return request({
+    url: '/warehouseBusiness/containerPort/list',
+    method: 'get',
+  })
+}
+// 查询单条数据
+export function single(fId) {
+  return request({
+    // url: '/basicdata/corps/selectCustomerDriverList',
+    url: '/warehouseBusiness/containerPort/' + fId,
+    method: 'get',
+  })
+}
+// 新增
+export function preservation(data) {
+  return request({
+    url: '/warehouseBusiness/containerPort/saveContainerPort',
+    method: 'post',
+    data: data
+  })
+}
+// 删除
+export function singleDeletion(fId) {
+  return request({
+    url: '/warehouseBusiness/containerPort/removeContainerPort/' + fId,
+    method: 'get'
+  })
+}
+// 撤销
+export function revokeContainerPort(fId) {
+  return request({
+    url: '/warehouseBusiness/containerPort/revokeContainerPort/' + fId,
+    method: 'get'
+  })
+}
+// 提交
+export function submit(data) {
+  return request({
+    url: '/warehouseBusiness/containerPort/addContainerPort',
+    method: 'post',
+    data: data
+  })
+}
+// 基础资料
+export function allInformation() {
+  return request({
+    url: '/warehouseBusiness/containerPort/selectBasicInformation',
+    method: 'get',
+  })
+}

src/views/finance/payment/index.vue

@@ -4,7 +4,6 @@
     <div v-show="mainTable == false">
       <el-form
         :model="tableFilter"
-        ref="queryForm"
         :inline="true"
         v-show="showSearch"
         label-width="68px"
@@ -75,6 +74,7 @@
           >
         </el-form-item>
       </el-form>
+
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
           <el-button
@@ -305,6 +305,7 @@
         <!--      <el-table-column label="单据类型" align="center" prop="fBilltype"/>-->
         <!--      <el-table-column label="制单部门" align="center" prop="fDeptid"/>-->
       </el-table>
+
       <pagination
         v-show="total > 0"
         :total="total"
@@ -315,6 +316,7 @@
     </div>
 <!--    新增页面-->
     <div v-show="mainTable == true">
+
       <template slot="title">
         <div class="avue-crud__dialog__header">
           <span class="el-dialog__title">
@@ -490,7 +492,7 @@
         <div style="display: flex">
           <el-button
             type="warning"
-            size="mini"
+            size="small"
             @click="charGe"
             :disabled="notChange"
             v-if="queryParams.fBillstatus < '4'"
@@ -498,18 +500,18 @@
           >
           <el-button
             type="primary"
-            size="mini"
+            size="small"
             @click="confirmCharge"
             :disabled="notChange"
             v-if="queryParams.fBillstatus < '4'"
           >确认付费</el-button
           >
-          <el-button type="warning" size="mini" @click="handleExportItems"
+          <el-button type="warning" size="small" @click="handleExportItems"
           >导出</el-button
           >
           <el-button
             type="success"
-            size="mini"
+            size="small"
             @click="revokeCharge"
             v-if="queryParams.fBillstatus === '6'"
           >撤销付费</el-button
@@ -518,32 +520,12 @@
           <!--        <el-button type="danger" size="small" :disabled="notChange" v-show="Lander == Operator">撤销审批</el-button>-->
           <el-button
             type="danger"
-            size="mini"
+            size="small"
             :disabled="tablefilter"
             @click="approvalRevocation"
             v-show="queryParams.fBillstatus === '4'"
           >撤销审批</el-button
           >
-          <el-button v-if="approve === true" size="mini" @click="immediateApproval"
-          >审批</el-button
-          >
-          <el-button
-            type="primary"
-            size="mini"
-            v-if="queryParams.fBillstatus >= '3'"
-            @click="addOrUpdateHandle"
-          >查看审批流</el-button
-          >
-          <el-button type="primary" @click="submitForm" size="mini" :disabled="notChange"
-          >保 存</el-button
-          >
-          <el-button v-if="cancelButton === true" size="mini" @click="cancel"
-          >返 回</el-button
-          >
-          <el-button v-if="cancelButton === false" size="mini" @click="homePage"
-          >返 回</el-button
-          >
-          <el-button @click="addPage" size="mini">新 增</el-button>
         </div>
         <div style="margin: 0 12px">
           <el-button
@@ -701,6 +683,24 @@
           ref="ApprovalComments"
           @refreshDataList="returnData"
         ></approval-comments>
+        <el-button v-if="approve === true" @click="immediateApproval"
+        >审批</el-button
+        >
+        <el-button
+          type="primary"
+          v-if="queryParams.fBillstatus >= '3'"
+          @click="addOrUpdateHandle"
+        >查看审批流</el-button
+        >
+        <el-button type="primary" @click="submitForm" :disabled="notChange"
+        >保 存</el-button
+        >
+        <el-button v-if="cancelButton === true" @click="mainTable = false"
+        >取 消</el-button
+        >
+        <el-button v-if="cancelButton === false" @click="homePage"
+        >取 消</el-button
+        >
       </div>
       <el-dialog
         v-dialogDrag
@@ -1782,7 +1782,6 @@ import Global from "@/layout/components/global";
 import Cookies from "js-cookie";
 import Vue from "vue";
 import { addSet, select, resetModule } from "@/api/system/set";
-import { MessageBox } from 'element-ui'
 Vue.directive("dialogDrag", {
   bind(el, binding, vnode, oldVnode) {
     const dialogHeaderEl = el.querySelector(".el-dialog__header");
@@ -2045,10 +2044,6 @@ export default {
           value: "2",
           label: "车队",
         },
-        {
-          value: "3",
-          label: "船务",
-        },
       ],
       //全屏放大
       dialogFull: false,
@@ -2203,26 +2198,9 @@ export default {
     this.getRow2();
   },
   activated() {
-    if(this.$route.query.data){
-      let data = JSON.parse(this.$route.query.data)
-      if(data.key === 1){
-        this.handleAdd()
-      }else{
-        this.adoPt();
-      }
-    }
+    this.adoPt();
   },
   methods: {
-    addPage(){
-      MessageBox.confirm("是否已保存？",{
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(()=> {
-        this.handleAdd()
-      })
-    },
     //导出明细
     handleExportItems() {
       const fIds = this.queryParams.fId;
@@ -2515,7 +2493,7 @@ export default {
             this.queryParams = response.data.tFee;
             this.fWbuOptions = response.data.feesList;
             this.fMblnoOptions = response.data.corps;
-            this.mainTable = true;
+            this.open = true;
             this.title = "修改付费列表";
           });
         } else if (Cookies.get("sysType") == 2) {
@@ -2541,7 +2519,7 @@ export default {
             this.queryParams = response.data.tFee;
             this.fWbuOptions = response.data.feesList;
             this.fMblnoOptions = response.data.corps;
-            this.mainTable = true;
+            this.open = true;
             this.title = "修改付费列表";
           });
         }
@@ -2611,7 +2589,6 @@ export default {
     // 查看按钮
     check(row, res) {
       this.notChange = true;
-      this.doNot = true
       if (Cookies.get("sysType") == 1) {
         //大木
         getCharge(row.fId).then((response) => {
@@ -2635,8 +2612,7 @@ export default {
           this.queryParams = response.data.tFee;
           this.fWbuOptions = response.data.feesList;
           this.fMblnoOptions = response.data.corps;
-          this.mainTable = true;
-          this.mainTable = true
+          this.open = true;
           this.title = "付费列表";
           this.tablefilter = true;
           if (res == 1) {
@@ -2673,7 +2649,7 @@ export default {
                 this.queryParams = response.data.tFee;
                 this.fWbuOptions = response.data.feesList;
                 this.fMblnoOptions = response.data.corps;
-                this.mainTable = true;
+                this.open = true;
               });
             } else {
               this.notChange = true;
@@ -2711,7 +2687,7 @@ export default {
               this.queryParams = response.data.tFee;
               this.fWbuOptions = response.data.feesList;
               this.fMblnoOptions = response.data.corps;
-              this.mainTable = true;
+              this.open = true;
             });
           }
         });
@@ -2738,7 +2714,7 @@ export default {
           this.queryParams = response.data.tFee;
           this.fWbuOptions = response.data.feesList;
           this.fMblnoOptions = response.data.corps;
-          this.mainTable = true;
+          this.open = true;
           this.title = "付费列表";
           this.tablefilter = true;
           if (res == 1) {
@@ -2775,7 +2751,7 @@ export default {
                 this.queryParams = response.data.tFee;
                 this.fWbuOptions = response.data.feesList;
                 this.fMblnoOptions = response.data.corps;
-                this.mainTable = true;
+                this.open = true;
               });
             } else {
               this.notChange = true;
@@ -2813,7 +2789,7 @@ export default {
               this.queryParams = response.data.tFee;
               this.fWbuOptions = response.data.feesList;
               this.fMblnoOptions = response.data.corps;
-              this.mainTable = true;
+              this.open = true;
             });
           }
         });
@@ -3035,21 +3011,9 @@ export default {
     },
     // 取消按钮
     cancel() {
-      if(this.notChange == true){
-        this.mainTable = false
-      }else{
-        MessageBox.confirm("是否已保存？",{
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-        ).then(()=>{
-          this.mainTable = false
-          this.approve = false;
-          this.getList();
-          this.reset();
-        })
-      }
+      this.open = false;
+      this.approve = false;
+      this.reset();
     },
     // 表单重置
     reset() {
@@ -3198,43 +3162,43 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.notChange = false;
+      // this.notChange = false;
       this.mainTable = true
-      this.hide = true;
-      this.reset();
-      (this.pass = {
-        fAmtdr: 0, //应收合计
-        fAmtcr: 0, //应付合计
-        fMblno: "", //提单号
-        fName: "", //货权方
-        fFeesName: "", //结算单位
-        fCorpid: "", //结算单位ID
-      }),
-        // this.queryParams = []
-        (this.increase_s = []);
-      this.queryParams = {
-        pageNum: 1,
-        pageSize: 10,
-        fBillno: null,
-        fCtrlcorpid: null,
-        fCorpid: null,
-        tMblno: null,
-        fAmtdr: null,
-        fAmtcr: null,
-        fBilltype: null,
-        fBillstatus: null,
-        fRemarks: null,
-        fAccbilldate: null,
-        fDeptid: null,
-        chargingMethod: null,
-        invoiceNo: null,
-        bank: null,
-        waterBillNo: null,
-        fSystemType: Cookies.get("sysType"),
-      };
-      this.resetForm("queryParams");
-      this.mainTable = true;
-      this.title = "添加财务数据主";
+      // this.hide = true;
+      // this.reset();
+      // (this.pass = {
+      //   fAmtdr: 0, //应收合计
+      //   fAmtcr: 0, //应付合计
+      //   fMblno: "", //提单号
+      //   fName: "", //货权方
+      //   fFeesName: "", //结算单位
+      //   fCorpid: "", //结算单位ID
+      // }),
+      //   // this.queryParams = []
+      //   (this.increase_s = []);
+      // this.queryParams = {
+      //   pageNum: 1,
+      //   pageSize: 10,
+      //   fBillno: null,
+      //   fCtrlcorpid: null,
+      //   fCorpid: null,
+      //   tMblno: null,
+      //   fAmtdr: null,
+      //   fAmtcr: null,
+      //   fBilltype: null,
+      //   fBillstatus: null,
+      //   fRemarks: null,
+      //   fAccbilldate: null,
+      //   fDeptid: null,
+      //   chargingMethod: null,
+      //   invoiceNo: null,
+      //   bank: null,
+      //   waterBillNo: null,
+      //   fSystemType: Cookies.get("sysType"),
+      // };
+      // this.resetForm("queryParams");
+      // this.open = true;
+      // this.title = "添加财务数据主";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -3274,7 +3238,7 @@ export default {
           this.queryParams = response.data.tFee;
           this.fWbuOptions = response.data.feesList;
           this.fMblnoOptions = response.data.corps;
-          this.mainTable = true;
+          this.open = true;
           this.title = "修改付费列表";
         });
       } else if (Cookies.get("sysType") == 2) {
@@ -3300,7 +3264,7 @@ export default {
           this.queryParams = response.data.tFee;
           this.fWbuOptions = response.data.feesList;
           this.fMblnoOptions = response.data.corps;
-          this.mainTable = true;
+          this.open = true;
           this.title = "修改付费列表";
         });
       }

src/views/fleet/sendcar/AddOrUpdate.vue

@@ -738,24 +738,6 @@
                   prop="orderNo"
                   width="100"
                 />
-                 <el-table-column
-                  label="单据类型"
-                  align="center"
-                  prop="billKind"
-                  width="100"
-                 >
-                   <template slot-scope="scope">
-                    <span v-if="scope.row.billKind === 'NN'">直单</span>
-                    <span v-if="scope.row.billKind === 'MM'">主单</span>
-                    <span v-if="scope.row.billKind === 'MH'">从单</span>
-                   </template>
-                 </el-table-column>
-                 <el-table-column
-                  label="主单号"
-                  align="center"
-                  prop="mBillNo"
-                  width="100"
-                />
                 <el-table-column label="备注" align="center" prop="remarks">
                   <template slot-scope="scope">
                     <el-input
@@ -1829,8 +1811,8 @@ export default {
           });
           for (let li in this.vehicleList) {
             if (
-              this.vehicleList[li].billStatus != 3 &&
-              this.vehicleList[li].billStatus < 6
+              this.vehicleList[li].billStatus < 6 &&
+              this.vehicleList[li].billStatus != 3
             ) {
               return this.$message.error("车辆安排存在未提交的数据");
             }

src/views/index.vue

@@ -49,7 +49,7 @@
                 <p>调拨</p>
               </div>
             </li>
-            <li @click="jump('/finance/charge',1)">
+            <li @click="jump('/finance/charge')">
               <div>
                 <i
                   class="el-icon-wallet"
@@ -58,7 +58,7 @@
                 <p>收款</p>
               </div>
             </li>
-            <li @click="jump('/finance/payment',1)">
+            <li @click="jump('/finance/payment')">
               <div>
                 <i
                   class="el-icon-money"
@@ -67,7 +67,7 @@
                 <p>付款</p>
               </div>
             </li>
-            <li @click="jump('/finance/contrast',1)">
+            <li @click="jump('/finance/contrast')">
               <div>
                 <i
                   class="el-icon-s-management"
@@ -174,7 +174,7 @@
                   <span v-else-if="item.refno2 === 'FF'">付费</span>
                   <span v-else-if="item.refno2 === 'JSCCF'">计算仓储费</span>
                 </div>
-                <div class="home_stock_table" @click="approval(item)">
+                <div class="home_stock_table" @click="approval(item.refno2)">
                   查看详情
                 </div>
               </div>
@@ -699,7 +699,7 @@ export default {
     },
     //跳转审批页面
     approval(row) {
-      switch (row.refno2) {
+      switch (row) {
         case "SJRK": {
           this.$router.push({
             path: "/business/inStock",
@@ -897,14 +897,8 @@ export default {
         });
       }
     },
-    jump(res,key) {
-      let data = {
-        key:key
-      }
-      this.$router.push({
-        path: res,
-        query:{data:JSON.stringify(data)}
-      });
+    jump(res) {
+      this.$router.push({ path: res });
     },
     //设置单元格边框
     cellStyle({ row, column, rowIndex, columnIndex }) {
@@ -1337,8 +1331,8 @@ export default {
   align-self: center;
   p{
   display: inline-block;
-  white-space: nowrap;
-  width: 100%;
+  white-space: nowrap; 
+  width: 100%; 
   overflow: hidden;
   text-overflow:ellipsis;
   }

src/views/jiGang/index.vue

@@ -1,184 +1,830 @@
 <template>
-<div class="app-container">
-  <el-form
-    :model="queryParams"
-    ref="queryForm"
-    :inline="true"
-    label-width="88px"
-  >
-    <el-row>
-      <el-form-item label="日期" prop="fBsdate">
-        <el-input
-          v-model="queryParams.fBsdate"
-          placeholder="请输入日期"
-          clearable
-          size="small"
+  <div class="app-container">
+    <div v-show="jiGang == false">
+      <el-form
+        :model="query"
+        ref="queryForm"
+        :inline="true"
+        label-width="88px"
+      >
+        <el-row>
+          <el-form-item label="提单号" prop="fMblno">
+            <el-input
+              v-model="query.fMblno"
+              placeholder="请输入提单号"
+              clearable
+              size="small"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              type="cyan"
+              icon="el-icon-search"
+              size="mini"
+              @click="getList"
+            >搜索
+            </el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            >重置
+            </el-button
+            >
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd()"
+            v-hasPermi="['warehouseBusiness:containerPort:add']"
+          >新增
+          </el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="success"
+            icon="el-icon-edit"
+            size="mini"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['agreement:agreementTask:edit']"
+          >修改
+          </el-button>
+        </el-col>
+        <!--      <el-col :span="1.5">-->
+        <!--        <el-button-->
+        <!--          type="danger"-->
+        <!--          icon="el-icon-delete"-->
+        <!--          size="mini"-->
+        <!--          :disabled="multiple"-->
+        <!--          @click="handleDelete"-->
+        <!--          v-hasPermi="['agreement:agreementTask:remove']"-->
+        <!--        >删除-->
+        <!--        </el-button>-->
+        <!--      </el-col>-->
+        <!--    <el-col :span="1.5">-->
+        <!--      <el-button-->
+        <!--        type="info"-->
+        <!--        icon="el-icon-download"-->
+        <!--        size="mini"-->
+        <!--        :disabled="single"-->
+        <!--        @click="handleUpdate(null, 2)"-->
+        <!--        v-hasPermi="['agreement:agreementStorage:export']"-->
+        <!--      >复制新增-->
+        <!--      </el-button>-->
+        <!--    </el-col>-->
+        <right-toolbar
+          :showSearch.sync="showSearch"
+          @queryTable="getList"
+        ></right-toolbar>
+      </el-row>
+      <el-table
+        v-loading="loading"
+        :data="agreementList"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" align="center"/>
+        <el-table-column type="index" label="行号" align="center" fixed/>
+        <el-table-column
+          label="日期"
+          sortable
+          align="center"
+          prop="fBsdate"
+          fixed
+          show-overflow-tooltip
         />
-      </el-form-item>
-      <el-form-item label="提单号" prop="fMblno">
-        <el-input
-          v-model="queryParams.fMblno"
-          placeholder="请输入提单号"
-          clearable
-          size="small"
+        <el-table-column
+          label="提单号"
+          sortable
+          align="center"
+          prop="fMblno"
+          fixed
+          show-overflow-tooltip
         />
-      </el-form-item>
-      <el-form-item label="制单人" prop="createBy">
-        <el-input
-          v-model="queryParams.createBy"
-          placeholder="请输入制单人"
-          clearable
-          size="small"
+        <el-table-column
+          label="制单人"
+          sortable
+          align="center"
+          prop="createBy"
+          fixed
+          show-overflow-tooltip
         />
-      </el-form-item>
-      <el-form-item>
-        <el-button
-          type="cyan"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-        >搜索</el-button
+        <el-table-column
+          label="状态"
+          sortable
+          align="center"
+          prop="fBillstatus"
+          fixed
+          show-overflow-tooltip
+        />
+        <el-table-column
+          label="操作"
+          align="center"
+          class-name="small-padding fixed-width"
+        >
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-view"
+              @click="handleUpdate(scope.row)"
+            >查看
+            </el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-if="scope.row.fBillstatus === '暂存'"
+              v-hasPermi="['warehouseBusiness:containerPort:edit']"
+            >修改
+            </el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-if="scope.row.fBillstatus === '暂存'"
+              v-hasPermi="['warehouseBusiness:containerPort:remove']"
+            >删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div style="padding-top: 10px;float: right;padding-bottom: 20px">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :page-sizes="[10, 20, 30, 40]"
+          background
+          layout="sizes, prev, pager, next"
+          :total="total">
+        </el-pagination>
+      </div>
+    </div>
+    <div v-show="jiGang == true">
+      <div style="margin-bottom: 20px;">
+        <el-button round icon="el-icon-arrow-left" @click="open" size="small">返回列表</el-button>
+        <el-button type="primary" round size="small" @click="submitForm" icon="el-icon-edit">保 存</el-button>
+        <el-button type="success" round size="small" @click="submit" icon="el-icon-check">提 交</el-button>
+        <el-button type="danger" round size="small" icon="el-icon-close" @click="cancellation" v-if="queryParams.fBillstatus >2">撤销提交</el-button>
+      </div>
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        :inline="true"
+        label-width="88px"
+      >
+        <el-row>
+          <el-form-item label="日期" prop="fBsdate">
+            <el-date-picker
+              v-model="queryParams.fBsdate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              :disabled="disabled"
+              clearable
+              size="small"
+              placeholder="选择日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="提单号" prop="fMblno">
+            <el-input
+              v-model="queryParams.fMblno"
+              placeholder="请输入提单号"
+              :disabled="disabled"
+              clearable
+              size="small"
+            />
+          </el-form-item>
+        </el-row>
+      </el-form>
+
+      <h3><i class="el-icon-circle-plus"></i>收款信息</h3>
+      <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"
+            @click.prevent="addCollection()"
+            :disabled="disabled"
+          >新行
+          </el-button>
+          <!-- <el-button :disabled="browseStatus" @click.prevent="deleteRow(warehouseDrList)"
+          >删除
+        </el-button> -->
+        </div>
+      </div>
+      <el-table
+        :data="warehouseDrList"
+        ref="table"
+        tooltip-effect="dark"
+        border
+        stripe
+        show-summary
+        :disabled="disabled"
+        @selection-change="Collectionoptions"
+        :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-select
+              v-model="scope.row.fCorpid"
+              filterable
+              remote
+              :remote-method="corpsRemoteMethod"
+              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="fFeeUnitid"
+          header-align="center"
+          align="center"
+          width="180px"
+          label="码头"
+        >
+          <template slot-scope="scope">
+            <el-select
+              style="width: 80%"
+              v-model="scope.row.fFeeUnitid"
+              filterable
+            >
+              <el-option
+                v-for="(dict, index) in businessTypeOption"
+                :key="index.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              ></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="fInventoryDays"
+          header-align="center"
+          align="center"
+          width="180px"
+          label="箱型"
+        >
+          <template slot-scope="scope">
+            <el-select
+              v-model="scope.row.fInventoryDays"
+              placeholder="请选择箱型"
+              clearable
+            >
+              <el-option
+                v-for="(dict, index) in jFeetunitOptions"
+                :key="index.fId"
+                :label="dict.fNo"
+                :value="dict.fId"
+              />
+            </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="箱量"
+              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="单价"
+              show-word-limit
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="fAmt"
+          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.fAmt"
+              placeholder="金额"
+              show-word-limit
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          header-align="center"
+          align="center"
+          label="操作"
         >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-        >重置</el-button
+          <template slot-scope="scope">
+            <el-button
+              @click.native.prevent="
+                    deleteRow(scope.$index, warehouseDrList)
+                  "
+              size="small"
+              :disabled="browseStatus"
+            >移除
+            </el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <h3><i class="el-icon-remove"></i>付款信息</h3>
+      <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"
+            @click.prevent="addpayment()"
+            size="small"
+          >新行
+          </el-button>
+        </div>
+      </div>
+      <el-table
+        :data="warehouseCrList"
+        ref="table"
+        tooltip-effect="dark"
+        border
+        stripe
+        show-summary
+        :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-select
+              v-model="scope.row.fCorpid"
+              filterable
+              remote
+              :remote-method="corpsRemoteMethod"
+              placeholder="客户名称"
+            >
+              <el-option
+                v-for="(dict, index) in blnoOptions"
+                :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
+              style="width: 80%"
+              v-model="scope.row.fFeeUnitid"
+              filterable
+            >
+              <el-option
+                v-for="(dict, index) in businessTypeOption"
+                :key="index.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              ></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="fInventoryDays"
+          header-align="center"
+          align="center"
+          width="180px"
+          label="箱型"
+        >
+          <template slot-scope="scope">
+            <el-select
+              v-model="scope.row.fInventoryDays"
+              placeholder="请选择箱型"
+              clearable
+            >
+              <el-option
+                v-for="(dict, index) in jFeetunitOptions"
+                :key="index.fId"
+                :label="dict.fNo"
+                :value="dict.fId"
+              />
+            </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="箱量"
+              show-word-limit
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="fUnitprice"
+          header-align="center"
+          align="center"
+          width="130px"
+          label="单价"
         >
-      </el-form-item>
-    </el-row>
-  </el-form>
-  <el-row :gutter="10" class="mb8">
-    <el-col :span="1.5">
-      <el-button
-        type="primary"
-        icon="el-icon-plus"
-        size="mini"
-        @click="handleAdd()"
-        v-hasPermi="['agreement:agreementTask:add']"
-      >新增
-      </el-button>
-    </el-col>
-    <!--      <el-col :span="1.5">-->
-    <!--        <el-button-->
-    <!--          type="success"-->
-    <!--          icon="el-icon-edit"-->
-    <!--          size="mini"-->
-    <!--          :disabled="single"-->
-    <!--          @click="handleUpdate"-->
-    <!--          v-hasPermi="['agreement:agreementTask:edit']"-->
-    <!--        >修改-->
-    <!--        </el-button>-->
-    <!--      </el-col>-->
-    <!--      <el-col :span="1.5">-->
-    <!--        <el-button-->
-    <!--          type="danger"-->
-    <!--          icon="el-icon-delete"-->
-    <!--          size="mini"-->
-    <!--          :disabled="multiple"-->
-    <!--          @click="handleDelete"-->
-    <!--          v-hasPermi="['agreement:agreementTask:remove']"-->
-    <!--        >删除-->
-    <!--        </el-button>-->
-    <!--      </el-col>-->
-    <el-col :span="1.5">
-      <el-button
-        type="warning"
-        icon="el-icon-download"
-        size="mini"
-        @click="handleExport"
-        v-hasPermi="['agreement:agreementTask:export']"
-      >导出
-      </el-button>
-    </el-col>
-    <el-col :span="1.5">
-      <el-button
-        type="info"
-        icon="el-icon-download"
-        size="mini"
-        :disabled="single"
-        @click="handleUpdate(null, 2)"
-        v-hasPermi="['agreement:agreementStorage:export']"
-      >复制新增
-      </el-button>
-    </el-col>
-    <right-toolbar
-      :showSearch.sync="showSearch"
-      @queryTable="getList"
-    ></right-toolbar>
-  </el-row>
-  <el-table
-    v-loading="loading"
-    :data="agreementList"
-    @selection-change="handleSelectionChange"
-  >
-    <el-table-column type="selection" width="55" align="center" />
-    <el-table-column type="index" label="行号" align="center" fixed />
-    <el-table-column
-      label="日期"
-      sortable
-      align="center"
-      prop="fBsdate"
-      fixed
-      show-overflow-tooltip
-    />
-    <el-table-column
-      label="提单号"
-      sortable
-      align="center"
-      prop="fMblno"
-      fixed
-      show-overflow-tooltip
-    />
-    <el-table-column
-      label="制单人"
-      sortable
-      align="center"
-      prop="createBy"
-      fixed
-      show-overflow-tooltip
-    />
-    <el-table-column
-      label="操作"
-      align="center"
-      class-name="small-padding fixed-width"
-    >
-      <template slot-scope="scope">
-        <el-button
-          size="mini"
-          type="text"
-          icon="el-icon-view"
-          @click="speed_s(scope.row, 0)"
-          v-hasPermi="['agreement:agreementTask:remove']"
-        >查看
-        </el-button>
-        <el-button
-          size="mini"
-          type="text"
-          icon="el-icon-edit"
-          @click="handleUpdate(scope.row)"
-          v-if="scope.row.fBillstatus <= 3"
-          v-hasPermi="['agreement:agreementTask:edit']"
-        >修改
-        </el-button>
-        <el-button
-          size="mini"
-          type="text"
-          icon="el-icon-delete"
-          @click="handleDelete(scope.row)"
-          v-if="scope.row.fBillstatus <= 3"
-          v-hasPermi="['agreement:agreementTask:remove']"
-        >删除
-        </el-button>
-      </template>
-    </el-table-column>
-  </el-table>
-</div>
+          <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="单价"
+              show-word-limit
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="fAmt"
+          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.fAmt"
+              placeholder="金额"
+              show-word-limit
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          header-align="center"
+          align="center"
+          label="操作"
+        >
+          <template slot-scope="scope">
+            <!-- <el-button size="small">审核费用</el-button> -->
+            <el-button
+              @click.native.prevent="
+                    deleteRoww(scope.$index, warehouseCrList)
+                  "
+              size="small"
+              :disabled="browseStatus"
+            >移除
+            </el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+  </div>
 </template>
 
 <script>
+import { listCorps, preservation, submit, allInformation,single ,singleDeletion,listCorps_s,revokeContainerPort} from '@/api/jiGang'
+import { listFees } from '@/api/basicdata/fees'
+
 export default {
   name: 'jiGang',
-  data(){
+  data() {
     return {
-      queryParams:[]
+      showSearch: true,
+      jiGang: false,
+      disabled:false,
+      agreementList: [],
+      warehouseCrList: [],
+      fCNameOptions: [],
+      fStltypeOptions: [],
+      jFeetunitOptions: [],
+      KHblnoOptions: [],
+      browseStatus: false,
+      fDNameOptions: [],
+      warehouseDrList: [],
+      businessTypeOption: [],
+      loading: true,
+      blnoOptions: [],
+      single:true,
+      total:0,
+      query: {
+        pageNum: 1,
+        pageSize: 10
+      },
+      selection:[],
+      queryParams: {}
+    }
+  },
+  created() {
+    allInformation().then(res => {
+      console.log(res)
+      this.jFeetunitOptions = res.data.cntrList
+      this.businessTypeOption = res.data.pierList
+      this.KHblnoOptions = res.data.corpList
+    })
+    this.getList()
+  },
+  methods: {
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.query.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.query.pageNum = val
+      this.getList()
+    },
+    getList() {
+      listCorps_s(this.query).then(res => {
+        this.total = res.total
+        console.log(res)
+        this.loading = false
+        this.agreementList = res.rows
+      })
+    },
+    corpsRemoteMethod(name) {
+      if (name == null || name === '') {
+        return false
+      }
+      let queryParams = { pageNum: 1, fName: name, type: 1 }
+      listCorps(queryParams).then((response) => {
+        console.log(response)
+        this.fMblnoOptions = response.rows
+        this.blnoOptions = response.rows
+      })
+    },
+    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
+        }
+      }
+    },
+    resetQuery() {
+      this.query = {
+        pageNum: 1,
+        pageSize: 10
+      }
+    },
+    open() {
+      this.$confirm('是否确定返回列表?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.jiGang = false
+      }).catch(() => {
+      })
+    },
+    handleSelectionChange(selection) {
+      console.log(selection)
+      this.selection = selection
+      if (selection.length === 1){
+        this.single = false
+      }else {
+        this.single = true
+      }
+    },
+    handleUpdate(row){
+      let fId
+      if (this.selection.length == 1){
+        fId = this.selection[0].fId
+      }else {
+        fId = row.fId
+      }
+      single(fId).then(res =>{
+        if (res.code === 200){
+          this.jiGang = true
+          this.queryParams = res.data.warehouseBills
+          this.warehouseDrList = res.data.feesDrList
+          this.warehouseCrList = res.data.feesCrList
+          this.warehouseDrList.fFeeUnitid = this.warehouseDrList.fFeeUnitid +''
+          this.warehouseCrList.fFeeUnitid = this.warehouseCrList.fFeeUnitid +''
+          if (this.queryParams.fBillstatus !== 2){
+            this.disabled = true
+          }else {
+            this.disabled = false
+          }
+        }
+      })
+    },
+    handleDelete(row){
+      singleDeletion(row.fId).then(res =>{
+        console.log(res)
+      })
+    },
+    handleAdd() {
+      this.jiGang = true
+      this.queryParams = {}
+      this.warehouseDrList = []
+      this.warehouseCrList = []
+    },
+    addpayment() {
+      this.warehouseCrList.push({
+        fCorpid: null,
+        fFeeid: null,
+        fFeeUnitid: '',
+        fQty: null,
+        fUnitprice: null,
+        fAmount: null,
+        fCurrency: 'RMB',
+        fExrate: '1',
+        fTaxrate: '',
+        fCxrate: null,
+        fRate: null,
+        remarks: null,
+        fMblno: '',
+        fProductName: '',
+        fMarks: '',
+        fBusinessType: '',
+        fSrcTypeId: 0
+      })
+      this.fWbuOptions = []
+      let queryParams = { pageNum: 1, fDc: 'C' }
+      listFees(queryParams).then((response) => {
+        this.fCNameOptions = response.rows
+      })
+    },
+    deleteRoww(index, rows) {
+      rows.splice(index, 1)
+    },
+    deleteRow(index, rows) {
+      rows.splice(index, 1)
+    },
+    submitForm() {
+      let formDatae = new window.FormData()
+      formDatae.append('warehouseBills', JSON.stringify(this.queryParams))
+      formDatae.append('feesCr', JSON.stringify(this.warehouseDrList))
+      formDatae.append('feesDr', JSON.stringify(this.warehouseCrList))
+      preservation(formDatae).then(res => {
+        console.log(res)
+        if (res.code === 200){
+          this.$message.success('保存成功');
+        }
+      })
+    },
+    submit() {
+      let formDatae = new window.FormData()
+      formDatae.append('warehouseBills', JSON.stringify(this.queryParams))
+      formDatae.append('feesCr', JSON.stringify(this.warehouseDrList))
+      formDatae.append('feesDr', JSON.stringify(this.warehouseCrList))
+      submit(formDatae).then(res => {
+        console.log(res)
+        if(res.code === 200){
+          this.$message.success('提交成功');
+        }
+      })
+    },
+    cancellation(){
+      let formDatae = new window.FormData()
+      formDatae.append('warehouseBills', JSON.stringify(this.queryParams))
+      formDatae.append('feesCr', JSON.stringify(this.warehouseDrList))
+      formDatae.append('feesDr', JSON.stringify(this.warehouseCrList))
+      revokeContainerPort(formDatae).then(res => {
+        console.log(res)
+        if(res.code === 200){
+          this.$message.success('撤销成功');
+        }
+      })
+    },
+    addCollection() {
+      this.warehouseDrList.push({
+        fCorpid: '',
+        fFeeUnitid: '',
+        fInventoryDays: '',
+        fQty: '',
+        fUnitprice: '',
+        fAmt: ''
+      })
+      this.fWbuOptions = []
+      let queryParams = { pageNum: 1, fDc: 'D' }
+      listFees(queryParams).then((response) => {
+        this.fDNameOptions = response.rows
+      })
+    },
+    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
+    },
+    Collectionoptions(selection) {
+      this.Collectionoptionss = selection
+      for (let lest in this.fWbuOptions) {
+        for (let li in this.Collectionoptionss) {
+          if (
+            this.fWbuOptions[lest].fId === this.Collectionoptionss[li].fFeeid
+          ) {
+            this.$set(
+              this.Collectionoptionss[li],
+              'fFeeids',
+              this.fWbuOptions[lest].fName
+            )
+          }
+        }
+      }
     }
   }
 }

src/views/jiGang/jigangeject.vue

@@ -1,876 +0,0 @@
-<template>
-<div class="app-container">
-  <el-form
-    :model="queryParams"
-    ref="queryForm"
-    :inline="true"
-    label-width="88px"
-  >
-    <el-row>
-      <el-form-item label="日期" prop="fBsdate">
-        <el-input
-          v-model="queryParams.fBsdate"
-          placeholder="请输入日期"
-          clearable
-          size="small"
-        />
-      </el-form-item>
-      <el-form-item label="提单号" prop="fMblno">
-        <el-input
-          v-model="queryParams.fMblno"
-          placeholder="请输入提单号"
-          clearable
-          size="small"
-        />
-      </el-form-item>
-      <el-form-item label="制单人" prop="createBy">
-        <el-input
-          v-model="queryParams.createBy"
-          placeholder="请输入制单人"
-          clearable
-          size="small"
-        />
-      </el-form-item>
-    </el-row>
-  </el-form>
-
-  <h3><i class="el-icon-circle-plus"></i>收款信息</h3>
-  <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"
-        @click.prevent="addCollection()"
-      >新行
-      </el-button>
-      <!-- <el-button :disabled="browseStatus" @click.prevent="deleteRow(warehouseDrList)"
-      >删除
-    </el-button> -->
-      <el-button
-        type="primary"
-        size="small"
-        @click="submitForm(2)"
-      >保 存</el-button
-      >
-    </div>
-  </div>
-  <el-table
-    :data="warehouseDrList"
-    ref="table"
-    tooltip-effect="dark"
-    border
-    stripe
-    show-summary
-    @selection-change="Collectionoptions"
-    :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-select
-          v-model="scope.row.fCorpid"
-          filterable
-          remote
-          :remote-method="corpsRemoteMethod"
-          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
-          :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="fBusinessType"
-      header-align="center"
-      align="center"
-      width="180px"
-      label="作业类型"
-    >
-      <template slot-scope="scope">
-        <el-select
-          style="width: 80%"
-          v-model="scope.row.fBusinessType"
-          filterable
-          disabled
-        >
-          <el-option
-            v-for="(dict, index) in businessTypeOption"
-            :key="index.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          ></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
-        >
-          <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="数量"
-          @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="单价"
-          @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="请选择结算表票结、月结"
-        >
-          <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"
-          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"
-          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="browseStatus"
-          placeholder="税率"
-          show-word-limit
-        />
-      </template>
-    </el-table-column>
-    <el-table-column
-      prop="fMblno"
-      header-align="center"
-      align="center"
-      width="130px"
-      label="提单号"
-    >
-      <template slot-scope="scope">
-        <el-input
-          v-model="scope.row.fMblno"
-          :disabled="browseStatus"
-          placeholder="提单号"
-          show-word-limit
-        />
-      </template>
-    </el-table-column>
-    <el-table-column
-      prop="fProductName"
-      header-align="center"
-      align="center"
-      width="140px"
-      label="品名"
-    >
-      <template slot-scope="scope">
-        <el-input
-          v-model="scope.row.fProductName"
-          :disabled="browseStatus"
-          placeholder="品名"
-          show-word-limit
-        />
-      </template>
-    </el-table-column>
-    <el-table-column
-      prop="fMarks"
-      header-align="center"
-      align="center"
-      width="130px"
-      label="品牌"
-    >
-      <template slot-scope="scope">
-        <el-input
-          v-model="scope.row.fMarks"
-          :disabled="browseStatus"
-          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="browseStatus"
-          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="browseStatus"
-        >移除</el-button
-        >
-      </template>
-    </el-table-column>
-  </el-table>
-
-  <h3><i class="el-icon-remove"></i>付款信息</h3>
-  <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"
-        @click.prevent="addpayment()"
-        size="small"
-      >新行
-      </el-button>
-      <el-button
-        type="primary"
-        size="small"
-      >保 存</el-button
-      >
-    </div>
-  </div>
-  <el-table
-    :data="warehouseCrList"
-    ref="table"
-    tooltip-effect="dark"
-    border
-    stripe
-    show-summary
-    :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-select
-          v-model="scope.row.fCorpid"
-          filterable
-          remote
-          :disabled="browseStatus"
-          :remote-method="corpsRemoteMethod"
-          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="browseStatus"
-          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="fBusinessType"
-      header-align="center"
-      align="center"
-      width="180px"
-      label="作业类型"
-    >
-      <template slot-scope="scope">
-        <el-select
-          style="width: 80%"
-          v-model="scope.row.fBusinessType"
-          filterable
-          disabled
-        >
-          <el-option
-            v-for="(dict, index) in businessTypeOption"
-            :key="index.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          ></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="browseStatus"
-          :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="browseStatus"
-          @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="browseStatus || 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="browseStatus"
-        >
-          <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="browseStatus"
-          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="browseStatus"
-          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="browseStatus"
-          placeholder="税率"
-          show-word-limit
-        />
-      </template>
-    </el-table-column>
-
-    <el-table-column
-      prop="fMblno"
-      header-align="center"
-      align="center"
-      width="130px"
-      label="提单号"
-    >
-      <template slot-scope="scope">
-        <el-input
-          v-model="scope.row.fMblno"
-          :disabled="browseStatus"
-          placeholder="提单号"
-          show-word-limit
-        />
-      </template>
-    </el-table-column>
-    <el-table-column
-      prop="fProductName"
-      header-align="center"
-      align="center"
-      width="140px"
-      label="品名"
-    >
-      <template slot-scope="scope">
-        <el-input
-          v-model="scope.row.fProductName"
-          :disabled="browseStatus"
-          placeholder="品名"
-          show-word-limit
-        />
-      </template>
-    </el-table-column>
-
-    <el-table-column
-      prop="fMarks"
-      header-align="center"
-      align="center"
-      width="130px"
-      label="品牌"
-    >
-      <template slot-scope="scope">
-        <el-input
-          v-model="scope.row.fMarks"
-          :disabled="browseStatus"
-          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="browseStatus"
-          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="browseStatus"
-        >移除</el-button
-        >
-      </template>
-    </el-table-column>
-  </el-table>
-</div>
-</template>
-
-<script>
-import { listFees } from '@/api/basicdata/fees'
-import { listCorps } from '@/api/basicdata/corps'
-
-export default {
-  name: 'jigangeject',
-  data() {
-    return {
-      queryParams:[],
-      warehouseCrList:[],
-      fCNameOptions:[],
-      jFeetunitOptions:[],
-      browseStatus:false,
-      fDNameOptions:[],
-      warehouseDrList:[]
-    }
-  },
-  created() {
-    this.getDicts("data_unitfees").then((response) => {
-      if (response.data) {
-        this.jFeetunitOptions = response.data;
-      }
-    });
-  },
-  methods: {
-    addpayment() {
-      this.warehouseCrList.push({
-        fCorpid: null,
-        fFeeid: null,
-        fFeeUnitid: "",
-        fQty: null,
-        fUnitprice: null,
-        fAmount: null,
-        fCurrency: "RMB",
-        fExrate: "1",
-        fTaxrate: '',
-        fCxrate: null,
-        fRate: null,
-        remarks: null,
-        fMblno: '',
-        fProductName: '',
-        fMarks: '',
-        fBusinessType: '',
-        fSrcTypeId: 0,
-      });
-      this.fWbuOptions = [];
-      let queryParams = { pageNum: 1, fDc: "C" };
-      listFees(queryParams).then((response) => {
-        this.fCNameOptions = response.rows;
-      });
-    },
-    addCollection() {
-      this.warehouseDrList.push({
-        fCorpid: null,
-        fFeeid: null,
-        fFeeUnitid: "",
-        fQty: null,
-        fUnitprice: null,
-        fAmount: null,
-        fCurrency: "RMB",
-        fExrate: "1",
-        fTaxrate: '',
-        fCxrate: null,
-        fRate: null,
-        remarks: null,
-        fMblno: '',
-        fProductName: '',
-        fMarks: '',
-        fBusinessType: '',
-        fSrcTypeId: 0,
-      });
-      this.fWbuOptions = [];
-      let queryParams = { pageNum: 1, fDc: "D" };
-      listFees(queryParams).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;
-    },
-    Collectionoptions(selection) {
-      this.Collectionoptionss = selection;
-      for (let lest in this.fWbuOptions) {
-        for (let li in this.Collectionoptionss) {
-          if (
-            this.fWbuOptions[lest].fId === this.Collectionoptionss[li].fFeeid
-          ) {
-            this.$set(
-              this.Collectionoptionss[li],
-              "fFeeids",
-              this.fWbuOptions[lest].fName
-            );
-          }
-        }
-      }
-    },
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

src/views/track/cabinet/AddOrUpdate.vue

@@ -470,7 +470,7 @@
 
         <el-row>
           <el-col :span="6">
-            <el-form-item label="油气费" prop="oilAmt" v-if="form.billKind !== 'MH'">
+            <el-form-item label="油气费" prop="oilAmt">
               <el-input
                 v-model="form.oilAmt"
                 placeholder="请输入油气费"
@@ -482,7 +482,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="单趟提成" prop="driverbonus" v-if="form.billKind !== 'MH'">
+            <el-form-item label="单趟提成" prop="driverbonus">
               <el-input
                 v-model="form.driverbonus"
                 placeholder="请输入单趟提成"
@@ -494,7 +494,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="其他费用" prop="costOth" v-if="form.billKind !== 'MH'">
+            <el-form-item label="其他费用" prop="costOth">
               <el-input
                 v-model="form.costOth"
                 placeholder="请输入其他费用"
@@ -506,7 +506,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="花销备注" prop="costRemarks" v-if="form.billKind !== 'MH'">
+            <el-form-item label="花销备注" prop="costRemarks">
               <el-input
                 v-model="form.costRemarks"
                 placeholder="请输入备注"
@@ -1384,7 +1384,7 @@ export default {
       }
     },
     addRelevt3() {
-      if (this.form.oilAmt > 0 && this.form.billKind !== 'MH') {
+      if (this.form.oilAmt > 0) {
         this.fFeeid52 = true;
         this.chiFeesList.map((e) => {
           if (e.fFeeid == 52 && e.actId == 1080) {
@@ -1408,7 +1408,7 @@ export default {
           });
         }
       }
-      if (this.form.driverbonus > 0 && this.form.billKind !== 'MH') {
+      if (this.form.driverbonus > 0) {
         this.fFeeid53 = true;
         this.chiFeesList.map((e) => {
           if (e.fFeeid == 53 && e.actId == 1080) {
@@ -1432,7 +1432,7 @@ export default {
           });
         }
       }
-      if (this.form.costOth > 0 && this.form.billKind !== 'MH') {
+      if (this.form.costOth > 0) {
         this.fFeeid54 = true;
         this.chiFeesList.map((e) => {
           if (e.fFeeid == 54 && e.actId == 1080) {

src/views/track/cabinet/index.vue

@@ -764,20 +764,6 @@ export default {
           checked: 0,
           width: 100,
         },
-        {
-          surface: "37",
-          label: "mBillNo",
-          name: "主单号",
-          checked: 0,
-          width: 100,
-        },
-        {
-          surface: "38",
-          label: "billKind",
-          name: "单据类型",
-          checked: 0,
-          width: 100,
-        },
       ],
       allCheck: false,
       title: "",