修改计划下达错误字段

src/api/fleetfinance/charge.js

@@ -0,0 +1,102 @@
+import request from '@/utils/request'
+
+// 查询财务数据主列表
+export function listCharge(query) {
+  return request({
+    url: '/finance/charge/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询财务数据主详细
+export function getCharge(fId) {
+  return request({
+    url: '/finance/charge/' + fId,
+    method: 'get'
+  })
+}
+
+// 新增财务数据主
+export function addCharge(data) {
+  return request({
+    url: '/finance/charge/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改财务数据主
+export function updateCharge(data) {
+  return request({
+    url: '/finance/charge',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除财务数据主
+export function delCharge(fId) {
+  return request({
+    url: '/finance/charge/' + fId,
+    method: 'delete'
+  })
+}
+
+// 导出财务数据主
+export function exportCharge(query) {
+  return request({
+    url: '/finance/charge/export',
+    method: 'get',
+    params: query
+  })
+}
+// 导入搜索
+export function search(queryParameter) {
+  return request({
+    url: '/finance/charge/chargeList',
+    method: 'get',
+    params: queryParameter
+  })
+}
+
+// 查询客户详情列表
+export function listCorps(query) {
+  return request({
+    url: '/basicdata/corps/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 确认收费
+export function collectFee(queryParameter) {
+  return request({
+    url: '/finance/charge/confirm',
+    method: 'post',
+    data:queryParameter
+  })
+}
+//删除前的判断
+export function delCharge_s(fId) {
+  return request({
+    url: '/finance/charge/queryRemove/' + fId,
+    method: 'delete'
+  })
+}
+// 撤销收费C
+export function backCharge(queryParameter) {
+  return request({
+    url: '/finance/charge/revoke',
+    method: 'post',
+    data: queryParameter
+  })
+}
+// 撤销审批
+export function revocation(data) {
+  return request({
+    url: '/warehouse/paths/revoke',
+    method: 'post',
+    data: data
+  })
+}

src/api/fleetfinance/contrast.js

@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+
+// 查询财务数据主列表
+export function listFee(query) {
+  return request({
+    url: '/finances/contrast/contrastList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询财务数据主详细
+export function getFee(fId) {
+  return request({
+    url: '/finances/contrast/' + fId,
+    method: 'get'
+  })
+}
+
+// 新增财务数据主
+export function addFee(data) {
+  return request({
+    url: '/finances/contrast/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改财务数据主
+export function updateFee(data) {
+  return request({
+    url: '/finance/contrast/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除财务数据主
+export function delFee(fId) {
+  return request({
+    url: '/finances/contrast/' + fId,
+    method: 'delete'
+  })
+}
+
+// 导出财务数据主
+export function exportFee(query) {
+  return request({
+    url: '/finance/contrast/export',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导入搜索
+export function importFee(TWareHouseFees) {
+  return request({
+    url: '/finance/contrast/contrastList',
+    // url:'/finance/charge/chargeList',
+    method: 'get',
+    params: TWareHouseFees,
+    tFee:TWareHouseFees,
+    tFeeDo:TWareHouseFees
+  })
+}
+// 确认对账
+export function Cfee(TWareHouseFees) {
+  return request({
+    url:'/finance/contrast/confirm',
+    method: 'post',
+    data: TWareHouseFees
+    // tFee:TWareHouseFees,
+    // tFeeDo:TWareHouseFees
+  })
+}
+
+// 删除财务数据主 是否有明细
+export function detailFee(fId) {
+  return request({
+    url: '/finance/contrast/queryRemove/' + fId,
+    method: 'delete'
+  })
+}
+
+// 撤销对账
+export function backFee(TWareHouseFees) {
+  return request({
+    url: '/finance/contrast/revoke',
+    method: 'post',
+    data: TWareHouseFees
+  })
+}
+
+//撤销审批
+export function RevocationApproval(data){
+  return request({
+    url:'/warehouse/paths/revoke',
+    method:'post',
+    data:data
+  })
+}
+
+// 导出计算明细从表
+export function exportWarehousebillsitems(fId) {
+  return request({
+    url: '/finance/contrast/exportItems/'+fId,
+    method: 'get'
+  })
+}

src/api/fleetfinance/payment.js

@@ -0,0 +1,103 @@
+import request from '@/utils/request'
+
+// 查询财务数据主列表
+export function listCharge(query) {
+  return request({
+    url: '/finance/payment/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询财务数据主详细
+export function getCharge(fId) {
+  return request({
+    url: '/finance/payment/' + fId,
+    method: 'get'
+  })
+}
+
+// 新增财务数据主
+export function addCharge(data) {
+  return request({
+    url: '/finance/payment/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改财务数据主
+export function updateCharge(data) {
+  return request({
+    url: '/finance/payment',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除财务数据主
+export function delCharge(fId) {
+  return request({
+    url: '/finance/payment/' + fId,
+    method: 'delete'
+  })
+}
+
+// 导出财务数据主
+export function exportCharge(query) {
+  return request({
+    url: '/finance/payment/export',
+    method: 'get',
+    params: query
+  })
+}
+// 导入搜索
+export function search(queryParameter) {
+  return request({
+    url: '/finance/payment/paymentList',
+    method: 'get',
+    params: queryParameter
+  })
+}
+
+// 查询客户详情列表
+export function listCorps(query) {
+  return request({
+    url: '/basicdata/corps/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 确认收费
+export function collectFee(queryParameter) {
+  return request({
+    url: '/finance/payment/confirm',
+    method: 'post',
+    data:queryParameter
+  })
+}
+//删除前的判断
+export function delCharge_s(fId) {
+  return request({
+    url: '/finance/payment/queryRemove/' + fId,
+    method: 'delete'
+  })
+}
+// 撤销收费C
+export function backCharge(queryParameter) {
+  return request({
+    url: '/finance/payment/revoke',
+    method: 'post',
+    data: queryParameter
+  })
+}
+// 撤销审批
+export function revocation(data) {
+  return request({
+    url: '/warehouse/paths/revoke',
+    method: 'post',
+    data: data
+  })
+}
+

src/views/fleet/plans/AddOrUpdate.vue

@@ -8,6 +8,7 @@
   >
     <span>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        {{form}}
         <el-row>
           <el-col :span="6">
             <el-form-item label="客户名称" prop="corpId">
@@ -1527,6 +1528,7 @@ export default {
           this.msgSuccess("保存成功");
           this.$parent.getList();
           this.$parent.getSave(response);
+          console.log(response)
         } else {
           this.msgSuccess("保存失败");
         }

src/views/fleet/plans/index.vue

@@ -716,7 +716,9 @@ export default {
       this.loading = true;
       listFtmsorderbills(this.queryParams).then((response) => {
         response.rows.map((e) => {
-          e.createTime = e.createTime.substring(0, 10);
+          if (e.createTime) {
+            e.createTime = e.createTime.substring(0, 10);
+          }
         });
         this.ftmsorderbillsList = response.rows;
         this.total = response.total;
@@ -844,6 +846,7 @@ export default {
     },
     //获取到保存并复制
     getSave(data) {
+      console.log(data)
       if (data.data.tmsorder.billType != null) {
         data.data.tmsorder.billType = data.data.tmsorder.billType.toString();
       }
@@ -857,8 +860,8 @@ export default {
           return (e.cntrId = e.cntrId.toString());
         });
       }
-      if (response.data.fees.length != 0) {
-        response.data.fees.ffeeunitid = response.data.fees.map((e) => {
+      if (data.data.fees.length != 0) {
+        data.data.fees.ffeeunitid = data.data.fees.map((e) => {
           if (e.ffeeunitid != null) {
             return (e.ffeeunitid = e.ffeeunitid.toString());
           }
@@ -867,7 +870,6 @@ export default {
       this.title = "修改订单主";
       this.form = data.data.tmsorder;
       this.planList = data.data.scntrs;
-      console.log(data.data);
       if (data.data.fees.length != 0) {
         this.DList = data.data.fees.filter((e) => e.fdc == "D");
         this.CList = data.data.fees.filter((e) => e.fdc == "C");

src/views/fleet/scheduling/AddOrUpdate.vue

@@ -529,7 +529,7 @@
                     icon="el-icon-plus"
                     size="mini"
                     @click="addschedulingRow(schedulingList)"
-                    :disabled="disabled2"
+                    :disabled="disabled"
                     >添加</el-button
                   >
                 </div>
@@ -540,7 +540,7 @@
                     <el-select
                       v-model="scope.row.cntrId"
                       placeholder="请选择箱型"
-                      :disabled="disabled2 || scope.row.billStatus == 6"
+                      :disabled="scope.row.billStatus >= 6"
                       @change="checkPid(scope.row)"
                     >
                       <el-option
@@ -562,7 +562,7 @@
                     <el-input
                       v-model="scope.row.carcorPid"
                       placeholder="车队名称"
-                      :disabled="disabled2 || scope.row.billStatus == 6"
+                      :disabled="scope.row.billStatus >= 6"
                     />
                   </template>
                 </el-table-column>
@@ -578,7 +578,7 @@
                       v-model="scope.row.cntrQty"
                       placeholder="调度安排货量"
                       v-input-limit="2"
-                      :disabled="disabled2 || scope.row.billStatus == 6"
+                      :disabled="scope.row.billStatus >= 6"
                     />
                   </template>
                 </el-table-column>
@@ -600,7 +600,7 @@
                     <el-input
                       v-model="scope.row.remarks"
                       placeholder="备注"
-                      :disabled="disabled2 || scope.row.billStatus == 6"
+                      :disabled="scope.row.billStatus >= 6"
                     />
                   </template>
                 </el-table-column>
@@ -619,7 +619,7 @@
                       @click.native.prevent="
                         delplansRow(scope.$index, schedulingList, scope.row)
                       "
-                      :disabled="disabled2 || scope.row.billStatus == 6"
+                      :disabled="scope.row.billStatus >= 6"
                       >删除</el-button
                     >
                     <el-button
@@ -627,7 +627,7 @@
                       type="text"
                       icon="el-icon-document-checked"
                       @click.native.prevent="addplansRow(scope.row)"
-                      :disabled="disabled2 || scope.row.billStatus == 6"
+                      :disabled="scope.row.billStatus >= 6"
                       >提交</el-button
                     >
                     <el-button
@@ -637,7 +637,7 @@
                       @click.native.prevent="
                         revokeplansRow(scope.$index, schedulingList, scope.row)
                       "
-                      :disabled="disabled2"
+                      :disabled="disabled"
                       >撤销</el-button
                     >
                     <el-button
@@ -645,7 +645,7 @@
                       type="text"
                       icon="el-icon-refresh"
                       @click.native.prevent="changeplansRow(scope.row)"
-                      :disabled="disabled2"
+                      :disabled="disabled"
                       >变更</el-button
                     >
                   </template>
@@ -1453,14 +1453,14 @@ export default {
           this.msgSuccess("撤回成功");
           this.$parent.getList();
           this.$emit("fixDisabled", "false");
-          this.$emit("fixDisabled2", "false");
+          // this.$emit("fixDisabled2", "false");
         }
       });
     },
     //修改
     submitAllowChanges() {
       this.$emit("fixDisabled", "false");
-      this.$emit("fixDisabled2", "false");
+      // this.$emit("fixDisabled2", "false");
       this.msgSuccess("允许修改");
       // if (this.form.billStatus == 70 || this.form.billStatus == 90) {
       //   this.$emit("fixDisabled", "false");
@@ -1584,7 +1584,7 @@ export default {
       changeFtmsorderbillsplans(row).then((response) => {
         if (response.code == 200) {
           this.msgSuccess("允许变更");
-          this.$set(row, "billStatus", 70);
+          this.$set(row, "billStatus", response.data.billStatus);
         }
       });
     },

src/views/fleet/scheduling/index.vue

@@ -88,7 +88,7 @@
                   clearable
                   size="small"
                   @keyup.enter.native="handleQuery"
-                  style="max-width:187px"
+                  style="max-width: 187px"
                 />
               </el-form-item>
             </el-col>
@@ -122,7 +122,7 @@
                   clearable
                   size="small"
                   @keyup.enter.native="handleQuery"
-                  style="max-width:187px"
+                  style="max-width: 187px"
                 />
               </el-form-item>
             </el-col>
@@ -138,7 +138,7 @@
                   clearable
                   size="small"
                   @keyup.enter.native="handleQuery"
-                  style="max-width:187px"
+                  style="max-width: 187px"
                 /> </el-form-item
             ></el-col>
           </el-row>
@@ -155,7 +155,7 @@
                   clearable
                   size="small"
                   @keyup.enter.native="handleQuery"
-                  style="max-width:187px"
+                  style="max-width: 187px"
                 /> </el-form-item
             ></el-col>
           </el-row>
@@ -206,7 +206,7 @@
         >
       </el-col>
       <div class="tabSetting">
-         <div style="margin-right: 20px">
+        <div style="margin-right: 20px">
           <el-button
             type="cyan"
             icon="el-icon-search"
@@ -384,9 +384,7 @@ import {
   delFtmsorderbills,
   exportFtmsorderbills,
 } from "@/api/fleet/ftmsorderbills";
-import {
-  getFtmsorderbillsplans
-} from "@/api/fleet/ftmsorderbillsplans";
+import { getFtmsorderbillsplans } from "@/api/fleet/ftmsorderbillsplans";
 
 import { listGoods } from "@/api/basicdata/goods";
 import { listCorps } from "@/api/basicdata/corps";
@@ -431,7 +429,7 @@ export default {
       transPropList: [],
       showSetting: false,
       drag: false,
-      setRowList:  [
+      setRowList: [
         {
           surface: "1",
           label: "corpId",
@@ -524,7 +522,7 @@ export default {
           width: 100,
         },
       ],
-      getRowList:  [
+      getRowList: [
         {
           surface: "1",
           label: "corpId",
@@ -627,7 +625,7 @@ export default {
       fMblnoOptions: [],
       goodsOptions: [],
       show: false,
-      collapses:[]
+      collapses: [],
     };
   },
   // 使用子组件
@@ -716,6 +714,11 @@ export default {
       this.loading = true;
       // this.queryParams["billStatus"]="40"
       listFtmsorderbills(this.queryParams).then((response) => {
+        response.rows.map((e) => {
+          if (e.createTime) {
+            e.createTime = e.createTime.substring(0, 10);
+          }
+        });
         this.ftmsorderbillsList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -789,7 +792,7 @@ export default {
       this.CList = [];
       this.schedulingList = [];
       this.disabled = false;
-      this.collapses=["1","2"]
+      this.collapses = ["1", "2"];
     },
     // 多选框选中数据
     handleSelectionChange(selection) {

src/views/fleet/sendcar/AddOrUpdate.vue

@@ -1569,7 +1569,7 @@ export default {
               singleaddFtmsorderbillscars(row).then((response) => {
                 this.msgSuccess("成功提交");
                 if (response.code == 200) {
-                  // this.$set(row, "id", response.data.id);
+                  this.$set(row, "id", response.data.id);
                   this.$set(row, "billStatus", 6);
                 }
               });
@@ -1588,7 +1588,7 @@ export default {
           singleaddFtmsorderbillscars(row).then((response) => {
             this.msgSuccess("成功提交");
             if (response.code == 200) {
-              // this.$set(row, "id", response.data.id);
+              this.$set(row, "id", response.data.id);
               this.$set(row, "billStatus", 6);
             }
           });

src/views/fleet/sendcar/index.vue

@@ -88,7 +88,7 @@
                   clearable
                   size="small"
                   @keyup.enter.native="handleQuery"
-                  style="max-width:187px"
+                  style="max-width: 187px"
                 />
               </el-form-item>
             </el-col>
@@ -122,7 +122,7 @@
                   clearable
                   size="small"
                   @keyup.enter.native="handleQuery"
-                  style="max-width:187px"
+                  style="max-width: 187px"
                 />
               </el-form-item>
             </el-col>
@@ -138,7 +138,7 @@
                   clearable
                   size="small"
                   @keyup.enter.native="handleQuery"
-                  style="max-width:187px"
+                  style="max-width: 187px"
                 /> </el-form-item
             ></el-col>
           </el-row>
@@ -155,7 +155,7 @@
                   clearable
                   size="small"
                   @keyup.enter.native="handleQuery"
-                  style="max-width:187px"
+                  style="max-width: 187px"
                 /> </el-form-item
             ></el-col>
           </el-row>
@@ -206,7 +206,7 @@
         >
       </el-col>
       <div class="tabSetting">
-         <div style="margin-right: 20px">
+        <div style="margin-right: 20px">
           <el-button
             type="cyan"
             icon="el-icon-search"
@@ -394,7 +394,7 @@ export default {
   data() {
     return {
       disabled: false,
-      disabled2:false,
+      disabled2: false,
       // 控制新增编辑弹窗的显示与隐藏
       addOrUpdateVisible: false,
       // 非单个禁用
@@ -426,7 +426,7 @@ export default {
       transPropList: [],
       showSetting: false,
       drag: false,
-      setRowList:  [
+      setRowList: [
         {
           surface: "1",
           label: "corpId",
@@ -519,7 +519,7 @@ export default {
           width: 100,
         },
       ],
-      getRowList:  [
+      getRowList: [
         {
           surface: "1",
           label: "corpId",
@@ -647,7 +647,7 @@ export default {
       this.fMblnoOptions = response.rows;
     });
     this.getRow();
-    console.log(window.location)
+    console.log(window.location);
   },
   methods: {
     //列设置全选
@@ -710,6 +710,11 @@ export default {
     getList() {
       this.loading = true;
       listFtmsorderbillsplans(this.queryParams).then((response) => {
+        response.rows.map((e) => {
+          if (e.createTime) {
+            e.createTime = e.createTime.substring(0, 10);
+          }
+        });
         this.ftmsorderbillsList = response.rows;
         this.total = response.total;
         this.loading = false;

src/views/fleetFinance/charge/index.vue

@@ -571,7 +571,7 @@ import {
   delCharge_s,
   backCharge,
   revocation
-} from '@/api/finance/charge'
+} from '@/api/fleetfinance/charge'
 import { listFees } from '@/api/basicdata/fees'
 import print from 'print-js'
 import AddOrUpdate from '@/views/viewApproval'

src/views/fleetFinance/contrast/index.vue

@@ -7,9 +7,9 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="货权方" prop="fCtrlcorpid">
+      <el-form-item label="货权方" prop="fCorpid">
         <el-input
-          v-model="tablefilter.fCtrlcorpid"
+          v-model="tablefilter.fCorpid"
           placeholder="请输入客户名称"
           filterable
           remote
@@ -22,9 +22,9 @@
 
       </el-form-item>
 
-      <el-form-item label="结算单位" prop="fCorpid">
+      <el-form-item label="结算单位" prop="fToCorpid">
         <el-select
-          v-model="tablefilter.fCorpid"
+          v-model="tablefilter.fToCorpid"
           placeholder="请选择结算单位"
           filterable
           remote
@@ -131,14 +131,14 @@
       <!-- <el-table-column label="制单部门" align="center" prop="fId" /> -->
       <el-table-column label="行号" align="center" type="index"/>
       <el-table-column label="系统编号" align="center" prop="fBillno" show-overflow-tooltip width="120"/>
-      <el-table-column label="货权方" sortable align="center" show-overflow-tooltip prop="fCtrlcorpid" width="220"/>
+      <el-table-column label="货权方" sortable align="center" show-overflow-tooltip prop="fCorpid" width="220"/>
       <el-table-column label="结算单位" sortable align="center" prop="fCorpidName" show-overflow-tooltip width="220"/>
       <el-table-column label="账单日期" sortable align="center" prop="fAccbilldate" width="120">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fAccbilldate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="提单号" sortable align="center" prop="tMblno" width="216"/>
+      <el-table-column label="提单号" sortable align="center" prop="fMblno" width="216"/>
       <el-table-column label="金额" align="center" prop="fAmtdr" width="120"/>
       <el-table-column label="对账金额" align="center" prop="fAmtcr" width="120"/>
       <!--       <el-table-column label="单据类型" align="center" prop="fBilltype" />-->
@@ -224,9 +224,9 @@
         :inline="true"
         v-show="showSearch"
       >
-        <el-form-item label="货权方" prop="fCtrlcorpid">
+        <el-form-item label="货权方" prop="fCorpid">
           <el-input
-            v-model="queryParams.fCtrlcorpid"
+            v-model="queryParams.fCorpid"
             clearable
             size="small"
             style="width:200px"
@@ -236,9 +236,9 @@
           />
         </el-form-item>
 
-        <el-form-item label="结算单位" label-width="78px" prop="fCorpid">
+        <el-form-item label="结算单位" label-width="78px" prop="fToCorpid">
           <el-select
-            v-model="queryParams.fCorpid"
+            v-model="queryParams.fToCorpid"
             placeholder="请选择结算单位"
             filterable
             remote
@@ -258,8 +258,8 @@
           </el-select>
         </el-form-item>
 
-        <!-- <el-form-item label="提单号" prop="tMblno">
-          <el-input v-model="TWareHouseFees.tMblno" placeholder="" :disabled="true"/>
+        <!-- <el-form-item label="提单号" prop="fMblno">
+          <el-input v-model="TWareHouseFees.fMblno" placeholder="" :disabled="true"/>
       </el-form-item> -->
 
         <el-form-item label="对账日期" prop="fAccbilldate" label-width="78px">
@@ -407,10 +407,10 @@
 
           <el-form-item
             label="货权方"
-            prop="fCorpid"
+            prop="fToCorpid"
           >
             <el-select
-              v-model="TWareHouseFees.fCorpid"
+              v-model="TWareHouseFees.fToCorpid"
               filterable
               remote
               clearable
@@ -779,14 +779,14 @@ export default {
         fMblno:'',    //提单号
         fName:'',      //货权方
         fFeesName:'',   //结算单位
-        fCorpid:''     //结算单位ID
+        fToCorpid:''     //结算单位ID
       },
       hide:false,
       cancelButton:true,
       businessTypeOption:[],
       // 传值对象
       TWareHouseFees:{
-        fCorpid:'',
+        fToCorpid:'',
         fToCorpid:'',
         fMblno:'',
         fStatementNo:'',
@@ -804,9 +804,9 @@ export default {
         pageNum: 1,
         pageSize: 10,
         fBillno: null,
-        fCtrlcorpid: null,
         fCorpid: null,
-        tMblno: null,
+        fToCorpid: null,
+        fMblno: null,
         fAmtdr: null,
         fAmtcr: null,
         fId:null,
@@ -823,10 +823,10 @@ export default {
         pageNum: 1,
         pageSize: 10,
         fBillno: null,
-        fCtrlcorpid: null,
-        fId:null,
         fCorpid: null,
-        tMblno: null,
+        fId:null,
+        fToCorpid: null,
+        fMblno: null,
         fAmtdr: null,
         fAmtcr: null,
         fBilltype: null,
@@ -839,10 +839,10 @@ export default {
       form: {},
       // 表单校验
       ruless:{
-        fCtrlcorpid: [
+        fCorpid: [
           { required: true, message: ' ', trigger: 'blur' }
         ],
-        fCorpid: [
+        fToCorpid: [
           { required: true, message: ' ', trigger: 'blur' }
         ],
         fAccbilldate: [
@@ -935,7 +935,7 @@ export default {
           fMblno: '',    //提单号
           fName: '',      //货权方
           fFeesName: '',   //结算单位
-          fCorpid: ''     //结算单位ID
+          fToCorpid: ''     //结算单位ID
         }
         getFee(this.approval.billId).then(response => {
           this.Operator = response.data.tFee.createBy
@@ -1110,13 +1110,13 @@ export default {
     // 对账按钮功能
     reconciliation(){
       this.queryParameter = {
-        fToCorpid: this.queryParams.fCorpid,
+        fToCorpid: this.queryParams.fToCorpid,
       }
       this.innerVisible = true
       this.feeList = []
       this.TWareHouseFees = {
-        fCorpid:'',
-        fToCorpid:this.queryParams.fCorpid,
+        fToCorpid:'',
+        fToCorpid:this.queryParams.fToCorpid,
         fMblno:'',
         fStatementNo:'',
         fFeeid :'',
@@ -1128,7 +1128,7 @@ export default {
         fDc:'D',
         fBilltype:''
       }
-      if(this.queryParams.fCorpid){
+      if(this.queryParams.fToCorpid){
         this.doNot = true
       }
     },
@@ -1236,16 +1236,16 @@ export default {
                 this.pass.fName = this.nothing[0] + "..."
               }
               // this.DzfeeList = this.DzfeeList.concat(this.Fee)
-              this.queryParams.tMblno = this.pass.fMblno //提单号
-              this.queryParams.fCorpid = this.TWareHouseFees.fToCorpid
-              this.queryParams.fCtrlcorpid = this.pass.fName
+              this.queryParams.fMblno = this.pass.fMblno //提单号
+              this.queryParams.fToCorpid = this.TWareHouseFees.fToCorpid
+              this.queryParams.fCorpid = this.pass.fName
               this.queryParams.fAmtcr = this.pass.fAmtcr
               this.queryParams.fAmtdr = this.pass.fAmtdr
               this.innerVisible = false
               this.feeList = []
               //  this.feeList = this.DzfeeList
               this.TWareHouseFees = {
-                fCorpid:'',
+                fToCorpid:'',
                 fToCorpid:'',
                 fMblno:'',
                 fStatementNo:'',
@@ -1288,16 +1288,16 @@ export default {
                     this.pass.fName = this.nothing[0] + "..."
                   }
                   // this.DzfeeList = this.DzfeeList.concat(this.Fee)
-                  this.queryParams.tMblno = this.pass.fMblno //提单号
-                  this.queryParams.fCorpid = this.TWareHouseFees.fToCorpid
-                  this.queryParams.fCtrlcorpid = this.pass.fName
+                  this.queryParams.fMblno = this.pass.fMblno //提单号
+                  this.queryParams.fToCorpid = this.TWareHouseFees.fToCorpid
+                  this.queryParams.fCorpid = this.pass.fName
                   this.queryParams.fAmtcr = this.pass.fAmtcr
                   this.queryParams.fAmtdr = this.pass.fAmtdr
                   this.innerVisible = false
                   this.feeList = []
                   //  this.feeList = this.DzfeeList
                   this.TWareHouseFees = {
-                    fCorpid:'',
+                    fToCorpid:'',
                     fToCorpid:'',
                     fMblno:'',
                     fStatementNo:'',
@@ -1385,9 +1385,9 @@ export default {
       this.form = {
         fId: null,
         fBillno: null,
-        fCtrlcorpid: null,
         fCorpid: null,
-        tMblno: null,
+        fToCorpid: null,
+        fMblno: null,
         fAmtdr: null,
         fAmtcr: null,
         fBilltype: null,
@@ -1432,14 +1432,14 @@ export default {
         pageNum: 1,
         pageSize: 10,
         fBillno: null,
-        fCtrlcorpid: null,
         fCorpid: null,
+        fToCorpid: null,
         timeInterval:null,
       }
 
       this.handleQuery();
       this.TWareHouseFees={
-        fCorpid:'',
+        fToCorpid:'',
         fToCorpid:'',
         fMblno:'',
         fStatementNo:'',
@@ -1453,7 +1453,7 @@ export default {
     //导入重置按钮
     resetQuery_s() {
       this.TWareHouseFees = {
-        fCorpid: '',
+        fToCorpid: '',
         fToCorpid: '',
         fMblno: '',
         fStatementNo: '',
@@ -1494,7 +1494,7 @@ export default {
         fMblno: '',    //提单号
         fName: '',      //货权方
         fFeesName: '',   //结算单位
-        fCorpid: ''     //结算单位ID
+        fToCorpid: ''     //结算单位ID
       }
       this.open = true
       this.title = '添加财务数据主'
@@ -1502,9 +1502,9 @@ export default {
         pageNum: 1,
         pageSize: 10,
         fBillno: null,
-        fCtrlcorpid: null,
         fCorpid: null,
-        tMblno: null,
+        fToCorpid: null,
+        fMblno: null,
         fAmtdr: null,
         fId: null,
         fAmtcr: null,
@@ -1542,7 +1542,7 @@ export default {
               fMblno: '',    //提单号
               fName: '',      //货权方
               fFeesName: '',   //结算单位
-              fCorpid: ''     //结算单位ID
+              fToCorpid: ''     //结算单位ID
             }
             const fId = row.fId || this.ids
             getFee(fId).then(response => {
@@ -1565,7 +1565,7 @@ export default {
             fMblno: '',    //提单号
             fName: '',      //货权方
             fFeesName: '',   //结算单位
-            fCorpid: ''     //结算单位ID
+            fToCorpid: ''     //结算单位ID
           }
           const fId = row.fId || this.ids
           getFee(fId).then(response => {
@@ -1591,7 +1591,7 @@ export default {
         fMblno:'',    //提单号
         fName:'',      //货权方
         fFeesName:'',   //结算单位
-        fCorpid:''     //结算单位ID
+        fToCorpid:''     //结算单位ID
       }
       const fId = row.fId || this.ids
       getFee(fId).then(response => {

src/views/fleetFinance/payment/index.vue

@@ -569,7 +569,7 @@ import {
   delCharge_s,
   backCharge,
   revocation
-} from '@/api/finance/payment'
+} from '@/api/fleetfinance/payment'
 import { listFees } from '@/api/basicdata/fees'
 import print from 'print-js'
 import AddOrUpdate from '@/views/viewApproval'