财务对账页修改

src/views/finance/contrast/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="app-container">
-    <el-form :model="TWareHouseFees" ref="TWareHouseFees" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams_s" ref="TWareHouseFees" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="货权方" prop="fCorpid">
         <el-select
-          v-model="TWareHouseFees.fCorpid"
+          v-model="queryParams_s.fCorpid"
           filterable
           remote
           clearable
@@ -24,7 +24,7 @@
 
       <el-form-item label="结算单位" prop="fCorpid">
         <el-select
-        v-model="TWareHouseFees.fCorpid"
+        v-model="queryParams_s.fCorpid"
         placeholder="请选择结算单位"
         filterable
           remote
@@ -98,12 +98,14 @@
       </el-form-item>
 
       <el-form-item label="状态" prop="fBillstatus">
-        <el-input label="录入已对账" value=""
-        v-model="queryParams.fBillstatus"
-        placeholder="请选择状态"
-        clearable
-        size="small"
-        @keyup.enter.native="handleQuery"/>
+        <el-select v-model="queryParams_s.fBillstatus" placeholder="请选择">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.dictLabel"
+            :value="item.dictValue">
+          </el-option>
+        </el-select>
       </el-form-item>
       <!-- <el-form-item label="备注" prop="fRemarks">
         <el-input
@@ -116,7 +118,7 @@
       </el-form-item>-->
       <el-form-item label="系统编号" prop="fBillno">
         <el-input placeholder="请输入"
-        v-model="TWareHouseFees.fBillno"
+        v-model="queryParams_s.fBillno"
         @keyup.enter.native="handleQuery"/>
       </el-form-item>
 
@@ -167,14 +169,14 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="contrastList" @selection-change="handleSelectionChange" size="mini">
-      <el-table-column label="选择" width="55" align="center" type="selection"/>
+    <el-table v-loading="loading" :data="contrastList" @selection-change="handleSelectionChange">
+      <el-table-column width="55" align="center" type="selection"/>
       <!-- <el-table-column label="制单部门" align="center" prop="fId" /> -->
-      <el-table-column label="行号" align="center" type="index"/>
+      <el-table-column label="行号" align="center" type="index" width="55"/>
       <el-table-column label="系统编号" align="center" prop="fBillno"/>
       <el-table-column label="货权方" align="center" prop="fCtrlcorpid"/>
       <el-table-column label="结算单位" align="center" prop="fCorpid"/>
-      <el-table-column label="账单日期" align="center" prop="fAccbilldate">
+      <el-table-column label="账单日期" align="center" prop="createTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fAccbilldate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -186,24 +188,24 @@
       <el-table-column label="备注" align="center" prop="fRemarks" />
       <el-table-column label="状态" align="center" prop="fBillstatus" />
       <!-- <el-table-column label="制单部门" align="center" prop="fDeptid" /> -->
-      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <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-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['warehouse:fee:edit']"
+            v-hasPermi="['finance:contrast:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['warehouse:fee:remove']"
+            v-hasPermi="['finance:contrast:remove']"
           >删除</el-button>
         </template>
-      </el-table-column> -->
+      </el-table-column>
     </el-table>
 
     <pagination
@@ -216,31 +218,21 @@
 
     <!-- 对账表 -->
     <el-dialog :visible.sync="open" width="65%" append-to-body :close-on-click-modal="false">
-      <el-form ref="rules" :model="TWareHouseFees" :rules="rules" label-width="68px" :inline="true" v-show="showSearch">
+      <el-form ref="rules" :model="queryParams" :rules="ruless" label-width="68px" :inline="true" v-show="showSearch">
 
         <el-form-item label="货权方" prop="fCtrlcorpid">
-        <el-select
-          v-model="TWareHouseFees.fCtrlcorpid"
-          filterable
-          remote
+        <el-input
+          v-model="queryParams.fCtrlcorpid"
           clearable
-          style="width: 200px"
+          size="small"
           @keyup.enter.native="handleQuery"
-          :remote-method="corpsRemoteMethod"
           placeholder="请输入客户名称"
-        >
-          <el-option
-            v-for="(dict, index) in fMblnoOptions"
-            :key="index.fId"
-            :label="dict.fName"
-            :value="dict.fId"
-          ></el-option>
-        </el-select>
+        />
       </el-form-item>
 
-      <el-form-item label="结算单位" prop="fCorpid">
+      <el-form-item label="结算单位" label-width="78px" prop="fCorpid">
         <el-select
-        v-model="TWareHouseFees.fCorpid"
+        v-model="queryParams.fCorpid"
         placeholder="请选择结算单位"
         filterable
           remote
@@ -258,13 +250,13 @@
       </el-form-item>
 
 
-      <el-form-item label="提单号" prop="tMblno">
+      <!-- <el-form-item label="提单号" prop="tMblno">
           <el-input v-model="TWareHouseFees.tMblno" placeholder="" :disabled="true"/>
-      </el-form-item>
+      </el-form-item> -->
 
-      <el-form-item label="对账日期" prop="timeReconci">
+      <el-form-item label="对账日期" prop="fAccbilldate">
         <el-date-picker
-          v-model="TWareHouseFees.timeReconci"
+          v-model="queryParams.fAccbilldate"
           size="small"
           style="width: 200px"
           value-format="yyyy-MM-dd"
@@ -283,65 +275,47 @@
         </el-date-picker>
       </el-form-item> -->
 
-      <el-form-item label="单据编号">
+      <el-form-item label="单据编号" prop="fBillno">
         <el-input :disabled="true"/>
       </el-form-item>
 
       <el-form-item label="录入人" prop="createBy">
-        <el-input v-model="form.createBy"/>
+        <el-input v-model="queryParams.createBy"/>
       </el-form-item>
 
+      <div style="width:100%">
+        <el-button type="warning" size="small" @click="innerVisible = true">对账</el-button>
+        <el-button type="primary" size="small">确认对账</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-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-        <el-button
-          type="warning"
-          size="small"
-          @click="innerVisible = true"
-        >对账</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          size="small"
-        >确认对账</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          size="small"
-        >导出</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          icon="el-icon-download"
-          size="small"
-        >打印</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          size="mini"
-        >删除</el-button>
-      </el-col>
       <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
-    </el-row>
     </el-form>
 
     <el-table v-loading="loading" :data="DzfeeList" @selection-change="handleSelectionChange_s" size="mini">
         <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="提单号" align="center" prop="fMblno"/>
+        <!-- <el-table-column label="提单号" align="center" prop="fMblno"/> -->
         <el-table-column label="业务日期" align="center" prop="fBsdate"/>
         <el-table-column label="费用名称" align="center" prop="fFeeName"/>
-        <el-table-column label="收/付" align="center" prop="fDc"/>
-        <el-table-column label="金额" align="center" prop="fOldAmount"/>
-        <el-table-column label="业务类型" align="center" prop="fBilltype"/>
+        <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="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> 
+          </template>
+        </el-table-column>
     </el-table>
 
       <div slot="footer" class="dialog-footer">
@@ -393,8 +367,8 @@
         </el-select>
       </el-form-item>
 
-        <el-form-item label="提单号" prop="tMblno">
-          <el-input v-model="TWareHouseFees.tMblno" placeholder="请模糊输入" style="width:200px"/>
+        <el-form-item label="提单号" prop="fMblno">
+          <el-input v-model="TWareHouseFees.fMblno" placeholder="请模糊输入" style="width:200px"/>
         </el-form-item>
         <el-form-item label="收付" prop="fDc">
           <el-col :span="8">
@@ -461,7 +435,7 @@
         <el-button class="btnColor" type="info" size="mini" @click="resetQuery_s">重置</el-button>
       </el-form-item>
 
-      <el-table v-loading="loading" :data="feeList" @selection-change="handleSelectionChange_s">
+      <el-table v-loading="loading" :data="feeList" show-summary :summary-method="getSummaries" @selection-change="handleSelectionChange_s">
         <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"/>
@@ -471,11 +445,18 @@
         <el-table-column label="提单号" align="center" prop="fMblno"/>
         <el-table-column label="品名" align="center" prop="fProductName"/>
         <el-table-column label="业务日期" align="center" prop="fBsdate"/>
-        <el-table-column label="业务类型" 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>
+          <span v-else-if="scope.row.fBilltype == 'CKDB'">调拨</span>
+          <span v-else-if="scope.row.fBilltype == 'HQZY'">货权转移</span> 
+          </template>
+        </el-table-column>
   <!--       <el-table-column label="单据类型" align="center" prop="fBilltype" />-->
         <el-table-column label="审核日期" align="center" prop="fReviewDate" />
-        <el-table-column label="金额" align="center" prop="fOldAmount" />
-        <el-table-column label="本次金额" align="center" prop="fNewAmoun" />
+        <el-table-column label="金额" align="center" prop="fAmtdr" />
+        <el-table-column label="本次金额" align="center" prop="fAmt" />
         <el-table-column label="费用名称" align="center" prop="fFeeName" />
         <el-table-column label="备注" align="center" prop="f_remarks" >
           <el-input placeholder="请输入内容"></el-input>
@@ -540,23 +521,12 @@ export default {
   data() {
     return {
       browseStatus:false,
+      options:'',
       value1:"",
       value2:"",
       value3:"",
       value4:"",
       dateRange:"",
-      TWareHouseFees :{
-        fCorpid:'',
-        fToCorpid:'',
-        fMblno:'',
-        fStatementNo:'',
-        fFeeid :'',
-        timeExamine:'',
-        timeInterval:'',
-        fDc:'',
-        fReconciliation:'',
-        timeReconci: ''
-      },
       // 遮罩层
       loading: true,
       fAccbilldate: '',
@@ -591,6 +561,19 @@ export default {
       DzfeeList: [],
       // 财务主页面表格
       contrastList: [],
+      // 传值对象
+      TWareHouseFees:{
+        fCorpid:'',
+        fToCorpid:'',
+        fMblno:'',
+        fStatementNo:'',
+        fFeeid :'',
+        timeExamine:'',
+        timeInterval:'',
+        fDc:'',
+        fReconciliation:'',
+        timeReconci: '',
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -606,30 +589,45 @@ export default {
         fRemarks: null,
         fAccbilldate: null,
         fDeptid: null,
+        createBy: null,
+      },
+      // 主表查询参数
+      queryParams_s: {
+        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
       },
       // 表单参数
       form: {},
       // 表单校验
-      rules:{},
+      ruless:{},
       feeListRules: {
         // fCtrlcorpid: [
         //   { required:true, message: '不能为空', trigger: 'blur'}
         // ],
 
-
-
-        // fDc: [
-        //   { required:true,message: '不能为空', trigger:'blur' }
-        // ],
-        // fToCorpid: [
-        //   { required:true,message:'不能为空', trigger:'blur'}
-        // ],
-        // fReconciliation: [
-        //   { required:true,message:'不能为空', trigger:'blur'}
-        // ],
-        timeExamine: [
-          { required:true,message:'不能为空', tigger:'blur'}
+        fDc: [
+          { required:true,message: '不能为空', trigger:'blur' }
+        ],
+        fToCorpid: [
+          { required:true,message:'不能为空', trigger:'blur'}
         ],
+        fReconciliation: [
+          { required:true,message:'不能为空', trigger:'blur'}
+        ],
+        // timeExamine: [
+        //   { required:true,message:'不能为空', tigger:'blur'}
+        // ]
         // fBilltype: [
         //   { required: true, message: "单据类型(对账单 收费 付费 付费申请 收费申请，发票申请 销项发票 进项发票)不能为空", trigger: "change" }
         // ],
@@ -653,6 +651,28 @@ export default {
     //   this.contrastList.createBy = response.user.userName
     //   })
     // },
+    
+    getSummaries(param) {
+        const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        const values = data.map(item => Number(item[column.property]));
+        if (!values.every(value => isNaN(value))) {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+            sums[0] = '合计';
+          } else {
+            sums[4] = '';
+          }
+        })
+        return sums;
+      },
     // 导入搜索
     searchFee() {
       console.log(this.TWareHouseFees)
@@ -676,12 +696,18 @@ export default {
     getList() {
       console.log(this)
       this.loading = true;
-      listFee(this.queryParams).then(response => {
-        this.feeList = response.rows;
-        this.total = response.total;
-        this.loading = false;
+       this.getDicts("approval_process").then(response => {
+        // this.feeList = response.rows;
+        this.options = response.data
       });
+      listFee(this.queryParams_s).then(response => {
+        console.log(response)
+        this.contrastList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
     },
+    
     // 取消按钮
     cancel() {
       this.open = false;
@@ -754,6 +780,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.DzfeeList = []
       this.open = true;
       this.title = "添加财务数据主";
     },
@@ -762,7 +789,9 @@ export default {
       this.reset();
       const fId = row.fId || this.ids
       getFee(fId).then(response => {
-        this.form = response.data;
+        this.DzfeeList = response.data.tFeeDoList
+        this.TWareHouseFees = response.data.tFee
+        this.fWbuOptions = response.data.feesList
         this.open = true;
         this.title = "修改财务数据主";
       });
@@ -795,15 +824,19 @@ export default {
             });
             
           } else {
-            // let formDate = new window.FormData()
-            // formDate.append('contrast',JSON.stringify(this.form))
-            // formDate.append("feelitems", JSON.stringify(this.feeList))
+            let formDate = new window.FormData()
+            formDate.append('tFee',JSON.stringify(this.queryParams))
+            formDate.append("tFeeDo", JSON.stringify(this.DzfeeList))
 
-            addFee(this.form).then(response => {
+            addFee(formDate).then(response => {
               this.msgSuccess("新增成功");
+              this.DzfeeList = []
               this.open = false;
               this.getList();
             });
+            for (let item in this.selection){
+          console.log(this.selection[item])
+            }
           }
         }
       });
@@ -823,9 +856,20 @@ export default {
       if (this.selection.length == '0') {
         console.log('未选择')//写入提示
       } else {
+        console.log(this.selection[0].fMblno)
+        for (let item in this.selection){
+          console.log(this.selection[item])
+          console.log(this.selection[item].fMblno)
+          if(item > 1){
+            this.fMblno = this.selection[item].fMblno + "..."
+          }else if(item == 0){
+            this.fMblno = this.selection[item].fMblno
+          }
+        }
        this.DzfeeList = this.selection
        this.innerVisible = false
-       this.feeList = this.DzfeeList
+       this.feeList = []
+      //  this.feeList = this.DzfeeList
        this.TWareHouseFees = {
         fCorpid:'',
         fToCorpid:'',
@@ -887,10 +931,10 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.btnColor{
-  border:1px solid #0f5dee;
+.btnColor {
+  border: 1px solid #0f5dee;
 }
-.btnColor:hover{
-  color:#0f5dee;
+.btnColor:hover {
+  color: #0f5dee;
 }
 </style>