| ruoyi-ui/src/api/self/index.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/collection/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/genealogy/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/self/show.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ruoyi-ui/src/api/self/index.js
@@ -206,7 +206,7 @@ export function addAutobiography(data) { return request({ url: '/zAutobiography', url: '/zAutobiography/', method: 'post', data: data }) ruoyi-ui/src/views/collection/index.vue
@@ -587,7 +587,7 @@ /** 查询记录列表 */ getList() { this.loading = true; console.log(this.queryParams) // console.log(this.queryParams) this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0] this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
@@ -57,16 +57,23 @@ <i slot="prefix" class="el-input__icon el-icon-search"></i> </el-input> </el-form-item> <el-form-item label="生日" prop="birth"> <el-input v-model="queryParams.birth" placeholder="请输入生日" clearable style="width: 240px" @keyup.enter.native="handleQuery" > <i slot="prefix" class="el-input__icon el-icon-search"></i> </el-input> <el-date-picker v-model="dateRange" style="width: 197px; height: 30px; background: #FFFFFF; border-radius: 14px 14px 14px 14px; opacity: 0.5; border: 1px solid rgba(0,0,0,0.25);" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" ></el-date-picker> </el-form-item> <el-form-item> <el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3; @@ -213,30 +220,30 @@ <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px"> <el-form-item label="身份" prop="identity"> <el-input v-model="formDat.identity" placeholder="请输入成员姓名" clearable :style="{width: '100%'}" > <el-input v-model="formDat.identity" placeholder="请输入身份" clearable :style="{width: '100%'}" > </el-input> </el-form-item> <el-form-item label="姓名" prop="nickName"> <el-input v-model="formDat.nickName" placeholder="请输入称呼" clearable :style="{width: '100%'}" ></el-input> <el-input v-model="formDat.nickName" placeholder="请输入姓名" clearable :style="{width: '100%'}" ></el-input> </el-form-item> <el-form-item label="性别" prop="sex"> <el-input v-model="formDat.sex" placeholder="请输入姓名" clearable :style="{width: '100%'}" > <el-input v-model="formDat.sex" placeholder="请输入性别" clearable :style="{width: '100%'}" > </el-input> </el-form-item> <el-form-item label="出生时间" prop="birth"> <el-input v-model="formDat.birth" placeholder="请输入工作单位" clearable :style="{width: '100%'}" > <el-input v-model="formDat.birth" placeholder="请输入出生时间" clearable :style="{width: '100%'}" > </el-input> </el-form-item> <el-form-item label="全生命周期" prop="deadDay"> <el-input v-model="formDat.deadDay" placeholder="请输入手机" clearable :style="{width: '100%'}" > <el-input v-model="formDat.deadDay" placeholder="请输入全生命周期" clearable :style="{width: '100%'}" > </el-input> </el-form-item> <el-form-item label="手机号码" prop="phoneNumber"> <el-input v-model="formDat.phoneNumber" placeholder="请输入微信" clearable :style="{width: '100%'}" > <el-input v-model="formDat.phoneNumber" placeholder="请输入手机号码" clearable :style="{width: '100%'}" > </el-input> </el-form-item> <el-form-item label="所在单位" prop="unit"> <el-input v-model="formDat.unit" placeholder="请输入QQ" clearable :style="{width: '100%'}" > <el-input v-model="formDat.unit" placeholder="请输入所在单位" clearable :style="{width: '100%'}" > </el-input> </el-form-item> <el-form-item label="配偶" prop="spouseName"> @@ -305,11 +312,8 @@ dateRange: [], // 数据范围选项 fot:[".jpg",".jif"], fileList:[ ], fileListOther:[ ], fileList:[], fileListOther:[], dsb:true, btn:false, fit:['fill'], @@ -472,7 +476,8 @@ this.loading = true; // console.log(this.queryParams) //alert(23) this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0] this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1] // listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => { listUserAll(this.queryParams).then(response => { // alert(123) ruoyi-ui/src/views/self/show.vue
@@ -239,7 +239,7 @@ <div> <el-form v-loading="loading" :data="individualList" @selection-change="handleSelectionChange"> <el-form-item label="是否拥有外籍、境外居留权、长期居留许可"> <el-radio-group v-model="individualList.outStatus" style="margin-bottom: 0"> <el-radio-group v-model="individualList.outStatus" style="margin-bottom: 0;color: #FEF7FC;"> <el-radio :label="1">是</el-radio> <el-radio :label="0">否</el-radio> </el-radio-group> @@ -247,7 +247,7 @@ <el-row :span="7"> <el-form v-loading="loading" :data="individualList" @selection-change="handleSelectionChange"> <el-form-item label="证件号码" prop="idNo" label-width="70px"> <el-input v-model="individualList.idNo" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> <el-input v-model="individualList.idNo" style="color: #FEF7FC;" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-form> @@ -627,16 +627,15 @@ </div> </el-dialog> <!--新增自传--> <el-dialog :title="title" :visible.sync="dialogVisible.autobiography" width="900px" > <el-dialog :title="title" :visible.sync="dialogVisible.autobiography" width="900px" append-to-body> <el-col > <el-form ref="elForm" :model="AutobiographyList" :rules="rules" size="medium" label-position="left" v-loading="loading" :data="AutobiographyList" @selection-change="handleSelectionChange" > <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-position="left" > <el-row :span="5"> <el-form-item label="年龄段：" prop="ageBegin ageEnd" label-width="70px"> <el-input v-model="AutobiographyList.ageBegin" placeholder="" clearable :style="{width: '20%'}" > <el-input v-model="formDat.ageBegin" placeholder="" clearable :style="{width: '20%'}" > </el-input> <span> 岁 ——</span> <el-input v-model="AutobiographyList.ageEnd" placeholder="" clearable :style="{width: '20%'}" > <el-input v-model="formDat.ageEnd" placeholder="" clearable :style="{width: '20%'}" > </el-input> <span> 岁 </span> </el-form-item> @@ -830,8 +829,10 @@ //自传 ageBegin:undefined, ageEnd:undefined, term:undefined term:undefined, }, AgeEnd:'', // 菜单列表 menuOptions: [], // 部门列表 @@ -921,13 +922,29 @@ trigger: 'blur' }], content: [{ // required: true, message: '请输入', required: true, message: '请输入文本', trigger: 'blur' }], witness: [{ required: true, message: '请输入证明人', trigger: 'blur' }], //自传 term: [{ required: true, message: '请选择时期', trigger: 'blur' }], ageBegin: [{ required: true, message: '', trigger: 'blur' }], ageEnd: [{ required: true, message: '', trigger: 'blur' }], @@ -973,7 +990,7 @@ handleClick(tab, event) { // console.log(tab, event); this.getAutobiographyInfor(); // this.getSrc1(typeOptions) }, //隔行变色 @@ -996,6 +1013,11 @@ return '——————' } }, getSrc1(term){ if(term==='7'){ return '研究生' } }, /** 查询角色列表 */ getList() { @@ -1010,6 +1032,7 @@ this.total = response.data.total; this.loading = false; } ); //成员关系 getIndividualRelation(this.queryParams).then(response => { @@ -1054,6 +1077,7 @@ this.AutobiographyList = response.data; this.total = response.data.total; this.loading = false; }); //根据不同时段的个人自传 // getAutobiographyTermList(this.queryParams).then(response => { @@ -1185,10 +1209,22 @@ let _this = this getCategory().then(response=>{ // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{ // _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]}) // }) response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{ _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]}) const label = elem.split(":")[0].trim(); const value = parseInt(elem.split(":")[1].trim()); _this.typeOptions.push({ "label": label, "value": value }); // this.getSrc1(value) }) }) // if(AutobiographyList.ageEnd==null){ // this.AgeEnd='?' // }else{ // this.AgeEnd=this.ageEnd // } }, /** 提交按钮（数据权限） */ @@ -1256,9 +1292,14 @@ this.formDat[key] = ''; }); }, //个人自传 submitDataScope6: function() { this.$refs["elForm"].validate(valid => { if (valid) { // 根据值找到选中的选项对象 const selectedOption = this.typeOptions.find(option => option.value === this.formDat.term); // 将选中选项的文本设置为"term"字段的值 this.formDat.term = selectedOption.label; addAutobiography(this.formDat).then(response => { this.$modal.msgSuccess("新增成功"); this.dialogVisible.autobiography = false;
