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

src/views/mis/financialManage/chargeFeeRecManage/chargeFeeRec.vue

@@ -147,6 +147,7 @@
               skey="cblx"
               isDisabled="all"
               :clearable="false"
+              @change="onJjslChange"
             >
             </cpsSelect>
           </el-descriptions-item>
@@ -189,365 +190,230 @@
           ></el-descriptions-item>
         </el-descriptions>
         <!--水价-->
-        <el-row :gutter="10">
-          <el-col :span="8"
-            >(基)水价1:<cpsSelect
-              v-model="recInfo.sjbm"
-              placeholder="请选择"
-              skey="sj"
-              size="small"
-              style="width: 60%"
+        <el-tabs v-model="activeName" type="border-card" style="margin: 3px">
+          <el-tab-pane label="水价1" name="ysjg1">
+            <el-descriptions
+              :column="3"
+              size="medium"
+              border
+              labelClassName="descLabel"
+              contentClassName="descContent"
+              labelStyle="width:12%"
+              contentStyle="width:17%"
             >
-            </cpsSelect
-          ></el-col>
-          <el-col :span="4"
-            >水量1:<el-input
-              v-model="recInfo.sl"
-              size="small"
-              style="width: 50%"
-            ></el-input
-          ></el-col>
-          <el-col :span="4"
-            >水费1:<el-input
-              v-model="recInfo.sf"
-              size="small"
-              style="width: 50%"
-            ></el-input
-          ></el-col>
-          <el-col :span="4"
-            >污水费1:<el-input
-              v-model="recInfo.wsf"
-              size="small"
-              style="width: 50%"
-            ></el-input
-          ></el-col>
-          <el-col :span="4"
-            >垃圾费1:<el-input
-              v-model="recInfo.ljf"
-              size="small"
-              style="width: 50%"
-            ></el-input
-          ></el-col>
-        </el-row>
-
-        <el-row :gutter="10">
-          <el-col :span="8"
-            >阶梯水价1:<el-input
-              v-model="recInfo.jt1sj"
-              size="small"
-              style="width: 50%"
-              :disabled="true"
-            ></el-input
-          ></el-col>
-          <el-col :span="8"
-            >阶梯水量1:<el-input
-              v-model="recInfo.jt1sl"
-              size="small"
-              style="width: 50%"
-              :disabled="true"
-            ></el-input
-          ></el-col>
-          <el-col :span="8"
-            >阶梯水费1:<el-input
-              v-model="recInfo.jt1sf"
-              size="small"
-              style="width: 50%"
-              :disabled="true"
-            ></el-input
-          ></el-col>
-        </el-row>
-        <el-row :gutter="10">
-          <el-col :span="8"
-            >阶梯水价2:<el-input
-              v-model="recInfo.jt2sj"
-              size="small"
-              style="width: 50%"
-              :disabled="true"
-            ></el-input
-          ></el-col>
-          <el-col :span="8"
-            >阶梯水量2:<el-input
-              v-model="recInfo.jt2sl"
-              size="small"
-              style="width: 50%"
-              :disabled="true"
-            ></el-input
-          ></el-col>
-          <el-col :span="8"
-            >阶梯水费2:<el-input
-              v-model="recInfo.jt2sf"
-              size="small"
-              style="width: 50%"
-              :disabled="true"
-            ></el-input
-          ></el-col>
-        </el-row>
-        <el-row :gutter="10">
-          <el-col :span="8"
-            >阶梯水价3:<el-input
-              v-model="recInfo.jt3sj"
-              size="small"
-              style="width: 50%"
-              :disabled="true"
-            ></el-input
-          ></el-col>
-          <el-col :span="8"
-            >阶梯水量3:<el-input
-              v-model="recInfo.jt3sl"
-              size="small"
-              style="width: 50%"
-              :disabled="true"
-            ></el-input
-          ></el-col>
-          <el-col :span="8"
-            >阶梯水费3:<el-input
-              v-model="recInfo.jt3sf"
-              size="small"
-              style="width: 50%"
-              :disabled="true"
-            ></el-input
-          ></el-col>
-        </el-row>
-        <!--水价1-->
-        <el-row :gutter="10">
-          <el-col :span="8"
-            >(基)水价2:<cpsSelect
-              v-model="recInfo.sjbm1"
-              placeholder="请选择"
-              skey="sj"
-              size="small"
-              style="width: 60%"
+              <el-descriptions-item label="(基)水价1">
+                <cpsSelect
+                  v-model="recInfo.sjbm"
+                  placeholder="请选择"
+                  skey="sj"
+                  @change="onJjslChange"
+                >
+                </cpsSelect
+              ></el-descriptions-item>
+              <el-descriptions-item label="水量1">
+                <el-input v-model="recInfo.sl" @change="onJjslChange"></el-input
+              ></el-descriptions-item>
+              <el-descriptions-item label="水费1">
+                {{ recInfo.sf }}
+              </el-descriptions-item>
+              <el-descriptions-item label="污水费单价">
+                {{ recInfo.wsfdj }}
+              </el-descriptions-item>
+              <el-descriptions-item label="污水费水量">
+                {{ recInfo.sl }}
+              </el-descriptions-item>
+              <el-descriptions-item label="污水费1">
+                {{ recInfo.wsf }}
+              </el-descriptions-item>
+              <el-descriptions-item label="垃圾费单价">
+                {{ recInfo.ljfdj }}
+              </el-descriptions-item>
+              <el-descriptions-item label="垃圾费水量">
+                {{ recInfo.sl }}
+              </el-descriptions-item>
+              <el-descriptions-item label="垃圾费1">
+                {{ recInfo.ljf }}
+              </el-descriptions-item>
+              <el-descriptions-item label="阶梯水价1">
+                {{ recInfo.jt1sj }}
+              </el-descriptions-item>
+              <el-descriptions-item label="阶梯水量1">
+                {{ recInfo.jt1sl }}
+              </el-descriptions-item>
+              <el-descriptions-item label="阶梯水费1">
+                {{ recInfo.jt1sf }}
+              </el-descriptions-item>
+              <el-descriptions-item label="阶梯水价2">
+                {{ recInfo.jt2sj }}
+              </el-descriptions-item>
+              <el-descriptions-item label="阶梯水量2">
+                {{ recInfo.jt2sl }}
+              </el-descriptions-item>
+              <el-descriptions-item label="阶梯水费2">
+                {{ recInfo.jt2sf }}
+              </el-descriptions-item>
+              <el-descriptions-item label="阶梯水价3">
+                {{ recInfo.jt3sj }}
+              </el-descriptions-item>
+              <el-descriptions-item label="阶梯水量3">
+                {{ recInfo.jt3sl }}
+              </el-descriptions-item>
+              <el-descriptions-item label="阶梯水费3">
+                {{ recInfo.jt3sf }}
+              </el-descriptions-item>
+            </el-descriptions>
+          </el-tab-pane>
+          <el-tab-pane label="水价2" name="ysjg2">
+            <el-descriptions
+              :column="3"
+              size="medium"
+              border
+              labelClassName="descLabel"
+              contentClassName="descContent"
+              labelStyle="width:12%"
+              contentStyle="width:17%"
             >
-            </cpsSelect
-          ></el-col>
-          <el-col :span="4"
-            >水量2:<el-input
-              v-model="recInfo.sl1"
-              size="small"
-              style="width: 50%"
-            ></el-input
-          ></el-col>
-          <el-col :span="4"
-            >水费2:<el-input
-              v-model="recInfo.sf1"
-              size="small"
-              style="width: 50%"
-            ></el-input
-          ></el-col>
-          <el-col :span="4"
-            >污水费2:<el-input
-              v-model="recInfo.wsf1"
-              size="small"
-              style="width: 50%"
-            ></el-input
-          ></el-col>
-          <el-col :span="4"
-            >垃圾费2:<el-input
-              v-model="recInfo.ljf1"
-              size="small"
-              style="width: 50%"
-            ></el-input
-          ></el-col>
-        </el-row>
-
-        <el-row :gutter="10">
-          <el-col :span="8"
-            >阶梯水价1:<el-input
-              v-model="recInfo.sj1Jt1sj"
-              size="small"
-              style="width: 50%"
-              :disabled="true"
-            ></el-input
-          ></el-col>
-          <el-col :span="8"
-            >阶梯水量1:<el-input
-              v-model="recInfo.sj1Jt1sl"
-              size="small"
-              style="width: 50%"
-              :disabled="true"
-            ></el-input
-          ></el-col>
-          <el-col :span="8"
-            >阶梯水费1:<el-input
-              v-model="recInfo.sj1Jt1sl"
-              size="small"
-              style="width: 50%"
-              :disabled="true"
-            ></el-input
-          ></el-col>
-        </el-row>
-        <el-row :gutter="10">
-          <el-col :span="8"
-            >阶梯水价2:<el-input
-              v-model="recInfo.sj1Jt2sj"
-              size="small"
-              style="width: 50%"
-              :disabled="true"
-            ></el-input
-          ></el-col>
-          <el-col :span="8"
-            >阶梯水量2:<el-input
-              v-model="recInfo.sj1Jt2sl"
-              size="small"
-              style="width: 50%"
-              :disabled="true"
-            ></el-input
-          ></el-col>
-          <el-col :span="8"
-            >阶梯水费2:<el-input
-              v-model="recInfo.sj1Jt2sf"
-              size="small"
-              style="width: 50%"
-              :disabled="true"
-            ></el-input
-          ></el-col>
-        </el-row>
-        <el-row :gutter="10">
-          <el-col :span="8"
-            >阶梯水价3:<el-input
-              v-model="recInfo.sj1Jt3sj"
-              size="small"
-              style="width: 50%"
-              :disabled="true"
-            ></el-input
-          ></el-col>
-          <el-col :span="8"
-            >阶梯水量3:<el-input
-              v-model="recInfo.sj1Jt3sl"
-              size="small"
-              style="width: 50%"
-              :disabled="true"
-            ></el-input
-          ></el-col>
-          <el-col :span="8"
-            >阶梯水费3:<el-input
-              v-model="recInfo.sj1Jt3sf"
-              size="small"
-              style="width: 50%"
-              :disabled="true"
-            ></el-input
-          ></el-col>
-        </el-row>
-        <!--水价2-->
-        <el-row :gutter="10">
-          <el-col :span="8"
-            >(基)水价3:<cpsSelect
-              v-model="recInfo.sjbm2"
-              placeholder="请选择"
-              skey="sj"
-              size="small"
-              style="width: 60%"
+              <el-descriptions-item label="(基)水价2">
+                <cpsSelect
+                  v-model="recInfo.sjbm1"
+                  placeholder="请选择"
+                  skey="sj"
+                  @change="onJjslChange"
+                >
+                </cpsSelect
+              ></el-descriptions-item>
+              <el-descriptions-item label="水量2">
+                <el-input
+                  v-model="recInfo.sl1"
+                  @change="onJjslChange"
+                ></el-input
+              ></el-descriptions-item>
+              <el-descriptions-item label="水费2">
+                {{ recInfo.sf1 }}
+              </el-descriptions-item>
+              <el-descriptions-item label="污水费单价">
+                {{ recInfo.wsfdj1 }}
+              </el-descriptions-item>
+              <el-descriptions-item label="污水费水量">
+                {{ recInfo.sl1 }}
+              </el-descriptions-item>
+              <el-descriptions-item label="污水费2">
+                {{ recInfo.wsf1 }}
+              </el-descriptions-item>
+              <el-descriptions-item label="垃圾费单价">
+                {{ recInfo.ljfdj1 }}
+              </el-descriptions-item>
+              <el-descriptions-item label="垃圾费水量">
+                {{ recInfo.sl1 }}
+              </el-descriptions-item>
+              <el-descriptions-item label="垃圾费2">
+                {{ recInfo.ljf1 }}
+              </el-descriptions-item>
+              <el-descriptions-item label="阶梯水价1">
+                {{ recInfo.sj1Jt1sj }}
+              </el-descriptions-item>
+              <el-descriptions-item label="阶梯水量1">
+                {{ recInfo.sj1Jt1sl }}
+              </el-descriptions-item>
+              <el-descriptions-item label="阶梯水费1">
+                {{ recInfo.sj1Jt1sf }}
+              </el-descriptions-item>
+              <el-descriptions-item label="阶梯水价2">
+                {{ recInfo.sj1Jt2sj }}
+              </el-descriptions-item>
+              <el-descriptions-item label="阶梯水量2">
+                {{ recInfo.sj1Jt2sl }}
+              </el-descriptions-item>
+              <el-descriptions-item label="阶梯水费2">
+                {{ recInfo.sj1Jt2sf }}
+              </el-descriptions-item>
+              <el-descriptions-item label="阶梯水价3">
+                {{ recInfo.sj1Jt3sj }}
+              </el-descriptions-item>
+              <el-descriptions-item label="阶梯水量3">
+                {{ recInfo.sj1Jt3sl }}
+              </el-descriptions-item>
+              <el-descriptions-item label="阶梯水费3">
+                {{ recInfo.sj1Jt3sf }}
+              </el-descriptions-item>
+            </el-descriptions>
+          </el-tab-pane>
+          <el-tab-pane label="水价3" name="ysjg3">
+            <el-descriptions
+              :column="3"
+              size="medium"
+              border
+              labelClassName="descLabel"
+              contentClassName="descContent"
+              labelStyle="width:12%"
+              contentStyle="width:17%"
             >
-            </cpsSelect
-          ></el-col>
-          <el-col :span="4"
-            >水量3:<el-input
-              v-model="recInfo.sl2"
-              size="small"
-              style="width: 50%"
-            ></el-input
-          ></el-col>
-          <el-col :span="4"
-            >水费3:<el-input
-              v-model="recInfo.sf2"
-              size="small"
-              style="width: 50%"
-            ></el-input
-          ></el-col>
-          <el-col :span="4"
-            >污水费3:<el-input
-              v-model="recInfo.wsf2"
-              size="small"
-              style="width: 50%"
-            ></el-input
-          ></el-col>
-          <el-col :span="4"
-            >垃圾费3:<el-input
-              v-model="recInfo.ljf2"
-              size="small"
-              style="width: 50%"
-            ></el-input
-          ></el-col>
-        </el-row>
-
-        <el-row :gutter="10">
-          <el-col :span="8"
-            >阶梯水价1:<el-input
-              v-model="recInfo.sj2Jt1sj"
-              size="small"
-              style="width: 50%"
-              :disabled="true"
-            ></el-input
-          ></el-col>
-          <el-col :span="8"
-            >阶梯水量1:<el-input
-              v-model="recInfo.sj2Jt1sl"
-              size="small"
-              style="width: 50%"
-              :disabled="true"
-            ></el-input
-          ></el-col>
-          <el-col :span="8"
-            >阶梯水费1:<el-input
-              v-model="recInfo.sj2Jt1sf"
-              size="small"
-              style="width: 50%"
-              :disabled="true"
-            ></el-input
-          ></el-col>
-        </el-row>
-        <el-row :gutter="10">
-          <el-col :span="8"
-            >阶梯水价2:<el-input
-              v-model="recInfo.sj2Jt2sj"
-              size="small"
-              style="width: 50%"
-              :disabled="true"
-            ></el-input
-          ></el-col>
-          <el-col :span="8"
-            >阶梯水量2:<el-input
-              v-model="recInfo.sj2Jt2sl"
-              size="small"
-              style="width: 50%"
-              :disabled="true"
-            ></el-input
-          ></el-col>
-          <el-col :span="8"
-            >阶梯水费2:<el-input
-              v-model="recInfo.sj2Jt2sf"
-              size="small"
-              style="width: 50%"
-              :disabled="true"
-            ></el-input
-          ></el-col>
-        </el-row>
-        <el-row :gutter="10">
-          <el-col :span="8"
-            >阶梯水价3:<el-input
-              v-model="recInfo.sj2Jt3sj"
-              size="small"
-              style="width: 50%"
-              :disabled="true"
-            ></el-input
-          ></el-col>
-          <el-col :span="8"
-            >阶梯水量3:<el-input
-              v-model="recInfo.sj2Jt3sl"
-              size="small"
-              style="width: 50%"
-              :disabled="true"
-            ></el-input
-          ></el-col>
-          <el-col :span="8"
-            >阶梯水费3:<el-input
-              v-model="recInfo.sj2Jt3sl"
-              size="small"
-              style="width: 50%"
-              :disabled="true"
-            ></el-input
-          ></el-col>
-        </el-row>
+              <el-descriptions-item label="(基)水价3">
+                <cpsSelect
+                  v-model="recInfo.sjbm2"
+                  placeholder="请选择"
+                  skey="sj"
+                  @change="onJjslChange"
+                >
+                </cpsSelect
+              ></el-descriptions-item>
+              <el-descriptions-item label="水量3">
+                <el-input
+                  v-model="recInfo.sl2"
+                  @change="onJjslChange"
+                ></el-input
+              ></el-descriptions-item>
+              <el-descriptions-item label="水费3">
+                {{ recInfo.sf2 }}
+              </el-descriptions-item>
+              <el-descriptions-item label="污水费单价">
+                {{ recInfo.wsfdj2 }}
+              </el-descriptions-item>
+              <el-descriptions-item label="污水费水量">
+                {{ recInfo.sl2 }}
+              </el-descriptions-item>
+              <el-descriptions-item label="污水费2">
+                {{ recInfo.wsf2 }}
+              </el-descriptions-item>
+              <el-descriptions-item label="垃圾费单价">
+                {{ recInfo.ljfdj2 }}
+              </el-descriptions-item>
+              <el-descriptions-item label="垃圾费水量">
+                {{ recInfo.sl2 }}
+              </el-descriptions-item>
+              <el-descriptions-item label="垃圾费2">
+                {{ recInfo.ljf2 }}
+              </el-descriptions-item>
+              <el-descriptions-item label="阶梯水价1">
+                {{ recInfo.sj2Jt1sj }}
+              </el-descriptions-item>
+              <el-descriptions-item label="阶梯水量1">
+                {{ recInfo.sj2Jt1sl }}
+              </el-descriptions-item>
+              <el-descriptions-item label="阶梯水费1">
+                {{ recInfo.sj2Jt1sf }}
+              </el-descriptions-item>
+              <el-descriptions-item label="阶梯水价2">
+                {{ recInfo.sj2Jt2sj }}
+              </el-descriptions-item>
+              <el-descriptions-item label="阶梯水量2">
+                {{ recInfo.sj2Jt2sl }}
+              </el-descriptions-item>
+              <el-descriptions-item label="阶梯水费2">
+                {{ recInfo.sj2Jt2sf }}
+              </el-descriptions-item>
+              <el-descriptions-item label="阶梯水价3">
+                {{ recInfo.sj2Jt3sj }}
+              </el-descriptions-item>
+              <el-descriptions-item label="阶梯水量3">
+                {{ recInfo.sj2Jt3sl }}
+              </el-descriptions-item>
+              <el-descriptions-item label="阶梯水费3">
+                {{ recInfo.sj2Jt3sf }}
+              </el-descriptions-item>
+            </el-descriptions>
+          </el-tab-pane>
+        </el-tabs>
         <el-descriptions
           class="margin-top"
           :column="2"
@@ -625,7 +491,7 @@ import "@/views/mis/common/assets/styles/misStyle.scss";
 import cpsSelect from "@/views/mis/common/components/cps-select.vue";
 import cpsCompany from "@/views/mis/common/components/cps-company.vue";
 import cpsLinkageArea from "@/views/mis/common/components/cps-linkageArea.vue";
-import tfTable from '@/views/mis/common/misTable/index.vue';
+import tfTable from "@/views/mis/common/misTable/index.vue";
 import {
   financial,
   FeeRec,
@@ -652,7 +518,7 @@ export default {
       },
       recInfo: {
         cbryxm: "",
-        cbkid:"",
+        cbkid: "",
         cwrq: "",
         ysyf: "",
         jsrq: "",
@@ -668,43 +534,49 @@ export default {
         sjbm: "",
         sl: 0,
         sf: 0,
+        wsfdj: 0,
         wsf: 0,
+        ljfdj: 0,
         ljf: 0,
-        jt1sj: "",
+        jt1sj: 0,
         jt1sf: 0,
         jt1sl: 0,
-        jt2sj: "",
+        jt2sj: 0,
         jt2sf: 0,
         jt2sl: 0,
-        jt3sj: "",
+        jt3sj: 0,
         jt3sf: 0,
         jt3sl: 0,
         sjbm1: "",
         sl1: 0,
         sf1: 0,
         wsf1: 0,
+        wsfdj1: 0,
         ljf1: 0,
-        sj1Jt1sj: "",
+        ljfdj1: 0,
+        sj1Jt1sj: 0,
         sj1Jt1sf: 0,
         sj1Jt1sl: 0,
-        sj1Jt2sj: "",
+        sj1Jt2sj: 0,
         sj1Jt2sf: 0,
         sj1Jt2sl: 0,
-        sj1Jt3sj: "",
+        sj1Jt3sj: 0,
         sj1Jt3sf: 0,
         sj1Jt3sl: 0,
         sjbm2: "",
         sl2: 0,
         sf2: 0,
         wsf2: 0,
+        wsfdj2: 0,
         ljf2: 0,
-        sj2Jt1sj: "",
+        ljfdj2: 0,
+        sj2Jt1sj: 0,
         sj2Jt1sf: 0,
         sj2Jt1sl: 0,
-        sj2Jt2sj: "",
+        sj2Jt2sj: 0,
         sj2Jt2sf: 0,
         sj2Jt2sl: 0,
-        sj2Jt3sj: "",
+        sj2Jt3sj: 0,
         sj2Jt3sf: 0,
         sj2Jt3sl: 0,
         ysljf: 0,
@@ -716,6 +588,7 @@ export default {
       isMultiPrice: false,
       selectionsData: [],
       pageInfo: { current: 1, total: 0, size: 50 },
+      activeName: "ysjg1",
       tableData: [],
       columns: [
         {
@@ -821,7 +694,7 @@ export default {
             this.recInfo.cbryxm = res.result.cbryxm;
             this.recInfo.cwrq = res.result.cwrq;
             this.recInfo.ysyf = res.result.ysyf;
-            this.recInfo.cbkid=res.result.cbkid;
+            this.recInfo.cbkid = res.result.cbkid;
             this.recInfo.jsrq = res.result.jsrq;
             this.recInfo.cbrq = res.result.cbrq;
             this.recInfo.cbjsfs = res.result.cbjsfs;
@@ -837,10 +710,51 @@ export default {
             this.recInfo.ysje = res.result.ysje;
             this.recInfo.ysljf = res.result.ysljf;
             this.recInfo.yswsf = res.result.yswsf;
-            this.recInfo.yssf = res.result.yssf;
+            (this.recInfo.wsfdj = res.result.wsfdj),
+              (this.recInfo.ljfdj = res.result.ljfdj),
+              (this.recInfo.yssf = res.result.yssf);
+            this.recInfo.jt1sj = res.result.jt1sj;
+            this.recInfo.jt1sl = res.result.jt1sl;
+            this.recInfo.jt1sf = res.result.jt1sf;
+            this.recInfo.jt2sj = res.result.jt2sj;
+            this.recInfo.jt2sl = res.result.jt2sl;
+            this.recInfo.jt2sf = res.result.jt2sf;
+            this.recInfo.jt3sj = res.result.jt3sj;
+            this.recInfo.jt3sl = res.result.jt3sl;
+            this.recInfo.jt3sf = res.result.jt3sf;
             if (res.result.cbjsbz == "1" || res.result.cbjsbz == "3") {
               this.recInfo.sjbm1 = res.result.sjbm1;
+              this.recInfo.sl1 = res.result.sl1;
+              this.recInfo.sf1 = res.result.sf1;
+              this.recInfo.wsf1 = res.result.wsf1;
+              this.recInfo.wsfdj1 = res.result.wsfdj1;
+              this.recInfo.ljf1 = res.result.ljf1;
+              this.recInfo.ljfdj1 = res.result.ljfdj1;
+              this.recInfo.sj1Jt1sj = res.result.sj1Jt1sj;
+              this.recInfo.sj1Jt1sf = res.result.sj1Jt1sf;
+              this.recInfo.sj1Jt1sl = res.result.sj1Jt1sl;
+              this.recInfo.sj1Jt2sj = res.result.sj1Jt2sj;
+              this.recInfo.sj1Jt2sf = res.result.sj1Jt2sf;
+              this.recInfo.sj1Jt2sl = res.result.sj1Jt2sl;
+              this.recInfo.sj1Jt3sj = res.result.sj1Jt3sj;
+              this.recInfo.sj1Jt3sf = res.result.sj1Jt3sf;
+              this.recInfo.sj1Jt3sl = res.result.sj1Jt3sl;
+              this.recInfo.sj1Jt1sj = res.result.sj1Jt1sj;
               this.recInfo.sjbm2 = res.result.sjbm2;
+              this.recInfo.sl2 = res.result.sl2;
+              this.recInfo.sf2 = res.result.sf2;
+              this.recInfo.wsf2 = res.result.wsf2;
+              this.recInfo.wsfdj2 = res.result.wsfdj2;
+              this.recInfo.ljf2 = res.result.ljf2;
+              this.recInfo.ljfdj2 = res.result.ljfdj2;
+              this.recInfo.sj2Jt1sf = res.result.sj2Jt1sf;
+              this.recInfo.sj2Jt1sl = res.result.sj2Jt1sl;
+              this.recInfo.sj2Jt2sj = res.result.sj2Jt2sj;
+              this.recInfo.sj2Jt2sf = res.result.sj2Jt2sf;
+              this.recInfo.sj2Jt2sl = res.result.sj2Jt2sl;
+              this.recInfo.sj2Jt3sj = res.result.sj2Jt3sj;
+              this.recInfo.sj2Jt3sf = res.result.sj2Jt3sf;
+              this.recInfo.sj2Jt3sl = res.result.sj2Jt3sl;
             }
           }
         })
@@ -861,7 +775,7 @@ export default {
       });
     },
     /**
-     *撤销算费 
+     *撤销算费
      **/
     backFees() {
       this.resetDetailData();
@@ -878,8 +792,8 @@ export default {
      * 费用测算
      * **/
     onJjslChange() {
-      if(this.recInfo.jjl==null){
-        this.recInfo.jjl=0;
+      if (this.recInfo.jjl == null) {
+        this.recInfo.jjl = 0;
       }
       this.recInfo.yssl =
         this.recInfo.bcds - this.recInfo.scds + this.recInfo.jjl;
@@ -914,6 +828,24 @@ export default {
             this.recInfo.jt3sj = res.result.jt3sj;
             this.recInfo.jt3sl = res.result.jt3sl;
             this.recInfo.jt3sf = res.result.jt3sf;
+            this.recInfo.sj1Jt1sj = res.result.sj1Jt1sj;
+            this.recInfo.sj1Jt1sf = res.result.sj1Jt1sf;
+            this.recInfo.sj1Jt1sl = res.result.sj1Jt1sl;
+            this.recInfo.sj1Jt2sj = res.result.sj1Jt2sj;
+            this.recInfo.sj1Jt2sf = res.result.sj1Jt2sf;
+            this.recInfo.sj1Jt2sl = res.result.sj1Jt2sl;
+            this.recInfo.sj1Jt3sj = res.result.sj1Jt3sj;
+            this.recInfo.sj1Jt3sf = res.result.sj1Jt3sf;
+            this.recInfo.sj1Jt3sl = res.result.sj1Jt3sl;
+            this.recInfo.sj1Jt1sj = res.result.sj1Jt1sj;
+            this.recInfo.sj2Jt1sf = res.result.sj2Jt1sf;
+            this.recInfo.sj2Jt1sl = res.result.sj2Jt1sl;
+            this.recInfo.sj2Jt2sj = res.result.sj2Jt2sj;
+            this.recInfo.sj2Jt2sf = res.result.sj2Jt2sf;
+            this.recInfo.sj2Jt2sl = res.result.sj2Jt2sl;
+            this.recInfo.sj2Jt3sj = res.result.sj2Jt3sj;
+            this.recInfo.sj2Jt3sf = res.result.sj2Jt3sf;
+            this.recInfo.sj2Jt3sl = res.result.sj2Jt3sl;
           }
         })
         .catch((ex) => {

src/views/mis/financialManage/priceManage/priceList.vue

@@ -138,44 +138,44 @@ export default {
           label: "公司",
           prop: "ssgsmc",
           align: "center",
-          sortable: true,
+      
         },
         {
           label: "水价编码",
           prop: "code",
           align: "center",
-          sortable: true,
+         
         },
         {
           label: "水价名称",
           prop: "name",
           align: "center",
           // percent: true,
-          sortable: true,
+         
         },
         {
           label: "用水类型",
           prop: "yslxmc",
           align: "center",
-          sortable: true,
+     
         },
         {
           label: "水价",
           prop: "hjtsj",
           align: "center",
-          sortable: true,
+         
         },
         {
           label: "污水费单价",
           prop: "wsfdj",
           align: "center",
-          sortable: true,
+      
         },
         {
           label: "垃圾费单价",
           prop: "ljfdj",
           align: "center",
-          sortable: true,
+    
         },
         {
           label: "创建时间",
@@ -190,7 +190,7 @@ export default {
           label: "阶梯标志",
           prop: "jtbz",
           align: "center",
-          sortable: true,
+
           formatter: function (row, column, value, index) {
             let colorCls =
               row.jtbz == "1"

src/views/mis/financialManage/priceMultipleManage/priceListMultipleList.vue

@@ -6,8 +6,8 @@
           <div class="content-title">用户信息列表</div>
           <el-divider />
           <div class="content-body" style="height: calc(100% - 52px)">
-            <div style="height: 70px;">
-              <el-row style="margin-top:5px">
+            <div style="height: 70px">
+              <el-row style="margin-top: 5px">
                 <el-col :span="24">
                   <cpsLinkageArea
                     :queryParams="queryParams"
@@ -15,7 +15,7 @@
                   ></cpsLinkageArea>
                 </el-col>
               </el-row>
-              <el-row style="margin-top:5px">
+              <el-row style="margin-top: 5px">
                 <el-col :span="24">
                   <div style="display: inline-block">
                     <span>用户状态：</span>
@@ -34,8 +34,11 @@
                     size="small"
                     @keyup.enter.native="loadData()"
                   ></el-input>
-                  <el-button type="primary" size="small" @click="loadData()"
-                  icon="el-icon-search"
+                  <el-button
+                    type="primary"
+                    size="small"
+                    @click="loadData()"
+                    icon="el-icon-search"
                     >查询</el-button
                   >
                 </el-col>
@@ -71,30 +74,28 @@
           <div class="content-title">水价信息批量设置</div>
           <el-divider />
           <br />
-          <el-row>
-            <el-col :span="12">
-              <span class="showText">
-                <el-switch
-                  v-model="ybdjbz"
-                  active-text=" 开启"
-                  inactive-text="一表多价：关闭"
-                >
-                </el-switch>
-              </span>
-            </el-col>
-            <el-col :span="12">
-              <span class="showText">
-                <el-switch
-                  v-model="daMeter.wsfbz"
-                  :active-value="1"
-                  :inactive-value="0"
-                  active-text=" 开启"
-                  inactive-text="污水费：关闭"
-                >
-                </el-switch>
-              </span>
-            </el-col>
-          </el-row>
+          <el-descriptions :column="2" border>
+            <el-descriptions-item label="一表多价">
+              <el-switch
+                v-model="ybdjbz"
+                active-text="是"
+                inactive-text="否"
+                active-value="1"
+                inactive-value="0"
+              >
+              </el-switch>
+            </el-descriptions-item>
+            <el-descriptions-item label="收污水费">
+              <el-switch
+                v-model="daMeter.wsfbz"
+                active-text="需收取"
+                inactive-text="不收取"
+                active-value="1"
+                inactive-value="0"
+              >
+              </el-switch>
+            </el-descriptions-item>
+          </el-descriptions>
           <el-divider></el-divider>
           <el-row>
             <el-col :span="12">
@@ -133,7 +134,7 @@
                   skey="sj"
                   size="small"
                   style="width: 70%"
-                  :disabled="!this.ybdjbz"
+                  :disabled="this.ybdjbz=='0'"
                 >
                 </cpsSelect>
               </span>
@@ -147,7 +148,7 @@
                   :precision="2"
                   :step="0.1"
                   :max="1"
-                  :disabled="!this.ybdjbz"
+                  :disabled="this.ybdjbz=='0'"
                 ></el-input-number>
               </span>
             </el-col>
@@ -162,7 +163,7 @@
                   skey="sj"
                   size="small"
                   style="width: 70%"
-                  :disabled="!this.ybdjbz"
+                  :disabled="this.ybdjbz=='0'"
                 >
                 </cpsSelect>
               </span>
@@ -176,7 +177,7 @@
                   :precision="2"
                   :step="0.1"
                   :max="1"
-                  :disabled="!this.ybdjbz"
+                  :disabled="this.ybdjbz=='0'"
                 ></el-input-number>
               </span>
             </el-col>
@@ -227,7 +228,7 @@ import "@/views/mis/common/assets/styles/misStyle.scss";
 import cpsSelect from "@/views/mis/common/components/cps-select.vue";
 import cpsCompany from "@/views/mis/common/components/cps-company.vue";
 import cpsLinkageArea from "@/views/mis/common/components/cps-linkageArea.vue";
-import tfTable from '@/views/mis/common/misTable/index.vue';
+import tfTable from "@/views/mis/common/misTable/index.vue";
 import { financial } from "@/views/mis/common/api/financialApi.js";
 
 export default {
@@ -257,7 +258,7 @@ export default {
         yhzt: null,
         searchText: undefined, //模糊查询
       },
-      ybdjbz: false,
+      ybdjbz: "0",
       selectionsData: [],
       pageInfo: { current: 1, total: 1, size: 50 },
       searchText: "",
@@ -268,14 +269,14 @@ export default {
           prop: "yhbh",
           align: "center",
           width: 120,
-          fixed:true,
+          fixed: true,
           sortable: true,
         },
         {
           label: "用户姓名",
           prop: "yhxm",
           width: 120,
-          fixed:true,
+          fixed: true,
           align: "center",
         },
         {
@@ -295,7 +296,6 @@ export default {
           prop: "yhdz",
           align: "left",
           width: 120,
-         
         },
         {
           label: "联系电话",
@@ -371,22 +371,22 @@ export default {
       if (this.selectionsData != null && this.selectionsData.length > 0) {
         let ids = [];
         this.selectionsData.forEach((item) => {
-          let yhxx={yhbh:"",cbkh:""};
-          yhxx.yhbh=item.yhbh;
-          yhxx.cbkh=item.cbkh;
+          let yhxx = { yhbh: "", cbkh: "" };
+          yhxx.yhbh = item.yhbh;
+          yhxx.cbkh = item.cbkh;
           ids.push(yhxx);
         });
         const obj = {
           yhbhcbkhs: ids,
-          sjbm: this.ybdjbz == true ? "" : this.daMeter.sjbm1,
-          sjbm1: this.ybdjbz == true ? this.daMeter.sjbm1 : "",
+          sjbm: this.ybdjbz == "0" ? "" : this.daMeter.sjbm1,
+          sjbm1: this.ybdjbz == "0" ? this.daMeter.sjbm1 : "",
           sjbm2: this.daMeter.sjbm2,
           sjbm3: this.daMeter.sjbm3,
           slbl1: this.daMeter.slbl1,
           slbl2: this.daMeter.slbl2,
           slbl3: this.daMeter.slbl3,
           wsfbz: this.daMeter.wsfbz == true ? 1 : 0,
-          ybdjbz: this.ybdjbz == true ? 1 : 0,
+          ybdjbz: this.ybdjbz
         };
         let params = Object.assign({}, obj);
 
@@ -422,8 +422,6 @@ body > .el-container {
   height: 100%;
 }
 
-
-
 .tableheight {
   height: calc(100% - 50px);
 }

src/views/mis/financialManage/waterType/waterTypeList.vue

@@ -158,38 +158,38 @@ export default {
           label: "公司",
           prop: "ssgsmc",
           align: "center",
-          sortable: true,
+         
         },
         {
           label: "编码",
           prop: "code",
           align: "center",
-          sortable: true,
+
         },
         {
           label: "用水类型名称",
           prop: "name",
           align: "center",
           // percent: true,
-          sortable: true,
+
         },
         {
           label: "违约金费率",
           prop: "znj",
           align: "center",
-          sortable: true,
+  
         },
         {
           label: "违约金收取方式",
           prop: "znjbm",
           align: "center",
-          sortable: true,
+   
         },
         {
           label: "备注说明",
           prop: "bz",
           align: "center",
-          sortable: true,
+  
         },
         {
           label: "操作时间",

src/views/mis/meterReadingManagement/bwMeterReadEntry-index.vue

@@ -719,6 +719,7 @@ export default {
               this.$message.error(res.message);
             }
             this.labelData.isDisabledSaveBtn = false;
+            this.getData();
           });
         })
         .catch(() => {});

src/views/mis/reportManagement/userComprehensiveQuery-index.vue

@@ -19,7 +19,7 @@
             >
             </cpsCompany
             >&nbsp;
-            <span>用户编号:</span>
+            <span>用户编号：</span>
             <el-input
               v-model="queryParams.yhbh"
               size="small"
@@ -40,91 +40,46 @@
         >
       </div>
       <div class="filteroption_1">
-        <el-row>
-          <el-col :span="5"
-            ><span style="margin-left: 15%">用户编号:</span
-            ><el-input
-              v-model="baseUserInfo.yhbh"
-              size="small"
-              style="width: 60%"
-              placeholder="用户编号"
-              readonly
-            ></el-input
-          ></el-col>
-          <el-col :span="5"
-            ><span style="margin-left: 15%">用户姓名:</span
-            ><el-input
-              v-model="baseUserInfo.yhxm"
-              size="small"
-              style="width: 60%"
-              placeholder="用户姓名"
-              readonly
-            ></el-input
-          ></el-col>
-          <el-col :span="5"
-            ><span style="margin-left: 15%">联系电话:</span
-            ><el-input
-              v-model="baseUserInfo.lxdh"
-              size="small"
-              style="width: 60%"
-              placeholder="联系电话"
-              readonly
-            ></el-input
-          ></el-col>
-          <el-col :span="9"
-            ><span>用户地址:</span
-            ><el-input
-              v-model="baseUserInfo.yhdz"
-              size="small"
-              style="width: 70%"
-              placeholder="用户地址"
-              readonly
-            ></el-input
-          ></el-col>
-        </el-row>
-        <el-row style="margin-top: 5px">
-          <el-col :span="5"
-            ><span style="margin-left: 15%">用户状态:</span
-            ><el-input
-              v-model="baseUserInfo.yhzt"
-              size="small"
-              style="width: 60%; color: red"
-              placeholder="用户状态"
-              readonly
-            ></el-input
-          ></el-col>
-          <el-col :span="5"
-            ><span style="margin-left: 15%">抄表员:</span
-            ><el-input
-              v-model="baseUserInfo.cbymc"
-              size="small"
-              style="width: 60%"
-              placeholder="抄表员"
-              readonly
-            ></el-input
-          ></el-col>
-          <el-col :span="5"
-            ><span style="margin-left: 15%">用水性质:</span
-            ><cpsSelect
+        <el-descriptions
+          :column="4"
+          border
+          size="small"
+          labelClassName="descLabel"
+          contentClassName="descContent"
+          labelStyle="width:7%"
+          contentStyle="width:18%"
+        >
+          <el-descriptions-item label="用户编号">
+            {{ baseUserInfo.yhbh }}
+          </el-descriptions-item>
+          <el-descriptions-item label="用户姓名">
+            {{ baseUserInfo.yhxm }}
+          </el-descriptions-item>
+          <el-descriptions-item label="联系电话">
+            {{ baseUserInfo.lxdh }}
+          </el-descriptions-item>
+          <el-descriptions-item label="用户地址">
+            {{ baseUserInfo.yhdz }}
+          </el-descriptions-item>
+          <el-descriptions-item label="用户状态">
+            {{ baseUserInfo.yhzt }}
+          </el-descriptions-item>
+          <el-descriptions-item label="抄表员">
+            {{ baseUserInfo.cbymc }}
+          </el-descriptions-item>
+          <el-descriptions-item label="用水性质">
+            <cpsSelect
               v-model="baseUserInfo.ysxz"
               size="small"
-              style="width: 60%"
               skey="sj"
               isDisabled="all"
               disabled
-            ></cpsSelect
-          ></el-col>
-          <el-col :span="9"
-            ><span>水表口径:</span
-            ><el-input
-              v-model="baseUserInfo.sbkj"
-              size="small"
-              style="width: 70%"
-              placeholder="水表口径"
-              readonly
-            ></el-input
-          ></el-col>
-        </el-row>
+            ></cpsSelect>
+          </el-descriptions-item>
+          <el-descriptions-item label="水表口径">
+            {{ baseUserInfo.sbkj }}
+          </el-descriptions-item>
+        </el-descriptions>
       </div>
     </div>
     <div style="height: 76%; padding-top: 10px">
@@ -137,7 +92,7 @@
         >
           <el-tab-pane label="用户档案信息" name="userinfo">
             <el-collapse v-model="userInfoActiveNames">
-              <el-collapse-item name="ubaseInfo" disabled="true">
+              <el-collapse-item name="ubaseInfo">
                 <template slot="title">
                   <span style="font-size: medium; font-weight: bold">
                     基本信息<i class="header-icon el-icon-notebook-2"></i>
@@ -146,7 +101,7 @@
                 <el-descriptions
                   :column="3"
                   border
-                  size="mini"
+                  size="small"
                   labelClassName="descLabel"
                   contentClassName="descContent"
                 >
@@ -357,7 +312,7 @@
                 </el-descriptions>
               </el-collapse-item>
 
-              <el-collapse-item name="uotherInfo" disabled="true">
+              <el-collapse-item name="uotherInfo">
                 <template slot="title">
                   <span style="font-size: medium; font-weight: bold">
                     其他信息<i class="header-icon el-icon-notebook-2"></i>
@@ -366,7 +321,7 @@
                 <el-descriptions
                   :column="3"
                   border
-                  size="mini"
+                  size="small"
                   labelClassName="descLabel"
                   contentClassName="descContent"
                 >
@@ -475,7 +430,7 @@
                   </el-descriptions-item>
                 </el-descriptions>
               </el-collapse-item>
-              <el-collapse-item name="uImgInfo" disabled="true">
+              <el-collapse-item name="uImgInfo">
                 <template slot="title">
                   <span style="font-size: medium; font-weight: bold">
                     图片信息<i class="header-icon el-icon-notebook-2"></i>
@@ -486,7 +441,7 @@
           </el-tab-pane>
           <el-tab-pane label="水表档案信息" name="meterinfo">
             <el-container>
-              <el-header style="height: 150px">
+              <el-header style="height: 160px">
                 <div class="tableheight_meter">
                   <tfTable
                     :table-data="meterListData"
@@ -504,12 +459,12 @@
               </el-header>
               <el-main>
                 <el-collapse v-model="meteractiveNames">
-                  <el-collapse-item name="1" disabled="true">
+                  <el-collapse-item name="1">
                     <template slot="title">
                       <i class="el-icon-postcard iconSize"></i
                       ><span class="title">基本信息</span>
                     </template>
-                    <el-descriptions :column="3" border size="mini">
+                    <el-descriptions :column="3" border size="small">
                       <el-descriptions-item
                         label="用户编号"
                         label-class-name="redStar"
@@ -718,12 +673,12 @@
                       </el-descriptions-item>
                     </el-descriptions>
                   </el-collapse-item>
-                  <el-collapse-item name="2" disabled="true">
+                  <el-collapse-item name="2">
                     <template slot="title">
                       <i class="el-icon-price-tag iconSize"></i
                       ><span class="title">水价信息</span>
                     </template>
-                    <el-descriptions :column="2" border size="mini">
+                    <el-descriptions :column="2" border size="small">
                       <el-descriptions-item
                         label="是否一表多价"
                         label-class-name="redStar"
@@ -810,7 +765,6 @@
                           style="width: 100%"
                           skey="sj"
                           :disabled="meterForm.ybdjbz != 1"
-                  
                         >
                         </cpsSelect>
                       </el-descriptions-item>
@@ -827,12 +781,12 @@
                       </el-descriptions-item>
                     </el-descriptions>
                   </el-collapse-item>
-                  <el-collapse-item name="3" disabled="true">
+                  <el-collapse-item name="3">
                     <template slot="title">
                       <i class="el-icon-document iconSize"></i
                       ><span class="title">其他信息</span>
                     </template>
-                    <el-descriptions :column="2" border size="mini">
+                    <el-descriptions :column="2" border size="small">
                       <el-descriptions-item label="开卡标志">
                         <el-select
                           v-model="meterForm.kkbz"
@@ -921,40 +875,25 @@
               </div>
             </div>
             <div class="filteroption_1">
-              <el-row>
-                <el-col :span="8"
-                  ><span style="margin-left: 15%">所属片区:</span
-                  ><el-input
-                    v-model="readInfo.sscbpq"
-                  
-                    size="small"
-                    style="width: 60%"
-                    placeholder="所属片区"
-             
-                  ></el-input
-                ></el-col>
-                <el-col :span="8"
-                  ><span style="margin-left: 15%">所属抄表册:</span
-                  ><el-input
-                    v-model="readInfo.sscbb"   
-                    isDisabled="all"
-                    style="width: 60%"
-                    placeholder="所属抄表册"
-      
-                  ></el-input
-                ></el-col>
-                <el-col :span="8"
-                  ><span style="margin-left: 15%">抄表合计水量:</span
-                  ><el-input
-                    v-model="readInfo.hjsl"
-                    size="small"
-                    style="width: 60%"
-                    placeholder="抄表合计水量"
-                    readonly
-                  ></el-input
-                  >方</el-col
-                >
-              </el-row>
+              <el-descriptions
+                :column="3"
+                border
+                size="small"
+                labelClassName="descLabel"
+                contentClassName="descContent"
+                labelStyle="width:10%"
+                contentStyle="width:20%"
+              >
+                <el-descriptions-item label="所属片区">
+                  {{ readInfo.sscbpq }}
+                </el-descriptions-item>
+                <el-descriptions-item label="所属抄表册">
+                  {{ readInfo.sscbb }}
+                </el-descriptions-item>
+                <el-descriptions-item label="抄表合计水量(方)">
+                  {{ readInfo.hjsl }}
+                </el-descriptions-item>
+              </el-descriptions>
             </div>
             <div class="tableheight_customer">
               <tfTable
@@ -978,41 +917,25 @@
               </div>
             </div>
             <div class="filteroption_1">
-              <el-row>
-                <el-col :span="8"
-                  ><span style="margin-left: 15%">合计欠费金额:</span
-                  ><el-input
-                    v-model="billFormData.qfhj"
-                    size="small"
-                    style="width: 60%"
-                    placeholder="合计欠费金额"
-                    readonly
-                  ></el-input
-                  >元</el-col
-                >
-                <el-col :span="8"
-                  ><span style="margin-left: 15%">合计欠费水量:</span
-                  ><el-input
-                    v-model="billFormData.slhj"
-                    size="small"
-                    style="width: 60%"
-                    placeholder="合计欠费水量"
-                    readonly
-                  ></el-input
-                  >方</el-col
-                >
-                <el-col :span="8"
-                  ><span style="margin-left: 15%">合计污水费:</span
-                  ><el-input
-                    v-model="billFormData.wsfhj"
-                    size="small"
-                    style="width: 60%"
-                    placeholder="合计污水费"
-                    readonly
-                  ></el-input
-                  >元</el-col
-                >
-              </el-row>
+              <el-descriptions
+                :column="3"
+                border
+                size="small"
+                labelClassName="descLabel"
+                contentClassName="descContent"
+                labelStyle="width:10%"
+                contentStyle="width:20%"
+              >
+                <el-descriptions-item label="合计欠费金额(元)">
+                  {{ billFormData.qfhj }}
+                </el-descriptions-item>
+                <el-descriptions-item label="合计欠费水量(方)">
+                  {{ billFormData.slhj }}
+                </el-descriptions-item>
+                <el-descriptions-item label="合计污水费(元)">
+                  {{ billFormData.wsfhj }}
+                </el-descriptions-item>
+              </el-descriptions>
             </div>
             <div class="tableheight_customer">
               <tfTable
@@ -1036,51 +959,28 @@
               </div>
             </div>
             <div class="filteroption_1">
-              <el-row>
-                <el-col :span="6"
-                  ><span style="margin-left: 15%">累计预付金额:</span
-                  ><el-input
-                    v-model="prepaidFormInfo.ljyf"
-                    size="small"
-                    style="width: 50%"
-                    placeholder="累计预付金额"
-                    readonly
-                  ></el-input
-                  >元</el-col
-                >
-                <el-col :span="6"
-                  ><span style="margin-left: 15%">累计扣减金额:</span
-                  ><el-input
-                    v-model="prepaidFormInfo.ljkj"
-                    size="small"
-                    style="width: 50%"
-                    placeholder="累计扣减金额"
-                  ></el-input
-                  >元</el-col
-                >
-                <el-col :span="6"
-                  ><span style="margin-left: 15%">账户结算余额:</span
-                  ><el-input
-                    v-model="prepaidFormInfo.jsye"
-                    size="small"
-                    style="width: 50%"
-                    placeholder="账户结算余额"
-                    readonly
-                  ></el-input
-                  >元</el-col
-                >
-                <el-col :span="6"
-                  ><span style="margin-left: 15%">账户可用余额:</span
-                  ><el-input
-                    v-model="prepaidFormInfo.kyye"
-                    size="small"
-                    style="width: 50%"
-                    placeholder="账户可用余额"
-                    readonly
-                  ></el-input
-                  >元</el-col
-                >
-              </el-row>
+              <el-descriptions
+                :column="4"
+                border
+                size="small"
+                labelClassName="descLabel"
+                contentClassName="descContent"
+                labelStyle="width:10%"
+                contentStyle="width:15%"
+              >
+                <el-descriptions-item label="累计预付金额(元)">
+                  {{ prepaidFormInfo.ljyf }}
+                </el-descriptions-item>
+                <el-descriptions-item label="累计扣减金额(元)">
+                  {{ prepaidFormInfo.ljkj }}
+                </el-descriptions-item>
+                <el-descriptions-item label="账户结算余额(元)">
+                  {{ prepaidFormInfo.jsye }}
+                </el-descriptions-item>
+                <el-descriptions-item label="账户可用余额(元)">
+                  {{ prepaidFormInfo.kyye }}
+                </el-descriptions-item>
+              </el-descriptions>
             </div>
             <el-tabs v-model="prepaidActiveName" type="card">
               <el-tab-pane label="预存缴费记录" name="pre1">
@@ -1118,38 +1018,22 @@
               </div>
             </div>
             <div class="filteroption_1">
-              <el-row>
-                <el-col :span="8"
-                  ><span style="margin-left: 15%">合计实收金额:</span
-                  ><el-input
-                    v-model="payFormInfo.sshj"
-                    size="small"
-                    style="width: 60%"
-                    placeholder="合计实收金额"
-                  ></el-input
-                  >元</el-col
-                >
-                <el-col :span="8"
-                  ><span style="margin-left: 15%"> 合计实收水量:</span
-                  ><el-input
-                    v-model="payFormInfo.slhj"
-                    size="small"
-                    style="width: 60%"
-                    placeholder="	合计实收水量"
-                  ></el-input
-                  >方</el-col
-                >
-                <!-- <el-col :span="8"
-                  ><span style="margin-left: 15%">合计污水费:</span
-                  ><el-input
-                    v-model="baseUserInfo.lxdh"
-                    size="small"
-                    style="width: 60%"
-                    placeholder="合计污水费"
-                  ></el-input
-                  >方</el-col
-                > -->
-              </el-row>
+              <el-descriptions
+                :column="2"
+                border
+                size="small"
+                labelClassName="descLabel"
+                contentClassName="descContent"
+                labelStyle="width:20%"
+                contentStyle="width:30%"
+              >
+                <el-descriptions-item label="合计实收金额(元)">
+                  {{ payFormInfo.sshj }}
+                </el-descriptions-item>
+                <el-descriptions-item label="合计实收水量(方)">
+                  {{ payFormInfo.slhj }}
+                </el-descriptions-item>
+              </el-descriptions>
             </div>
             <div class="tableheight_customer">
               <tfTable
@@ -1172,7 +1056,7 @@
 </template>
 <script>
 import "@/views/mis/common/assets/styles/misStyle.scss";
-import tfTable from '@/views/mis/common/misTable/index.vue';
+import tfTable from "@/views/mis/common/misTable/index.vue";
 import cpsSelect from "@/views/mis/common/components/cps-select.vue";
 import cpsCompany from "@/views/mis/common/components/cps-company.vue";
 import { DateHelper } from "@/views/mis/common/assets/scripts/utils.js";
@@ -1798,7 +1682,7 @@ export default {
           .catch((ex) => {
             this.$message.error("查询用户信息失败！");
           });
-      } 
+      }
     },
 
     tabClick() {
@@ -1839,7 +1723,7 @@ export default {
           this.meterListData = rs.result.records;
           this.meterForm = Object.assign({}, this.meterListData[0]);
         });
-      } 
+      }
     },
 
     /*抄表信息*/
@@ -1864,7 +1748,7 @@ export default {
             });
           }
         });
-      } 
+      }
     },
 
     /*欠费信息*/
@@ -1891,7 +1775,7 @@ export default {
             });
           }
         });
-      } 
+      }
     },
 
     /*预付费信息*/
@@ -1932,7 +1816,7 @@ export default {
             });
           }
         });
-      } 
+      }
     },
 
     /*缴费信息*/
@@ -1960,7 +1844,7 @@ export default {
             });
           }
         });
-      } 
+      }
     },
 
     /**
@@ -2103,4 +1987,12 @@ export default {
   margin-top: 5px;
   height: calc(100% - 83px);
 }
+
+/deep/ .el-collapse-item__header {
+  pointer-events: none;
+}
+
+/deep/ .el-collapse-item__arrow {
+  pointer-events: auto;
+}
 </style>