ruoyi-ui/src/views/bignote/index.vue
@@ -51,7 +51,7 @@ <el-form-item label="时间" prop="happenTime"> <el-date-picker v-model="dateRange" style="width: 197px; style="width: 240px; height: 30px; background: #FFFFFF; border-radius: 14px 14px 14px 14px; ruoyi-ui/src/views/collection/index.vue
@@ -4,7 +4,7 @@ <el-form-item label="时间" prop="happenTime"> <el-date-picker v-model="dateRange" style="width: 197px; style="width: 240px; height: 30px; background: #FFFFFF; border-radius: 14px 14px 14px 14px; ruoyi-ui/src/views/device/index.vue
@@ -5,7 +5,7 @@ <el-form-item label="时间" prop="happenTime"> <el-date-picker v-model="dateRange" style="width: 200px; style="width: 240px; height: 35px; border-radius: 16px 16px 16px 16px; opacity: 0.5;" ruoyi-ui/src/views/doctor/index.vue
@@ -3,7 +3,7 @@ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"> <el-form-item label="类别" prop="type"> <el-select v-model="queryParams.type" placeholder="所有类别" clearable style="width: 200px; style="width: 240px; height: 35px; border-radius: 16px 16px 16px 16px; opacity: 0.5;" @keyup.enter.native="handleQuery"> ruoyi-ui/src/views/economy/index.vue
@@ -5,7 +5,7 @@ <el-form-item label="时间" prop="createTime"> <el-date-picker v-model="dateRange" style="width: 200px; style="width: 240px; height: 35px; border-radius: 16px 16px 16px 16px; opacity: 0.5;" ruoyi-ui/src/views/genealogy/index.vue
@@ -42,7 +42,7 @@ <el-form-item label="生日" prop="birth deadDay"> <el-date-picker v-model="dateRange" style="width: 197px; style="width: 240px; height: 30px; background: #FFFFFF; border-radius: 14px 14px 14px 14px; ruoyi-ui/src/views/healthy/Examination.vue
@@ -6,7 +6,7 @@ <el-form-item label="体检时间" prop="happenTime"> <el-date-picker v-model="dateRange" style="width: 200px; style="width: 240px; height: 35px; border-radius: 16px 16px 16px 16px; opacity: 0.5;" ruoyi-ui/src/views/healthy/index.vue
@@ -6,7 +6,7 @@ <el-form-item label="看病时间" prop="checkTime"> <el-date-picker v-model="dateRange" style="width: 200px; style="width: 240px; height: 35px; border-radius: 16px 16px 16px 16px; opacity: 0.5;" ruoyi-ui/src/views/homeRoot/personInfo.vue
@@ -1,7 +1,7 @@ <template> <div class="app-container" > <div class="wrapper" style="overflow: auto;"> <div id="building" v-show="personInfos[1]"> <div id="building" v-if="isshow"> <el-form ref="elForm" :model="personInfos" :rules="rules" size="medium" label-position="center" label-width="100px"> <el-container> <div style="padding-left:30px;padding-top: 50px"> @@ -10,7 +10,7 @@ <el-col v-model="personInfos[0].url" prop="url"> <el-avatar shape="square" :size=200 > <el-image :src="'http://47.93.189.255:8080/'+ personInfos[0].url" :src="'https://www.bendudu.com:8080/'+personInfos[0].url" style="width: 100%;height: 100%;" ></el-image> </el-avatar> @@ -44,9 +44,10 @@ </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="星座" prop="constellation" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfos[0].constellation" placeholder="请输入星座" clearable :style="{width: '100%'}" :disabled="dsb"> <el-form-item label="户籍地址" prop="locationAddress" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input type="textarea" v-model="personInfos[0].locationAddress" placeholder="请输入户籍地址" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> @@ -77,9 +78,9 @@ </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="单位" prop="unit" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfos[0].unit" placeholder="请输入单位" clearable :style="{width: '100%'}" :disabled="dsb"> <el-row :span="8"> <el-form-item label="常住地址" prop="alwaysAddress" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input type="textarea" v-model="personInfos[0].alwaysAddress" placeholder="请输入常住地址" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> @@ -94,25 +95,27 @@ </el-row> <el-row :span="8"> <el-form-item label="配偶" prop="nickName" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfos[1].nickName" placeholder="请输入配偶" clearable :style="{width: '100%'}" :disabled="dsb"> <el-input v-model="personInfos[0].nickName" placeholder="请输入配偶" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="户籍地址" prop="locationAddress" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfos[0].locationAddress" placeholder="请输入户籍地址" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="常住地址" prop="alwaysAddress" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfos[0].alwaysAddress" placeholder="请输入常住地址" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="职务职称" prop="position" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfos[0].position" placeholder="请输入职务职称" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="星座" prop="constellation" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfos[0].constellation" placeholder="请输入星座" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="单位" prop="unit" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input type="textarea" v-model="personInfos[0].unit" placeholder="请输入单位" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> @@ -120,7 +123,7 @@ </div> </el-container> <el-divider /> <el-container > <el-container v-if="isshow"> <div style="padding-left:30px;padding-top: 10px"> <el-col> <el-row :span="8"> @@ -149,13 +152,13 @@ </el-row> <el-row :span="8"> <el-form-item label="星座" prop="constellation" label-width="50px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfos[1].constellation" placeholder="请输入星座" clearable :style="{width: '100%'}" :disabled="dsb"> <el-input type="textarea" v-model="personInfos[1].constellation" placeholder="请输入星座" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> </el-col> </div> <div style="padding-left:30px;padding-top: 10px"> <div style="padding-left:30px;padding-top: 10px" v-show="personInfos[1]"> <el-col> <el-row :span="8"> <el-form-item label="性别" prop="sex" label-width="45px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;"> @@ -180,9 +183,10 @@ </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="单位" prop="unit" label-width="68px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfos[1].unit" placeholder="请输入单位" clearable :style="{width: '100%'}" :disabled="dsb"> <el-form-item label="常住地址" prop="alwaysAddress" label-width="68px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input type="textarea" v-model="personInfos[1].alwaysAddress" placeholder="请输入常住地址" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> @@ -201,21 +205,23 @@ </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="户籍地址" prop="locationAddress" label-width="68px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfos[1].locationAddress" placeholder="请输入户籍地址" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="常住地址" prop="alwaysAddress" label-width="68px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfos[1].alwaysAddress" placeholder="请输入常住地址" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="职务职称" prop="position" label-width="68px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfos[1].position" placeholder="请输入职务职称" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="星座" prop="constellation" label-width="50px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfos[1].constellation" placeholder="请输入星座" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="单位" prop="unit" label-width="68px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input type="textarea" v-model="personInfos[1].unit" placeholder="请输入单位" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> @@ -228,7 +234,7 @@ <el-col v-model="personInfos[1].url" prop="url"> <el-avatar shape="square" :size=200 > <el-image :src="'http://47.93.189.255:8080/'+ personInfos[1].url" :src="'https://www.bendudu.com:8080/'+ personInfos[1].url" style="width: 100%;height: 100%;" ></el-image> </el-avatar> @@ -241,7 +247,7 @@ </el-form> </div> <div id="building2" v-show="!personInfos[1]"> <div id="building2" v-show="!isshow"> <el-form ref="elForm" :model="personInfo1" :rules="rules" size="medium" label-position="center" label-width="100px"> <el-container> <div style="padding-left:30px;padding-top: 50px"> @@ -251,7 +257,7 @@ <el-col v-model="personInfo1.url" prop="url"> <el-avatar shape="square" :size=200 > <el-image :src="'http://47.93.189.255:8080/'+ personInfo1.url" :src="'https://www.bendudu.com:8080/'+ personInfo1.url" style="width: 100%;height: 100%;" ></el-image> </el-avatar> @@ -287,12 +293,12 @@ </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="星座" prop="constellation" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfo1.constellation" placeholder="请输入星座" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="户籍地址" prop="locationAddress" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input type="textarea" v-model="personInfo1.locationAddress" placeholder="请输入户籍地址" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> </el-col> </el-container> @@ -323,12 +329,16 @@ </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="单位" prop="unit" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfo1.unit" placeholder="请输入单位" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="常住地址" prop="alwaysAddress" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input type="textarea" v-model="personInfo1.alwaysAddress" placeholder="请输入常住地址" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> </el-col> </el-container> </div> @@ -346,21 +356,24 @@ </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="户籍地址" prop="locationAddress" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfo1.locationAddress" placeholder="请输入户籍地址" clearable :style="{width: '100%'}" :disabled="dsb"> <el-row :span="8"> <el-form-item label="星座" prop="constellation" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfo1.constellation" placeholder="请输入星座" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="常住地址" prop="alwaysAddress" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfo1.alwaysAddress" placeholder="请输入常住地址" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item label="职务职称" prop="position" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="personInfo1.position" placeholder="请输入职务职称" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="8"> <el-form-item class="centered-label" label="单位" prop="unit" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input type="textarea" v-model="personInfo1.unit" placeholder="请输入单位" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> @@ -388,6 +401,7 @@ personInfo1:{}, loading: true, dsb:true, isshow:true, formData:{ userId: undefined, nickName: undefined, @@ -445,13 +459,15 @@ methods:{ getList(id) { // alert(id) let _this = this; getRoot(id).then(response => { // console.log(response.data) console.log(response.data) //这里是夫妻的信息，已经拿到了 this.personInfos = response.data this.personInfo1 = response.data[0] console.log(this.personInfo1.nickName) _this.personInfos = response.data if(_this.personInfos[1]==null) _this.isshow = false; _this.personInfo1 = response.data[0] //alert(this.personInfos[0].url) }); @@ -489,4 +505,11 @@ margin: 2px 0px; position: relative; } .centered-label .el-form-item__content{ line-height: 38px; padding: 0px; margin-left: 50%; border: 1px solid red; text-align: center; } </style> ruoyi-ui/src/views/honor/index.vue
@@ -3,7 +3,7 @@ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"> <el-form-item label="名称" prop="name"> <el-select v-model="queryParams.name" placeholder="所有名称" clearable style="width: 200px; style="width: 240px; height: 35px; border-radius: 16px 16px 16px 16px; opacity: 0.5;" @keyup.enter.native="handleQuery"> ruoyi-ui/src/views/mindMap/index.vue
@@ -95,7 +95,7 @@ var data = { "label": mpdata['spouse'] != null ? eval(mpdata['spouse']).nickName : '', "prop": mpdata['nickName'], "url": 'https://www.bendudu.com/', "url": 'https://www.bendudu.com:8080/'+mpdata['url'], "id": mpdata['userId'], "link": mpdata['nickName'], "children": [] @@ -106,7 +106,7 @@ var dt = { "label": mpdata['childList'][i]['spouse'] != null ? eval(mpdata['childList'][i]['spouse']).nickName : '', "prop": mpdata['childList'][i]['nickName'], "url": 'https://47.93.189.255:8085/'+mpdata['childList'][i]['url'], "url": 'https://www.bendudu.com:8080/'+mpdata['childList'][i]['url'], "id": mpdata['childList'][i]['userId'], "link": mpdata['childList'][i]['nickName'], "children": [] ruoyi-ui/src/views/note/index.vue
@@ -66,7 +66,7 @@ <el-form-item label="发生时间" prop="happenTime"> <el-date-picker v-model="dateRange" style="width: 200px; style="width: 240px; height: 35px; border-radius: 16px 16px 16px 16px; opacity: 0.5;" ruoyi-ui/src/views/pet/petInfo.vue
@@ -588,15 +588,11 @@ this.loading = true; // this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0] // this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1] // console.log(this.queryParams) this.queryParams.pid = this.pid; // listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => { listPetnote(this.queryParams).then(response => { // alert(123) // console.log(response.data) this.PetNoteList = response.data.data; this.total = response.data.total; this.loading = false; } ruoyi-ui/src/views/pet/petnote.vue
@@ -55,7 +55,7 @@ > <el-button size="mini" type="primary" plain icon="el-icon-plus" >导入</el-button> icon="el-icon-top" >导入</el-button> </el-upload> </el-col> ruoyi-ui/src/views/search/index.vue
@@ -15,7 +15,7 @@ <el-form-item label="时间" prop="happenTime"> <el-date-picker v-model="dateRange" style="width: 197px; style="width: 240px; height: 30px; background: #FFFFFF; border-radius: 14px 14px 14px 14px; ruoyi-ui/src/views/secret/index.vue
@@ -15,7 +15,7 @@ <el-form-item label="时间" prop="happenTime"> <el-date-picker v-model="dateRange" style="width: 200px; style="width: 240px; height: 35px; border-radius: 16px 16px 16px 16px; opacity: 0.5;" ruoyi-ui/src/views/self/memo.vue
@@ -5,7 +5,7 @@ <el-form-item label="时间" prop="happenTime"> <el-date-picker v-model="dateRange" style="width: 200px; style="width: 240px; height: 35px; border-radius: 16px 16px 16px 16px; opacity: 0.5;" ruoyi-ui/src/views/self/show.vue
@@ -148,47 +148,29 @@ <div style="padding-left:100px;padding-top:30px"> <el-col :span="6" :data="individualList"> <div class="block" :model="individualList"> <div v-if="!isEditing"> <el-avatar shape="square" style="width: 200px; height: 150px;"> <el-image class="el-upload-list__item-thumbnail" v-if="!individualList.img" src="default-avatar-url" :fit="fit" style="width: 100%; height: 100%;" ></el-image> <el-image v-else :src="'http://47.93.189.255:8080/' + individualList.img" :fit="fit" style="width: 100%; height: 100%;" ></el-image> </el-avatar> </div> <el-upload v-else class="upload-demo" action="#" :auto-upload="false" :http-request="requestUpload" :limit="1" :file-list="fileList" > <el-avatar shape="square" style="width: 200px; height: 150px;"> <el-image class="el-upload-list__item-thumbnail" v-if="!individualList.img" src="default-avatar-url" :fit="fit" style="width: 100%; height: 100%;" ></el-image> <el-image v-else :src="'http://47.93.189.255:8080/' + individualList.img" :fit="fit" style="width: 100%; height: 100%;" ></el-image> </el-avatar> </el-upload> <el-upload ref="uploadDemo" action="" :file-list="fileList1" list-type="picture-card" accept="image/*" :multiple="false" :http-request="requestUpload" :on-success="handleSucess" :limit="1"> <el-avatar shape="square" style="width: 200px;;height: 200px;" > <el-image :src="'https://www.bendudu.com:8080/'+ individualList.url" :fit="fit" style="width: 100%;height: 100%;border-radius: 0px 0px 0px 0px;opacity: 1;border: 1px solid rgba(0,0,0,0.5);" ></el-image> </el-avatar> </el-upload> <div class="edit-text" v-if="isEditing" @click="uploadImage">点击更换图片</div> </div> </el-col> @@ -205,24 +187,26 @@ <el-container> <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange"> <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left"> <el-row :span="16"> <el-form-item label="户籍地址" prop="locationAddress" label-width="70px"> <el-input v-model="individualList.locationAddress" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="16"> <el-form-item label="常住地址" prop="alwaysAddress" label-width="70px"> <el-input v-model="individualList.alwaysAddress" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="16" > <el-form-item label="单位" prop="unit" label-width="40px"> <el-input v-model="individualList.unit" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="16"> <el-form-item label="户籍地址" prop="locationAddress" label-width="70px"> <el-input type="textarea" v-model="individualList.locationAddress" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="28"> <el-form-item label="常住地址" prop="alwaysAddress" label-width="70px"> <el-input type="textarea" v-model="individualList.alwaysAddress" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> </el-form> </el-col> @@ -232,24 +216,25 @@ <el-container> <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange"> <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left"> <el-row :span="12"> <el-form-item label="户籍地公安机关" prop="locationPolice" label-width="110px"> <el-input v-model="individualList.locationPolice" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="12"> <el-form-item label="常住地公安机关" prop="alwaysPolice" label-width="110px"> <el-input v-model="individualList.alwaysPolice" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="12" > <el-form-item label="职务职称" prop="position" label-width="70px"> <el-input v-model="individualList.position" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="12"> <el-form-item label="户籍地公安机关" prop="locationPolice" label-width="110px"> <el-input type="textarea" v-model="individualList.locationPolice" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> <el-row :span="12"> <el-form-item label="常住地公安机关" prop="alwaysPolice" label-width="110px"> <el-input type="textarea" v-model="individualList.alwaysPolice" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> </el-form> </el-col> </el-container> @@ -1116,57 +1101,59 @@ // console.log(this.queryParams) // listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => { //个人经历 let _this = this; listExperience(this.queryParams).then(response => { // alert(123) // console.log(response.data) this.experienceList = response.data; _this.experienceList = response.data; // this.total = response.data.total; this.loading = false; _this.loading = false; } ); //成员关系 getIndividualRelation(this.queryParams).then(response => { // alert(123) // console.log(response.data) this.relationList = response.data; _this.relationList = response.data; // this.total = response.data.total; this.loading = false; _this.loading = false; } ); //个人信息 getIndividualList(this.queryParams).then(response => { // alert(123) // console.log(response.data) this.individualList = response.data; _this.individualList = response.data; // this.total = response.data.total; this.loading = false; _this.loading = false; } ); //出入境证件情况 getCertificateList(this.queryParams).then(response => { // alert(123) // console.log(response.data) this.certificateList = response.data; _this.certificateList = response.data; // this.total = response.data.total; this.loading = false; _this.loading = false; } ); //出国情况 getAbroadList(this.queryParams).then(response => { // alert(123) // console.log(response.data) this.AbroadList = response.data; _this.AbroadList = response.data; // this.total = response.data.total; this.loading = false; _this.loading = false; } ); //查询个人所有自传 getAutobiographyList(this.queryParams).then(response => { // alert(123) // console.log(response.data) this.AutobiographyList = response.data; _this.AutobiographyList = response.data; // this.total = response.data.total; this.loading = false; _this.loading = false; }); //根据不同时段的个人自传 @@ -1178,12 +1165,12 @@ // this.loading = false; // }); listType(this.queryParams).then(response => { this.typeList = response.data; _this.typeList = response.data; // this.total = response.data.total; // console.log( this.typeList ) // 在回调函数中调用 getTypeOptions() this.getTypeOptions(); this.loading = false; _this.getTypeOptions(); _this.loading = false; } ); }, @@ -1343,12 +1330,13 @@ /** 提交按钮（数据权限） */ //新增主要经历的保存 submitDataScope: function() { let _this = this this.$refs["elForm"].validate(valid => { if (valid) { addExperience(this.formDat).then(response => { this.$modal.msgSuccess("新增成功"); this.dialogVisible.open = false; this.getList(); addExperience(_this.formDat).then(response => { _this.$modal.msgSuccess("新增成功"); _this.dialogVisible.open = false; _this.getList(); }); } }); @@ -1467,14 +1455,14 @@ this.individualList.maritalStatus = 1 else this.individualList.maritalStatus = 2 let ul = this.fileList.map(function (elem){ return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") }).join(",") let uls = this.fileListOther.map(function (elem){ return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") }).join(",") this.individualList.url = ul+","+uls // let ul = this.fileList.map(function (elem){ // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") // }).join(",") // let uls = this.fileListOther.map(function (elem){ // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") // }).join(",") // // this.individualList.url = ul+","+uls // console.log(this.individualList) this.$refs['elForm'].validate(valid => { if (valid) { if (this.individualList.userId !== undefined) { @@ -1635,7 +1623,12 @@ formData.append('uploadFile', file); let _this = this // console.log(this.individualList) this.$refs.uploadDemo.clearFiles(); // alert(234) uploadPic(formData).then(response => { // alert(response.data.url) // alert(response.data.originalFilename) let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length) if(_this.fot.includes(pth) === true) @@ -1645,9 +1638,25 @@ } else{ _this.fileListOther.push({name:response.data.fileName, url:response.data.url}) _this.fileList.push({name:response.data.fileName, url:response.data.url}) } _this.individualList.img = response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") _this.individualList.url = response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") updateIndividual(_this.individualList).then(response => { // 将选中选项的文本设置为"term"字段的值 // this.formDat.term = selectedOption.value; // this.formDat.id = selectedOption.id; console.log("1") _this.$modal.msgSuccess("修改成功"); _this.dialogVisible.autobiography = false; _this.isEdit1 = false; _this.getList(); }).catch(error => { console.log(error); _this.isEdit1 = false; _this.dialogVisible.autobiography = false; }); }) }, ruoyi-ui/src/views/selfeconomy/index.vue
@@ -5,7 +5,7 @@ <el-form-item label="日期" prop="happenTime"> <el-date-picker v-model="dateRange" style="width: 200px; style="width: 240px; height: 35px; border-radius: 16px 16px 16px 16px; opacity: 0.5;" ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
@@ -503,6 +503,19 @@ _this.fileListOther.push({name:response.data.fileName, url:response.data.url}) } let ul = _this.fileList.map(function (elem){ return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") }).join(",") let uls = _this.fileListOther.map(function (elem){ return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") }).join(",") _this.formData.url = ul+","+uls updateSelfEconomy(_this.formData).then(response => { this.$modal.msgSuccess("修改成功"); // this.open = false; this.btn=false }); }) }, ruoyi-ui/src/views/travel/index.vue
@@ -5,7 +5,7 @@ <el-form-item label="时间" prop="startTime" > <el-date-picker v-model="dateRange" style="width: 200px; style="width: 240px; height: 35px; border-radius: 16px 16px 16px 16px; opacity: 0.5;" ruoyi-ui/src/views/wish/index.vue
@@ -4,7 +4,7 @@ <el-form-item label="时间" prop="happenTime"> <el-date-picker v-model="dateRange" style="width: 197px; style="width: 240px; height: 30px; background: #FFFFFF; border-radius: 14px 14px 14px 14px;
