zx

src/api/manage/index.js

@@ -72,6 +72,15 @@ export function getAddCommunity(params) {
 	})
 }
 
+// 小区管理-根据小区主键id查询小区信息
+export function findByIdAdmin(params) {
+	return httpService({
+		url: `/user/community/findByIdAdmin`,
+		method: 'get',
+		params: params,
+	})
+}
+
 // 小区管理-修改小区信息
 export function updateCommunity(params) {
 	return httpService({
@@ -212,7 +221,7 @@ export function postRefund(params) {
 	return httpService({
 		url: `/user/financialStatements/refund`,
 		method: 'post',
-		params: params,
+		data: params,
 	})
 }
 

src/views/Basic/home/index.vue

@@ -216,6 +216,7 @@
 <script>
 import { consoleShow, communityInsert } from "@/api/basic/console";
 import { userUnbindingCommunity, userBindingCommunity } from "@/api/basic/console";
+import { findByIdAdmin } from "@/api/manage";
 import store from "@/store";
 export default {
 	name: "Console",
@@ -313,7 +314,10 @@ export default {
       this.boundVisible = false;
     },
     handlerDetail(val) {
-      console.log(val)
+      findByIdAdmin({communityId: val.id}).then(res => {
+        let data = res.data;
+        console.log(data)
+      })
     },
     //订单列表解绑
     unbound(val) {

src/views/Login/index.vue

@@ -13,11 +13,11 @@
               <div class="login-input">
                 <a-input v-model="form.username" placeholder="请输入手机号码"></a-input>
                 <a-input type="password" v-model="form.password" placeholder="请输入密码"></a-input>
-                <a-row>
+                <!-- <a-row>
                   <a-col :span="12" style="margin-left: 23px"
                     ><a-checkbox></a-checkbox>&nbsp;&nbsp;三天之内免登陆</a-col
                   >
-                </a-row>
+                </a-row> -->
                 <a-button
                   type="primary"
                   @click="loginPWD"
@@ -52,11 +52,11 @@
                   style="width: 60%"
                 ></a-input>
                 <a-button type="primary" @click="getCode">获取验证码</a-button>
-                <a-row>
+                <!-- <a-row>
                   <a-col :span="12" style="margin-left: 23px"
                     ><a-checkbox></a-checkbox>&nbsp;&nbsp;三天之内免登陆</a-col
                   >
-                </a-row>
+                </a-row> -->
                 <a-button
                   type="primary"
                   @click="login"

src/views/Manage/ChargingManage/ChargingStandard/index.vue

@@ -7,6 +7,16 @@
                     <a-form-model-item label="模版名称">
                         <a-input v-model="form.name" placeholder="请输入模版名称" />
                     </a-form-model-item>
+                    <a-form-model-item label="状态">
+                        <a-select placeholder="请选择状态" style="width: 180px" allowClear v-model="form.status">
+                            <a-select-option :value="1">
+                                启用
+                            </a-select-option>
+                            <a-select-option :value="2">
+                                禁用
+                            </a-select-option>
+                        </a-select>
+                    </a-form-model-item>
                 </a-form-model>
                 <a-button @click="onSearch" type="primary">查 询</a-button>
                 <a-button @click="onReset">重 置</a-button>
@@ -50,10 +60,20 @@
                         <a-input v-model="addForm.name" style="width: 240px" placeholder="请输入模版名称" />
                     </a-form-model-item>
                     <a-form-model-item label="功能模块大类">
-                        <a-checkbox-group :options="modalType" @change="modelChange" />
+                        <!-- <a-checkbox-group :options="modalType" @change="modelChange" /> -->
+                        <a-checkbox-group v-model="chargingFunctionIds">
+                            <a-checkbox v-for="(item) in modelInput" :value="item.id" :key="item.id">
+                                {{item.name}}
+                            </a-checkbox>
+                        </a-checkbox-group>
                     </a-form-model-item>
                     <a-form-model-item label="时间类型">
-                        <a-checkbox-group :options="timeType" @change="timeChange" />
+                        <!-- <a-checkbox-group :options="timeType" @change="timeChange" /> -->
+                        <a-checkbox-group v-model="chargingTimeTypeIds">
+                            <a-checkbox v-for="(item) in timeInput" :value="item.id" :key="item.id">
+                                {{item.years}}年{{item.months}}个月{{item.days}}天
+                            </a-checkbox>
+                        </a-checkbox-group>
                     </a-form-model-item>
                     <a-form-model-item label="价格参数">
                         <div class="columns">
@@ -62,11 +82,11 @@
                             <span class="columns-item">价格</span>
                         </div>
                         <div class="model-item" v-for="(item, index) in modelInput" :key="index">
-                            <template v-if="activeModel.indexOf(item.id)!=-1">
+                            <template v-if="chargingFunctionIds.indexOf(item.id)!=-1">
                                 <span class="models">{{item.name}}</span>
                                 <span class="models2">
                                     <div v-for="(it , id) in timeInput" :key="id">
-                                        <span v-if="activeTime.indexOf(it.id)!=-1">
+                                        <span v-if="chargingTimeTypeIds.indexOf(it.id)!=-1">
                                             {{it.years}}年{{it.months}}个月{{it.days}}天
                                             <a-input-number step="0.01" v-model="addForm.chargingTemplateFunctionTimeTypeDTO[id + index * timeInput.length].unitPrice" style="width:120px;margin-left: 65px"></a-input-number>
                                         </span>
@@ -84,7 +104,7 @@
 </template>
 
 <script>
-import {getChargingList} from "@/api/manage"
+import {getChargingList, getChargeById} from "@/api/manage"
 import {onoffCharging} from "@/api/manage"
 import {findTimeType, findSuperNavigation, addCharge, updateCharge } from "@/api/manage";
 export default {
@@ -95,9 +115,13 @@ export default {
             form: {
                 pageNum: 1,
                 size: 10,
-                name: ''
+                name: '',
+                status: undefined
             },
-            colors: ['volcano','orange','yellow','green','blue','purple','grey'],
+            chargingFunctionIds: [],
+            chargingTimeTypeIds: [],
+            // colors: ['volcano','orange','yellow','green','blue','purple','grey'],
+            colors: ['#1F519B','#1F519B','#1F519B','#1F519B','#1F519B','#1F519B','#1F519B','#1F519B','#1F519B',],
             tableData: [],
             columns: [
                 {
@@ -152,11 +176,11 @@ export default {
             },
             visible: false,
             //收费标准时间类型
-            timeType: [],
+            // timeType: [],
             activeTime: [],
             timeInput: [],
             //收费标准模块信息
-            modalType: [],
+            // modalType: [],
             activeModel: [],
             modelInput: [],
         }
@@ -179,27 +203,27 @@ export default {
             findTimeType().then(res => {
                 let data = res.data;
                 this.timeInput = data; //输入框
-                let opts = [];
-                data.forEach(ele => {
-                    let obj = {
-                        label: ele.years+'年' + ele.months+'个月' + ele.days+'天',
-                        value: ele.id
-                    };
-                    opts.push(obj)
-                })
-                this.timeType = opts //多选框
+                // let opts = [];
+                // data.forEach(ele => {
+                //     let obj = {
+                //         label: ele.years+'年' + ele.months+'个月' + ele.days+'天',
+                //         value: ele.id
+                //     };
+                //     opts.push(obj)
+                // })
+                // this.timeType = opts //多选框
             });
             findSuperNavigation().then(res => {
                 let data = res.data;
                 this.modelInput = data; //输入框
-                let opts = [];
-                data.forEach(ele => {
-                    let obj = {
-                        label: ele.name, value: ele.id
-                    };
-                    opts.push(obj)
-                })
-                this.modalType = opts //多选框
+                // let opts = [];
+                // data.forEach(ele => {
+                //     let obj = {
+                //         label: ele.name, value: ele.id
+                //     };
+                //     opts.push(obj)
+                // })
+                // this.modalType = opts //多选框
             })
         },
         //填充价格
@@ -219,6 +243,8 @@ export default {
         },
         //分页
 		handleTableChange(pagination) {
+            this.pagination.current = pagination.current
+            this.pagination.pageSize = pagination.pageSize
 			this.form.size = pagination.pageSize;
 			this.form.pageNum = pagination.current;
 			this.getData();
@@ -226,15 +252,18 @@ export default {
         //新建收费模版
         handlerAdd() {
             this.drawerModel = 1;
+            this.addForm.name = '';
+            this.chargingFunctionIds = [];
+            this.chargingTimeTypeIds = [];
             this.visible = true
         },
         //-改变选择的模块
-        modelChange(val) {
-            this.activeModel = val;
-        },
-        timeChange(val) {
-            this.activeTime = val
-        },
+        // modelChange(val) {
+        //     this.activeModel = val;
+        // },
+        // timeChange(val) {
+        //     this.activeTime = val
+        // },
         hanlderClose() {
             this.visible = false
         },
@@ -243,8 +272,8 @@ export default {
             let adds = this.addForm.chargingTemplateFunctionTimeTypeDTO
             let chosenAdds = [];
             adds.forEach(ele => {
-                if(this.activeModel.indexOf(ele.chargingFunctionId)!= -1 && 
-                   this.activeTime.indexOf(ele.chargingTimeTypeId)!= -1) {
+                if(this.chargingFunctionIds.indexOf(ele.chargingFunctionId)!= -1 && 
+                   this.chargingTimeTypeIds.indexOf(ele.chargingTimeTypeId)!= -1) {
                     let obj = {
                         chargingFunctionId: ele.chargingFunctionId,
                         chargingTimeTypeId: ele.chargingTimeTypeId,
@@ -258,21 +287,48 @@ export default {
                 chargingTemplateFunctionTimeTypeDTO: chosenAdds
             }
             if(this.drawerModel == 1) {
-                addCharge(obj).then(() => {
-                    this.visible = false
+                addCharge(obj).then((res) => {
+                    if (res.code === 200) {
+                        this.visible = false
+                        this.$message.success(res.msg);
+                        this.getData();
+                    } else {
+                        this.$message.error(res.msg);
+                    }
                 })
             } else {
                 let o = Object.assign(obj, {id: this.chosenModel});
-                updateCharge(o).then(() => {
-                    this.visible = false
+                updateCharge(o).then((res) => {
+                    if (res.code === 200) {
+                        this.visible = false
+                        this.$message.success(res.msg);
+                        this.getData();
+                    } else {
+                        this.$message.error(res.msg);
+                    }
                 })
             };
-            this.getData();
         },
-        //修改模版
+        //修改模版的回显
         detail(record) {
             this.chosenModel = record.id
             this.drawerModel = 2;
+            getChargeById({id: record.id}).then(res => {
+                let data = res.data;
+                this.addForm.name = data.name
+                this.chargingFunctionIds = data.functionList;
+                this.chargingTimeTypeIds = data.timeTypeList;
+                let arr = this.addForm.chargingTemplateFunctionTimeTypeDTO
+                let j = 0;
+                for(let i=0;i<arr.length;i++) {
+                    if(this.chargingFunctionIds.indexOf(arr[i].chargingFunctionId)!= -1 && 
+                        this.chargingTimeTypeIds.indexOf(arr[i].chargingTimeTypeId)!= -1) {
+                            arr[i].unitPrice = data.chargingFunctionToTimeTypeVos[j].unitPrice;
+                            j = j+1;
+                        }
+                };
+                this.addForm.chargingTemplateFunctionTimeTypeDTO = arr;
+            })
             this.visible = true
         },
         //启用/禁用

src/views/Manage/ChargingManage/FinancialBill/_payback.vue

@@ -126,7 +126,14 @@ export default {
             this.$router.go(-1);
         },
         auditSubmit() {
-            postRefund(this.paybackForm).then(() => {});
+            postRefund(this.paybackForm).then((res) => {
+                if (res.code === 200) {
+                        this.$message.success(res.msg);
+                        this.$router.go(-1);
+                } else {
+                        this.$message.error(res.msg);
+                }
+            });
             this.auditShow = false;
         },
         auditCancel() {

src/views/Manage/OrderManage/_addOrder.vue

@@ -131,7 +131,8 @@ export default {
 				let data = res.data.rows
 				this.companyData = data;
 			});
-            getChargingList(Object.assign(obj, {name: ''})).then(res => {
+            let o = {pageNum: 1,size: 1000, status: 1}
+            getChargingList(o).then(res => {  
                 let data = res.data.rows;
                 this.modelData = data
             })

src/views/Manage/VillageManage/index.vue

@@ -19,25 +19,25 @@
 					添加小区
 				</a-button>
 			</div>
-		<a-table
-			:scroll="{ x: 1300 }"
-			:columns="columns"
-			:data-source="tableData"
-			:pagination="pagination"
-			@change="handleTableChange"
-			:row-key="
-			(record, index) => {
-				return index;
-			}
-			"
-		>
-			<span slot="pics" slot-scope="text,record">
-				<img :src="item.url" alt="" v-for="(item, index) in record.communityImgList" :key="index">
-			</span>
-			<span slot="action" slot-scope="text,record">
-			<a @click="detail(record)">修改</a>
-			</span>
-		</a-table>
+			<a-table
+				:scroll="{ x: 1300 }"
+				:columns="columns"
+				:data-source="tableData"
+				:pagination="pagination"
+				@change="handleTableChange"
+				:row-key="
+				(record, index) => {
+					return index;
+				}
+				"
+			>
+				<span slot="pics" slot-scope="text,record">
+					<img :src="item.url" alt="" v-for="(item, index) in record.communityImgList" :key="index">
+				</span>
+				<span slot="action" slot-scope="text,record">
+				<a @click="detail(record)">修改</a>
+				</span>
+			</a-table>
 		</div>
 		<a-drawer :title="modelType == 1 ? '填写小区信息':'修改小区信息'" :visible="visible" @close="hanlderClose" width="512">
             <a-form-model>
@@ -83,7 +83,7 @@
 
 <script>
 import imgUpload from "@/components/upload/index.vue"
-import {getCommunityList, getAddCommunity, getAllRequest, updateCommunity} from "@/api/manage"
+import {getCommunityList, getAddCommunity, getAllRequest, updateCommunity, findByIdAdmin} from "@/api/manage"
 import {getAllCity, getCityByParent} from "@/api/city"
 export default {
 	components: {
@@ -191,6 +191,10 @@ export default {
 		//点击详情
 		detail(record) {
 			this.modelType = 2;
+			findByIdAdmin({communityId: record.id}).then(res => {
+				let data = res.data;
+				console.log(data)
+			})
 			this.chosenId = record.id; //小区id
 			this.visible = true;
 		},

src/views/Rule/admin.vue

@@ -70,7 +70,6 @@
                 <span class="agreement-underline">委托授权合作伙伴为您提供某些服务或代表我们履行职能</span>
                 。我们仅会处于本隐私政策声明的合法、正当、必要、特定、明确的目的共享您的信息。我们会采取必要的技术和管理措施保护您的个人信息安全。
             </p>
-            <p>您可以通过<a style="text-decoration: underline;color:blue;" href="https://h5.cloud.189.cn/third.html#/list/third">第三方SDK情况说明</a>查看第三方SDK收集和使用您个人信息的情况。</p>
             <div class="agreement-rule">
                 <p><span>三、您的权力</span></p>
             </div>

src/views/Rule/user.vue

@@ -70,7 +70,6 @@
                 <span class="agreement-underline">委托授权合作伙伴为您提供某些服务或代表我们履行职能</span>
                 。我们仅会处于本隐私政策声明的合法、正当、必要、特定、明确的目的共享您的信息。我们会采取必要的技术和管理措施保护您的个人信息安全。
             </p>
-            <p>您可以通过<a style="text-decoration: underline;color:blue;" href="https://h5.cloud.189.cn/third.html#/list/third">第三方SDK情况说明</a>查看第三方SDK收集和使用您个人信息的情况。</p>
             <div class="agreement-rule">
                 <p><span>三、您的权力</span></p>
             </div>