From 41a9afca7dff7d488ba22a8bfca848969cbbbb70 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 17 May 2023 14:45:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityParty/members/crateForm.vue      | 1134 +++++++++--------
 src/views/modules/cpts/base/cpts/edit.vue     |   13 +-
 src/views/modules/lingshan/djyl/hsdb/dby.vue  |   25 +-
 3 files changed, 631 insertions(+), 541 deletions(-)

diff --git a/src/views/modules/communityParty/members/crateForm.vue b/src/views/modules/communityParty/members/crateForm.vue
index 2483719..4073e19 100644
--- a/src/views/modules/communityParty/members/crateForm.vue
+++ b/src/views/modules/communityParty/members/crateForm.vue
@@ -1,229 +1,263 @@
 <template>
-  <div class="dialog-h-content scroll-h pd0">
-    <div class="div-tip">本模块主要为添加非本社区居住党员，本社区居住党员建议到居民信息页面添加</div>
-    <el-form label-width="120px"
-             :model="form"
-             :inline="true"
-             :disabled="disabled"
-             :rules="rules"
-             ref="ruleForm"
-             class="form-wr">
-      <div class="flex-div">
-        <el-form-item label="所属党组织"
-                      prop="sszb"
-                      class="wd50">
-          <el-cascader v-model="form.sszb"
-                       :options="partyList"
-                       :props="partyProps"
-                       clearable
-                       class="input-width"
-                       @change="handlePartyChange"></el-cascader>
-        </el-form-item>
-        <el-form-item label="党员中心户"
-                      prop="isDyzxh"
-                      class="wd50">
-          <el-radio-group v-model="form.isDyzxh">
-            <el-radio label="1">是</el-radio>
-            <el-radio label="0">否</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </div>
-      <div class="flex-div">
-        <el-form-item label="姓名"
-                      prop="name"
-                      class="wd50">
-          <el-input v-model="form.name"
-                    placeholder="请输入"
-                    :disabled="disabled"
-                    class="input-width"
-                    clearable></el-input>
-        </el-form-item>
-        <el-form-item label="免学习"
-                      prop="isMxx"
-                      class="wd50">
-          <el-radio-group v-model="form.isMxx">
-            <el-radio label="1">是</el-radio>
-            <el-radio label="0">否</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </div>
-      <div class="flex-div">
-        <el-form-item label="手机号"
-                      prop="mobile"
-                      class="wd50">
-          <el-input v-model="form.mobile"
-                    placeholder="请输入"
-                    :disabled="disabled"
-                    class="input-width"
-                    clearable />
-        </el-form-item>
-        <el-form-item label="职务"
-                      prop="partyZw"
-                      class="wd50">
-          <el-select v-model="form.partyZw"
-                     filterable
-                     :disabled="disabled"
-                     placeholder="请选择"
-                     class="input-width"
-                     clearable>
-            <el-option v-for="item in zwList"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </div>
-      <div class="flex-div">
-        <el-form-item label="身份证"
-                      prop="idCard"
-                      class="wd50">
-          <el-input v-model="form.idCard"
-                    placeholder="请输入"
-                    :disabled="disabled"
-                    class="input-width"
-                    clearable
-                    @blur="handleValidBlur" />
-        </el-form-item>
-        <el-form-item label="文化程度"
-                      prop="culture"
-                      class="wd50">
-          <el-select v-model="form.culture"
-                     filterable
-                     :disabled="disabled"
-                     placeholder="请选择"
-                     class="input-width"
-                     clearable>
-            <el-option v-for="item in eduList"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </div>
-      <div class="flex-div">
-        <el-form-item label="地址"
-                      prop="address"
-                      class="wd50">
-          <el-input v-model="form.address"
-                    placeholder="请输入"
-                    :disabled="disabled || isAuto"
-                    class="input-width"
-                    clearable></el-input>
-        </el-form-item>
-        <el-form-item label="入党时间"
-                      prop="rdsj"
-                      class="wd50">
-          <el-date-picker v-model="form.rdsj"
-                          :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="isLd"
-                      class="wd50">
-          <el-radio-group v-model="form.isLd"
-                          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="ldzh"
-                      class="wd50">
-          <el-input v-model="form.ldzh"
-                    placeholder="请输入"
-                    :disabled="disabled"
-                    class="input-width"
-                    clearable></el-input>
-        </el-form-item>
-      </div>
-      <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"
-                     @click="handleCancle">取消</el-button>
-          <el-button v-if="!disabled"
-                     type="primary"
-                     size="small"
-                     @click="hadnleSubmitbase">提交</el-button>
-        </div>
-      </div>
+	<div class="dialog-h-content scroll-h pd0">
+		<div class="div-tip">
+			本模块主要为添加非本社区居住党员，本社区居住党员建议到居民信息页面添加
+		</div>
+		<el-form
+			label-width="120px"
+			:model="form"
+			:inline="true"
+			:disabled="disabled"
+			:rules="rules"
+			ref="ruleForm"
+			class="form-wr"
+		>
+			<div class="flex-div">
+				<el-form-item label="所属党组织" prop="sszb" class="wd50">
+					<el-cascader
+						v-model="form.sszb"
+						:options="partyList"
+						:props="partyProps"
+						clearable
+						class="input-width"
+						@change="handlePartyChange"
+					></el-cascader>
+				</el-form-item>
+				<el-form-item label="党员中心户" prop="isDyzxh" class="wd50">
+					<el-radio-group v-model="form.isDyzxh">
+						<el-radio label="1">是</el-radio>
+						<el-radio label="0">否</el-radio>
+					</el-radio-group>
+				</el-form-item>
+			</div>
+			<div class="flex-div">
+				<el-form-item label="姓名" prop="name" class="wd50">
+					<el-input
+						v-model="form.name"
+						placeholder="请输入"
+						:disabled="disabled"
+						class="input-width"
+						clearable
+					></el-input>
+				</el-form-item>
+				<el-form-item label="免学习" prop="isMxx" class="wd50">
+					<el-radio-group v-model="form.isMxx">
+						<el-radio label="1">是</el-radio>
+						<el-radio label="0">否</el-radio>
+					</el-radio-group>
+				</el-form-item>
+			</div>
+			<div class="flex-div">
+				<el-form-item label="手机号" prop="mobile" class="wd50">
+					<el-input
+						v-model="form.mobile"
+						placeholder="请输入"
+						:disabled="disabled"
+						class="input-width"
+						clearable
+					/>
+				</el-form-item>
+				<el-form-item label="职务" prop="partyZw" class="wd50">
+					<el-select
+						v-model="form.partyZw"
+						filterable
+						:disabled="disabled"
+						placeholder="请选择"
+						class="input-width"
+						clearable
+					>
+						<el-option
+							v-for="item in zwList"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value"
+						>
+						</el-option>
+					</el-select>
+				</el-form-item>
+			</div>
+			<div class="flex-div">
+				<el-form-item label="身份证" prop="idCard" class="wd50">
+					<el-input
+						v-model="form.idCard"
+						placeholder="请输入"
+						:disabled="disabled"
+						class="input-width"
+						clearable
+						@blur="handleValidBlur"
+					/>
+				</el-form-item>
+				<el-form-item label="文化程度" prop="culture" class="wd50">
+					<el-select
+						v-model="form.culture"
+						filterable
+						:disabled="disabled"
+						placeholder="请选择"
+						class="input-width"
+						clearable
+					>
+						<el-option
+							v-for="item in eduList"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value"
+						>
+						</el-option>
+					</el-select>
+				</el-form-item>
+			</div>
+			<div class="flex-div">
+				<el-form-item label="地址" prop="address" class="wd50">
+					<el-input
+						v-model="form.address"
+						placeholder="请输入"
+						:disabled="disabled || isAuto"
+						class="input-width"
+						clearable
+					></el-input>
+				</el-form-item>
+				<el-form-item label="入党时间" prop="rdsj" class="wd50">
+					<el-date-picker
+						v-model="form.rdsj"
+						: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="isLd" class="wd50">
+					<el-radio-group v-model="form.isLd" 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="ldzh" class="wd50">
+					<el-input
+						v-model="form.ldzh"
+						placeholder="请输入"
+						:disabled="disabled"
+						class="input-width"
+						clearable
+					></el-input>
+				</el-form-item>
+			</div>
+			<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>
 
-    </el-form>
-    <div class="pdl40">
-      <el-tabs v-model="activesName">
-        <el-tab-pane label="量化积分"
-                     name="first">
-          <pointsInfo :partyId="partymenberid"
-                      :disabled="disabled"
-                      @save="handleSavePoints" />
-        </el-tab-pane>
-        <el-tab-pane label="缴费记录"
-                     name="second">
-          <record :partyId="partymenberid"
-                  :disabled="disabled" />
-        </el-tab-pane>
-      </el-tabs>
-      <!-- <el-button-group>
+			<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 class="flex-div">
+				<el-form-item label="头像" prop="headPhoto" label-width="120px">
+					<el-upload
+						:headers="$getElUploadHeaders()"
+						:class="[
+							'avatar-uploader',
+							{ 'z-hide': headPhotoList.length > 0 },
+						]"
+						ref="uploadPic"
+						:action="uploadUlr"
+						list-type="picture-card"
+						:on-exceed="exceedPic"
+						:on-remove="removePic"
+						:file-list="headPhotoList"
+						:on-change="handleEditChange"
+						:on-success="handleSuccess"
+						:multiple="false"
+						:limit="1"
+					>
+						<i class="el-icon-plus avatar-uploader-icon"></i>
+					</el-upload>
+				</el-form-item>
+			</div>
+
+			<div>
+				<div style="margin-top: 20px; text-align: center">
+					<el-button size="small" @click="handleCancle"
+						>取消</el-button
+					>
+					<el-button
+						v-if="!disabled"
+						type="primary"
+						size="small"
+						@click="hadnleSubmitbase"
+						>提交</el-button
+					>
+				</div>
+			</div>
+		</el-form>
+		<div class="pdl40">
+			<el-tabs v-model="activesName">
+				<el-tab-pane label="量化积分" name="first">
+					<pointsInfo
+						:partyId="partymenberid"
+						:disabled="disabled"
+						@save="handleSavePoints"
+					/>
+				</el-tab-pane>
+				<el-tab-pane label="缴费记录" name="second">
+					<record :partyId="partymenberid" :disabled="disabled" />
+				</el-tab-pane>
+			</el-tabs>
+			<!-- <el-button-group>
         <el-button class="diy-button--add" size="small">量化积分</el-button>
         <el-button size="small">缴费记录</el-button>
       </el-button-group> -->
-    </div>
-    <!-- <div class="resi-btns">
+		</div>
+		<!-- <div class="resi-btns">
       <el-button size="small" @click="handlerCancle">取消</el-button>
       <el-button
         v-if="!disabled"
@@ -234,335 +268,381 @@
         >提交</el-button
       >
     </div> -->
-  </div>
+	</div>
 </template>
 
 <script>
-import { isCard, isMobile, isPhone } from '@/utils/validate'
-import { computedCard } from '@/utils/index'
+import { isCard, isMobile, isPhone } from "@/utils/validate";
+import { computedCard } from "@/utils/index";
 
-import pointsInfo from './cpts/points.vue'
-import record from './cpts/record.vue'
+import pointsInfo from "./cpts/points.vue";
+import record from "./cpts/record.vue";
 
 export default {
-  components: {
-    pointsInfo,
-    record
-  },
-  props: {
-    partyList: {
-      type: Array,
-      default: () => []
-    },
-    info: {
-      type: Object,
-      default: () => { }
-    },
-    disabled: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data () {
-    let checkMObile = (rule, value, callback) => {
-      if (value === '') {
-        callback(new Error('请输入手机号'))
-      } else {
-        if (!isMobile(value) && !isPhone(value)) {
-          callback(new Error('手机号格式不正确'))
-        }
-        callback()
-      }
-    }
-    let checkIdCard = (rule, value, callback) => {
-      if (value === '') {
-        callback(new Error('请输入身份证'))
-      } else {
-        if (!isCard(value)) {
-          callback(new Error('身份证号格式不正确'))
-        }
-        callback()
-      }
-    }
-    return {
-      activesName: 'first',
-      isAuto: false,
-      formItemWd: '100%',
-      partymenberid: '',
-      partyProps: {
-        label: 'partyOrgName',
-        value: 'id',
-        emitPath: false
-      },
-      zwList: [
-        {
-          label: '普通党员',
-          value: '0'
-        },
-        {
-          label: '支部书记',
-          value: '1'
-        },
-        {
-          label: '支部委员',
-          value: '2'
-        },
-        {
-          label: '党委委员',
-          value: '3'
-        },
-      ],
-      form: {
-        icResiUser: '',
-        name: '',
-        mobile: '',
-        idCard: '',
-        address: '',
-        rdsj: '',
-        sszb: '',
-        isLd: '0',
-        ldzh: '',
-        partyZw: '0',
-        isDyzxh: '0',
-        isMxx: '0',
-        culture: '',
-        rdsszzb: '',
-        zzgxzrsqsj: '',
-        isQcj: '0',
-        remark: ''
-      },
-      eduList: [],
-      rules: {
-        sszb: [{ required: true, message: '所属党组织不能为空', trigger: 'blur' }],
-        name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
-        mobile: [{ required: true, validator: checkMObile, trigger: 'blur' }],
-        idCard: [{ required: true, validator: checkIdCard, trigger: 'blur' }],
-      },
-      partyOrgs: []
-    }
-  },
-  watch: {
-    info: {
-      handler (val) {
-        if (Object.keys(val).length > 0) {
-          this.form = { ...val }
-          if (val.icResiUserId || val.icResiUser) this.isAuto = true
-          console.log('val----------in', val)
-          console.log('isAuto----------in', this.isAuto)
-          this.partyOrgs = val.orgPids.split(':')
-          console.log('partyOrgs-----', this.partyOrgs)
-          this.partymenberid = val.id
-        }
-      },
-      immediate: true
-    }
-  },
-  created () {
-    this.getEduList()
-    console.log('partyList', this.partyList)
-  },
-  mounted () {
-    const w = document.getElementsByClassName('dialog-h-content')[0]
-    this.formItemWd = w.clientWidth + 'px'
-  },
-  destroyed () {
-    // this.$refs['ruleForm'].resetFields()
-  },
-  methods: {
-    handleCancle () {
-      this.$refs['ruleForm'].resetFields()
-      this.$emit('cancle')
-    },
-    handlePartyChange (val) {
-      console.log('val------pp', val)
-      // if (val.length > 0) {
-      //   const i = val.length - 1
-      //   this.form.sszb = val[i]
-      // } else this.form.sszb = ''
-    },
-    handleValidBlur (n) {
-      if (!isCard(this.form.idCard)) return
-      const { age } = computedCard(this.form.idCard)
-      this.form.isMxx = age >= 70 ? '1' : '0'
-      this.validateResi()
-    },
-    async getEduList () {
-      await this.$http
-        .post('/sys/dict/data/education')
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            this.eduList = res.data
-          }
-        })
-        .catch(err => {
-          console.log('err', err)
-          return this.$message.error('网络错误')
-        })
-    },
-    async validateResi () {
-      const params = {
-        idCard: this.form.idCard,
-        agencyId: this.$store.state.user.agencyId
-      }
-      await this.$http
-        .post('/epmetuser/icresiuser/getUserByIdCard', params)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            const { address, icResiUserId } = res.data
-            if (icResiUserId) {
-              this.form.address = address
-              this.isAuto = true
-            } else {
-              this.form.address = ''
-              this.isAuto = false
-            }
-
-          }
-        })
-        .catch(err => {
-          console.log('err', err)
-          return this.$message.error('网络错误')
-        })
-    },
-    hadnleSubmitbase () {
-      this.$refs['ruleForm'].validate((valid) => {
-        if (valid) {
-          if (Object.keys(this.info).length > 0) this.editBase()
-          else this.saveBase()
-        } else {
-          console.log('error submit!!');
-          return false;
-        }
-      });
-    },
-    handleSavePoints (data) {
+	components: {
+		pointsInfo,
+		record,
+	},
+	props: {
+		partyList: {
+			type: Array,
+			default: () => [],
+		},
+		info: {
+			type: Object,
+			default: () => {},
+		},
+		disabled: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	data() {
+		let checkMObile = (rule, value, callback) => {
+			if (value === "") {
+				callback(new Error("请输入手机号"));
+			} else {
+				if (!isMobile(value) && !isPhone(value)) {
+					callback(new Error("手机号格式不正确"));
+				}
+				callback();
+			}
+		};
+		let checkIdCard = (rule, value, callback) => {
+			if (value === "") {
+				callback(new Error("请输入身份证"));
+			} else {
+				if (!isCard(value)) {
+					callback(new Error("身份证号格式不正确"));
+				}
+				callback();
+			}
+		};
+		return {
+			activesName: "first",
+			isAuto: false,
+			formItemWd: "100%",
+			partymenberid: "",
+			partyProps: {
+				label: "partyOrgName",
+				value: "id",
+				emitPath: false,
+			},
+			zwList: [
+				{
+					label: "普通党员",
+					value: "0",
+				},
+				{
+					label: "支部书记",
+					value: "1",
+				},
+				{
+					label: "支部委员",
+					value: "2",
+				},
+				{
+					label: "党委委员",
+					value: "3",
+				},
+			],
+			form: {
+				icResiUser: "",
+				name: "",
+				mobile: "",
+				idCard: "",
+				address: "",
+				rdsj: "",
+				sszb: "",
+				isLd: "0",
+				ldzh: "",
+				partyZw: "0",
+				isDyzxh: "0",
+				isMxx: "0",
+				culture: "",
+				rdsszzb: "",
+				zzgxzrsqsj: "",
+				isQcj: "0",
+				remark: "",
+				headPhoto: "",
+			},
+			eduList: [],
+			rules: {
+				sszb: [
+					{
+						required: true,
+						message: "所属党组织不能为空",
+						trigger: "blur",
+					},
+				],
+				name: [
+					{
+						required: true,
+						message: "姓名不能为空",
+						trigger: "blur",
+					},
+				],
+				mobile: [
+					{ required: true, validator: checkMObile, trigger: "blur" },
+				],
+				idCard: [
+					{ required: true, validator: checkIdCard, trigger: "blur" },
+				],
+			},
+			partyOrgs: [],
 
-      const _data = { ...data }
-      const params = {
-        ..._data,
-        baseOptions: data.baseOptions.length > 0 ? data.baseOptions.toString() : '',
-        reviewOptions: data.reviewOptions.length > 0 ? data.reviewOptions.toString() : '',
-        inspireOptions: data.inspireOptions.length > 0 ? data.inspireOptions.toString() : '',
-        warnOptions: data.warnOptions.length > 0 ? data.warnOptions.toString() : ''
-      }
-      this.savePoints(params)
-    },
-    async saveBase () {
-      const params = {
-        ...this.form
-      }
-      await this.$http
-        .post('/resi/partymember/icPartyMember/save', params)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            this.$message.success('保存成功')
-            this.partymenberid = res.data
-            this.$emit('saveBase', true)
+			headPhotoList: [],
+			uploadUlr:
+				window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
+		};
+	},
+	watch: {
+		info: {
+			handler(val) {
+				if (Object.keys(val).length > 0) {
+					this.form = { ...val };
+					if (val.icResiUserId || val.icResiUser) this.isAuto = true;
+					console.log("val----------in", val);
+					console.log("isAuto----------in", this.isAuto);
+					this.partyOrgs = val.orgPids.split(":");
+					console.log("partyOrgs-----", this.partyOrgs);
+					this.partymenberid = val.id;
 
-          }
-        })
-        .catch(err => {
-          console.log('err', err)
-          return this.$message.error('网络错误')
-        })
-    },
-    async editBase () {
-      const params = {
-        ...this.form
-      }
-      await this.$http
-        .post('/resi/partymember/icPartyMember/update', params)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            this.$message.success('保存成功')
-            this.partymenberid = res.data
-            this.$emit('saveBase', true)
+					if (val.headPhoto) {
+						this.headPhotoList = [{ url: val.headPhoto }];
+					}
+				}
+			},
+			immediate: true,
+		},
+	},
+	created() {
+		this.getEduList();
+		console.log("partyList", this.partyList);
+	},
+	mounted() {
+		const w = document.getElementsByClassName("dialog-h-content")[0];
+		this.formItemWd = w.clientWidth + "px";
+	},
+	destroyed() {
+		// this.$refs['ruleForm'].resetFields()
+	},
+	methods: {
+		removePic(file, fileList) {
+			this.form.headPhoto = "";
+			this.headPhotoList = [];
+		},
+		// 最多上传3张图，超过时隐藏上传按钮
+		handleEditChange(file, fileList) {},
+		exceedPic() {
+			this.$message.warning("最多上传1张图片");
+		},
+		handleSuccess(response, file, fileList) {
+			console.log(file);
+			this.headPhotoList.push(file);
+			this.form.headPhoto = response.data.url;
+		},
 
-          }
-        })
-        .catch(err => {
-          console.log('err', err)
-          return this.$message.error('网络错误')
-        })
-    },
-    async savePoints (form) {
-      const params = {
-        ...form,
-        partyMemberId: this.partymenberid
-      }
-      let url = ''
-      if (form.id) url = '/resi/partymember/icPartyMemberPoint/update'
-      else url = '/resi/partymember/icPartyMemberPoint/save'
-      await this.$http
-        .post(url, params)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            this.$message.success('保存成功')
-
-          }
-        })
-        .catch(err => {
-          console.log('err', err)
-          return this.$message.error('网络错误')
-        })
-    },
-    async saveRecord (form) {
-      const params = {
-        ...form,
-        partyMemberId: this.partymenberid
-      }
-      await this.$http
-        .post('/resi/partymember/icPartyMemberPoint/save', params)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            this.$message.success('保存成功')
-
-          }
-        })
-        .catch(err => {
-          console.log('err', err)
-          return this.$message.error('网络错误')
-        })
-    }
-  }
-}
+		handleCancle() {
+			this.$refs["ruleForm"].resetFields();
+			this.$emit("cancle");
+		},
+		handlePartyChange(val) {
+			console.log("val------pp", val);
+			// if (val.length > 0) {
+			//   const i = val.length - 1
+			//   this.form.sszb = val[i]
+			// } else this.form.sszb = ''
+		},
+		handleValidBlur(n) {
+			if (!isCard(this.form.idCard)) return;
+			const { age } = computedCard(this.form.idCard);
+			this.form.isMxx = age >= 70 ? "1" : "0";
+			this.validateResi();
+		},
+		async getEduList() {
+			await this.$http
+				.post("/sys/dict/data/education")
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						this.eduList = res.data;
+					}
+				})
+				.catch((err) => {
+					console.log("err", err);
+					return this.$message.error("网络错误");
+				});
+		},
+		async validateResi() {
+			const params = {
+				idCard: this.form.idCard,
+				agencyId: this.$store.state.user.agencyId,
+			};
+			await this.$http
+				.post("/epmetuser/icresiuser/getUserByIdCard", params)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						const { address, icResiUserId } = res.data;
+						if (icResiUserId) {
+							this.form.address = address;
+							this.isAuto = true;
+						} else {
+							this.form.address = "";
+							this.isAuto = false;
+						}
+					}
+				})
+				.catch((err) => {
+					console.log("err", err);
+					return this.$message.error("网络错误");
+				});
+		},
+		hadnleSubmitbase() {
+			this.$refs["ruleForm"].validate((valid) => {
+				if (valid) {
+					if (Object.keys(this.info).length > 0) this.editBase();
+					else this.saveBase();
+				} else {
+					console.log("error submit!!");
+					return false;
+				}
+			});
+		},
+		handleSavePoints(data) {
+			const _data = { ...data };
+			const params = {
+				..._data,
+				baseOptions:
+					data.baseOptions.length > 0
+						? data.baseOptions.toString()
+						: "",
+				reviewOptions:
+					data.reviewOptions.length > 0
+						? data.reviewOptions.toString()
+						: "",
+				inspireOptions:
+					data.inspireOptions.length > 0
+						? data.inspireOptions.toString()
+						: "",
+				warnOptions:
+					data.warnOptions.length > 0
+						? data.warnOptions.toString()
+						: "",
+			};
+			this.savePoints(params);
+		},
+		async saveBase() {
+			const params = {
+				...this.form,
+			};
+			await this.$http
+				.post("/resi/partymember/icPartyMember/save", params)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						this.$message.success("保存成功");
+						this.partymenberid = res.data;
+						this.$emit("saveBase", true);
+					}
+				})
+				.catch((err) => {
+					console.log("err", err);
+					return this.$message.error("网络错误");
+				});
+		},
+		async editBase() {
+			const params = {
+				...this.form,
+			};
+			await this.$http
+				.post("/resi/partymember/icPartyMember/update", params)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						this.$message.success("保存成功");
+						this.partymenberid = res.data;
+						this.$emit("saveBase", true);
+					}
+				})
+				.catch((err) => {
+					console.log("err", err);
+					return this.$message.error("网络错误");
+				});
+		},
+		async savePoints(form) {
+			const params = {
+				...form,
+				partyMemberId: this.partymenberid,
+			};
+			let url = "";
+			if (form.id) url = "/resi/partymember/icPartyMemberPoint/update";
+			else url = "/resi/partymember/icPartyMemberPoint/save";
+			await this.$http
+				.post(url, params)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						this.$message.success("保存成功");
+					}
+				})
+				.catch((err) => {
+					console.log("err", err);
+					return this.$message.error("网络错误");
+				});
+		},
+		async saveRecord(form) {
+			const params = {
+				...form,
+				partyMemberId: this.partymenberid,
+			};
+			await this.$http
+				.post("/resi/partymember/icPartyMemberPoint/save", params)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						this.$message.success("保存成功");
+					}
+				})
+				.catch((err) => {
+					console.log("err", err);
+					return this.$message.error("网络错误");
+				});
+		},
+	},
+};
 </script>
 
 <style lang="scss" scoped>
 .input-width-textarea {
-  width: 400px;
+	width: 400px;
 }
 .input-width {
-  width: 220px;
+	width: 220px;
 }
 .flex-div {
-  display: flex;
-  // justify-content: space-between;
+	display: flex;
+	// justify-content: space-between;
 }
 .wd50 {
-  width: 50%;
+	width: 50%;
 }
 .pdl40 {
-  padding-left: 40px;
+	padding-left: 40px;
 }
 .pd0 {
-  padding: 0 !important;
+	padding: 0 !important;
 }
 .div-tip {
-  margin-left: 40px;
-  color: #f56c6c;
-  padding: 10px 0 20px;
+	margin-left: 40px;
+	color: #f56c6c;
+	padding: 10px 0 20px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue
index 719204a..bef3853 100644
--- a/src/views/modules/cpts/base/cpts/edit.vue
+++ b/src/views/modules/cpts/base/cpts/edit.vue
@@ -138,6 +138,7 @@
 								clearable
 								class="item-select"
 								:multiple="item.multiple || false"
+								:value-key="item.valueKey || 'value'"
 								:filterable="item.filterable || false"
 								:allowCreate="item.allowCreate || false"
 								:collapse-tags="item.collapseTags || false"
@@ -146,13 +147,13 @@
 							>
 								<template v-if="item.optionType == 'group'">
 									<el-option-group
-										v-for="group in item.optionList"
-										:key="group.label"
+										v-for="(group,groupIndex) in item.optionList"
+										:key="groupIndex"
 										:label="group.label"
 									>
 										<el-option
 											v-for="(subItem,subIndex) in group.optionList"
-											:key="subItem.label + subIndex"
+											:key="subIndex"
 											:label="subItem.label"
 											:value="subItem.value"
 										>
@@ -164,7 +165,7 @@
 										v-for="(
 											subItem, subIndex
 										) in item.optionList"
-										:key="subItem.value + subIndex"
+										:key="subIndex"
 										:label="subItem.label"
 										:value="subItem.value"
 									>
@@ -269,10 +270,10 @@
 								"
 							>
 								<a style="display:block;"
-									:key="val.url"
+									:key="valIndex"
 									target="_blank"
 									:href="val.url"
-									v-for="val in fmData[item.keyName]"
+									v-for="(val, valIndex) in fmData[item.keyName]"
 									>{{ val.name }}</a
 								>
 							</div>
diff --git a/src/views/modules/lingshan/djyl/hsdb/dby.vue b/src/views/modules/lingshan/djyl/hsdb/dby.vue
index 7ce53d1..3142574 100644
--- a/src/views/modules/lingshan/djyl/hsdb/dby.vue
+++ b/src/views/modules/lingshan/djyl/hsdb/dby.vue
@@ -15,7 +15,7 @@
 			:mubanUrl="mubanUrl"
 			:editParams="editParams"
 			:editElseRules="editElseRules"
-			idName="icDangerousChemicalsId"
+			idName="agentId"
 		></base-page>
 	</div>
 </template>
@@ -91,7 +91,8 @@ export default {
 				{ field: "联系电话", keyName: "mobile", type: "text" },
 				{ field: "身份证号", keyName: "idCard", type: "text" },
 			],
-			tableUrl: "【GET】/data/aggregator/lingshan/serviceAgent/workpc/agentList",
+			tableUrl:
+				"【GET】/data/aggregator/lingshan/serviceAgent/workpc/agentList",
 			mubanUrl: "",
 			importUrl: "",
 			exportUrl: "/gov/org/icDangerousChemicals/export",
@@ -100,12 +101,14 @@ export default {
 			editUrl: "/gov/org/staff/editstaff",
 			infoUrl: "/gov/org/staff/editstaffinit",
 			delUrl: "/gov/org/icDangerousChemicals/del",
-			// editAuth(item) {
-			// 	return item.agencyId == this.$store.state.user.agencyId;
-			// },
-			// delAuth(item) {
-			// 	return item.agencyId == this.$store.state.user.agencyId;
-			// },
+			editAuth(item) {
+				return true || item.agencyId == this.$store.state.user.agencyId;
+			},
+			delAuth(item) {
+				return (
+					false && item.agencyId == this.$store.state.user.agencyId
+				);
+			},
 
 			editParams: [
 				// {
@@ -254,6 +257,12 @@ export default {
 					},
 					optionList: () => [],
 					editDisabled: false,
+					optionCook(arr) {
+						return arr.map((item) => ({
+							value: item.roleId,
+							label: item.roleName,
+						}));
+					},
 					rules: [
 						{
 							required: true,