Merge remote-tracking branch 'origin/dev_partymember_sync' into dev_partymember_sync

src/App.vue

@@ -194,4 +194,24 @@ export default {
   flex-direction: column;
   justify-content: center;
 }
+
+::-webkit-scrollbar {
+  // display: none;
+  width: 8px;
+  height: 8px;
+  background-color: #EBEEF5;
+}
+::-webkit-scrollbar-thumb {
+  box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
+  -webkit-box-shadow: inset 0 0  6px rgba(243, 236, 236, 0.3);
+  background-color: #ccc;
+  border-radius: 8px;
+}
+::-webkit-scrollbar-track {
+  box-shadow: inset 0 0 6px rgba(0,0,0, .2);
+  /*滚动条的轨道*/
+  border-radius: 8px;
+  background: rgba(255, 255, 255, 1);
+}
+
 </style>

src/views/components/editResi.vue

@@ -265,7 +265,7 @@
 </template>
 
 <script>
-import { isCard, isMobile } from '@/utils/validate'
+import { isCard, isMobile, isPhone } from '@/utils/validate'
 
 export default {
   name: 'editForm',
@@ -325,7 +325,7 @@ export default {
       if (value === '') {
         callback(new Error('请输入手机号'))
       } else {
-        if (!isMobile(value)) {
+        if (!isMobile(value) && !isPhone(value)) {
           callback(new Error('手机号格式不正确'))
         }
         callback()

src/views/components/resiForm.vue

@@ -258,7 +258,7 @@
 </template>
 
 <script>
-import { isCard, isPassport, isMobile } from '@/utils/validate'
+import { isCard, isPassport, isMobile, isPhone } from '@/utils/validate'
 import { computedCard } from '@/utils/index'
 
 export default {
@@ -305,7 +305,7 @@ export default {
       if (value === '') {
         callback(new Error('请输入手机号'))
       } else {
-        if (!isMobile(value)) {
+        if (!isMobile(value) && !isPhone(value)) {
           callback(new Error('手机号格式不正确'))
         }
         callback()

src/views/modules/communityParty/members/crateForm.vue

@@ -146,16 +146,52 @@
                     clearable></el-input>
         </el-form-item>
       </div>
-      <el-form-item label="备注"
-                    prop="remark">
-        <el-input v-model="form.remark"
-                  :autosize="{ minRows: 4, maxRows: 10}"
-                  :disabled="disabled"
-                  type="textarea"
-                  clearable
-                  class="input-width-textarea"
-                  placeholder="请输入内容"></el-input>
-      </el-form-item>
+      <div class="flex-div">
+        <el-form-item label="入党时所在党支部"
+                      prop="rdsszzb"
+                      class="wd50">
+          <el-input v-model="form.rdsszzb"
+                    placeholder="请输入"
+                    :disabled="disabled"
+                    class="input-width"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item label="组织关系转入社区时间"
+                      prop="zzgxzrsqsj"
+                      class="wd50">
+          <el-date-picker v-model="form.zzgxzrsqsj"
+                          :disabled="disabled"
+                          type="date"
+                          class="input-width"
+                          clearable
+                          placeholder="选择日期"
+                          format="yyyy 年 MM 月 dd 日"
+                          value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </el-form-item>
+      </div>
+      <div class="flex-div">
+        <el-form-item label="是否请长假"
+                      prop="isQcj"
+                      class="wd50">
+          <el-radio-group v-model="form.isQcj"
+                          class="input-width">
+            <el-radio label="1">是</el-radio>
+            <el-radio label="0">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注"
+                      prop="remark"
+                      class="wd50">
+          <el-input v-model="form.remark"
+                    :autosize="{ minRows: 4, maxRows: 10}"
+                    :disabled="disabled"
+                    type="textarea"
+                    clearable
+                    class="input-width-textarea "
+                    placeholder="请输入内容"></el-input>
+        </el-form-item>
+      </div>
       <div>
         <div style="margin-top: 20px; text-align: center;">
           <el-button size="small"
@@ -202,7 +238,7 @@
 </template>
 
 <script>
-import { isCard, isMobile } from '@/utils/validate'
+import { isCard, isMobile, isPhone } from '@/utils/validate'
 import { computedCard } from '@/utils/index'
 
 import pointsInfo from './cpts/points.vue'
@@ -232,7 +268,7 @@ export default {
       if (value === '') {
         callback(new Error('请输入手机号'))
       } else {
-        if (!isMobile(value)) {
+        if (!isMobile(value) && !isPhone(value)) {
           callback(new Error('手机号格式不正确'))
         }
         callback()
@@ -290,6 +326,9 @@ export default {
         isDyzxh: '0',
         isMxx: '0',
         culture: '',
+        rdsszzb: '',
+        zzgxzrsqsj: '',
+        isQcj: '0',
         remark: ''
       },
       eduList: [],

src/views/modules/communityParty/members/detailForm.vue

@@ -79,9 +79,23 @@
           </div>
 
         </div>
-
         <div class="m-row-2">
+      <div class="info-prop">
+          <span class="info-title-2">入党时所在党支部：</span>
+          <span>{{ info.rdsszzb?info.rdsszzb:'--'}}</span>
+        </div>
+        <div class="info-prop">
+          <span class="info-title-2">组织关系转入社区时间：</span>
+          <span>{{ info.zzgxzrsqsj?info.zzgxzrsqsj:'--' }}</span>
+        </div>
 
+      </div>
+
+       <div class="m-row-2">
+          <div class="info-prop">
+            <span class="info-title-2">是否请长假：</span>
+            <span>{{ info.isQcj==='1'?'是':'否'}}</span>
+          </div>
           <div class="info-prop">
             <span class="info-title-2">备注：</span>
             <span>{{ info.remark? info.remark:'--'  }}</span>

src/views/modules/communityParty/members/index.vue

@@ -114,6 +114,7 @@
               </el-select>
             </el-form-item>
           </div>
+          <div>
           <el-form-item label="免学习"
                         prop="isMxx">
             <el-select v-model="searchForm.isMxx"
@@ -126,6 +127,18 @@
                          value="0" />
             </el-select>
           </el-form-item>
+          <el-form-item label="是否请长假"
+                        prop="isQcj">
+            <el-select v-model="searchForm.isQcj"
+                       filterable
+                       placeholder="请选择"
+                       clearable>
+              <el-option label="是"
+                         value="1" />
+              <el-option label="否"
+                         value="0" />
+            </el-select>
+          </el-form-item>
           <el-form-item label="最近缴费时间"
                         label-width="130px"
                         prop="startTime">
@@ -138,8 +151,8 @@
                             start-placeholder="开始时间"
                             end-placeholder="结束时间">
             </el-date-picker>
-
           </el-form-item>
+          </div>
           <el-form-item label="入党时间"
                         prop="startTime">
             <el-date-picker v-model="timeRange"
@@ -447,6 +460,7 @@ export default {
         partyZw: '',
         isDyzxh: '',
         isMxx: '',
+        isQcj: '',
         culture: '',
         isPay: '',
         rdsjStartDate: '',