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

src/api/finance/contrast.js

@@ -56,9 +56,20 @@ export function exportFee(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',
+//     params: TWareHouseFees
+    // tFee:TWareHouseFees,
+    // tFeeDo:TWareHouseFees
+//   })
+// }

src/views/finance/contrast/index.vue

@@ -312,7 +312,7 @@
           <el-input v-model="TWareHouseFees.tMblno" placeholder="" :disabled="true"/>
       </el-form-item> -->
 
-        <el-form-item label="对账日期" prop="fAccbilldate">
+        <el-form-item label="对账日期" prop="fAccbilldate" label-width="78px">
           <el-date-picker
             v-model="queryParams.fAccbilldate"
             size="small"
@@ -354,10 +354,10 @@
         </el-form-item>
 
         <div style="width: 100%">
-          <el-button type="warning" size="small" @click="innerVisible = true"
+          <el-button type="warning" size="small" @click="reconciliation"
             >对账</el-button
           >
-          <el-button type="primary" size="small">确认对账</el-button>
+          <el-button type="primary" size="small" :disabled="statrGo" @click="confirmReconciliation">确认对账</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>
@@ -369,11 +369,11 @@
       <el-table
         v-loading="loading"
         :data="DzfeeList"
-        @selection-change="handleSelectionChange_s"
+        @selection-change="handleSelectionChanGe"
       >
         <el-table-column type="selection" width="55" align="center" />
         <!-- <el-table-column label="制单部门" align="center" prop="fId" /> -->
-        <el-table-column label="行号" align="center" type="index" />
+        <el-table-column label="行1号" align="center" type="index" />
         <el-table-column label="提单号" align="center" prop="fMblno" />
         <el-table-column label="业务日期" align="center" prop="fBsdate">
           <template slot-scope="scope">
@@ -387,7 +387,8 @@
             <span v-else-if="scope.row.fSrcdc == 'C'">付</span>
           </template>
         </el-table-column>
-        <el-table-column label="金额" align="center" prop="fAmt" />
+        <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">
           <template slot-scope="scope">
             <span v-if="scope.row.fBilltype == 'SJRK'">入库</span>
@@ -495,7 +496,7 @@
           <el-form-item label="是否对账" prop="fReconciliation">
             <el-col :span="8">
               <el-select
-                v-model="TWareHouseFees.fReconciliation"
+                v-model="TWareHouseFees.fReconciliation" 
                 style="width: 200px"
               >
                 <el-option label="是" value="1" />
@@ -607,7 +608,7 @@
                   clearable
                   size="small"
                   oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
-                  @change="imgChange1(scope.row)"
+                  @change="imgChangeI(scope.row)"
                 />
               </template>
             </el-table-column>
@@ -670,7 +671,7 @@
 </template>
 
 <script>
-import { listFee, getFee, delFee, addFee, updateFee, exportFee, importFee} from "@/api/finance/contrast";
+import { Cfee, listFee, getFee, delFee, addFee, updateFee, exportFee, importFee} from "@/api/finance/contrast";
 import { listCorps } from '@/api/basicdata/corps'
 import { listFees } from '@/api/basicdata/fees'
 import { queryUserVal } from '@/api/warehouseBusiness/agreement'
@@ -681,6 +682,7 @@ export default {
   },
   data() {
     return {
+      statrGo:true,
       state_s: true,
       browseStatus:false,
       options:'',
@@ -723,12 +725,15 @@ export default {
       DzfeeList: [],
       // 财务主页面表格
       contrastList: [],
+      empty:[],
+      nothing:[],
       //导入从表传主表
       pass:{
         fAmtdr:'',    //应收合计
         fAmtcr:'',    //应付合计
         fMblno:'',    //提单号
-        fName:''      //货权方
+        fName:'',      //货权方
+        fFeesName:''    //结算单位
       },
       // 传值对象
       TWareHouseFees:{
@@ -739,8 +744,8 @@ export default {
         fFeeid :'',
         timeExamine:'',
         timeInterval:'',
-        fDc:'',
-        fReconciliation:'',
+        fDc:'D',
+        fReconciliation:'1',
         timeReconci:'',
       },
       // 查询参数
@@ -827,7 +832,18 @@ export default {
     this.register()
   },
   methods: {
-   
+    // 确认对账按钮功能
+    confirmReconciliation(){
+      Cfee().then(response=>{
+        console.log(response)
+      })
+    },
+    // 对账按钮功能
+    reconciliation(){
+      this.TWareHouseFees.fToCorpid = this.queryParams.fCorpid
+      console.log(this.queryParams.fCorpid)
+      this.innerVisible = true
+    },
     // 默认录入人
     register() {
       queryUserVal().then((response)=>{
@@ -860,13 +876,13 @@ export default {
         return sums;
       },
        // 金额筛选
-       imgChange1(row){
+       imgChangeI(row){
       if (row.fAmt && Number(row.fAmt) > Number(row.fAmtdr)){
         this.$set(row, 'fAmt', row.fAmtdr)
         this.state_s = true
       }
     },
-    // imgChange1(fAmtdr,fAmt){
+    // imgChangeI(fAmtdr,fAmt){
     //   if (fAmt <= fAmtdr){
     //     console.log("小了！")
     //     this.state_s = true
@@ -944,6 +960,7 @@ export default {
     handleQuery() {
       this.queryParams.pageNum = 1;
       this.getList();
+      console.log(this.contrastList)
       // this.searchFee()
     },
     /** 重置按钮操作 */
@@ -980,6 +997,13 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
+    handleSelectionChanGe(selection){
+      if(selection.length > 0) {
+        this.statrGo = false
+      }else{
+        this.statrGo = true
+      }
+    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
@@ -1106,6 +1130,11 @@ export default {
     },
     /* 添加财务数据主 导入*/
     confirmImport(){
+      for (let item in this.selection) {
+        this.pass.fAmtcr += Number(this.selection[item].fAmt)
+        this.pass.fAmtdr += Number(this.selection[item].fAmtdr)
+      }
+
       if(this.state_s == true) {
         if (this.selection.length == '0') {
           console.log('未选择')//写入提示
@@ -1115,27 +1144,48 @@ export default {
           for (let item in this.selection){
             console.log(this.selection[item])
             console.log(this.selection[item].fMblno)
-            
-            if(item >= 1){
+            this.empty.push(this.selection[item].fMblno)
+            this.nothing.push(this.selection[item].fName)
+          }
+          //去重提单号
+          this.empty = new Set(this.empty)
+          this.empty = Array.from(this.empty)
+          //去重货权方
+          this.nothing = new Set(this.nothing)
+          this.nothing = Array.from(this.nothing)
+          console.log(this.nothing)
 
-              this.pass.fMblno = this.selection[item].fMblno + "..."
-              // this.pass.fName = this.selection[item].fName + "..."
-              this.pass.fFeesName = this.selection[item].fFeesName + "..."
-            }else if(item == 0){
-              this.pass.fMblno = this.selection[item].fMblno
-              // this.pass.fName = this.selection[item].fName
-              this.pass.fFeesName = this.selection[item].fFeesName + "..."
-            }
+          if(this.empty.length <= 1){
+            this.pass.fMblno = this.empty[0]
+            console.log(this.pass.fMblno)
+          }else {
+            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]
+            console.log(this.nothing)
+          }else {
+            this.pass.fFeesName = this.nothing[0] + "..."
+            console.log(this.nothing)
           }
-          console.log(this.pass)
+
         this.DzfeeList = this.selection
         this.queryParams.tMblno = this.pass.fMblno //提单号
-        // this.queryParams.fCtrlcorpid = this.pass.fName
-
         this.queryParams.fCorpid = this.pass.fFeesName
+        // this.queryParams.fCtrlcorpid = this.pass.fName
         this.queryParams.fAmtcr = this.pass.fAmtcr
         this.queryParams.fAmtdr = this.pass.fAmtdr
-        console.log(this.TWareHouseFees)
+        console.log(this.pass)
+        console.log(this.queryParams)
+        console.log(this.DzfeeList)
         this.innerVisible = false
         this.feeList = []
         //  this.feeList = this.DzfeeList