From 1737343f1ac89c5980a268775a201304c47151ca Mon Sep 17 00:00:00 2001 From: Tcsm <1377977403@qq.com> Date: 星期二, 08 八月 2023 19:38:58 +0800 Subject: [PATCH] 个人模块的查看详情电子文件三键 --- ruoyi-ui/src/views/self/show.vue | 982 ++++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 654 insertions(+), 328 deletions(-) diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue index dc67c27..9bd7f95 100644 --- a/ruoyi-ui/src/views/self/show.vue +++ b/ruoyi-ui/src/views/self/show.vue @@ -1,12 +1,23 @@ <template> <div class="app-container"> + <!-- 鍒锋柊椤甸潰 --> +<!-- <MyComponent :key="componentKey" />--> <!-- 鍥炲埌椤堕儴--> <el-backtop :bottom="150" :right="30"> <el-button type="primary" circle class="el-icon-top" ></el-button> </el-backtop> - <h1 style="font-size:21px;padding-top:30px">涓汉绠�鍘�</h1> + <h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;"> + <span>涓汉绠�鍘�</span> + <div style="display: flex; align-items: center;"> + <el-button size="mini" type="text" @click="toMemo" v-hasPermi="['person:information:memo']"> + <div class="form" ><el-icon style="padding-right:110px;"></el-icon> + <span class="text" style="width: 69px;height: 26px;font-size: 16px; + font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">涓汉璁颁簨鏈�</span></div> + </el-button> + </div> + </h1> <el-divider /> <!-- 鍩烘湰淇℃伅--> <h2 style="font-size:16px">鍩烘湰淇℃伅</h2> @@ -44,8 +55,17 @@ <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left"> <el-row :span="5"> <el-form-item label="鎬у埆" prop="sex" label-width="40px"> - <el-input v-model="individualList.sex === 1 ? '鐢�':'濂�' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> - </el-input> +<!-- <el-input v-model="individualList.sex === 1 ? '鐢�':'濂�' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">--> +<!-- </el-input>--> + <template v-if="!isEditing"> + <el-input v-model="individualList.sex === 1 ? inds='鐢�':inds='濂�'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input> + </template> + <template v-else> + <el-select v-model="inds" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}" :disabled="dsb"> + <el-option label="鐢�" value='1'></el-option> + <el-option label="濂�" value='0'></el-option> + </el-select> + </template> </el-form-item> </el-row> <el-row :span="5"> @@ -76,8 +96,19 @@ </el-row> <el-row :span="5"> <el-form-item label="濠氬Щ鐘跺喌" prop="maritalStatus" label-width="70px"> - <el-input v-model="individualList.maritalStatus === 1 ? '宸插':'鏈'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> - </el-input> + <template v-if="!isEditing" > + <el-input v-if="individualList.maritalStatus===0" placeholder="鏈"></el-input> + <el-input v-if="individualList.maritalStatus===1" placeholder="宸插"></el-input> + <el-input v-if="individualList.maritalStatus===2" placeholder="鏈"></el-input> + + </template> + <template v-else> + <el-select v-model="mrs" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}"> + <el-option label="鏈" value='0'></el-option> + <el-option label="宸插" value='1'></el-option> + <el-option label="绂诲" value='2'></el-option> + </el-select> + </template> </el-form-item> </el-row> @@ -88,44 +119,38 @@ <div style="padding-left:30px;padding-top:30px"> <el-col :span="6" :data="individualList"> <div class="block" :model="individualList" > - <el-col v-model="individualList.url" prop="url"> - <el-avatar shape="square" :size=200 > + <el-col v-model="individualList.img" prop="img"> + <el-avatar shape="square" style="width: 200px;height: 150px;" > <el-image - :src="'http://47.93.189.255:8080/'+ individualList.url" + :src="'http://47.93.189.255:8080/'+ individualList.img" :fit="fit" + style="width: 100%;height: 100%;" ></el-image> </el-avatar> - </el-col> +<!-- <el-upload--> +<!-- action="#"--> +<!-- list-type="picture-card"--> +<!-- multiple--> +<!-- :http-request="requestUpload"--> +<!-- :file-list="fileList"--> +<!-- >--> +<!-- <i slot="default" class="el-icon-plus"></i>--> +<!-- <div slot="file" slot-scope="{file}">--> +<!-- <img--> +<!-- class="el-upload-list__item-thumbnail"--> +<!-- :src="file.url"--> +<!-- alt=""--> +<!-- style="width: 147px; height: 147px"--> +<!-- fit="cover"--> +<!-- :preview-src-list="[file.url]"--> +<!-- >--> +<!-- </div>--> +<!-- </el-upload>--> + </el-col> </div> </el-col> - - <!-- <el-row>--> - <!--<!– <el-table border style="width: 100%">–>--> - <!--<!– <el-table-column–>--> - <!--<!– prop="img"–>--> - <!--<!– v-model="individualList.img"–>--> - <!--<!– placeholder=""–>--> - <!--<!– width="180">–>--> - <!--<!– <template slot-scope="scope">–>--> - <!--<!– <img :src="scope.row.src" style="width:100px;height:50px;"/>–>--> - <!--<!– </template>–>--> - <!--<!– </el-table-column>–>--> - - <!--<!– </el-table>–>--> - <!--<!– <el-upload :class="{uoloadSty:showBtnDealImg,disUoloadSty:noneBtnImg}"–>--> - <!--<!– ref="ref1"–>--> - <!--<!– action=""–>--> - <!--<!– :file-list="fileList"–>--> - <!--<!– list-type="picture-card"–>--> - <!--<!– accept="image/*"–>--> - <!--<!– :auto-upload="false"–>--> - <!--<!– :multiple="false"–>--> - <!--<!– :limit="limitCountImg">–>--> - <!--<!– <i class="el-icon-plus"></i>–>--> - <!--<!– </el-upload>–>--> - <!-- </el-row>--> </div> <div style="padding-left:30px;padding-top:30px" > @@ -137,6 +162,7 @@ v-if="isShow" v-hasPermi="['system:role:edit']" >缂栬緫</el-button> + <el-button v-if="isShow_2" type="primary" @click="submitForm" :disabled="dsb">瀹屾垚</el-button> <br> <el-button type="primary" @@ -144,7 +170,10 @@ v-hasPermi="['family:note:export']" >瀵煎嚭</el-button> <br> - <el-button v-if="isShow_2" type="primary" @click="submitForm" :disabled="dsb">瀹屾垚</el-button> + <el-button + type="primary" + v-hasPermi="['family:note:export']" + >鎵撳嵃</el-button> </el-row> </el-container> @@ -208,52 +237,77 @@ </el-container> <!--鎶樺彔闈㈡澘--> - <el-collapse v-model="activeNames" @change="handleChange"> + <el-collapse v-model="activeNames" @change="handleChange"> + <el-collapse-item title="绉诲眳鍥斤紙澧冿級鎯呭喌" name="3" > + <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;color: #FEF7FC;" :disabled="dsb"> + <el-radio :label="1">鏄�</el-radio> + <el-radio :label="0">鍚�</el-radio> + </el-radio-group> + <el-container > + <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" style="color: #FEF7FC;" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> + </el-input> + </el-form-item> + </el-form> + </el-row> + </el-container> + </el-form-item> + </el-form> + + </div> + + </el-collapse-item> + <!--涓昏瀛︿範鍙婂伐浣滅粡鍘�--> <el-collapse-item name="1" > <template v-slot:title> <div class="title-wrapper"> 涓昏瀛︿範鍙婂伐浣滅粡鍘� - <el-button class="button" type="primary" size='mini' @click="showDialog('open')"> - 鏂板</el-button> + <div> + <el-button class="button" size="mini" type="text" @click="showDialog('open')" > + <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button> + </div> </div> </template> <el-table v-loading="loading" :data="experienceList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;"> - <el-table-column label="寮�濮嬫棩鏈�" prop="startDate" sortable width="300" align="center" > - <template slot-scope="scope">{{scope.row.startDate? scope.row.startDate: '鈥斺�斺�斺��'}}</template> + <el-table-column label="寮�濮嬫棩鏈�" prop="startDate" sortable width="250" align="center" > + <template slot-scope="scope"> + <template v-if="!scope.row.isEdit">{{ scope.row.startDate }}</template> + <template v-else><el-input v-model="scope.row.startDate"></el-input></template> + </template> + </el-table-column> + <el-table-column label="缁撴潫鏃ユ湡" prop="endDate" sortable width="250" align="center" > + <template slot-scope="scope"> + <template v-if="!scope.row.isEdit">{{ scope.row.endDate }}</template> + <template v-else><el-input v-model="scope.row.endDate"></el-input></template> + </template> </el-table-column> <el-table-column label="涓昏瀛︿範缁忓巻銆佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" prop="content" sortable width="350" align="center" > - <template slot-scope="scope">{{scope.row.content? scope.row.content: '鈥斺�斺�斺��'}}</template> + <template slot-scope="scope"> + <template v-if="!scope.row.isEdit">{{ scope.row.content }}</template> + <template v-else><el-input v-model="scope.row.content"></el-input></template> + </template> </el-table-column> <el-table-column label="璇佹槑浜�" prop="witness" sortable width="300" align="center" > - <template slot-scope="scope">{{scope.row.witness? scope.row.witness: '鈥斺�斺�斺��'}}</template> + <template slot-scope="scope"> + <template v-if="!scope.row.isEdit">{{ scope.row.witness }}</template> + <template v-else><el-input v-model="scope.row.witness"></el-input></template> + </template> </el-table-column> <!-- 鎿嶄綔--> <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width"> <template slot-scope="scope" v-if="scope.row.roleId !== 1"> -<!-- @click="handleUpdate(scope.row)"--> - <el-button - size="mini" - type="text" - icon="el-icon-edit" - @click="showDialog1" - v-hasPermi="['system:role:edit']" - >淇敼</el-button> - <el-button - size="mini" - type="text" - icon="el-icon-delete" - @click="handleExperienceDelete(scope.row)" - v-hasPermi="['system:role:remove']" - >鍒犻櫎</el-button> -<!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">--> -<!-- <el-button size="mini" --> -<!-- type="text" --> -<!-- icon="el-icon-d-arrow-right" --> -<!-- @click="handleCheck(scope.row)"--> -<!-- >鏌ョ湅璇︽儏</el-button>--> - -<!-- </el-dropdown>--> + <el-button size="mini" type="text" icon="el-icon-edit" v-if="!editStatus[scope.row.id]" + @click="editRow(scope.row)" v-hasPermi="['system:role:edit']">淇敼</el-button> + <el-button size="mini" type="text" + v-if="editStatus[scope.row.id]" @click="saveRowExperienceList(scope.row)">淇濆瓨</el-button> + <el-button size="mini" type="text" icon="el-icon-delete" + @click="handleExperienceDelete(scope.row)" v-hasPermi="['system:role:remove']">鍒犻櫎</el-button> </template> </el-table-column> </el-table> @@ -263,130 +317,110 @@ <template v-slot:title> <div class="title-wrapper"> 瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐� - <el-button class="button2" type="primary" size='mini' @click="showDialog('relation1')"> - 鏂板</el-button> + <div> + <el-button class="button2" size="mini" type="text" @click="showDialog('relation1')"> + <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button></div> </div> </template> <el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;"> <el-table-column label="涓庢湰浜哄叧绯�" prop="relation" sortable width="260" align="center" > - <template slot-scope="scope">{{scope.row.relation? scope.row.relation: '鈥斺�斺�斺��'}}</template> + <template slot-scope="scope"> + <template v-if="!scope.row.isEdit">{{ scope.row.relation }}</template> + <template v-else><el-input v-model="scope.row.relation"></el-input></template> + </template> </el-table-column> <el-table-column label="濮撳悕" prop="otherName" sortable width="260" align="center" > - <template slot-scope="scope">{{scope.row.otherName? scope.row.otherName: '鈥斺�斺�斺��'}}</template> - </el-table-column> - <el-table-column label="鍗曚綅鍙婅亴鍔�" prop="otherUnit position" sortable width="260" align="center"> <template slot-scope="scope"> - <span v-if="scope.row.otherUnit || scope.row.otherPosition == true"> - {{scope.row.otherUnit}}/{{scope.row.otherPosition}} - </span> - <span v-else>鈥斺�斺�斺��</span> + <template v-if="!scope.row.isEdit">{{ scope.row.otherName }}</template> + <template v-else><el-input v-model="scope.row.otherName"></el-input></template> + </template> + </el-table-column> + <el-table-column label="鍗曚綅" prop="otherUnit" sortable width="220" align="center" > + <template slot-scope="scope"> + <template v-if="!scope.row.isEdit">{{ scope.row.otherUnit }}</template> + <template v-else><el-input v-model="scope.row.otherUnit"></el-input></template> + </template> + </el-table-column> + <el-table-column label="鑱屽姟" prop="otherPosition" sortable width="220" align="center"> + <template slot-scope="scope"> + <template v-if="!scope.row.isEdit">{{ scope.row.otherPosition }}</template> + <template v-else><el-input v-model="scope.row.otherPosition"></el-input></template> </template> </el-table-column> <el-table-column label="鏀挎不闈㈣矊" prop="otherPolitical" sortable width="260" align="center"> - <template slot-scope="scope">{{scope.row.otherPolitical? scope.row.otherPolitical: '鈥斺�斺�斺��'}}</template> + <template slot-scope="scope"> + <template v-if="!scope.row.isEdit">{{ scope.row.otherPolitical }}</template> + <template v-else><el-input v-model="scope.row.otherPolitical"></el-input></template> + </template> </el-table-column> <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width"> <template slot-scope="scope" v-if="scope.row.roleId !== 1"> - <el-button - size="mini" - type="text" - icon="el-icon-edit" - @click="handleUpdate(scope.row)" - v-hasPermi="['system:role:edit']" - >淇敼</el-button> - <el-button - size="mini" - type="text" - icon="el-icon-delete" - @click="handleRelationDelete(scope.row)" - v-hasPermi="['system:role:remove']" - >鍒犻櫎</el-button> -<!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">--> -<!-- <el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>--> - -<!-- </el-dropdown>--> + <el-button size="mini" type="text" icon="el-icon-edit" v-if="!editStatus[scope.row.id]" + @click="editRow(scope.row)" v-hasPermi="['system:role:edit']">淇敼</el-button> + <el-button size="mini" type="text" v-if="editStatus[scope.row.id]" + @click="saveRowRelationList(scope.row)">淇濆瓨</el-button> + <el-button size="mini" type="text" icon="el-icon-delete" + @click="handleRelationDelete(scope.row)" v-hasPermi="['system:role:remove']">鍒犻櫎</el-button> </template> </el-table-column> </el-table> - </el-collapse-item> - <el-collapse-item title="绉诲眳鍥斤紙澧冿級鎯呭喌" name="3" > - <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 :label="1">鏄�</el-radio> - <el-radio :label="0">鍚�</el-radio> - </el-radio-group> - <el-container > - <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> - </el-form-item> - </el-form> - </el-row> - </el-container> - </el-form-item> - </el-form> - - </div> - </el-collapse-item> <!--鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�--> <el-collapse-item name="4"> <template v-slot:title> <div class="title-wrapper"> 鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐� - <el-button class="button" type="primary" size='mini' @click="showDialog('certificate')"> - 鏂板</el-button> + <el-button class="button4" size="mini" type="text" @click="showDialog('certificate')"> + <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button> </div> </template> <el-table v-loading="loading" :data="certificateList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;"> - <el-table-column label="璇佷欢鍚嶇О" prop="cerName" sortable width="280" align="center" > - <template slot-scope="scope">{{scope.row.cerName? scope.row.cerName: '鈥斺�斺�斺��'}}</template> - </el-table-column> - <el-table-column label="鎸佹湁鎯呭喌" prop="ownStatus" sortable width="280" align="center" > - <template slot-scope="scope">{{scope.row.ownStatus? scope.row.ownStatus: '鈥斺�斺�斺��'}}</template> - </el-table-column> - <el-table-column label="璇佷欢鍙风爜" prop="idNo" sortable width="280" align="center" > - <template slot-scope="scope">{{scope.row.idNo? scope.row.idNo: '鈥斺�斺�斺��'}}</template> - </el-table-column> - <el-table-column label="鏈夋晥鏈�" prop="startTime endTime" sortable width="280" align="center"> + <el-table-column label="璇佷欢鍚嶇О" prop="cerName" sortable width="230" align="center" > <template slot-scope="scope"> - <span v-if="scope.row.startTime || scope.row.endTime == true"> - {{scope.row.startTime}} 鑷� {{scope.row.endTime}} - </span> - <span v-else>鈥斺�斺�斺��</span> + <template v-if="!scope.row.isEdit">{{ scope.row.cerName }}</template> + <template v-else><el-input v-model="scope.row.cerName"></el-input></template> + </template> + </el-table-column> + <el-table-column label="璇佷欢绫诲瀷" prop="type" sortable width="230" align="center" > + <template slot-scope="scope"> + <template v-if="!scope.row.isEdit">{{ scope.row.type }}</template> + <template v-else><el-input v-model="scope.row.type"></el-input></template> + </template> + </el-table-column> + <el-table-column label="鎸佹湁鎯呭喌" prop="ownStatus" sortable width="230" align="center" > + <template slot-scope="scope"> + <template v-if="!scope.row.isEdit">{{ scope.row.ownStatus }}</template> + <template v-else><el-input v-model="scope.row.ownStatus"></el-input></template> + </template> + </el-table-column> + <el-table-column label="璇佷欢鍙风爜" prop="idNo" sortable width="230" align="center" > + <template slot-scope="scope"> + <template v-if="!scope.row.isEdit">{{ scope.row.idNo }}</template> + <template v-else><el-input v-model="scope.row.idNo"></el-input></template> + </template> + </el-table-column> + <el-table-column label="寮�濮嬫椂闂�" prop="startTime" sortable width="230" align="center"> + <template slot-scope="scope"> + <template v-if="!scope.row.isEdit">{{ scope.row.startTime }}</template> + <template v-else><el-input v-model="scope.row.startTime"></el-input></template> + </template> + </el-table-column> + <el-table-column label="缁撴潫鏃堕棿" prop="endTime" sortable width="230" align="center"> + <template slot-scope="scope"> + <template v-if="!scope.row.isEdit">{{ scope.row.endTime }}</template> + <template v-else><el-input v-model="scope.row.endTime"></el-input></template> </template> </el-table-column> <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width"> <template slot-scope="scope" v-if="scope.row.roleId !== 1"> - <!-- @click="handleUpdate(scope.row)"--> - <el-button - size="mini" - type="text" - icon="el-icon-edit" - @click="handleAdd" - v-hasPermi="['system:role:edit']" - >淇敼</el-button> - <el-button - size="mini" - type="text" - icon="el-icon-delete" - @click="handleCertificateDelete(scope.row)" - v-hasPermi="['system:role:remove']" - >鍒犻櫎</el-button> - <!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">--> - <!-- <el-button size="mini" --> - <!-- type="text" --> - <!-- icon="el-icon-d-arrow-right" --> - <!-- @click="handleCheck(scope.row)"--> - <!-- >鏌ョ湅璇︽儏</el-button>--> - - <!-- </el-dropdown>--> + <el-button size="mini" type="text" icon="el-icon-edit" v-if="!editStatus[scope.row.id]" + @click="editRow(scope.row)" v-hasPermi="['system:role:edit']">淇敼</el-button> + <el-button size="mini" type="text" v-if="editStatus[scope.row.id]" + @click="saveRowCertificateList(scope.row)">淇濆瓨</el-button> + <el-button size="mini" type="text" icon="el-icon-delete" + @click="handleCertificateDelete(scope.row)" v-hasPermi="['system:role:remove']">鍒犻櫎</el-button> </template> </el-table-column> </el-table> @@ -396,52 +430,44 @@ <template v-slot:title> <div class="title-wrapper"> 鍑哄浗锛堝锛夋儏鍐� - <el-button class="button5" type="primary" size='mini' @click="showDialog('abroad')"> - 鏂板</el-button> + <el-button class="button5" size="mini" type="text" @click="showDialog('abroad')"> + <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button> </div> </template> <el-table v-loading="loading" :data="AbroadList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;"> - <el-table-column label="璧锋鏃ユ湡" prop="startTime endTime" sortable width="350" align="center" > + <el-table-column label="寮�濮嬫椂闂�" prop="startTime" sortable width="200" align="center"> <template slot-scope="scope"> - <span v-if="scope.row.startTime || scope.row.endTime == true"> - {{scope.row.startTime}} 鑷� {{scope.row.endTime}} - </span> - <span v-else>鈥斺�斺�斺��</span> + <template v-if="!scope.row.isEdit">{{ scope.row.startTime }}</template> + <template v-else><el-input v-model="scope.row.startTime"></el-input></template> </template> </el-table-column> - <el-table-column label="鎵�鍒板浗瀹舵垨鑰呭湴鍖�" prop="destination" sortable width="350" align="center" > - <template slot-scope="scope">{{scope.row.destination? scope.row.destination: '鈥斺�斺�斺��'}}</template> + <el-table-column label="缁撴潫鏃堕棿" prop="endTime" sortable width="200" align="center"> + <template slot-scope="scope"> + <template v-if="!scope.row.isEdit">{{ scope.row.endTime }}</template> + <template v-else><el-input v-model="scope.row.endTime"></el-input></template> + </template> + </el-table-column> + <el-table-column label="鎵�鍒板浗瀹舵垨鑰呭湴鍖�" prop="destination" sortable width="300" align="center" > + <template slot-scope="scope"> + <template v-if="!scope.row.isEdit">{{ scope.row.destination }}</template> + <template v-else><el-input v-model="scope.row.destination"></el-input></template> + </template> </el-table-column> <el-table-column label="浜嬬敱锛堟梾娓搞�佽蛋璁裤�佹帰浜层�佺户鎵胯储浜с�佸叾浠栵級" prop="cause" sortable width="420" align="center" > - <template slot-scope="scope">{{scope.row.cause? scope.row.cause: '鈥斺�斺�斺��'}}</template> + <template slot-scope="scope"> + <template v-if="!scope.row.isEdit">{{ scope.row.cause }}</template> + <template v-else><el-input v-model="scope.row.cause"></el-input></template> + </template> </el-table-column> <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width"> <template slot-scope="scope" v-if="scope.row.roleId !== 1"> - <!-- @click="handleUpdate(scope.row)"--> - - <el-button - size="mini" - type="text" - icon="el-icon-edit" - @click="handleAdd" - v-hasPermi="['system:role:edit']" - >淇敼</el-button> - <el-button - size="mini" - type="text" - icon="el-icon-delete" - @click="handleAbroadDelete(scope.row)" - v-hasPermi="['system:role:remove']" - >鍒犻櫎</el-button> - <!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">--> - <!-- <el-button size="mini" --> - <!-- type="text" --> - <!-- icon="el-icon-d-arrow-right" --> - <!-- @click="handleCheck(scope.row)"--> - <!-- >鏌ョ湅璇︽儏</el-button>--> - - <!-- </el-dropdown>--> + <el-button size="mini" type="text" icon="el-icon-edit" v-if="!editStatus[scope.row.id]" + @click="editRow(scope.row)" v-hasPermi="['system:role:edit']">淇敼</el-button> + <el-button size="mini" type="text" v-if="editStatus[scope.row.id]" + @click="saveRowAbroadList(scope.row)">淇濆瓨</el-button> + <el-button size="mini" type="text" icon="el-icon-delete" @click="handleAbroadDelete(scope.row)" + v-hasPermi="['system:role:remove']">鍒犻櫎</el-button> </template> </el-table-column> </el-table> @@ -453,22 +479,30 @@ <el-container> <div style="width:100%"><h2 style="font-size:15px" >鑷紶</h2></div> </el-container> - <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick" - v-loading="loading" :data="AutobiographyList" > - <el-tab-pane v-for="(item, index) in AutobiographyList" - :key='item.id' :label="item.ageBegin+'~'+item.ageEnd+'宀�'+'('+item.term+')'"> - <div v-if="item.term === '濠村効'"> {{item.content}}</div> - <div v-if="item.term === '骞煎効'"> {{item.content}}</div> - <div v-if="item.term === '灏忓'"> {{item.content}}</div> - <div v-if="item.term === '鍒濅腑'"> {{item.content}}</div> - <div v-if="item.term === '楂樹腑'"> {{item.content}}</div> - <div v-if="item.term === '澶у'"> {{item.content}}</div> - <div v-if="item.term === '鐮旂┒鐢�'"> {{item.content}}</div> - <div v-if="item.term === '宸ヤ綔'"> {{item.content}}</div> - <div v-if="item.term === '缁撳鍚�'"> {{item.content}}</div> - </el-tab-pane> - </el-tabs> + <div style='position: relative;'> + <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick" + v-loading="loading" :data="AutobiographyList" > + <el-tab-pane v-for="(item, index) in AutobiographyList" + :key='item.id' :label="item.ageBegin+'~'+item.ageEnd+'宀�'+'('+item.term+')'"> + <div v-if="item.term === '濠村効'"> {{item.content}}</div> + <div v-if="item.term === '骞煎効'"> {{item.content}}</div> + <div v-if="item.term === '灏忓'"> {{item.content}}</div> + <div v-if="item.term === '鍒濅腑'"> {{item.content}}</div> + <div v-if="item.term === '楂樹腑'"> {{item.content}}</div> + <div v-if="item.term === '澶у'"> {{item.content}}</div> + <div v-if="item.term === '鐮旂┒鐢�'"> {{item.content}}</div> + <div v-if="item.term === '宸ヤ綔'"> {{item.content}}</div> + <div v-if="item.term === '缁撳鍚�'"> {{item.content}}</div> + <el-button size='mini' type="text" class="btn_edit" @click="editData(item)" style='position: absolute;right:10px;top:5px;'> + <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn> + </el-button> + </el-tab-pane> + </el-tabs> + <el-button size='mini' type="text" class="btn_autobiography" @click="showDialog('autobiography')" style='position: absolute;right:10px;top:5px;'> + <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn> + </el-button> + </div> </div> @@ -484,10 +518,13 @@ <el-dialog :title="title" :visible.sync="dialogVisible.open" width="900px" append-to-body> <el-form ref="elForm1" :model="formDat" :rules="rules" size="medium" label-width="140px"> <el-form-item label="寮�濮嬫棩鏈�" prop="startDate"> - <el-input v-model="formDat.startDate" placeholder="璇疯緭鍏ュ紑濮嬫棩鏈�" clearable :style="{width: '100%'}" ></el-input> + <el-input v-model="formDat.startDate" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" ></el-input> + </el-form-item> + <el-form-item label="缁撴潫鏃ユ湡" prop="endDate"> + <el-input v-model="formDat.endDate" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" ></el-input> </el-form-item> <el-form-item label="涓昏瀛︿範缁忓巻銆佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" prop="content"> - <el-input v-model="formDat.content" placeholder="璇疯緭鍏ヤ富瑕佸涔犵粡鍘嗐�佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" clearable :style="{width: '100%'}" > + <el-input v-model="formDat.content" type="textarea" :rows="5" placeholder="璇疯緭鍏ヤ富瑕佸涔犵粡鍘嗐�佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" clearable :style="{width: '100%'}" > </el-input> </el-form-item> <el-form-item label="璇佹槑浜�" prop="witness"> @@ -541,6 +578,12 @@ <el-input v-model="formDat.cerName" placeholder="璇疯緭鍏ヨ瘉浠跺悕绉�" clearable :style="{width: '100%'}" > </el-input> </el-form-item> + <el-form-item label="璇佷欢绫诲瀷" prop="type"> + <el-select v-model="formDat.type" placeholder="璇烽�夋嫨绫诲瀷" clearable :style="{width: '100%'}" > + <el-option v-for="(item, index) in typeOption" :key="index" :label="item.label" :value="item.value" + ></el-option> + </el-select> + </el-form-item> <el-form-item label="鎸佹湁鎯呭喌" prop="ownStatus"> <el-input v-model="formDat.ownStatus" placeholder="璇疯緭鍏ユ寔鏈夋儏鍐�" clearable :style="{width: '100%'}" > </el-input> @@ -550,11 +593,10 @@ </el-input> </el-form-item> <el-form-item label="寮�濮嬫棩鏈�" prop="startTime"> - <el-input v-model="formDat.startTime" placeholder="璇疯緭鍏ュ紑濮嬫棩鏈�" clearable :style="{width: '100%'}" ></el-input> + <el-input v-model="formDat.startTime" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" ></el-input> </el-form-item> <el-form-item label="缁撴潫鏃ユ湡" prop="endTime"> - <el-input v-model="formDat.endTime" placeholder="璇疯緭鍏ョ粨鏉熸棩鏈�" clearable :style="{width: '100%'}" > - </el-input> + <el-input v-model="formDat.endTime" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" ></el-input> </el-form-item> </el-form> <h4 class="form-header"> </h4> @@ -568,14 +610,14 @@ <el-dialog :title="title" :visible.sync="dialogVisible.abroad" width="900px" append-to-body> <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="140px"> <el-form-item label="寮�濮嬫棩鏈�" prop="startTime"> - <el-input v-model="formDat.startTime" placeholder="璇疯緭鍏ュ紑濮嬫棩鏈�" clearable :style="{width: '100%'}" ></el-input> + <el-input v-model="formDat.startTime" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" ></el-input> </el-form-item> <el-form-item label="缁撴潫鏃ユ湡" prop="endTime"> - <el-input v-model="formDat.endTime" placeholder="璇疯緭鍏ョ粨鏉熸棩鏈�" clearable :style="{width: '100%'}" > + <el-input v-model="formDat.endTime" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" > </el-input> </el-form-item> <el-form-item label="鎵�鍒板浗瀹舵垨鑰呭湴鍖�" prop="destination"> - <el-input v-model="formDat.destination" placeholder="璇疯緭鍏ユ墍鍒板浗瀹舵垨鑰呭湴鍖�" clearable :style="{width: '100%'}" > + <el-input v-model="formDat.destination" type="textarea" :rows="5" placeholder="璇疯緭鍏ユ墍鍒板浗瀹舵垨鑰呭湴鍖�" clearable :style="{width: '100%'}" > </el-input> </el-form-item> <el-form-item label="浜嬬敱(鏃呮父銆佽蛋璁裤�佹帰浜层�佺户鎵胯储浜с�佸叾浠�)" prop="cause"> @@ -591,6 +633,45 @@ <el-button @click="cancelData">鍙� 娑�</el-button> </div> </el-dialog> + <!--鏂板鑷紶--> + <el-dialog :title="isEdit1 ? '缂栬緫璁板綍' : '鏂板璁板綍'" :visible.sync="dialogVisible.autobiography" width="900px" append-to-body> + <el-col > + <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-position="left" > + <el-row :span="5"> +<!-- <el-form-item label="闇�瑕佷慨鏀圭殑璁板綍锛�" prop="id">--> +<!-- <el-select v-model="formDat.id" placeholder="璇烽�夋嫨闇�瑕佷慨鏀圭殑璁板綍" clearable :style="{width: '50%'}" >--> +<!-- <el-option v-for="(item, index) in AutobiographyList" :key='item.id' :label="item.ageBegin+'~'+item.ageEnd+'宀�'+'('+item.term+')'"--> +<!-- ></el-option>--> +<!-- </el-select>--> +<!-- </el-form-item>--> + <el-form-item label="骞撮緞娈碉細" prop="ageBegin ageEnd" label-width="70px"> + <el-input v-model="formDat.ageBegin" placeholder="" clearable :style="{width: '20%'}" > + </el-input> + <span> 宀� 鈥斺��</span> + <el-input v-model="formDat.ageEnd" placeholder="" clearable :style="{width: '20%'}" > + </el-input> + <span> 宀� </span> + </el-form-item> + <el-form-item label="鏃舵湡锛�" prop="term"> + <el-select v-model="formDat.term" placeholder="璇烽�夋嫨鏃舵湡" clearable :style="{width: '50%'}" > + <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value" + ></el-option> + </el-select> + </el-form-item> + <el-form-item label="鍐呭缂栬緫锛�" prop="content"> + <el-input v-model="formDat.content" type="textarea" :rows="5" placeholder="" clearable :style="{width: '100%'}" > + </el-input> + </el-form-item> + </el-row> + </el-form> + </el-col> + <h4 class="form-header"> </h4> + + <div slot="footer" class="dialog-footer"> + <el-button type="primary" @click="submitDataScope6">淇� 瀛�</el-button> + <el-button @click="cancelData">鍙� 娑�</el-button> + </div> + </el-dialog> </div> @@ -599,17 +680,18 @@ <script> import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role"; import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu"; - - +import axios from 'axios'; //鍦╯ystem/note/index.js涓鍏ユ帴鍙e嚱鏁� --鎺ュソ浜� -import {getIndividualList, addIndividual, updateIndividual, delIndividual, - listExperience, addExperience,updateExperience, delExperience, - getIndividualRelation,addRelation,updateRelation,delRelation, - getCertificateList, addCertificate, delCertificate, - getAbroadList,addAbroad, delAbroad, - getAutobiographyList, getAutobiographyTermList, - getCategory} from "@/api/self/index"; +import { + getIndividualList, addIndividual, updateIndividual, delIndividual, + listExperience, addExperience, updateExperience, delExperience, + getIndividualRelation, addRelation, updateRelation, delRelation, + getCertificateList, addCertificate, updateCertificate, delCertificate, + getAbroadList, addAbroad, updateAbroad, delAbroad, + getAutobiographyList, getAutobiographyTermList, addAutobiography,updateAutobiography, + getCategory, +} from "@/api/self/index"; import { delFamilyevent, uploadPic } from '../../api/bignote' import { blobValidate } from '../../utils/ruoyi' @@ -618,6 +700,9 @@ export default { name: "show", dicts: ['sys_normal_disable'], + // components: { + // MyComponent + // }, data() { return { // 閬僵灞� @@ -625,8 +710,13 @@ loading: true, formData:[], + componentKey: 0, // 閫変腑鏁扮粍 ids: [], + //鎬у埆 + inds:undefined, + //濠氬Щ绫诲埆 + mrs:undefined, // 闈炲崟涓鐢� single: true, // 闈炲涓鐢� @@ -638,12 +728,16 @@ //澶村儚涓婁紶 showBtnDealImg:true, noneBtnImg:false, - limitCountImg:1,//涓婁紶鍥剧墖鐨勬渶澶ф暟閲� + //涓婁紶鍥剧墖鐨勬渶澶ф暟閲� + limitCountImg:1, //涓汉淇℃伅鏁版嵁 individualList:[], - fit:['fill'], + isEditing: false, + // fit:['fill'], // 涓汉缁忓巻鏁版嵁 experienceList: [], + // isEdit:true, + editStatus: {}, //瀹跺涵鎴愬憳鍏崇郴鏁版嵁 relationList:[], //鍑哄叆澧冭瘉浠舵儏鍐� @@ -669,12 +763,13 @@ // current: 0, //涓嬫媺瀹炵幇 - activeNames:'', + activeNames:'3', dialogVisible: { open: false, relation1:false, certificate:false, abroad:false, + autobiography:false }, // 寮瑰嚭灞傛爣棰� title: "", @@ -692,15 +787,13 @@ dateRange: [], // 鏁版嵁鑼冨洿閫夐」 fot:[".jpg",".jif"], - fileList:[ - ], - fileListOther:[ - - ], + fileList:[], + fileListOther:[], dsb:true, btn:false, isShow:true, isShow_2:false, + isEdit1:false, formDat: { //涓汉鍩烘湰淇℃伅 nickName:undefined, @@ -731,6 +824,7 @@ id:undefined, userId:undefined, startDate:undefined, + endDate:undefined, content:undefined, witness:undefined, remark: undefined, @@ -741,6 +835,7 @@ otherPosition:undefined, otherPolitical:undefined, //鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐� + type:undefined, cerName:undefined, validityDate:undefined, ownStatus:undefined, @@ -750,6 +845,11 @@ endTime:undefined, cause:undefined, url: undefined, + //鑷紶 + ageBegin:undefined, + ageEnd:undefined, + term:undefined, + }, // 鑿滃崟鍒楄〃 menuOptions: [], @@ -834,9 +934,14 @@ message: '璇疯緭鍏ヨ捣濮嬫棩鏈�', trigger: 'blur' }], + endDate: [{ + // required: true, + message: '璇疯緭鍏ョ粨鏉熸棩鏈�', + trigger: 'blur' + }], content: [{ required: true, - message: '璇疯緭鍏ヤ富瑕佸涔犵粡鍘嗐�佸伐浣滃崟浣嶅強浠昏亴鎯呭喌', + message: '璇疯緭鍏ユ枃鏈�', trigger: 'blur' }], witness: [{ @@ -844,14 +949,42 @@ message: '璇疯緭鍏ヨ瘉鏄庝汉', trigger: 'blur' }], + //鑷紶 + term: [{ + required: true, + message: '璇烽�夋嫨鏃舵湡', + trigger: 'blur' + }], + ageBegin: [{ + required: true, + message: '', + trigger: 'blur' + }], + ageEnd: [{ + required: true, + message: '', + trigger: 'blur' + }], }, - typeOptions: [], + selectedOption:'', + typeOptions:[], + typeOption: [{ + value:'鎶ょ収', + label:'鎶ょ収' + },{ + value:'閫氳璇�', + label:'閫氳璇�' + },{ + value:'韬唤璇�', + label:'韬唤璇�' + }], }; }, created() { this.getList(); this.getAutobiographyInfor() + }, methods: { // 鍙栨秷鎸夐挳 @@ -859,8 +992,14 @@ this.dialogVisible.open = false; this.dialogVisible.relation1 = false; this.dialogVisible.certificate =false; - this.dialogVisible.abroad=false + this.dialogVisible.abroad=false; + this.dialogVisible.autobiography=false; + this.isEdit1 = false; this.reset(); + // 娓呯┖formDat瀵硅薄鐨勬暟鎹� + Object.keys(this.formDat).forEach(key => { + this.formDat[key] = ''; + }); }, //涓嬫媺 handleChange(activeNames) { @@ -875,7 +1014,19 @@ handleClick(tab, event) { // console.log(tab, event); this.getAutobiographyInfor(); + // this.getSrc1(typeOptions) + }, + //涓汉鑷紶缂栬緫 + editData(data) { + this.isEdit1 = true; // 璁剧疆涓虹紪杈戞搷浣� + // 灏嗚淇敼鐨勬暟鎹~鍏呭埌formDat瀵硅薄涓� + this.formDat.ageBegin = data.ageBegin; + this.formDat.ageEnd = data.ageEnd; + this.formDat.term = data.term; + this.formDat.content = data.content; + // 鎵撳紑寮圭獥 + this.dialogVisible.autobiography = true; }, //闅旇鍙樿壊 @@ -886,7 +1037,18 @@ return "statistics-warning-row"; } }, - + //璇佷欢绫诲埆 + getSrc(type) { + if (type === '鎶ょ収'){ + return '鎶ょ収' + }else if(type === '閫氳璇�'){ + return '閫氳璇�' + }else if(type === '韬唤璇�'){ + return '韬唤璇�' + }else { + return '鈥斺�斺�斺�斺�斺��' + } + }, /** 鏌ヨ瑙掕壊鍒楄〃 */ getList() { @@ -945,20 +1107,19 @@ this.AutobiographyList = response.data; this.total = response.data.total; this.loading = false; + }); //鏍规嵁涓嶅悓鏃舵鐨勪釜浜鸿嚜浼� - getAutobiographyTermList(this.queryParams).then(response => { - // alert(123) - // console.log(response.data) - this.AutobiographyTermList = response.data; - this.total = response.data.total; - this.loading = false; - }); - + // getAutobiographyTermList(this.queryParams).then(response => { + // // alert(123) + // // console.log(response.data) + // this.AutobiographyTermList = response.data; + // this.total = response.data.total; + // this.loading = false; + // }); }, //鍥剧墖鐨勪笂浼犲強涓婁紶鎸夐挳闅愯棌 - // 鍙栨秷鎸夐挳 cancel() { @@ -971,30 +1132,6 @@ this.reset(); }, - submitForm() { - 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 - - this.$refs['elForm'].validate(valid => { - if (valid) { - if (this.individualList.id !== undefined) { - updateIndividual(this.individualList).then(response => { - this.$modal.msgSuccess("淇敼鎴愬姛"); - // this.open = false; - this.btn=false - }); - } else { - this.$modal.msgSuccess("淇敼澶辫触"); - - } - } - }) - }, // 琛ㄥ崟閲嶇疆 reset() { if (this.$refs.menu !== undefined) { @@ -1037,13 +1174,10 @@ this.multiple = !selection.length }, - /** 鏂板鎸夐挳鎿嶄綔 */ - // handleAdd() { - // this.reset(); - // this.open = true; - // this.title = "娣诲姞涓汉淇℃伅"; - // }, - + //涓汉璁颁簨鏈� + toMemo(){ + this.$router.push("/self/self/memo/" + this.individualList.userId); + }, /** 鏌ョ湅璇︾粏淇℃伅 */ handleCheck(row){ @@ -1094,107 +1228,281 @@ this.btn = true this.isShow=false this.isShow_2=true + this.isEditing=true + if(this.individualList.maritalStatus == 0) + this.mrs = '鏈' + else if(this.individualList.maritalStatus == 1) + this.mrs = '宸插' + else + this.mrs = '绂诲'// this.isEdit=false }, - //淇敼鎸夐挳 - /** 鏂板鎸夐挳鎿嶄綔 */ - handleAdd() { - this.reset(); - // this.open = true; - this.title = "鏂板璇︾粏淇℃伅"; - }, + /** 鏌ヨ鑷紶淇℃伅 */ getAutobiographyInfor() { 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]}) + // }) + response.data.itemValues.replace("{", "").replace("}", "").split(",").map(elem => { + 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 + // } }, + /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */ + //鏂板涓昏缁忓巻鐨勪繚瀛� submitDataScope: function() { - - 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.formDat.url = ul+","+uls - this.$refs["elForm"].validate(valid => { if (valid) { addExperience(this.formDat).then(response => { this.$modal.msgSuccess("鏂板鎴愬姛"); - this.open = false; + this.dialogVisible.open = false; this.getList(); }); } }); + // 娓呯┖formDat瀵硅薄鐨勬暟鎹� + Object.keys(this.formDat).forEach(key => { + this.formDat[key] = ''; + }); }, + //鏂板鎴愬憳鍏崇郴鐨勪繚瀛� submitDataScope2: function() { - - 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.formDat.url = ul+","+uls - this.$refs["elForm"].validate(valid => { if (valid) { addRelation(this.formDat).then(response => { this.$modal.msgSuccess("鏂板鎴愬姛"); - this.relation1 = false; + this.dialogVisible.relation1 = false; this.getList(); }); } }); + // 娓呯┖formDat瀵硅薄鐨勬暟鎹� + Object.keys(this.formDat).forEach(key => { + this.formDat[key] = ''; + }); }, + //鏂板鍑哄叆澧冭瘉浠剁殑淇濆瓨 submitDataScope4: function() { - - 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.formDat.url = ul+","+uls - this.$refs["elForm"].validate(valid => { if (valid) { addCertificate(this.formDat).then(response => { this.$modal.msgSuccess("鏂板鎴愬姛"); - this.certificate = false; + this.dialogVisible.certificate = false; this.getList(); }); } }); + // 娓呯┖formDat瀵硅薄鐨勬暟鎹� + Object.keys(this.formDat).forEach(key => { + this.formDat[key] = ''; + }); }, + //鏂板鍑哄浗澧冪殑淇濆瓨 submitDataScope5: function() { + this.$refs["elForm"].validate(valid => { + if (valid) { + addAbroad(this.formDat).then(response => { + this.$modal.msgSuccess("鏂板鎴愬姛"); + this.dialogVisible.abroad = false; + this.getList(); + }); + } + }); + // 娓呯┖formDat瀵硅薄鐨勬暟鎹� + Object.keys(this.formDat).forEach(key => { + this.formDat[key] = ''; + }); + }, + //涓汉鑷紶鐨勪繚瀛� + submitDataScope6: function() { + this.$refs["elForm"].validate(valid => { + if (valid) { + // 鏍规嵁鍊兼壘鍒伴�変腑鐨勯�夐」瀵硅薄 + const selectedOption = this.typeOptions.find(option => option.value === this.formDat.term); + if (this.isEdit1) { + // 鎵ц淇敼鎿嶄綔 + updateAutobiography(this.formDat).then(response => { + // 灏嗛�変腑閫夐」鐨勬枃鏈缃负"term"瀛楁鐨勫�� + this.formDat.term = selectedOption.label; + 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; + }); + } else { + // 鎵ц鏂板鎿嶄綔 + addAutobiography(this.formDat).then(response => { + this.formDat.term = selectedOption.label; + this.$modal.msgSuccess("鏂板鎴愬姛"); + this.dialogVisible.autobiography = false; + this.getList(); + }).catch(error => { + console.log(error); + this.dialogVisible.autobiography = false; + }); + } + } + }); + // 娓呯┖formDat瀵硅薄鐨勬暟鎹� + Object.keys(this.formDat).forEach(key => { + this.formDat[key] = ''; + }); + // 閲嶇疆isEdit涓篺alse锛屼互渚夸笅娆$偣鍑绘柊澧炴椂涓烘柊澧炴搷浣� + this.isEdit1 = false; + }, + + editRow(row) { + this.$set(row, 'isEdit', true); + this.$set(this.editStatus, row.id, true); + }, + //淇敼鍚庣殑淇濆瓨 + //涓汉鍩烘湰淇℃伅 + submitForm() { + if(this.inds=='1') + this.individualList.sex = 1; + else + this.individualList.sex = 0; + if(this.mrs=='0') + this.individualList.maritalStatus = 0 + else if(this.mrs == '1') + 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.formDat.url = ul+","+uls + this.individualList.url = ul+","+uls - this.$refs["elForm"].validate(valid => { + this.$refs['elForm'].validate(valid => { if (valid) { - addAbroad(this.formDat).then(response => { - this.$modal.msgSuccess("鏂板鎴愬姛"); - this.abroad = false; - this.getList(); - }); + if (this.individualList.userId !== undefined) { + updateIndividual(this.individualList).then(response => { + this.$modal.msgSuccess("淇敼鎴愬姛"); + // 寮哄埗鏇存柊鐩稿叧缁勪欢 + this.individualList={...this.individualList} + + // this.open = false; + this.dsb = true + this.btn=false + this.isShow_2=false + this.isShow=true + }); + } else { + this.$modal.msgSuccess("淇敼澶辫触"); + + } + } + }) + // 鍒锋柊椤甸潰 + // window.location.reload(); + }, + //涓昏缁忓巻 + saveRowExperienceList(row) { + this.$refs['elForm'].validate(valid => { + if (valid) { + const foundIndex = this.experienceList.findIndex(item => item.id === row.id); + if (foundIndex !== -1) { + const updatedData = Object.assign({}, this.experienceList[foundIndex], row); + updateExperience(updatedData).then(response => { + this.$modal.msgSuccess("淇敼鎴愬姛"); + }).catch(error => { + this.$modal.msgError("淇敼澶辫触"); + console.log(error); + }); + } else { + this.$modal.msgError("淇敼澶辫触"); + } } }); + this.$set(row, 'isEdit', false); + this.$set(this.editStatus, row.id, false); }, - + //鎴愬憳鍏崇郴 + saveRowRelationList(row) { + this.$refs['elForm'].validate(valid => { + if (valid) { + const foundIndex = this.relationList.findIndex(item => item.id === row.id); + if (foundIndex !== -1) { + const updatedData = Object.assign({}, this.relationList[foundIndex], row); + updateRelation(updatedData).then(response => { + this.$modal.msgSuccess("淇敼鎴愬姛"); + }).catch(error => { + this.$modal.msgError("淇敼澶辫触"); + console.log(error); + }); + } else { + this.$modal.msgError("淇敼澶辫触"); + } + } + }); + this.$set(row, 'isEdit', false); + this.$set(this.editStatus, row.id, false); + }, + //璇佷欢鎯呭喌 + saveRowCertificateList(row) { + this.$refs['elForm'].validate(valid => { + if (valid) { + const foundIndex = this.certificateList.findIndex(item => item.id === row.id); + if (foundIndex !== -1) { + const updatedData = Object.assign({}, this.certificateList[foundIndex], row); + updateCertificate(updatedData).then(response => { + this.$modal.msgSuccess("淇敼鎴愬姛"); + }).catch(error => { + this.$modal.msgError("淇敼澶辫触"); + console.log(error); + }); + } else { + this.$modal.msgError("淇敼澶辫触"); + } + } + }); + this.$set(row, 'isEdit', false); + this.$set(this.editStatus, row.id, false); + }, + //鍑哄浗鎯呭喌 + saveRowAbroadList(row) { + this.$refs['elForm'].validate(valid => { + if (valid) { + const foundIndex = this.AbroadList.findIndex(item => item.id === row.id); + if (foundIndex !== -1) { + const updatedData = Object.assign({}, this.AbroadList[foundIndex], row); + updateAbroad(updatedData).then(response => { + this.$modal.msgSuccess("淇敼鎴愬姛"); + }).catch(error => { + this.$modal.msgError("淇敼澶辫触"); + console.log(error); + }); + } else { + this.$modal.msgError("淇敼澶辫触"); + } + } + }); + this.$set(row, 'isEdit', false); + this.$set(this.editStatus, row.id, false); + }, requestUpload(params) { var file = params.file; @@ -1232,7 +1540,7 @@ /** 鍒犻櫎鎴愬憳鍏崇郴鎸夐挳鎿嶄綔 */ handleRelationDelete(row) { const Ids = row.id || this.ids; - this.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤癸紵'+Ids).then(function() { + this.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤癸紵').then(function() { return delRelation(Ids); }).then(() => { this.getList(); @@ -1252,7 +1560,7 @@ /** 鍒犻櫎鍑哄浗锛堝锛夋儏鍐垫寜閽搷浣� */ handleAbroadDelete(row) { const Ids = row.id || this.ids; - this.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤癸紵'+Ids).then(function() { + this.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤癸紵').then(function() { return delAbroad(Ids); }).then(() => { this.getList(); @@ -1304,14 +1612,32 @@ display: flex; justify-content: space-between; } +.btn_autobiography{ + background:center no-repeat url('../../assets/icons/add1.png') ; +} +.btn_edit{ + background:center no-repeat url('../../assets/icons/edit.png') ; +} .button { - margin-left: 67.6vw; + background:center no-repeat url('../../assets/icons/add1.png') ; + margin-left: 69.5vw; + } .button2 { - margin-left: 64vw; + background: center no-repeat url('../../assets/icons/add1.png') ; + margin-left: 66vw; +} +.button4 { + background: center no-repeat url('../../assets/icons/add1.png') ; + margin-left: 69.5vw; } .button5 { - margin-left: 69.5vw; + background:center no-repeat url('../../assets/icons/add1.png') ; + margin-left: 71vw; +} +.form{ + background:center/11% no-repeat url('../../assets/icons/form.png') ; + } </style> -- Gitblit v1.9.1