Browse Source

Merge branch 'master' of http://192.168.2.241:3000/hdc/java-collect-fees-front

jonbo 5 months ago
parent
commit
01cec35871

+ 2 - 1
src/views/mis/feesManage/businessFees2-index.vue

@@ -81,6 +81,7 @@
                   icon="el-icon-mobile"
                   size="small"
                   style="margin-left: 2px"
+                  disabled="true"
                   circle
                 ></el-button>
               </el-descriptions-item>
@@ -761,7 +762,7 @@ export default {
         }
       } else {
         //零头实缴
-        this.feesModel.payTotalAmount = this.feesModel.chargeAcc.toFixed(2);
+        this.feesModel.payTotalAmount = parseFloat(this.feesModel.chargeAcc).toFixed(2);
         this.feesModel.thisBlance = 0.0;
       }
 

+ 44 - 31
src/views/mis/feesManage/chargeInvoce.vue

@@ -1,11 +1,16 @@
 <template>
   <div>
-    <div class="filter" style="line-height:40px">
+    <div class="filter" style="line-height: 40px">
       <el-row>
-        <el-col :span="5" >
+        <el-col :span="5">
           <div class="grid-content bg-purple">
             <label> <span>票据状态:</span></label>
-            <el-select v-model="queryParams.chbz" style="width: 120px;" size="small" placeholder="全部">
+            <el-select
+              v-model="queryParams.chbz"
+              style="width: 120px"
+              size="small"
+              placeholder="全部"
+            >
               <el-option
                 v-for="item in invoceState"
                 :key="item.value"
@@ -17,10 +22,15 @@
             </el-select>
           </div>
         </el-col>
-        <el-col :span="5" >
+        <el-col :span="5">
           <div class="grid-content bg-purple">
             <label> <span>收费类型:</span></label>
-            <el-select v-model="queryParams.sflx" style="width: 120px;" size="small" placeholder="全部">
+            <el-select
+              v-model="queryParams.sflx"
+              style="width: 120px"
+              size="small"
+              placeholder="全部"
+            >
               <el-option
                 v-for="item in chargeType"
                 :key="item.value"
@@ -32,7 +42,7 @@
             </el-select>
           </div>
         </el-col>
-        <el-col :span="8" >
+        <el-col :span="8">
           <div class="grid-content bg-purple">
             <label> <span>用户编号:</span></label>
             <el-input
@@ -41,11 +51,17 @@
               style="width: 40%"
               size="small"
             ></el-input>
-            <el-button type="primary" @click="onLoadChargeList" size="small" icon="el-icon-search">查询</el-button>
+            <el-button
+              type="primary"
+              @click="onLoadChargeList"
+              size="small"
+              icon="el-icon-search"
+              >查询</el-button
+            >
           </div>
         </el-col>
 
-        <el-col :span="6" >
+        <el-col :span="6">
           <div class="grid-content bg-purple" style="padding-top: 3px">
             <el-button
               type="danger"
@@ -68,12 +84,13 @@
       <TableItem
         :table-data="tableChargeData"
         :column="chargeColumn"
+        :for-id="true"
         :pagination="true"
         :pagesize="pageInfo.size"
         :currentpage="pageInfo.current"
         :total="pageInfo.tableTotal"
         :border="true"
-        :multiple="true"
+        :multiple="false"
         :fixed="true"
         :isdelete="false"
         :is-select="false"
@@ -106,7 +123,7 @@
   </div>
 </template>
  <script>
-import TableItem from '@/views/mis/common/misTable/index.vue';
+import TableItem from "@/views/mis/common/misTable/index.vue";
 import "@/views/mis/common/assets/styles/misStyle.scss";
 import { feesApi } from "@/views/mis/common/api/feesApi.js";
 export default {
@@ -266,28 +283,24 @@ export default {
   destroyed() {},
   methods: {
     onLoadChargeList() {
-      if (this.queryParams.yhbh != "") {
-        /**
-         * @description 查询用户实收明细
-         */
+      /**
+       * @description 查询用户实收明细
+       */
 
-        const params = Object.assign({}, this.pageInfo, this.queryParams);
-        feesApi
-          .queryCharge(params)
-          .then((res) => {
-            if (res.result.total > 0) {
-              this.tableChargeData = res.result.records;
-              this.pageInfo.tableTotal = res.result.total;
-            } else {
-              this.tableChargeData = [];
-            }
-          })
-          .catch((ex) => {
-            this.$message.error("查询实收信息失败!");
-          });
-      } else {
-        this.$message.error("请输入需要查询的用户编号!");
-      }
+      const params = Object.assign({}, this.pageInfo, this.queryParams);
+      feesApi
+        .queryCharge(params)
+        .then((res) => {
+          if (res.result.total > 0) {
+            this.tableChargeData = res.result.records;
+            this.pageInfo.tableTotal = res.result.total;
+          } else {
+            this.tableChargeData = [];
+          }
+        })
+        .catch((ex) => {
+          this.$message.error("查询实收信息失败!");
+        });
     },
     onChargeHandleCurrentChange(currpage) {
       //设置页码

+ 3 - 0
src/views/mis/financialManage/chargeFeeRecManage/chargeFeeRec.vue

@@ -753,6 +753,9 @@ export default {
   created() {
     //水价1、水价2、水价3
   },
+  mounted() {
+    this.loadData();
+  },
   methods: {
     /**
      * 数据加载

+ 8 - 1
src/views/mis/financialManage/waterType/waterAdd.vue

@@ -32,7 +32,14 @@
       </cpsSelect>
     </el-form-item>
     <el-form-item label="天数、日期" prop="znjday">
-      <el-input v-model="reportForm.znjday" class="from_text"></el-input>
+      <el-input-number
+        v-model="reportForm.znjday"
+        class="from_text"
+        controls-position="right"
+        :precision="0"
+        :min="0"
+        :max="99999999999"
+      ></el-input-number>
     </el-form-item>
     <el-form-item label="备注说明" prop="bz">
       <el-input v-model="reportForm.bz" class="from_text"></el-input>

+ 3 - 3
src/views/mis/financialManage/waterType/waterTypeList.vue

@@ -49,7 +49,7 @@
           size="small"
           icon="el-icon-edit"
           @click="editClick()"
-          :disabled="multipleSelection.length !== 1"
+
           >修改</el-button
         >
         <el-button
@@ -58,7 +58,7 @@
           type="danger"
           size="small"
           icon="el-icon-delete"
-          :disabled="multipleSelection.length !== 1"
+        
           @click="deleteClick()"
           >删除</el-button
         >
@@ -73,7 +73,7 @@
         :pagesize="pageInfo.size"
         :currentpage="pageInfo.current"
         :border="true"
-        :multiple="true"
+        :multiple="false"
         :total="pageInfo.tableTotal"
         :fixed="true"
         :isdelete="false"

+ 2 - 2
src/views/mis/weChatManagement/wxBzSq-index.vue

@@ -81,13 +81,13 @@
               @click="clickModify()"
               >处理</el-button
             >
-            <el-button
+            <!-- <el-button
               type="primary"
               size="small"
               icon="el-icon-refresh"
               @click="clickRefresh()"
               >刷新</el-button
-            >
+            > -->
             <el-button
               type="info"
               size="small"

+ 2 - 2
src/views/mis/weChatManagement/wxFwNotice-index.vue

@@ -79,13 +79,13 @@
               @click="clickSend()"
               >发送</el-button
             >
-            <el-button
+            <!-- <el-button
               type="primary"
               size="small"
               icon="el-icon-refresh"
               @click="clickRefresh()"
               >刷新</el-button
-            >
+            > -->
           </el-col>
         </el-row>
       </el-header>

+ 2 - 2
src/views/mis/weChatManagement/wxTsNotice-index.vue

@@ -80,13 +80,13 @@
               >发送</el-button
             >
 
-            <el-button
+            <!-- <el-button
               type="primary"
               size="small"
               icon="el-icon-refresh"
               @click="clickRefresh()"
               >刷新</el-button
-            >
+            > -->
           </el-col>
         </el-row>
       </el-header>

+ 2 - 2
src/views/mis/weChatManagement/wx_ts_notice.vue

@@ -45,11 +45,11 @@
             >发送</el-button
           >
         </div>
-        <div>
+        <!-- <div>
           <el-button type="primary tfbutton" size="small" @click="doRefresh()"
             >刷新</el-button
           >
-        </div>
+        </div> -->
       </div>
     </div>