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

src/views/finance/contrast/index.vue

@@ -132,15 +132,15 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          type="success"
+          type="primary"
           size="mini"
-          @click="dialogVisible = true"
-          v-hasPermi="['warehouse:fee:add']"
+          @click="handleAdd"
+          v-hasPermi="['finance:contrast:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
+          type="success"
           size="mini"
           :disabled="single"
           @click="handleUpdate"
@@ -158,15 +158,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="info"
-          size="mini"
-          @click="openImportTable"
-          v-hasPermi="['warehouse:fee:export']"
-        >导入</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
+          type="warning"
           size="mini"
           @click="handleExport"
           v-hasPermi="['finance:contrast:export']"
@@ -223,12 +215,12 @@
     />
 
     <!-- 对账表 -->
-    <el-dialog :visible.sync="dialogVisible" width="65%" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
+    <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-item label="货权方" prop="fCtrlcorpid">
         <el-select
-          v-model="form.fCtrlcorpid"
+          v-model="TWareHouseFees.fCtrlcorpid"
           filterable
           remote
           clearable
@@ -248,7 +240,7 @@
 
       <el-form-item label="结算单位" prop="fCorpid">
         <el-select
-        v-model="queryParams.fCorpid"
+        v-model="TWareHouseFees.fCorpid"
         placeholder="请选择结算单位"
         filterable
           remote
@@ -267,20 +259,21 @@
 
 
       <el-form-item label="提单号" prop="tMblno">
-          <el-input v-model="form.tMblno" placeholder="" :disabled="true"/>
+          <el-input v-model="TWareHouseFees.tMblno" placeholder="" :disabled="true"/>
       </el-form-item>
 
-      <el-form-item label="对账日期">
+      <el-form-item label="对账日期" prop="timeReconci">
         <el-date-picker
-          v-model="value3"
+          v-model="TWareHouseFees.timeReconci"
           size="small"
-          style="width: 240px"
+          style="width: 200px"
           value-format="yyyy-MM-dd"
-          type="date">
+          type="date"
+          placeholder="选择账单日期">
         </el-date-picker>
       </el-form-item>
 
-      <el-form-item label="单据日期">
+      <!-- <el-form-item label="单据日期">
         <el-date-picker
           v-model="value4"
           size="small"
@@ -288,7 +281,7 @@
           value-format="yyyy-MM-dd"
           type="date">
         </el-date-picker>
-      </el-form-item>
+      </el-form-item> -->
 
       <el-form-item label="单据编号">
         <el-input :disabled="true"/>
@@ -298,12 +291,23 @@
         <el-input v-model="form.createBy"/>
       </el-form-item>
 
+
+      
+    
+
       <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+        <el-button
+          type="warning"
+          size="mini"
+          @click="innerVisible = true" v-hasPermi="['warehouse:fee:add']"
+        >对账</el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="info"
           size="mini"
-          @click="handleAdd" v-hasPermi="['warehouse:fee:add']"
+          @click="innerVisible = true" v-hasPermi="['warehouse:fee:add']"
         >确认对账</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -327,7 +331,7 @@
           v-hasPermi="['warehouse:fee:remove']"
         >删除</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
     </el-form>
 
@@ -347,10 +351,9 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
 
-    <!-- 添加或修改财务数据主对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="65%" append-to-body :close-on-click-modal="false">
+        <!-- 添加或修改财务数据主对话框 -->
+    <el-dialog :close-on-click-modal="false" width="65%" :title="title" :visible.sync="innerVisible" append-to-body>
       <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="请输入业务编号" />
@@ -394,21 +397,21 @@
       </el-form-item>
 
         <el-form-item label="提单号" prop="tMblno">
-          <el-input v-model="form.tMblno" placeholder="请模糊输入" @keyup.enter.native="handleQuery"/>
+          <el-input v-model="TWareHouseFees.tMblno" placeholder="请模糊输入" style="width:200px"/>
         </el-form-item>
-        <el-form-item label="收付" prop="fSrcdc">
+        <el-form-item label="收付" prop="fDc">
           <el-col :span="8">
-            <el-select v-model="TWareHouseFees.fSrcdc">
-              <el-option value="是"/>
-              <el-option value="否"/>
+            <el-select v-model="TWareHouseFees.fDc" style="width:200px">
+              <el-option label="收" value="D"/>
+              <el-option label="付" value="C"/>
             </el-select>
           </el-col>
         </el-form-item>
         <el-form-item label="是否对账" prop="fReconciliation">
           <el-col :span="8">
-            <el-select v-model="TWareHouseFees.fReconciliation">
-              <el-option value="是"/>
-              <el-option value="否"/>
+            <el-select v-model="TWareHouseFees.fReconciliation" style="width:200px">
+              <el-option label="是" value="1"/>
+              <el-option label="否" value="0"/>
             </el-select>
           </el-col>
         </el-form-item>
@@ -416,29 +419,33 @@
         <el-form-item label="费用名称" prop="fFeeid">
             <template>
               <el-select
-                v-model="form.fFeeid"
+                v-model="TWareHouseFees.fFeeid"
                 filterable
                 :disabled="browseStatus"
                 remote
-                @keyup.enter.native="handleQuery"
                 :remote-method="fWRemoteMethod"
                 placeholder="费用名称"
+                multiple
               >
-                <el-option
+                <!-- <el-option
                   v-for="(dict, index) in fWbuOptions"
                   :key="index.fId"
                   :label="dict.fName"
                   :value="dict.fId"
-                ></el-option>
+                ></el-option> -->
+                <el-option v-for="item in fWbuOptions" :key="item.fId" :label="item.fName" :value="item.fId">
+                </el-option>
+
               </el-select>
             </template>
 
         </el-form-item>
 
-        <el-form-item label="审核日期" prop="fReviewDate">
+        <el-form-item label="审核日期" prop="timeExamine">
         <el-date-picker
           style="width:200px"
-          v-model="TWareHouseFees.fReviewDate"
+          size="small"
+          v-model="TWareHouseFees.timeExamine"
           type="daterange"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
@@ -447,27 +454,27 @@
         </el-date-picker>
       </el-form-item>
 
-      <el-form-item label="对账日期">
+      <el-form-item label="对账日期" label-width="85px" prop="timeReconci">
         <el-date-picker
-          v-model="value2"
+          v-model="TWareHouseFees.timeReconci"
           size="small"
-          style="width: 240px"
+          style="width: 200px"
           value-format="yyyy-MM-dd"
           type="daterange"
-          range-separator="-"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']"
         ></el-date-picker>
       </el-form-item>
 
       <el-form-item>
-        <el-button class="btnColor" type="info" size="mini">导入</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-button class="btnColor" type="info" size="mini">导入</el-button> -->
+        <el-button class="btnColor" type="cyan" size="mini" @click="searchFee">搜索</el-button>
+        <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" size="mini">
-        <el-table-column label="选择"  width="55" align="center" type="selection"/>
+      <el-table v-loading="loading" :data="feeList" @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="fName"/>
@@ -480,7 +487,7 @@
   <!--       <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="fNewAmount" />
+        <el-table-column label="本次金额" align="center" prop="fNewAmoun" />
         <el-table-column label="费用名称" align="center" prop="fFeeName" />
         <el-table-column label="备注" align="center" prop="f_remarks" >
           <el-input placeholder="请输入内容"></el-input>
@@ -522,14 +529,13 @@
             <el-option label="请选择字典生成" value="" />
           </el-select>
         </el-form-item> -->
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="confirm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="confirmImport">确 定</el-button>
+          <el-button @click="innerVisible = false">取 消</el-button>
+        </div>
+      </el-dialog>
     </el-dialog>
-
-
   </div>
 </template>
 
@@ -560,8 +566,9 @@ export default {
         fFeeid :'',
         timeExamine:'',
         timeInterval:'',
-        fSrcdc:'',
-        fReconciliation:''
+        fDc:'',
+        fReconciliation:'',
+        timeReconci: ''
       },
       // 遮罩层
       loading: true,
@@ -583,7 +590,8 @@ export default {
       fFeeunitidOptions: [],
       fWbuOptions: [],
       KHblnoOptions: [],
-    
+      //打开内部弹窗
+      innerVisible: false,
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -615,7 +623,7 @@ export default {
         // fCtrlcorpid: [
         //   { required:true, message: '不能为空', trigger: 'blur'}
         // ],
-        fSrcdc: [
+        fDc: [
           { required:true,message: '不能为空', trigger:'blur' }
         ],
         fToCorpid: [
@@ -646,12 +654,14 @@ export default {
     // 导入搜索
     searchFee() {
       console.log(this.TWareHouseFees)
-      importFee(this.TWareHouseFees).then(response =>{
-        console.log(response)
-        
-        this.feeList = response.rows
-        
-      })
+      this.$refs['feeListRules'].validate(valid => {
+        if (valid){
+          importFee(this.TWareHouseFees).then(response =>{
+          console.log(response) 
+          this.feeList = response.rows
+         })
+        }
+      }) 
     },
 
      /** 打开导入表弹窗 */
@@ -719,6 +729,18 @@ export default {
         fReconciliation:''
       }
     },
+    //导入重置按钮
+    resetQuery_s() {
+      this.TWareHouseFees = {
+        fCorpid: '',
+        fToCorpid: '',
+        fMblno: '',
+        fStatementNo: '',
+        fFeeid: '',
+        timeExamine: '',
+        timeInterval: ''
+      }
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.fId)
@@ -755,8 +777,7 @@ export default {
     
     /** 提交按钮 */
     submitForm() {
-      console.log(this.form)
-      this.$refs["form"].validate(valid => {
+      this.$refs["feeListRules"].validate(valid => {
         if (valid) {
           if (this.form.fId != null) {
             // let formDate = new window.FormData()
@@ -784,10 +805,38 @@ export default {
         }
       });
     },
-    /* 添加财务数据主 导入*/
-    confirm(){
-      this.DzfeeList = this.feeList
+    // 导入多选框
+    handleSelectionChange_s(selection) {
+      this.selection = selection
     },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.fId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /* 添加财务数据主 导入*/
+    confirmImport(){
+      if (this.selection.length == '0') {
+        console.log('未选择')//写入提示
+      } else {
+       this.DzfeeList = this.selection
+       this.innerVisible = false
+       this.feeList = this.DzfeeList
+       this.TWareHouseFees = {
+        fCorpid:'',
+        fToCorpid:'',
+        fMblno:'',
+        fStatementNo:'',
+        fFeeid :'',
+        timeExamine:'',
+        timeInterval:'',
+        fSrcdc:'',
+        fReconciliation:'',
+        timeReconci: ''
+       }
+    }
+  },
 
     /** 删除按钮操作 */
     handleDelete(row) {