Merge branch 'dev-党群1128' into dev

src/views/main-navbar.vue

@@ -6,7 +6,7 @@
       :class="`aui-navbar--${$store.state.navbarLayoutType}`"
     >
       <div class="aui-navbar__header">
-        <h1 class="aui-navbar__brand" @click="$router.push({ name: 'home' })">
+        <h1 class="aui-navbar__brand">
           <a class="aui-navbar__brand-lg" href="javascript:;">{{
             customerName
           }}</a>

src/views/main-shuju/main-navbar.vue

@@ -2,7 +2,7 @@
   <div>
     <nav v-if="showHeader" class="m-navbar">
       <div class="navbar__header">
-        <h1 class="navbar__brand" @click="$router.push({ name: 'home' })">
+        <h1 class="navbar__brand">
           <a class="navbar__brand-lg" href="javascript:;">{{ customerName }}</a>
           <a class="navbar__brand-mini" href="javascript:;">{{
             customerName.slice(0, 2)

src/views/modules/communityService/dqfwzx/cpts/edit.vue

@@ -169,8 +169,23 @@
                              :value="item.value">
                   </el-option>
                 </el-select>
-
+                <el-select v-if="item.appointmentType==='custom'"
-                <el-time-select style="width: 120px; margin-left: 20px"
+                           style="width: 300px; margin-left: 10px"
+                           v-model="item.customList"
+                           filterable
+                           multiple
+                           placeholder="请选择"
+                           :disabled="item.matterId != undefined">
+                  <el-option v-for="item in customOption"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value">
+                  </el-option>
+                </el-select>
+              </div>
+              <div class="item-pic"
+                   style="margin-top:20px;">
+                <el-time-select style="width: 150px; "
                                 v-model="item.startTime"
                                 :picker-options="{
                     start: '00:00',
@@ -181,7 +196,7 @@
                                 :disabled="item.matterId != undefined">
                 </el-time-select>
                 <span style="margin: 0 5px">至</span>
-                <el-time-select style="width: 120px"
+                <el-time-select style="width: 150px"
                                 v-model="item.endTime"
                                 :picker-options="{
                     start: '00:00',
@@ -196,6 +211,7 @@
                            size="small"
                            @click="handleDelStaff(index)">删除</el-button>
               </div>
+
             </div>
 
             <div class="item-add">
@@ -261,6 +277,41 @@ export default {
           label: "周末",
           value: "weekend",
         },
+        {
+          label: "自定义",
+          value: "custom",
+        },
+      ],
+      customOption: [
+        {
+          label: "周日",
+          value: "1",
+        },
+        {
+          label: "周一",
+          value: "2",
+        },
+        {
+          label: "周二",
+          value: "3",
+        },
+        {
+          label: "周三",
+          value: "4",
+        },
+        {
+          label: "周四",
+          value: "5",
+        },
+        {
+          label: "周五",
+          value: "6",
+        },
+        {
+          label: "周六",
+          value: "7",
+        },
+
       ],
 
       dataForm: {
@@ -350,6 +401,8 @@ export default {
           matterImg: "",
           startTime: "",
           endTime: "",
+          customDay: "",
+          customList: []
         },
       ];
     },
@@ -470,6 +523,15 @@ export default {
         this.dataForm = { ...this.dataForm, ...row };
         this.partyServiceCenterId = this.dataForm.partyServiceCenterId;
 
+        this.dataForm.matterList.forEach(element => {
+          if (element.customDay) {
+            element.customList = element.customDay.split(',')
+          } else {
+            element.customList = []
+          }
+
+        });
+
       } else {
         this.dataForm.latitude = latitude
         this.dataForm.longitude = longitude
@@ -491,7 +553,7 @@ export default {
       this.btnDisable = true;
       setTimeout(() => {
         this.btnDisable = false;
-      }, 10000);
+      }, 5000);
       this.$refs["ref_form"].validate((valid, messageObj) => {
         if (!valid) {
           app.util.validateRule(messageObj);
@@ -516,14 +578,17 @@ export default {
       const matterList = this.dataForm.matterList.filter(
         (item) => !item.matterId
       );
+
       if (
+
         matterList.some(
           (item) =>
+
             !item.matterImg ||
             !item.matterName ||
             !item.appointmentType ||
             !item.startTime ||
-            !item.endTime
+            !item.endTime || (item.appointmentType === 'custom' && item.customList.length === 0)
         )
       ) {
         return this.$message({
@@ -532,6 +597,12 @@ export default {
         });
       }
 
+      matterList.forEach(element => {
+        element.customDay = element.customList.join(',')
+      });
+
+
+
       const { data, code, msg } = await requestPost(url, {
         ...this.dataForm,
         matterList,

src/views/modules/communityService/fuwujilu/detailForm.vue

@@ -21,7 +21,7 @@
 
           <div class="info-prop">
             <span class="info-title-2">政策依据：</span>
-            <span>{{ formData.policyName||'--'  }}</span>
+            <span>{{ formData.policyTitle||'--'  }}</span>
             <el-button v-if="formData.policyId"
                        style="margin-left: 10px"
                        type="primary"

src/views/modules/plugins/rent/rentcontractinfo.vue

@@ -101,30 +101,30 @@
           <el-form-item label="出租人" label-width="100px">
               <el-input size="small" v-model="dataForm.lessorName" placeholder='出租人' clearable @keyup.native="btKeyUpLessorName"></el-input>
           </el-form-item>
-          <el-form-item label="出租人证件号" label-width="100px">
+          <el-form-item label="出租人证件号" label-width="110px">
               <el-input size="small" v-model="dataForm.lessorIdCard" placeholder='出租人证件号' clearable @keyup.native="btKeyUpLessorIdCard"></el-input>
           </el-form-item>
-          <el-form-item label="出租人手机号" label-width="100px">
+          <el-form-item label="出租人手机号" label-width="110px">
               <el-input size="small" v-model="dataForm.lessorMobile" placeholder='出租人手机号' clearable @keyup.native="btKeyUpLessorMobile"></el-input>
           </el-form-item>
           <br/>
           <el-form-item label="承租人" label-width="100px">
               <el-input size="small" v-model="dataForm.lesseeName" placeholder='承租人' clearable @keyup.native="btKeyUpLesseeName"></el-input>
           </el-form-item>
-          <el-form-item label="承租人证件号" label-width="100px">
+          <el-form-item label="承租人证件号" label-width="110px">
             <el-input size="small" v-model="dataForm.lesseeIdCard" placeholder='承租人证件号' clearable @keyup.native="btKeyUpLesseeIdCard"></el-input>
           </el-form-item>
-          <el-form-item label="承租人手机号" label-width="100px">
+          <el-form-item label="承租人手机号" label-width="110px">
             <el-input size="small" v-model="dataForm.lesseeMobile" placeholder='承租人手机号' clearable @keyup.native="btKeyUpLesseeMobile"></el-input>
           </el-form-item>
           <br/>
-          <el-form-item label="合同到期时间" prop="endDate" label-width="100px">
+          <el-form-item label="合同到期时间" prop="endDate" label-width="110px">
               <el-select size="small" v-model="dataForm.endDate" placeholder="合同到期时间" clearable>
                   <el-option v-for="item in endDateArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
                   </el-option>
               </el-select>
           </el-form-item>
-        <el-form-item label="合同签订时间" prop="startTime" label-width="100px">
+        <el-form-item label="合同签订时间" prop="startTime" label-width="110px">
           <el-date-picker v-model="dataForm.startTime"
                           type="date" size="small"
                           :picker-options="pickerBeginDateBefore"