修复bug

operationSupport/src/utils/http.js

@@ -49,6 +49,7 @@ http.interceptors.response.use(
     },
     (err) => {
         if (err.response.status == 401) {
+          
             axios({
                 url: '/user-auth/user/getUserStatus?accessToken=' + localStorage.getItem('SC_token'),
                 method: 'get'
@@ -57,35 +58,20 @@ http.interceptors.response.use(
                 window.relogin = true;
                 let data = response.data.data;
                 if (data == 0) {
-                    // Vue.prototype
-                    //     .$msgBox('你的登录已超时,请重新登录', '', 'warning', {
-                    //         width: '290px',
-                    //         showCancelButton: false,
-                    //         confirmButtonText: '确定',
-                    //         showClose: false
-                    //     })
-                    //     .then(() => {
-                    //         window.open(config.loginUrl, '_self');
-                    //         window.relogin = false;
-                    //         localStorage.removeItem('SC_token');
-                    //     })
-                    //     .catch(() => { });
-                    ELEMENT.Message.success('你的登录已超时,请重新登录');
-                    window.open(config.loginUrl, '_self');
-                    window.relogin = false;
-                    localStorage.removeItem('SC_token');
-                } else if (data == 1) {
                     Vue.prototype
-                    // .$msgBox('该账号已在其他地址登录,如需访问请重新登录', '', 'warning', {
-                    //     width: '290px',
-                    //     showCancelButton: false,
-                    //     confirmButtonText: '确定',
-                    //     showClose: false
-                    // })
-                    // .then(() => {
-
-                    // })
-                    // .catch(() => {});
+                        .$msgBox('你的登录已超时,请重新登录', '', 'warning', {
+                            width: '290px',
+                            showCancelButton: false,
+                            confirmButtonText: '确定',
+                            showClose: false
+                        })
+                        .then(() => {
+                            window.open(config.loginUrl, '_self');
+                            window.relogin = false;
+                            localStorage.removeItem('SC_token');
+                        })
+                        .catch(() => { });
+                } else if (data == 1) {
                     ELEMENT.Message.success('您已退出登录');
                     window.open(config.loginUrl, '_self');
                     window.relogin = false;

operationSupport/src/utils/newValidate.js

@@ -84,7 +84,7 @@ export default {
             message: '该项不能为空.',
             required: true,
             trigger: 'blur',
-            validator() {}
+            validator() { }
         };
     },
     // 为空校验
@@ -150,9 +150,9 @@ export default {
         return !regExp.test(value) && '由中文、英文字母、数字、下划线和中划线组成';
     },
     /*
-	初始化校验
-	arg为需要校验项的数组集合，需要优先校验项放在最后
-	*/
+    初始化校验
+    arg为需要校验项的数组集合，需要优先校验项放在最后
+    */
     init(arg) {
         let set = this.getSetting();
         set.validator = (rule, value, callback) => {
@@ -173,8 +173,8 @@ export default {
     },
 
     /*
-	为必填校验
-	 */
+    为必填校验
+     */
     noRequired(arg) {
         let set = this.getSetting();
         set.required = false;
@@ -203,11 +203,11 @@ export default {
         return [Object.assign({}, this.getSetting(), params)];
     },
     /*
-	正则校验
-	reg正则表达式
-	msg提示消息
-	required是否为必填,不传为不必填，传值则根据required的Boolean值来确定
-	*/
+    正则校验
+    reg正则表达式
+    msg提示消息
+    required是否为必填,不传为不必填，传值则根据required的Boolean值来确定
+    */
     reg(reg, msg, required) {
         let self = this;
         return [
@@ -332,8 +332,12 @@ export default {
     // 手机号校验
     patternPhoneNumber(required = true) {
         let pattern = /^(1[3|4|5|6|7|8|9])\d{9}$|^0\d{2,3}-?\d{6,8}$/,
-            // let pattern = /(0\d{2,3}-\d{7,8})|(1[3-9]\d{9})/,
             message = '您输入的手机号有误';
         return { required, pattern, message, trigger: 'blur' };
+    },
+    patternCard(required = true) {
+        let pattern = /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}(\d|[xX])$/,
+            message = '您输入的身份证格式有误';
+        return { required, pattern, message, trigger: 'blur' };
     }
 };

operationSupport/src/views/businessManagement/contractManagement/stepPage/add.vue

@@ -49,6 +49,7 @@ export default {
                 customerName: '',
                 customerPhone: '',
                 customerAddress: '',
+                idCardNo:'',
                 contractHouseDtoList: []
             },
 
@@ -67,8 +68,9 @@ export default {
             relationTable: {},
             formRules: {
                 customerName: [this.$valid.inputRequired('客户名称')],
-                customerPhone: [this.$valid.inputRequired('客户手机')],
+                customerPhone: [this.$valid.patternPhone('客户手机')],
                 customerAddress: [this.$valid.inputRequired('联系地址')],
+                idCardNo:this.$valid.patternCard(),
                 communityId: [this.$valid.selectRequired('社区')],
                 signTime: [this.$valid.selectRequired('签订时间')],
                 startTime: this.$valid.custome({
@@ -243,7 +245,7 @@ export default {
         }
     },
     created() {
-        this.randomPassword();
+        // this.randomPassword();
         const { todo, data, communityArr, communityTree } = this.params;
         this.communityArr = communityArr;
         this.communityTree = communityTree;

operationSupport/src/views/businessManagement/contractManagement/stepPage/firstStep.vue

@@ -2,8 +2,7 @@
     <el-form ref="form" :model="$parent.formData" :rules="$parent.formRules" label-width="90px">
         <div class="formContent-item_title">合同信息</div>
         <el-col :span="12"
-            ><el-form-item label="合同编号" prop="contractNo" required>
-                <el-input v-model="$parent.formData.contractNo" disabled placeholder="请输入合同编号"></el-input> </el-form-item
+            ><el-form-item label="合同编号" required> <el-input disabled placeholder="自动生成"></el-input> </el-form-item
         ></el-col>
         <el-col :span="12">
             <el-form-item label="合同类型" prop="contractType" required>
@@ -20,11 +19,11 @@
             </el-form-item></el-col
         >
         <template v-if="$parent.formData.customerType == 2">
-            <el-col :span="8"
+            <el-col :span="12"
                 ><el-form-item label="客户名称" prop="customerName">
                     <el-input v-model="$parent.formData.customerName" placeholder="请输入客户名称"></el-input> </el-form-item
             ></el-col>
-            <el-col :span="8"
+            <el-col :span="12"
                 ><el-form-item label="客户手机" prop="customerPhone">
                     <el-input
                         v-model="$parent.formData.customerPhone"
@@ -32,10 +31,14 @@
                         maxlength="11"
                     ></el-input> </el-form-item
             ></el-col>
-            <el-col :span="8"
+            <el-col :span="12"
                 ><el-form-item label="联系地址" prop="customerAddress">
                     <el-input v-model="$parent.formData.customerAddress" placeholder="请输入联系地址"></el-input> </el-form-item
             ></el-col>
+            <el-col :span="12"
+                ><el-form-item label="身份证号码" prop="idCardNo">
+                    <el-input v-model="$parent.formData.idCardNo" placeholder="请输入联系地址"></el-input> </el-form-item
+            ></el-col>
         </template>
         <el-table
             :data="[$parent.relationTable]"
@@ -185,6 +188,8 @@ export default {
                 this.$parent.relationTable = res;
                 this.$parent.formData.customerPhone = res.contactPhone;
                 this.$parent.formData.customerAddress = res.address;
+                this.$parent.formData.idCardNo = res.contactIdCard;
+
                 this.$parent.formData.customerName = res.contactName;
                 this.$parent.formData.companyId = res.id;
             });

operationSupport/src/views/businessManagement/contractManagement/stepPage/stepTwo.vue

@@ -17,7 +17,7 @@
         </el-table>
         <el-form ref="form" :rules="$parent.idsObjRules" label-width="90px">
             <div v-for="(item, index) in $parent.idsObj" :key="index">
-                <el-col :span="12">
+                <el-col :span="12" style="clear: both">
                     <el-form-item label="租金规则" :rules="rulesFun('租金规则', item.ruleId)">
                         <el-select v-model="item.ruleId" placeholder="请选择租金规则" clearable @change="ruleIdChange(index, item.ruleId)">
                             <el-option v-for="(item, index) in tegyArr" :key="index" :label="item.chargeName" :value="item.id"></el-option>
@@ -71,7 +71,11 @@
                 </el-col>
                 <el-col :span="12"
                     ><el-form-item label="租赁保证金">
-                        <el-input v-model="item.earnestMoney" placeholder="请输入租赁保证金"></el-input> </el-form-item
+                        <el-input
+                            v-model="item.earnestMoney"
+                            placeholder="请输入租赁保证金"
+                            oninput="value=value.replace(/[^0-9.]/g,'')"
+                        ></el-input> </el-form-item
                 ></el-col>
                 <el-col :span="12"
                     ><el-form-item label="租赁保证金是否抵扣第一期租金：" label-width="220px">

operationSupport/src/views/patrolManagement/popups/scheduling.vue

@@ -29,9 +29,7 @@
                                     <span>{{ itx.partolName }}</span>
                                 </div>
                             </template>
-                            <template
-                                v-if="date.getTime() <= $moment($parent.thisObj.endDate).valueOf() && thisTimeFF(data, item.rosterUserDtos)"
-                            >
+                            <template v-if="date.getTime() <= $moment(thisObj.endDate).valueOf() && thisTimeFF(data, item.rosterUserDtos)">
                                 <!-- 每周那几天 -->
                                 <span v-if="thisObj.periodType == 1">
                                     <template v-if="periodValueType(thisObj.periodValue).includes(date.getDay() + '')">
@@ -40,7 +38,7 @@
                                 </span>
                                 <!-- 每隔N天 -->
                                 <span v-else>
-                                    <template v-if="timeAddDay($parent.thisObj, thisObj.periodValue, data)">
+                                    <template v-if="timeAddDay(thisObj, thisObj.periodValue, data)">
                                         <div class="pointSet" @click="addItem(date, data, item)">点击设置</div>
                                     </template>
                                 </span>
@@ -50,7 +48,7 @@
                     <!-- 时间范围内且没有排班 -->
                     <template
                         v-if="
-                            date.getTime() <= $moment($parent.thisObj.endDate).valueOf() &&
+                            date.getTime() <= $moment(thisObj.endDate).valueOf() &&
                             date.getTime() >= $moment(new Date()).valueOf() &&
                             !trueArr.includes(data.day)
                         "
@@ -63,7 +61,7 @@
                         </span>
                         <!-- 每隔N天 -->
                         <span v-else>
-                            <template v-if="timeAddDay($parent.thisObj, thisObj.periodValue, data)">
+                            <template v-if="timeAddDay(thisObj, thisObj.periodValue, data)">
                                 <div class="pointSet" @click="add(data)">点击设置</div>
                             </template>
                         </span>
@@ -200,7 +198,13 @@ export default {
         },
         periodValueType(value) {
             if (!!value) {
-                return value.split(',').sort();
+                let vra = value.split(',').sort();
+                vra.map((item, index) => {
+                    if (item == 7) {
+                        vra[index] = '0';
+                    }
+                });
+                return vra;
             }
             return [];
         },

operationSupport/src/views/payService/depositManagement/stepPage/details.vue

@@ -3,12 +3,16 @@
         <div class="formContent-item_title">房屋：{{ thisItem.assets }} <br />租户/业主：{{ thisItem.residentName }}</div>
         <el-form ref="form" label-width="100px">
             <template v-for="(item, index) in formLook">
-                <el-col :span="!!item.col?item.col:12" :key="index">
+                <el-col :span="!!item.col ? item.col : 12" :key="index">
                     <el-form-item :label="item.label">
                         <template v-if="item.slot">
                             <template v-if="item.slot == 'depositType'">
                                 {{ !!thisItem['depositType'] && !!thisItem['depositType'] == 1 ? '装修押金' : '租赁押金' }}
                             </template>
+                            <template v-else-if="item.slot == 'payee'">
+                                {{ thisItem.paymentPlat == 1 ? thisItem.collectionOperatorName : thisItem.payee }}
+                            </template>
+
                             <template v-else-if="item.slot == 'paymentMode'">
                                 {{ !!chargeModeValue[thisItem[item.prop]] ? chargeModeValue[thisItem[item.prop]] : '--' }}
                             </template>
@@ -63,7 +67,8 @@ export default {
                 },
                 {
                     label: '收款人：',
-                    prop: 'payee'
+                    prop: 'payee',
+                    slot: 'payee'
                 },
                 {
                     label: '收款时间：',
@@ -80,7 +85,7 @@ export default {
                 {
                     label: '备注：',
                     prop: 'remarks',
-                    col:24
+                    col: 24
                 },
                 {
                     label: '退款人：',