Shannon_mu 2 лет назад
Родитель
Сommit
164d93413b

+ 9 - 9
login/src/views/Login/index.vue

@@ -73,7 +73,7 @@
                                 <img class="el-fl-right codeImg codeImg-item" :src="loginData.codeUrl" @click="refreshCode" />
                             </div>
 
-                            <!-- <div class="form-item">
+                            <div class="form-item">
                                 <el-input
                                     type="text"
                                     placeholder="请输入手机验证码"
@@ -100,7 +100,7 @@
                                 >
                                     获取验证码</el-button
                                 >
-                            </div> -->
+                            </div>
                             <span class="tips" v-if="loginData.errMsg">{{ loginData.errMsg }}</span>
                             <el-button type="primary" class="btn mgTop16" @click="loginSubmit">登录</el-button>
                         </el-form>
@@ -134,7 +134,7 @@ export default {
                 mobile: '17800000001', //手机号
                 code: '', //校验码
                 codeUrl: '',
-                smsCode: '2020', //手机校验码
+                smsCode: '', //手机校验码
                 time: 0,
                 random: '', //用于重新获取数字校验码的随机数
                 errMsg: ''
@@ -360,12 +360,12 @@ export default {
         loginSubmit() {
             let errorMsg = '';
             const params = { ...this.loginData };
-            // if (!codeRegExp.test(params.smsCode)) {
-            //     errorMsg = '· 您输入的手机验证码有误,请重新输入';
-            // }
-            // if (!params.smsCode) {
-            //     errorMsg = '· 请输入手机检验码';
-            // }
+            if (!codeRegExp.test(params.smsCode)) {
+                errorMsg = '· 您输入的手机验证码有误,请重新输入';
+            }
+            if (!params.smsCode) {
+                errorMsg = '· 请输入手机检验码';
+            }
             if (!codeRegExp.test(params.code)) {
                 errorMsg = '· 您输入的图形验证码有误,请重新输入';
             }

+ 3 - 1
operationSupport/src/views/businessManagement/contractManagement/stepPage/details.vue

@@ -114,7 +114,9 @@
                 <el-table-column prop="period" label="期数">
                     <template slot-scope="scope"> 第 {{ scope.row.period || '' }}期 </template>
                 </el-table-column>
-                <el-table-column label="应收日期" prop="amount"></el-table-column>
+                <el-table-column label="应收日期" prop="receivableDate">
+                    <template slot-scope="scope"> {{ $moment(new Date(scope.row.receivableDate)).format('YYYY-MM-DD') }} </template>
+                </el-table-column>
                 <el-table-column label="计费周期" prop="cycle"> </el-table-column>
                 <el-table-column prop="rent" label="租金(元)"> </el-table-column>
                 <el-table-column prop="amount" label="应收金额(元)"> </el-table-column>

+ 5 - 1
operationSupport/src/views/businessManagement/contractManagement/stepPage/lastStep.vue

@@ -26,7 +26,11 @@
                 <el-table-column prop="period" label="期数">
                     <template slot-scope="scope"> 第 {{ scope.row.period || '' }}期 </template>
                 </el-table-column>
-                <el-table-column label="应收日期" prop="amount"></el-table-column>
+                <el-table-column label="应收日期">
+                    <template slot-scope="scope">
+                        {{ $moment(new Date(scope.row.receivableDate)).format('YYYY-MM-DD') }}
+                    </template></el-table-column
+                >
                 <el-table-column label="计费周期" prop="cycle"> </el-table-column>
                 <el-table-column prop="rent" label="租金(元)"> </el-table-column>
                 <el-table-column prop="amount" label="应收金额(元)"> </el-table-column>

+ 121 - 27
operationSupport/src/views/payService/chargeSetting/stepPage/add.vue

@@ -1,6 +1,22 @@
 <template>
-    <el-form ref="form" label-width="120px">
-        <el-form-item label="选择收费项目" :required="true">
+    <el-form ref="form" :model="formData" label-width="120px" :rules="formRules">
+        <el-form-item label="所属社区" prop="communityId">
+            <el-select v-model="formData.communityId" placeholder="请选择所属社区" clearable @change="communityChange">
+                <el-option v-for="(item, index) in communityArr" :key="index" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item label="选择房屋" prop="communityTreeIds">
+            <el-cascader
+                :options="communityTreeArr"
+                v-model="formData.communityTreeIds"
+                :props="defaultProps"
+                collapse-tags
+                ref="communityTreeArr"
+                @change="findTreeIds"
+                clearable
+            ></el-cascader>
+        </el-form-item>
+        <el-form-item label="选择收费项目" prop="strategyIds">
             <div class="contentScorll">
                 <div class="all">
                     <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全部设置</el-checkbox>
@@ -10,6 +26,7 @@
                     <el-checkbox-group v-model="formData.strategyIds" @change="handleCheckedCitiesChange">
                         <el-checkbox v-for="item in list" :label="item.id" :key="item">{{ item.chargeName }}</el-checkbox>
                     </el-checkbox-group>
+                    <div v-if="list.length == 0" style="line-height: 150px; text-align: center; opacity: 0.5">社区暂无收费项目</div>
                 </div>
             </div>
         </el-form-item>
@@ -25,8 +42,44 @@ export default {
             checkAll: false,
             isIndeterminate: false,
             formData: {
-                strategyIds: []
-            }
+                strategyIds: [],
+                communityId: '',
+                communityTreeIds: []
+            },
+            defaultProps: {
+                multiple: true,
+                // emitPath: false,
+                value: 'value', // 唯一标识
+                label: 'name', // 标签显示
+                children: 'children' // 子级
+            },
+            formRules: {
+                communityId: [this.$valid.selectRequired('社区')],
+                communityTreeIds: this.$valid.custome({
+                    validator(rule, value, cb) {
+                        const rl = rule;
+                        if (value.length == 0) {
+                            rl.message = '请选择房间';
+                            cb(new Error());
+                        } else {
+                            cb();
+                        }
+                    }
+                }),
+                strategyIds: this.$valid.custome({
+                    validator(rule, value, cb) {
+                        const rl = rule;
+                        if (value.length == 0) {
+                            rl.message = '请选择收费项目';
+                            cb(new Error());
+                        } else {
+                            cb();
+                        }
+                    }
+                })
+            },
+            communityArr: [],
+            communityTreeArr: []
         };
     },
 
@@ -47,36 +100,77 @@ export default {
             this.isIndeterminate = false;
         },
         submit() {
-            if (!this.formData.strategyIds.length) {
-                this.$message.error('选择收费项目');
-                return;
-            }
-            var loading = this.$loading();
+            let assetItemArr = [];
+            let thisArr = this.$refs.communityTreeArr.getCheckedNodes();
+            thisArr.map((item) => {
+                if (item.level == 2) {
+                    assetItemArr.push({
+                        address: `${item.parent.label}-${item.label}`,
+                        value: item.value,
+                        type: 4
+                    });
+                } else if (item.level == 3) {
+                    assetItemArr.push({
+                        address: `${item.parent.parent.label}-${item.parent.label}-${item.label}`,
+                        value: item.value,
+                        type: 4
+                    });
+                }
+            });
+            let installData = {
+                strategyIds: this.formData.strategyIds,
+                assetItem: assetItemArr
+            };
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    var loading = this.$loading();
+                    this.$http
+                        .post('/sc-charge/scChargeStrategyConfig/add', installData)
+                        .then(({ status, msg }) => {
+                            if (status == 0) {
+                                this.$message.success(msg);
+                                this.params.callback();
+                                this.$emit('close');
+                            } else {
+                                this.$message.error(msg);
+                            }
+                            loading.close();
+                        })
+                        .catch(() => {
+                            loading.close();
+                        });
+                }
+            });
+        },
+        getList(id) {
+            this.$http.get('/sc-charge/scChargeStrategy/list?communityId=' + id).then(({ data, status, msg }) => {
+                this.list = data;
+            });
+        },
+        getorgTree() {
             this.$http
-                .post('/sc-charge/scChargeStrategyConfig/add', this.formData)
-                .then(({ status, msg }) => {
-                    if (status == 0) {
-                        this.$message.success(msg);
-                        this.params.callback();
-                        this.$emit('close');
-                    } else {
-                        this.$message.error(msg);
-                    }
-                    loading.close();
+                .get('/sc-community/assets/tree/community/find')
+                .then((data) => {
+                    this.communityArr = data.data;
                 })
-                .catch(() => {
-                    loading.close();
-                });
+
+                .catch(function () {});
         },
-        getList() {
-            this.$http.get('/sc-charge/scChargeStrategy/list?communityId=' + this.params.communityId).then(({ data, status, msg }) => {
-                this.list = data;
+        findTreeIds(va) {
+            console.log(va);
+        },
+        communityChange(val) {
+            this.communityArr.map((item) => {
+                if (item.id == val) {
+                    this.communityTreeArr = item.children;
+                }
             });
+            this.getList(val);
         }
     },
     created() {
-        Object.assign(this.formData, this.params.data);
-        this.getList();
+        this.getorgTree();
+        // Object.assign(this.formData, this.params.data);
     }
 };
 </script>

+ 3 - 3
operationSupport/src/views/payService/depositManagement/stepPage/details.vue

@@ -84,7 +84,7 @@ export default {
                 },
                 {
                     label: '退款人:',
-                    prop: 'payee'
+                    prop: 'refundOperatorName'
                 },
                 {
                     label: '退款时间:',
@@ -116,8 +116,8 @@ export default {
         }
     },
     created() {
-        this.thisItem = this.params.data;
-        // this.getDatali(this.params.id);
+        // this.thisItem = this.params.data;
+        this.getDatali(this.params.data.id);
     }
 };
 </script>