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

src/api/finance/charge.js

@@ -68,3 +68,12 @@ export function listCorps(query) {
     params: query
   })
 }
+
+// 确认收费
+export function collectFee(queryParameter) {
+  return request({
+    url: '/finance/charge/confirm',
+    method: 'post',
+    data:queryParameter
+  })
+}

src/api/finance/contrast.js

@@ -64,12 +64,12 @@ export function importFee(TWareHouseFees) {
   })
 }
 // 确认对账
-// export function Cfee(TWareHouseFees) {
-//   return request({
-//     url:'/finance/contrast/confirm',
-//     method: 'post',
-//     params: TWareHouseFees
+export function Cfee(TWareHouseFees) {
+  return request({
+    url:'/finance/contrast/confirm',
+    method: 'post',
+    data: TWareHouseFees
     // tFee:TWareHouseFees,
     // tFeeDo:TWareHouseFees
-//   })
-// }
+  })
+}

src/views/basicdata/corps/index.vue

@@ -107,12 +107,23 @@
 
     <el-table v-loading="loading" :data="corpsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="客户类别" align="center" prop="fTypeid" :formatter="fTypeidFormat" />
+      <el-table-column
+        :show-overflow-tooltip="true"
+        label="客户类别" align="center" prop="fTypeid" :formatter="fTypeidFormat" />
       <el-table-column label="编号" align="center" prop="fNo" />
-      <el-table-column label="名称" align="center" prop="fName" />
-      <el-table-column label="简称" align="center" prop="fCname" />
-      <el-table-column label="英文名称" align="center" prop="fEname" />
-      <el-table-column label="电话" align="center" prop="fTel" />
+      <el-table-column
+        :show-overflow-tooltip="true"
+        label="名称" align="center" prop="fName"
+      />
+      <el-table-column
+        :show-overflow-tooltip="true"
+        label="简称" align="center" prop="fCname" />
+      <el-table-column
+        :show-overflow-tooltip="true"
+        label="英文名称" align="center" prop="fEname" />
+      <el-table-column
+        :show-overflow-tooltip="true"
+        label="电话" align="center" prop="fTel" />
 
       <el-table-column label="录入人" align="center" prop="createBy" />
       <el-table-column label="录入时间" align="center" prop="createTime" width="180">
@@ -136,7 +147,8 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column
+        label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
         <template slot-scope="scope">
           <el-button

src/views/basicdata/fees/index.vue

@@ -119,13 +119,13 @@
     <el-table v-loading="loading" :data="feesList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" align="center"/>
-      <el-table-column label="编号" align="center" prop="fNo" />
-      <el-table-column label="名称" align="center" prop="fName" />
-      <el-table-column label="费用属性" align="center" prop="fFeetype" :formatter="fFeetypeFormat" />
+      <el-table-column label="编号" align="center" prop="fNo" :show-overflow-tooltip="true" />
+      <el-table-column label="名称" align="center" prop="fName" :show-overflow-tooltip="true" />
+      <el-table-column label="费用属性" align="center" prop="fFeetype" :formatter="fFeetypeFormat"  />
       <el-table-column label="计量单位" align="center" prop="fFeeunitid" :formatter="fFeeunitidFormat" />
-      <el-table-column label="币种" align="center" prop="fCurrency" />
+      <el-table-column label="币种" align="center" prop="fCurrency" :show-overflow-tooltip="true"  />
       <el-table-column label="状态" align="center" prop="fStatus" :formatter="statusFormat" />
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

src/views/basicdata/goods/index.vue

@@ -146,13 +146,13 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" align="center"/>
       <!--<el-table-column label="存储id" align="center" prop="fTypeid" />--><!-- 后期添加 -->
-      <el-table-column label="编号" align="center" prop="fNo" />
-      <el-table-column label="名称" align="center" prop="fName" />
-      <el-table-column label="英文名称" align="center" prop="fEnam" />
-      <el-table-column label="规格" align="center" prop="fSpecs" />
-      <el-table-column label="包装规格" align="center" prop="fPackagespecs" />
-      <el-table-column label="颜色" align="center" prop="fColor" />
-      <el-table-column label="海关编码" align="center" prop="fHscode" />
+      <el-table-column label="编号" align="center" prop="fNo" :show-overflow-tooltip="true" />
+      <el-table-column label="名称" align="center" prop="fName" :show-overflow-tooltip="true" />
+      <el-table-column label="英文名称" align="center" prop="fEnam" :show-overflow-tooltip="true" />
+      <el-table-column label="规格" align="center" prop="fSpecs" :show-overflow-tooltip="true" />
+      <el-table-column label="包装规格" align="center" prop="fPackagespecs" :show-overflow-tooltip="true"  />
+      <el-table-column label="颜色" align="center" prop="fColor" :show-overflow-tooltip="true" />
+      <el-table-column label="海关编码" align="center" prop="fHscode" :show-overflow-tooltip="true" />
       <el-table-column label="包装类型" align="center" prop="fPackageid" />
       <el-table-column label="状态" align="center" prop="fStatus" >
         <template slot-scope="scope">
@@ -164,7 +164,7 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
         <template slot-scope="scope">
           <el-button

src/views/basicdata/warehouse/index.vue

@@ -98,9 +98,9 @@
     <el-table v-loading="loading" :data="warehouseList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" align="center"/>
-      <el-table-column label="编号" align="center" prop="fNo" />
-      <el-table-column label="名称" align="center" prop="fName" />
-      <el-table-column label="地址" align="center" prop="fAddr" />
+      <el-table-column label="编号" align="center" prop="fNo" :show-overflow-tooltip="true" />
+      <el-table-column label="名称" align="center" prop="fName" :show-overflow-tooltip="true" />
+      <el-table-column label="地址" align="center" prop="fAddr" :show-overflow-tooltip="true" />
       <el-table-column label="状态" align="center">
         <template slot-scope="scope">
           <el-switch
@@ -111,7 +111,7 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

src/views/finance/charge/index.vue

@@ -233,13 +233,13 @@
       </el-form>
       <div style="width: 100%;">
         <el-button type="warning" size="small" @click="charGe">收费</el-button>
-        <el-button type="primary" size="small">确认收费</el-button>
+        <el-button type="primary" size="small" @click="confirmCharge">确认收费</el-button>
         <el-button type="success" size="small">导出</el-button>
         <el-button type="info" size="small">打印</el-button>
         <el-button type="danger" size="small">删除</el-button>
       </div>
       <el-table v-loading="loading" :data="increase_s" @selection-change="handleSelectionChange_s">
-        <el-table-column type="selection" width="55" align="center"/>
+        <!-- <el-table-column type="selection" width="55" align="center"/> -->
         <el-table-column label="序号" type="index" width="55" align="center"/>
         <el-table-column label="提单号" align="center" prop="fMblno"/>
         <el-table-column label="存货单号" align="center" prop="fBscorpno"/>
@@ -424,11 +424,13 @@
         </div>
       </el-dialog>
     </el-dialog>
+
   </div>
 </template>
 
 <script>
 import {
+  collectFee,
   listCharge,
   getCharge,
   delCharge,
@@ -567,6 +569,19 @@ export default {
     this.getList()
   },
   methods: {
+    // 确认收费
+    confirmCharge() {
+      this.queryParams.fBillstatus = '4'
+      let formDate = new window.FormData()
+        formDate.append('tFee',JSON.stringify(this.queryParams))
+        formDate.append("tFeeDo", JSON.stringify(this.increase_s))
+
+        collectFee(formDate).then(response=>{
+          console.log(response)
+          this.msgSuccess("操作成功")
+        })
+        this.open = false
+    },
     charGe(){
       this.queryParameter.fToCorpid = this.queryParams.fCorpid
       this.innerVisible = true
@@ -603,8 +618,12 @@ export default {
     confirmImport() {
       console.log(this.state_s)
       for (let item in this.selection) {
+        this.pass.fAmtcr = Number(this.pass.fAmtcr)
+        this.pass.fAmtdr = Number(this.pass.fAmtdr)
         this.pass.fAmtcr += Number(this.selection[item].fAmt)
         this.pass.fAmtdr += Number(this.selection[item].fAmtdr)
+        console.log(this.pass.fAmtcr)
+        console.log(this.pass.fAmtdr)
       }
       if (this.state_s == true) {
         if (this.selection.length == '0') {
@@ -639,6 +658,7 @@ export default {
           this.increase_s = this.selection
           this.queryParams.tMblno = this.pass.fMblno //提单号
           this.queryParams.fCtrlcorpid = this.pass.fName
+          this.queryParams.fCorpid = this.queryParameter.fToCorpid
           this.queryParams.fAmtcr = this.pass.fAmtcr
           this.queryParams.fAmtdr = this.pass.fAmtdr
           console.log(this.queryParams)
@@ -772,6 +792,14 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset()
+      this.pass={
+        fAmtdr:'',    //应收合计
+        fAmtcr:'',    //应付合计
+        fMblno:'',    //提单号
+        fName:'',      //货权方
+        fFeesName:'',   //结算单位
+        fCorpid:''     //结算单位ID
+      },
       // this.queryParams = []
       this.increase_s = []
       this.queryParams = {
@@ -797,6 +825,14 @@ export default {
     handleUpdate(row) {
       console.log(row)
       this.reset()
+      this.pass={
+        fAmtdr:'',    //应收合计
+        fAmtcr:'',    //应付合计
+        fMblno:'',    //提单号
+        fName:'',      //货权方
+        fFeesName:'',   //结算单位
+        fCorpid:''     //结算单位ID
+      }
       const fId = row.fId || this.ids
       console.log(fId)
       getCharge(fId).then(response => {
@@ -875,7 +911,18 @@ export default {
     },
     //清空一行
     deleteRow(index, rows) {
+      this.queryParams.fAmtcr = 0
+      this.queryParams.fAmtdr = 0
       rows.splice(index, 1);
+      for(let item in this.increase_s) {
+        console.log(this.increase_s[item])
+        this.queryParams.fAmtcr += this.increase_s[item].fAmt
+        this.queryParams.fAmtdr += this.increase_s[item].fAmtdr
+        
+      }
+      console.log(this.queryParams.fAmtdr)
+      console.log(this.queryParams.fAmtcr)
+
     },
   }
 }

src/views/finance/contrast/index.vue

@@ -2,27 +2,30 @@
   <div class="app-container">
     <el-form
       :model="queryParams_s"
-      ref="TWareHouseFees"
+      ref="queryParams_s"
       :inline="true"
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="货权方" prop="fCorpid">
-        <el-select
-          v-model="queryParams_s.fCorpid"
+      <el-form-item label="货权方" prop="fCtrlcorpid">
+        <el-input
+          v-model="queryParams_s.fCtrlcorpid"
           placeholder="请输入客户名称"
+          filterable
+          remote
           clearable
-          size="small"
+          style="width:200px"
           @keyup.enter.native="handleQuery"
           :remote-method="corpsRemoteMethod"
-        >
-          <el-option
+          />
+
+          <!-- <el-option
             v-for="(dict, index) in fMblnoOptions"
             :key="index.fId"
             :label="dict.fName"
             :value="dict.fId"
           ></el-option>
-        </el-select>
+        </el-select> -->
       </el-form-item>
 
       <el-form-item label="结算单位" prop="fCorpid">
@@ -48,9 +51,10 @@
       <el-form-item label="录入人" prop="createBy">
         <el-input
           v-model="queryParams_s.createBy"
-          placeholder="请输入录入人"
-          clearable
+
+
           size="small"
+          disabled
         />
       </el-form-item>
 
@@ -201,23 +205,23 @@
       :data="contrastList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column width="55" align="center" type="selection" />
+      <el-table-column width="50" align="center" type="selection" />
       <!-- <el-table-column label="制单部门" align="center" prop="fId" /> -->
-      <el-table-column label="行号" align="center" type="index" width="55" />
-      <el-table-column label="系统编号" align="center" prop="fBillno" />
-      <el-table-column label="货权方" align="center" show-overflow-tooltip prop="fCtrlcorpid" />
-      <el-table-column label="结算单位" align="center" prop="fCorpid" />
-      <el-table-column label="账单日期" align="center" prop="fAccbilldate">
+      <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="货权方" align="center" show-overflow-tooltip prop="fCtrlcorpid" width="120"/>
+      <el-table-column label="结算单位" align="center" prop="fCorpidName" show-overflow-tooltip width="120"/>
+      <el-table-column label="账单日期" 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="提单号" align="center" prop="tMblno" />
-      <el-table-column label="应收金额" align="center" prop="fAmtdr" />
-      <el-table-column label="应付金额" align="center" prop="fAmtcr" />
+      <el-table-column label="提单号" align="center" prop="tMblno" width="120"/>
+      <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" />-->
-      <el-table-column label="备注" align="center" show-overflow-tooltip prop="fRemarks" />
-      <el-table-column label="状态" align="center" prop="fBillstatus">
+      <el-table-column label="备注" align="center" show-overflow-tooltip prop="fRemarks" width="120"/>
+      <el-table-column label="状态" align="center" prop="fBillstatus" width="120">
         <template slot-scope="scope">
           <span v-if="scope.row.fBillstatus == '1'">新建</span>
           <span v-else-if="scope.row.fBillstatus == '2'">暂存</span>
@@ -233,6 +237,7 @@
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
+        width="140"
       >
         <template slot-scope="scope">
           <el-button
@@ -357,9 +362,9 @@
           <el-button type="warning" size="small" @click="reconciliation"
             >对账</el-button
           >
-          <el-button type="primary" size="small" :disabled="statrGo" @click="confirmReconciliation">确认对账</el-button>
+          <el-button type="primary" size="small" @click="confirmReconciliation">确认对账</el-button>
           <el-button type="success" size="small">导出</el-button>
-          <el-button type="info" size="small">打印</el-button>
+          <el-button type="info" size="small" @click="openPrint=true">打印</el-button>
           <el-button type="danger" size="small">删除</el-button>
         </div>
 
@@ -371,9 +376,9 @@
         :data="DzfeeList"
         @selection-change="handleSelectionChanGe"
       >
-        <el-table-column type="selection" width="55" align="center" />
+        <!-- <el-table-column type="selection" width="55" align="center" /> -->
         <!-- <el-table-column label="制单部门" align="center" prop="fId" /> -->
-        <el-table-column label="行1号" align="center" type="index" />
+        <el-table-column label="行号" align="center" type="index" />
         <el-table-column label="提单号" align="center" prop="fMblno" />
         <el-table-column label="业务日期" align="center" prop="fBsdate">
           <template slot-scope="scope">
@@ -389,7 +394,7 @@
         </el-table-column>
         <el-table-column label="金额" align="center" prop="fAmtdr" />
         <el-table-column label="本次金额" align="center" prop="fAmt" />
-        <el-table-column label="业务1类型" align="center" prop="fBilltype">
+        <el-table-column label="业务类型" align="center" prop="fBilltype">
           <template slot-scope="scope">
             <span v-if="scope.row.fBilltype == 'SJRK'">入库</span>
             <span v-else-if="scope.row.fBilltype == 'SJCK'">出库</span>
@@ -667,6 +672,49 @@
         </div>
       </el-dialog>
     </el-dialog>
+
+    <!-- 打印页面 -->
+    <el-dialog
+      :visible.sync="openPrint"
+      width="70%"
+      append-to-body
+      :close-on-click-modal="false"
+      title="对账单"
+    >
+      <el-table
+        border="true"
+        v-loading="loading"
+        :data="DzfeeList"
+        @selection-change="handleSelectionChanGe">
+
+        <el-table-column label="行号" align="center" type="index" />
+        <el-table-column label="提单号" align="center" prop="fMblno" />
+        <el-table-column label="业务日期" align="center" prop="fBsdate">
+          <template slot-scope="scope">
+            <span>{{scope.row.fBsdate.slice(0,10)}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="费用名称" align="center" prop="fFeeName" />
+        <el-table-column label="收/付" align="center" prop="fSrcdc">
+          <template slot-scope="scope">
+            <span v-if="scope.row.fSrcdc == 'D'">收</span>
+            <span v-else-if="scope.row.fSrcdc == 'C'">付</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="金额" align="center" prop="fAmtdr" />
+        <el-table-column label="本次金额" align="center" prop="fAmt" />
+        <el-table-column label="业务类型" align="center" prop="fBilltype">
+          <template slot-scope="scope">
+            <span v-if="scope.row.fBilltype == 'SJRK'">入库</span>
+            <span v-else-if="scope.row.fBilltype == 'SJCK'">出库</span>
+            <span v-else-if="scope.row.fBilltype == 'CKDB'">调拨</span>
+            <span v-else-if="scope.row.fBilltype == 'HQZY'">货权转移</span>
+            <span v-else>{{scope.row.fBilltype}}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-button style="marginTop:10px">打印</el-button>
+    </el-dialog>
   </div>
 </template>
 
@@ -682,6 +730,7 @@ export default {
   },
   data() {
     return {
+      openPrint:false,
       statrGo:true,
       state_s: true,
       browseStatus:false,
@@ -733,7 +782,8 @@ export default {
         fAmtcr:'',    //应付合计
         fMblno:'',    //提单号
         fName:'',      //货权方
-        fFeesName:''    //结算单位
+        fFeesName:'',   //结算单位
+        fCorpid:''     //结算单位ID
       },
       // 传值对象
       TWareHouseFees:{
@@ -828,15 +878,23 @@ export default {
     };
   },
   created() {
-    this.getList();
+    this.getList()
     this.register()
   },
   methods: {
     // 确认对账按钮功能
     confirmReconciliation(){
-      Cfee().then(response=>{
+      this.queryParams.fBillstatus = '4'
+      let formDate = new window.FormData()
+        formDate.append('tFee',JSON.stringify(this.queryParams))
+        formDate.append("tFeeDo", JSON.stringify(this.DzfeeList))
+
+      Cfee(formDate).then(response=>{
         console.log(response)
+        this.msgSuccess("操作成功")
+        
       })
+      this.open = false
     },
     // 对账按钮功能
     reconciliation(){
@@ -847,7 +905,9 @@ export default {
     // 默认录入人
     register() {
       queryUserVal().then((response)=>{
-      this.contrastList.createBy = response.user.userName
+      this.queryParams_s.createBy = response.user.userName
+      this.queryParams.createBy = response.user.userName
+      console.log(this.DzfeeList.createBy)
       console.log(response.user.userName)
       })
     },
@@ -869,8 +929,8 @@ export default {
             sums[0] = '合计';
           } else {
             sums[4] = '';
-          this.pass.fAmtdr = sums[9]
-          this.pass.fAmtcr = sums[10]
+          // this.pass.fAmtdr = sums[9]
+          // this.pass.fAmtcr = sums[10]
           }
         })
         return sums;
@@ -958,6 +1018,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      console.log(this.queryParams_s)
       this.queryParams.pageNum = 1;
       this.getList();
       console.log(this.contrastList)
@@ -1008,6 +1069,14 @@ export default {
     handleAdd() {
       this.reset();
       this.DzfeeList = []
+      this.pass={
+        fAmtdr:'',    //应收合计
+        fAmtcr:'',    //应付合计
+        fMblno:'',    //提单号
+        fName:'',      //货权方
+        fFeesName:'',   //结算单位
+        fCorpid:''     //结算单位ID
+      },
       this.open = true;
       this.title = "添加财务数据主";
       this.queryParams = {
@@ -1054,6 +1123,14 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      this.pass={
+        fAmtdr:'',    //应收合计
+        fAmtcr:'',    //应付合计
+        fMblno:'',    //提单号
+        fName:'',      //货权方
+        fFeesName:'',   //结算单位
+        fCorpid:''     //结算单位ID
+      }
       const fId = row.fId || this.ids
       console.log(fId)
       getFee(fId).then(response => {
@@ -1084,6 +1161,7 @@ export default {
     /** 提交按钮 */
     submitForm() {
       console.log(this.queryParams)
+      console.log(this.DzfeeList)
       // console.log(this.feeList)
       this.$refs["ruless"].validate(valid => {
         if (valid) {
@@ -1131,10 +1209,16 @@ export default {
     /* 添加财务数据主 导入*/
     confirmImport(){
       for (let item in this.selection) {
+        this.pass.fAmtcr = Number(this.pass.fAmtcr)
+        this.pass.fAmtdr = Number(this.pass.fAmtdr)
         this.pass.fAmtcr += Number(this.selection[item].fAmt)
         this.pass.fAmtdr += Number(this.selection[item].fAmtdr)
+        // console.log(Number(this.pass.fAmtcr))
+        // console.log(this.pass)
+        // console.log(this.pass.fAmtcr)
+        // console.log(this.pass.fAmtdr)
       }
-
+      console.log(this.pass)
       if(this.state_s == true) {
         if (this.selection.length == '0') {
           console.log('未选择')//写入提示
@@ -1162,25 +1246,28 @@ export default {
             this.pass.fMblno = this.empty[0] + "..."
             console.log(this.pass.fMblno)
           }
-          // if (this.nothing.length <= 1){
-          //   this.pass.fName = this.nothing[0]
-          //   console.log(this.nothing)
-          // }else {
-          //   this.pass.fName = this.nothing[0] + "..."
-          //   console.log(this.nothing)
-          // }
           if (this.nothing.length <= 1){
-            this.pass.fFeesName = this.nothing[0]
+            this.pass.fName = this.nothing[0]
             console.log(this.nothing)
           }else {
-            this.pass.fFeesName = this.nothing[0] + "..."
+            this.pass.fName = this.nothing[0] + "..."
             console.log(this.nothing)
           }
-
+          // if (this.nothing.length <= 1){
+          //   this.pass.fCorpid = this.nothing[0]
+          //   console.log(this.nothing)
+          // }else {
+          //   this.pass.fCorpid = this.nothing[0] + "..."
+          //   console.log(this.nothing)
+          // }
         this.DzfeeList = this.selection
         this.queryParams.tMblno = this.pass.fMblno //提单号
-        this.queryParams.fCorpid = this.pass.fFeesName
-        // this.queryParams.fCtrlcorpid = this.pass.fName
+        // this.queryParams.fCorpid = this.pass.fFeesName
+        
+        this.queryParams.fCorpid = this.TWareHouseFees.fToCorpid
+        this.queryParams.fCtrlcorpid = this.pass.fName
+        console.log(this.queryParams.fCorpid)
+        console.log(this.pass)
         this.queryParams.fAmtcr = this.pass.fAmtcr
         this.queryParams.fAmtdr = this.pass.fAmtdr
         console.log(this.pass)
@@ -1251,7 +1338,14 @@ export default {
     },
     //清空一行
     deleteRow(index, rows) {
-      rows.splice(index, 1);
+      this.queryParams.fAmtdr = 0
+      this.queryParams.fAmtcr = 0
+      rows.splice(index, 1)
+      for(let item in this.DzfeeList) {
+        console.log(this.DzfeeList[item])
+        this.queryParams.fAmtcr = this.DzfeeList[item].fAmt
+        this.queryParams.fAmtdr = this.DzfeeList[item].fAmtdr
+      }
     },
   },
 };

vue.config.js

@@ -34,8 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://192.168.137.1:9010`,
-        target: `http://engineering.echepei.com:9010/`,
+        target: `http://localhost:9010`,
+        //  target: `http://engineering.echepei.com:9010/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''