提交

package-lock.json

@@ -4366,7 +4366,7 @@
     },
     "claygl": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmmirror.com/claygl/-/claygl-1.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/claygl/-/claygl-1.3.0.tgz",
       "integrity": "sha512-+gGtJjT6SSHD2l2yC3MCubW/sCV40tZuSs5opdtn79vFSGUgp/lH139RNEQ6Jy078/L0aV8odCw8RSrUcMfLaQ=="
     },
     "clean-css": {

src/api/mis/common/base.js

@@ -19,4 +19,7 @@ export function getMrBook(params) {
         method: 'get',
         params
     })
-}
+}
+
+
+//用水类型

src/plugin/company/mrBook.vue

@@ -0,0 +1,43 @@
+<template>
+    <div>{{usType}}</div>
+        <el-select v-model="usType" size="small" clearable  style="width:100%">
+            <el-option v-for="item in thisData" :key="item.code" :label="item.name" :value="item.code" />
+        </el-select>
+    </template>
+    
+    <script>
+    /*
+    *用水类型组件
+    */
+    
+    import { queryUwTypeList } from '@/api/mis/financialManage/financialApi'
+    
+    export default {
+      name: 'uwType',
+      props: ['usType'],
+      data() {
+        return {
+            queryParams:{
+                usType:undefined,
+            },
+            thisData:null
+        }
+      },
+      computed: {
+      },
+      watch: {
+      },
+      mounted() {
+      },
+      created() {
+          
+        queryUwTypeList({}).then(res=>{ 
+            this.thisData=res.result.records 
+            })
+      },
+      destroyed() {
+      },
+      methods: {
+      }
+    }
+    </script>

src/plugin/company/mrMrea.vue

@@ -0,0 +1,43 @@
+<template>
+    <div>{{usType}}</div>
+        <el-select v-model="usType" size="small" clearable  style="width:100%">
+            <el-option v-for="item in thisData" :key="item.code" :label="item.name" :value="item.code" />
+        </el-select>
+    </template>
+    
+    <script>
+    /*
+    *用水类型组件
+    */
+    
+    import { queryUwTypeList } from '@/api/mis/financialManage/financialApi'
+    
+    export default {
+      name: 'uwType',
+      props: ['usType'],
+      data() {
+        return {
+            queryParams:{
+                usType:undefined,
+            },
+            thisData:null
+        }
+      },
+      computed: {
+      },
+      watch: {
+      },
+      mounted() {
+      },
+      created() {
+          
+        queryUwTypeList({}).then(res=>{ 
+            this.thisData=res.result.records 
+            })
+      },
+      destroyed() {
+      },
+      methods: {
+      }
+    }
+    </script>

src/plugin/company/index.vue

@@ -1,16 +1,20 @@
 <template>
-    <el-select v-model="queryParams.usType" size="small" clearable  style="width:100%">
+<div>{{usType}}</div>
+    <el-select v-model="usType" size="small" clearable  style="width:100%">
         <el-option v-for="item in thisData" :key="item.code" :label="item.name" :value="item.code" />
     </el-select>
- 
 </template>
+
 <script>
+/*
+*用水类型组件
+*/
 
 import { queryUwTypeList } from '@/api/mis/financialManage/financialApi'
 
 export default {
   name: 'uwType',
-  props: ['isLook','data'],
+  props: ['usType'],
   data() {
     return {
         queryParams:{

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

@@ -1,7 +1,10 @@
 <template>
+ 
     <div style="width: 100%;display: flex; flex-wrap: wrap">
-        <div class="flexLeft">
 
+      
+        <div class="flexLeft">
+          
             <el-collapse v-model="activeNames"   >
                 <el-collapse-item   name="1">
                     
@@ -11,9 +14,10 @@
 
                     <div class="flexLeft50">
                         <span class="spanTitle" style="text-align:right">所属公司：</span>
+                        <!-- <span>打印信息:{{ reportForm }}</span> -->
                         <div style="width:80%">
 
-                        <el-select v-model="queryParams.assessType" size="small" clearable style="width:100%" >
+                        <el-select v-model="reportForm.companyBranch" size="small" clearable style="width:100%" >
                             <el-option v-for="item in company" :key="item.id" :label="item.companyName" :value="item.id" />
                         </el-select>
                         
@@ -22,23 +26,26 @@
                     <div class="flexLeft50">
                         <span class="spanTitle" style="text-align:right">用水类型：</span>
                         <div style="width:80%">
-                        <el-select v-model="queryParams.usType" size="small" clearable  style="width:100%">
+                        <!-- <el-select v-model="queryParams.usType" size="small" clearable  style="width:100%">
                             <el-option v-for="item in usTypeDate" :key="item.code" :label="item.name" :value="item.code" />
-                        </el-select>
+                        </el-select> -->
+
+                         <uwType :usType="reportForm.useWaterType" ></uwType>
+
                         </div>
                     </div>
 
                     <div class="flexLeft50">
                         <span class="spanTitle" style="text-align:right">水价名称：</span>
                         <div style="width:80%">
-                        <el-input v-model="queryParams.name" size="small" placeholder="请输入水价名称"></el-input>
+                        <el-input v-model="reportForm.name" size="small" placeholder="请输入水价名称"></el-input>
                         </div>
                     </div>
 
                     <div class="flexLeft50">
                         <span class="spanTitle" style="text-align:right">水&nbsp;&nbsp;&nbsp;&nbsp;价：</span>
                         <div style="width:80%">
-                        <el-input-number v-model="queryParams.price" size="small"  style="width:100%"   controls-position='right' :min='0' placeholder="请输入水价"></el-input-number>
+                        <el-input-number v-model="reportForm.price" size="small"  style="width:100%"   controls-position='right' :min='0' placeholder="请输入水价"></el-input-number>
                         </div>
                     </div>
 
@@ -75,7 +82,7 @@
                             <el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12">
                                 <div class="grid-content bg-purple-light" style="vertical-align:middel;">
                                     <span >计算类型：</span>
-                                    <el-select v-model="queryParams.tieredcaltype" size="small" clearable style="width:300px" :disabled="!queryParams.isDisabled">
+                                    <el-select v-model="reportForm.tieredCalType" size="small" clearable style="width:300px" :disabled="!queryParams.isDisabled">
                                         <el-option v-for="item in cntType" :key="item.id" :label="item.text" :value="item.id" />
                                     </el-select>
                                 </div>
@@ -94,13 +101,13 @@
                             <el-col :xs="4" :sm="6" :md="8" :lg="10" :xl="10">
                                 <div class="grid-content bg-purple-light">
                                     <span style="width:20%; text-align:center ">止数：</span>
-                                    <el-input-number v-model="queryParams.jt1" size="small"  controls-position='right' :min='0' placeholder="请输入阶梯1止数"></el-input-number> 方
+                                    <el-input-number v-model="reportForm.tiered1Limit" size="small"  controls-position='right' :min='0' placeholder="请输入阶梯1止数" :disabled="!queryParams.isDisabled"></el-input-number> 方
                                 </div>
                             </el-col>
                             <el-col :xs="4" :sm="6" :md="8" :lg="10" :xl="10">
                                 <div class="grid-content bg-purple">
                                     <span style="width:20%; text-align:center ">水价：</span>
-                                    <el-input-number v-model="queryParams.jt1" size="small" controls-position='right' :min='0' placeholder="请输入阶梯1水价"></el-input-number> 元
+                                    <el-input-number v-model="reportForm.tiered1Price" size="small" controls-position='right' :min='0' placeholder="请输入阶梯1水价" :disabled="!queryParams.isDisabled"></el-input-number> 元
                                 </div>
                             </el-col>
 
@@ -114,13 +121,13 @@
                             <el-col :xs="4" :sm="6" :md="8" :lg="10" :xl="10">
                                 <div class="grid-content bg-purple-light">
                                     <span style="width:20%; text-align:center ">止数：</span>
-                                    <el-input-number v-model="queryParams.jt1" size="small" controls-position='right' :min='0' placeholder="请输入阶梯2止数" :disabled="!queryParams.isDisabled"></el-input-number> 方
+                                    <el-input-number v-model="reportForm.tiered2Limit" size="small" controls-position='right' :min='0' placeholder="请输入阶梯2止数" :disabled="!queryParams.isDisabled"></el-input-number> 方
                                 </div>
                             </el-col>
                             <el-col :xs="4" :sm="6" :md="8" :lg="10" :xl="10">
                                 <div class="grid-content bg-purple">
                                     <span style="width:20%; text-align:center ">水价：</span>
-                                    <el-input-number v-model="queryParams.jt1" size="small" controls-position='right' :min='0' placeholder="请输入阶梯2水价" :disabled="!queryParams.isDisabled"></el-input-number> 元
+                                    <el-input-number v-model="reportForm.tiered2Price" size="small" controls-position='right' :min='0' placeholder="请输入阶梯2水价" :disabled="!queryParams.isDisabled"></el-input-number> 元
                                 </div>
                             </el-col>
 
@@ -134,13 +141,13 @@
                             <el-col :xs="4" :sm="6" :md="8" :lg="10" :xl="10">
                                 <div class="grid-content bg-purple-light">
                                     <span style="width:20%; text-align:center ">止数：</span>
-                                    <el-input-number v-model="queryParams.jt1" size="small" controls-position='right' :min='0' placeholder="请输入阶梯3止数" :disabled="!queryParams.isDisabled"></el-input-number> 方
+                                    <el-input-number v-model="reportForm.tiered3Limit" size="small" controls-position='right' :min='0' placeholder="请输入阶梯3止数" :disabled="!queryParams.isDisabled"></el-input-number> 方
                                 </div>
                             </el-col>
                             <el-col :xs="4" :sm="6" :md="8" :lg="10" :xl="10">
                                 <div class="grid-content bg-purple">
                                     <span style="width:20%; text-align:center ">水价：</span>
-                                    <el-input-number v-model="queryParams.jt1" size="small" controls-position='right' :min='0' placeholder="请输入阶梯3水价" :disabled="!queryParams.isDisabled"></el-input-number> 元
+                                    <el-input-number v-model="reportForm.tiered3Price" size="small" controls-position='right' :min='0' placeholder="请输入阶梯3水价" :disabled="!queryParams.isDisabled"></el-input-number> 元
                                 </div>
                             </el-col>
 
@@ -154,13 +161,13 @@
                             <el-col :xs="4" :sm="6" :md="8" :lg="10" :xl="10">
                                 <div class="grid-content bg-purple-light">
                                     <span style="width:20%; text-align:center ">止数：</span>
-                                    <el-input-number v-model="queryParams.jt1" size="small" controls-position='right' :min='0' placeholder="请输入阶梯4止数" :disabled="!queryParams.isDisabled"></el-input-number> 方
+                                    <el-input-number v-model="reportForm.tiered4Limit" size="small" controls-position='right' :min='0' placeholder="请输入阶梯4止数" :disabled="!queryParams.isDisabled"></el-input-number> 方
                                 </div>
                             </el-col>
                             <el-col :xs="4" :sm="6" :md="8" :lg="10" :xl="10">
                                 <div class="grid-content bg-purple">
                                     <span style="width:20%; text-align:center ">水价：</span>
-                                    <el-input-number v-model="queryParams.jt1" size="small" controls-position='right' :min='0' placeholder="请输入阶梯4水价" :disabled="!queryParams.isDisabled"></el-input-number> 元
+                                    <el-input-number v-model="reportForm.tiered4Price" size="small" controls-position='right' :min='0' placeholder="请输入阶梯4水价" :disabled="!queryParams.isDisabled"></el-input-number> 元
                                 </div>
                             </el-col>
 
@@ -183,13 +190,13 @@
                         <el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12">
                             <div class="grid-content bg-purple" style="vertical-align:middel;">
                                 <span style="width:30%; text-align:center ">污水费单价:</span>
-                                <el-input-number v-model="queryParams.wsfdj" :min='0' size="small"  controls-position='right'></el-input-number>元
+                                <el-input-number v-model="reportForm.sewageFeePrice" :min='0' size="small"  controls-position='right'></el-input-number>元
                             </div>
                         </el-col>
                         <el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12">
                             <div class="grid-content bg-purple-light" style="vertical-align:middel;">
                                 <span style="width:30%; text-align:center ">垃圾费单价：</span>
-                                <el-input-number v-model="queryParams.ljfdj" :min='0' size="small" controls-position='right'></el-input-number>元
+                                <el-input-number v-model="reportForm.garbageFeePrice" :min='0' size="small" controls-position='right'></el-input-number>元
                             </div>
                         </el-col>
 
@@ -200,6 +207,8 @@
 
         </div>
     </div>
+
+  
 </template>
 
 
@@ -207,9 +216,14 @@
 
 import { getCompanyTree, getCompany } from '@/api/base'
 import { queryUwTypeList } from '@/api/mis/financialManage/financialApi'
+import uwType from "@/plugin/company/uwType.vue";
 
 export default {
     name: 'priceDialog',
+    components: {
+    uwType 
+  },
+  
     props: ['reportForm', 'isLook'],
     data() {
         return {

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

@@ -58,8 +58,8 @@
       :column="column"
       :for-id="true"
       :pagination="true"
-      :pagesize="pageInfo.size"
-      :currentpage="pageInfo.current"
+      :pagesize="pageInfo.pageSize"
+      :currentpage="pageInfo.page"
       :border="true"
       :multiple="true"
       :total="pageInfo.tableTotal"
@@ -92,6 +92,15 @@
       >确定</el-button>
     </template>
   </el-dialog>
+
+  <el-dialog :visible.sync="editDialog" title="修改" width="800px" top="10vh">
+    <priceAddDialog :report-form="editData" :is-look="false" />
+    <template slot="footer">
+      <el-button size="small" @click="cancelEdit">取消</el-button>
+      <el-button type="primary" size="small" @click="editItem">确定</el-button>
+    </template>
+  </el-dialog>
+
   <!--
   <el-dialog :visible.sync="dialogDetail" title="查看" width="600px" top="5vh">
     <KpiStandardDialog :report-form="detailData" :is-look="true" />
@@ -130,7 +139,7 @@ export default {
   data() {
     return {
       multipleSelection: [], // 表格选中数据
-      pageInfo: { page: 1, pageSize: 10, tableTotal: 1 }, // 分页数据
+      pageInfo: { page: 1, pageSize: 10}, // 分页数据
       column: [
         {
           label: '公司',
@@ -194,6 +203,7 @@ export default {
       reportDialog: false, // 上报弹窗
       editDialog: false, // 编辑弹窗
       reportForm: {
+        id:undefined,
         assessStandard: undefined,
         assessContent: undefined,
         assessType: undefined,
@@ -252,7 +262,7 @@ export default {
      * @description 改变当前页
      */
     handleCurrentChange(currentPage) {
-      this.pageInfo.current = currentPage
+      this.pageInfo.page = currentPage
       this.getData()
     },
     handleSelectionChange(val) {
@@ -264,13 +274,14 @@ export default {
      * @description 查询应急事件列表
      */
     buildReportQuery() {
-      this.pageInfo.current = 1
+      this.pageInfo.page = 1
       this.getData()
     },
     editClick() {
-    //  this.editDialog = true
+      this.editDialog = true
       this.editData = this.multipleSelection[0]
-      this.reportDialog=true
+     // console.log("eidtData"+ JSON.stringify(this.editData));
+      // this.reportDialog=true
     },
     cancelEdit() {
       this.editDialog = false
@@ -296,24 +307,24 @@ export default {
     getData() {
       var that = this
       // 追加分页参数
-      const query = that.pageInfo
-      Object.assign(query, that.queryParams)
-      console.log('query参数：' + JSON.stringify(that.pageInfo))
-      that.buildsiteData = []
-      // queryKpiStandardList(query).then((res) => {
-      //   if (res.code !== 1) {
-      //     that.$message.error('获取信息出错!')
-      //     return
-      //   }
-      //   // 数据总数
-      //   that.pageInfo.tableTotal = res.result.total
-      //   that.buildsiteData = res.result.records
-      // })
- 
+      // const query = that.pageInfo
+      // Object.assign(query, that.queryParams)
+  
+      // console.log('query参数：' + JSON.stringify(that.pageInfo))
+
+
+      const query={
+        page: that.pageInfo.page, 
+        pageSize: that.pageInfo.pageSize,
+        name:"" 
+      }
+
+      that.buildsiteData = [] 
+   
+  
       
      queryPriceList(query).then((res)=>{
-
-      console.log("-------------");
+ 
       console.log(res);
       console.log(res.result.records);
       if (res.code !== 1) {
@@ -321,8 +332,7 @@ export default {
           return
         }
         this.pageInfo.tableTotal=res.result.total;
-        this.buildsiteData=res.result.items;
-    
+        this.buildsiteData=res.result.items; 
 
      })
     },

src/views/mis/financialManage/type/pricesSet.vue

@@ -3,7 +3,7 @@
 </template>
 <script>
 
-import uwType from "@/plugin/company/index.vue";
+import uwType from "@/plugin/company/uwType.vue";
 export default {
   // 组件注册
   components: {