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

src/api/finance/contrast.js

@@ -51,3 +51,14 @@ export function exportFee(query) {
     params: query
   })
 }
+
+// 导入搜索
+export function importFee(TWareHouseFees) {
+  return request({
+    url: '/finance/charge/chargeList',
+    method: 'get',
+    params: TWareHouseFees,
+    tFee:TWareHouseFees,
+    tFeeDo:TWareHouseFees
+  })
+}

src/views/finance/contrast/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="货权方" prop="fCtrlcorpid">
+      <el-form-item label="货权方" prop="fCorpid">
         <el-select
-          v-model="queryParams.fCtrlcorpid"
+          v-model="TWareHouseFees.fCorpid"
           filterable
           remote
           clearable
@@ -20,11 +20,16 @@
           ></el-option>
         </el-select>
       </el-form-item>
+
+
       <el-form-item label="结算单位" prop="fCorpid">
-        <el-select label="请选择字典生成" value=""
+        <el-select
         v-model="queryParams.fCorpid"
         placeholder="请选择结算单位"
-        clearable size="small"
+        filterable
+          remote
+          clearable
+          style="width: 200px"
         @keyup.enter.native="handleQuery"
         :remote-method="corpsRemoteMethod">
           <el-option
@@ -119,7 +124,7 @@
         <el-input label="请选择字典生成" value="" v-model="queryParams.fDeptid" placeholder="请选择制单部门" clearable size="small"/>
       </el-form-item> -->
       <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="searchFee">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -148,7 +153,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['warehouse:fee:remove']"
+          v-hasPermi="['finance:contrast + fId']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -164,16 +169,16 @@
           type="primary"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['warehouse:fee:export']"
+          v-hasPermi="['finance:contrast:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="feeList" @selection-change="handleSelectionChange" size="mini">
-      <el-table-column label="选择" width="55" align="center"/>
+      <el-table-column label="选择" width="55" align="center" type="selection"/>
       <!-- <el-table-column label="制单部门" align="center" prop="fId" /> -->
-      <el-table-column label="行号" align="center"/>
+      <el-table-column label="行号" align="center" type="index"/>
       <el-table-column label="系统编号" align="center" prop="fBillno"/>
       <el-table-column label="货权方" align="center" prop="fCtrlcorpid"/>
       <el-table-column label="结算单位" align="center" prop="fCorpid"/>
@@ -232,7 +237,6 @@
           :remote-method="corpsRemoteMethod"
           placeholder="请输入客户名称"
         >
-
           <el-option
             v-for="(dict, index) in fMblnoOptions"
             :key="index.fId"
@@ -243,10 +247,14 @@
       </el-form-item>
 
       <el-form-item label="结算单位" prop="fCorpid">
-        <el-select label="请选择字典生成" value=""
-        v-model="form.fCorpid"
+        <el-select
+        v-model="queryParams.fCorpid"
         placeholder="请选择结算单位"
-        clearable size="small"
+        filterable
+          remote
+          clearable
+          style="width: 200px"
+        @keyup.enter.native="handleQuery"
         :remote-method="corpsRemoteMethod">
           <el-option
             v-for="(dict, index) in fMblnoOptions"
@@ -259,7 +267,7 @@
 
 
       <el-form-item label="提单号" prop="tMblno">
-          <el-input v-model="form.tMblno" placeholder="请模糊输入" @keyup.enter.native="handleQuery"/>
+          <el-input v-model="form.tMblno" placeholder="" :disabled="true"/>
       </el-form-item>
 
       <el-form-item label="对账日期">
@@ -283,7 +291,7 @@
       </el-form-item>
 
       <el-form-item label="单据编号">
-        <el-input/>
+        <el-input :disabled="true"/>
       </el-form-item>
 
       <el-form-item label="录入人" prop="createBy">
@@ -323,16 +331,16 @@
     </el-row>
     </el-form>
 
-    <el-table v-loading="loading" :data="feeList" @selection-change="handleSelectionChange" size="mini">
-        <el-table-column label="选1择" width="55" align="center"/>
+    <el-table v-loading="loading" :data="DzfeeList" @selection-change="handleSelectionChange" 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"/>
-        <el-table-column label="提单号" align="center" prop="tMblno"/>
-        <el-table-column label="业务日期" align="center"/>
-        <el-table-column label="费用名称" align="center"/>
-        <el-table-column label="收/付" align="center"/>
-        <el-table-column label="金额" align="center"/>
-        <el-table-column label="业务类型" align="center"/>
+        <el-table-column label="行号" align="center" type="index"/>
+        <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="fSrcdc"/>
+        <el-table-column label="金额" align="center" prop="fOldAmount"/>
+        <el-table-column label="业务类型" align="center" prop="fBilltype"/>
     </el-table>
 
       <div slot="footer" class="dialog-footer">
@@ -343,34 +351,68 @@
 
     <!-- 添加或修改财务数据主对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="65%" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
-        <el-form-item label="业务编号" prop="fBillno">
+      <el-form :model="TWareHouseFees" ref="feeListRules" :rules="feeListRules" label-width="80px" :inline="true">
+        <!-- <el-form-item label="业务编号" prop="fBillno">
           <el-input v-model="form.fBillno" placeholder="请输入业务编号" />
-        </el-form-item>
+        </el-form-item> -->
 
-        <el-form-item class="el-form-item__label" label="货权方" prop="fCtrlcorpid">
-          <el-input value="" v-model="form.fCtrlcorpid" placeholder="请模糊输入" @keyup.enter.native="handleQuery"/>
-        </el-form-item>
-        <el-form-item label="结算单位" prop="fCorpid">
-          <el-input value="" v-model="form.fCorpid" placeholder="请模糊输入" @keyup.enter.native="handleQuery"/>
+        <el-form-item class="el-form-item__label" label="货权方" prop="fCorpid">
+          <el-select
+          v-model="TWareHouseFees.fCorpid"
+          filterable
+          remote
+          clearable
+          style="width: 200px"
+          :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="fToCorpid">
+        <el-select
+        v-model="TWareHouseFees.fToCorpid"
+        placeholder="请选择结算单位"
+        filterable
+          remote
+          clearable
+          style="width: 200px"
+        :remote-method="corpsRemoteMethod">
+          <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="tMblno">
           <el-input v-model="form.tMblno" placeholder="请模糊输入" @keyup.enter.native="handleQuery"/>
         </el-form-item>
-        <el-form-item label="收付">
-          <el-col :span="6">
-            <el-input placeholder="收" />
+        <el-form-item label="收付" prop="fSrcdc">
+          <el-col :span="8">
+            <el-select v-model="TWareHouseFees.fSrcdc">
+              <el-option value="是"/>
+              <el-option value="否"/>
+            </el-select>
           </el-col>
         </el-form-item>
-        <el-form-item label="是否对账">
-          <el-col :span="6">
-            <el-input placeholder="否" />
+        <el-form-item label="是否对账" prop="fReconciliation">
+          <el-col :span="8">
+            <el-select v-model="TWareHouseFees.fReconciliation">
+              <el-option value="是"/>
+              <el-option value="否"/>
+            </el-select>
           </el-col>
         </el-form-item>
 
-
-
-
         <el-form-item label="费用名称" prop="fFeeid">
             <template>
               <el-select
@@ -378,6 +420,7 @@
                 filterable
                 :disabled="browseStatus"
                 remote
+                @keyup.enter.native="handleQuery"
                 :remote-method="fWRemoteMethod"
                 placeholder="费用名称"
               >
@@ -392,22 +435,16 @@
 
         </el-form-item>
 
-
-
-
-
-
-        <el-form-item label="审核日期">
+        <el-form-item label="审核日期" prop="fReviewDate">
         <el-date-picker
-          v-model="value1"
-          size="small"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
+          style="width:200px"
+          v-model="TWareHouseFees.fReviewDate"
           type="daterange"
-          range-separator="-"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
-        ></el-date-picker>
+          value-format="yyyy-MM-dd"
+          :default-time="['00:00:00', '23:59:59']">
+        </el-date-picker>
       </el-form-item>
 
       <el-form-item label="对账日期">
@@ -425,24 +462,29 @@
 
       <el-form-item>
         <el-button class="btnColor" type="info" size="mini">导入</el-button>
-        <el-button class="btnColor" type="info" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button class="btnColor" type="info" size="mini" @click="searchFee">搜索</el-button>
         <el-button class="btnColor" type="info" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
 
       <el-table v-loading="loading" :data="feeList" @selection-change="handleSelectionChange" size="mini">
-        <el-table-column label="选2择" width="55" align="center"/>
+        <el-table-column label="选择"  width="55" align="center" type="selection"/>
         <!-- <el-table-column label="制单部门" align="center" prop="fId" /> -->
-        <el-table-column label="行号" align="center"/>
-        <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="tMblno"/>
-        <el-table-column label="应收合计" align="center" prop="fAmtdr"/>
-        <el-table-column label="应付合计" align="center" prop="fAmtcr"/>
+        <el-table-column label="行号" align="center" type="index"/>
+        <el-table-column label="货权方" align="center" prop="fName"/>
+        <el-table-column label="结算单位" align="center" prop="fFeesName"/>
+        <!-- <el-table-column label="账单日期" align="center" prop="fAccbilldate"/> -->
+        <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" />-->
-        <el-table-column label="备注" align="center" prop="fRemarks" />
-        <el-table-column label="状态" align="center" prop="fBillstatus" />
+        <el-table-column label="审核日期" align="center" prop="fReviewDate" />
+        <el-table-column label="金额" align="center" prop="fOldAmount" />
+        <el-table-column label="本次金额" align="center" prop="fNewAmount" />
+        <el-table-column label="费用名称" align="center" prop="fFeeName" />
+        <el-table-column label="备注" align="center" prop="f_remarks" >
+          <el-input placeholder="请输入内容"></el-input>
+        </el-table-column>
       </el-table>
 
         <!-- <el-form-item label="应收合计" prop="fAmtdr">
@@ -482,7 +524,7 @@
         </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="confirm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -492,9 +534,10 @@
 </template>
 
 <script>
-import { listFee, getFee, delFee, addFee, updateFee, exportFee } from "@/api/finance/contrast";
+import { listFee, getFee, delFee, addFee, updateFee, exportFee, importFee} from "@/api/finance/contrast";
 import { listCorps } from '@/api/basicdata/corps'
 import { listFees } from '@/api/basicdata/fees'
+
 import moment from 'moment'
 export default {
   name: "Fee",
@@ -502,12 +545,24 @@ export default {
   },
   data() {
     return {
+      // lineId:respones.Arry.index,
       browseStatus:false,
       value1:"",
       value2:"",
       value3:"",
       value4:"",
       dateRange:"",
+      TWareHouseFees :{
+        fCorpid:'',
+        fToCorpid:'',
+        fMblno:'',
+        fStatementNo:'',
+        fFeeid :'',
+        timeExamine:'',
+        timeInterval:'',
+        fSrcdc:'',
+        fReconciliation:''
+      },
       // 遮罩层
       loading: true,
       fAccbilldate: '',
@@ -528,12 +583,14 @@ export default {
       fFeeunitidOptions: [],
       fWbuOptions: [],
       KHblnoOptions: [],
-
+    
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
       dialogVisible: false,
+      // 财务对账表格
+      DzfeeList: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -553,22 +610,32 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-        fCtrlcorpid: [
-          { required: true, message: "货权方不能为空", trigger: "change" }
+      rules:{},
+      feeListRules: {
+        // fCtrlcorpid: [
+        //   { required:true, message: '不能为空', trigger: 'blur'}
+        // ],
+        fSrcdc: [
+          { required:true,message: '不能为空', trigger:'blur' }
+        ],
+        fToCorpid: [
+          { required:true,message:'不能为空', trigger:'blur'}
         ],
-        fCorpid: [
-          { required: true, message: "结算单位(下拉模糊搜索)不能为空", trigger: "change" }
+        fReconciliation: [
+          { required:true,message:'不能为空', trigger:'blur'}
         ],
-        fBilltype: [
-          { required: true, message: "单据类型(对账单 收费 付费 付费申请 收费申请，发票申请 销项发票 进项发票)不能为空", trigger: "change" }
+        fReviewDate: [
+          { required:true,message:'不能为空', tigger:'blur'}
         ],
+        // fBilltype: [
+        //   { required: true, message: "单据类型(对账单 收费 付费 付费申请 收费申请，发票申请 销项发票 进项发票)不能为空", trigger: "change" }
+        // ],
         fBillstatus: [
           { required: true, message: "状态不能为空", trigger: "blur" }
-        ],
-        fDeptid: [
-          { required: true, message: "制单部门不能为空", trigger: "change" }
-        ],
+        ]
+        // fDeptid: [
+        //   { required: true, message: "制单部门不能为空", trigger: "change" }
+        // ],
       }
     };
   },
@@ -576,6 +643,17 @@ export default {
     this.getList();
   },
   methods: {
+    // 导入搜索
+    searchFee() {
+      console.log(this.TWareHouseFees)
+      importFee(this.TWareHouseFees).then(response =>{
+        console.log(response)
+        
+        this.feeList = response.rows
+        
+      })
+    },
+
      /** 打开导入表弹窗 */
     openImportTable() {
       this.$refs.import.show();
@@ -593,6 +671,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.feeList = []
       this.reset();
     },
     // 表单重置
@@ -622,11 +701,23 @@ export default {
     handleQuery() {
       this.queryParams.pageNum = 1;
       this.getList();
+      this.searchFee()
     },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
       this.handleQuery();
+      this.TWareHouseFees={
+        fCorpid:'',
+        fToCorpid:'',
+        fMblno:'',
+        fStatementNo:'',
+        fFeeid :'',
+        timeExamine:'',
+        timeInterval:'',
+        fSrcdc:'',
+        fReconciliation:''
+      }
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -661,18 +752,29 @@ export default {
         this.KHblnoOptions = response.rows;
       });
     },
-
+    
     /** 提交按钮 */
     submitForm() {
+      console.log(this.form)
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.fId != null) {
+            // let formDate = new window.FormData()
+            // formDate.append('contrast',JSON.stringify(this.form))
+            // formDate.append("feelitems", JSON.stringify(this.feeList))
+
             updateFee(this.form).then(response => {
               this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
+              this.feeList = []
             });
+            
           } else {
+            // let formDate = new window.FormData()
+            // formDate.append('contrast',JSON.stringify(this.form))
+            // formDate.append("feelitems", JSON.stringify(this.feeList))
+
             addFee(this.form).then(response => {
               this.msgSuccess("新增成功");
               this.open = false;
@@ -682,6 +784,11 @@ export default {
         }
       });
     },
+    /* 添加财务数据主 导入*/
+    confirm(){
+      this.DzfeeList = this.feeList
+    },
+
     /** 删除按钮操作 */
     handleDelete(row) {
       const fIds = row.fId || this.ids;
@@ -706,9 +813,7 @@ export default {
       listFees(queryParams).then((response) => {
         console.log(response)
         console.log("1111")
-        this.fWbuOptions = response.rows
-        // let fWbuOptions = this.fWbuOptions.concat(response.rows)
-        // this.fWbuOptions = Array.from(new Set(fWbuOptions))
+       this.fWbuOptions = response.rows
         console.log(this.fWbuOptions)
       });
     },