From 8319f67b9bec1d19c06eaa4216f0f34c67e3afb1 Mon Sep 17 00:00:00 2001 From: feige <feige@qq.com> Date: 星期日, 10 九月 2023 10:08:25 +0800 Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web --- ruoyi-ui/src/views/self/show.vue | 294 +++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 177 insertions(+), 117 deletions(-) diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue index e44fbb8..2889f83 100644 --- a/ruoyi-ui/src/views/self/show.vue +++ b/ruoyi-ui/src/views/self/show.vue @@ -8,11 +8,39 @@ class="el-icon-top" ></el-button> </el-backtop> - <h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;"> + <h1 style="font-size:21px;padding-top:30px;display: flex;"> <span>涓汉绠�鍘�</span> + <div class="button-container" > + <el-button + size="mini" + style="background: #E0EEFE; + border-radius: 7px 7px 7px 7px;opacity: 1; margin-left: 20px;" + @click="handleEdit()" + v-if="isShow" + v-hasPermi="['system:role:edit']" + >缂栬緫</el-button> + <el-button v-if="isShow_2" size="mini" + style=" width: 67px;height: 27px;background:#E0EEFE; + border-radius: 7px 7px 7px 7px;opacity: 1;margin-left: 20px; "@click="submitForm" :disabled="dsb">瀹屾垚</el-button> + + <el-button + size="mini" + style=" width: 67px;height: 27px;background: #D2F3E0; + border-radius: 7px 7px 7px 7px;opacity: 1;margin-left: 20px; " + @click="handleExport" + v-hasPermi="['family:note:export']" + >瀵煎嚭</el-button> + + <el-button + size="mini" + style=" width: 67px;height: 27px;background: #FFDDE3; + border-radius: 7px 7px 7px 7px;opacity: 1; margin-left: 20px;" + v-hasPermi="['family:note:export']" + >鎵撳嵃</el-button> + </div> <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> + <el-button size="mini" type="text" @click="toMemo" v-hasPermi="['person:information:memo']" style="margin-left: 20px"> + <div class="form" ><el-icon style="padding-right:100px;"></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> @@ -27,19 +55,19 @@ <el-col > <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left" v-loading="loading" :data="individualList" @selection-change="handleSelectionChange" > - <el-row :span="5"> + <el-row :span="6"> <el-form-item label="濮撳悕" prop="nickName" label-width="40px"> <el-input v-model="individualList.nickName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> - <el-row :span="5"> + <el-row :span="6"> <el-form-item label="鏇剧敤鍚�" prop="oldName" label-width="60px"> <el-input v-model="individualList.oldName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-row> - <el-row :span="5"> + <el-row :span="6"> <el-form-item label="韬唤璇佸彿" prop="idNum" label-width="70px"> <el-input v-model="individualList.idNum" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> @@ -49,7 +77,7 @@ </el-col> </el-container> </div> - <div style="padding-left:30px"> + <div style="padding-left:60px"> <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"> @@ -84,7 +112,7 @@ </el-col> </el-container> </div> - <div style="padding-left:30px"> + <div style="padding-left:60px"> <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":disabled="dsb"> @@ -116,7 +144,7 @@ </el-col> </el-container> </div> - <div style="padding-left:30px;padding-top:30px"> + <div style="padding-left:100px;padding-top:30px"> <el-col :span="6" :data="individualList"> <div class="block" :model="individualList"> <div v-if="!isEditing"> @@ -167,29 +195,7 @@ </div> <div style="padding-left:30px;padding-top:30px" > - <el-container > - <el-row > - <el-button - type="primary" - @click="handleEdit()" - 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" - @click="handleExport" - v-hasPermi="['family:note:export']" - >瀵煎嚭</el-button> - <br> - <el-button - type="primary" - v-hasPermi="['family:note:export']" - >鎵撳嵃</el-button> - </el-row> - </el-container> </div> <!-- </el-dialog> self:user:export--> </el-container> @@ -221,7 +227,7 @@ </el-col> </el-container> </div> - <div style="padding-left:30px"> + <div style="padding-left:60px"> <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"> @@ -291,13 +297,18 @@ <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" type="date" placeholder="閫夋嫨鏃ユ湡"></el-input></template> + <template v-else> + <el-date-picker v-model="scope.row.startDate" type="date" placeholder="璇烽�夋嫨鏃ユ湡" + :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd" + ></el-date-picker></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" type="date" placeholder="閫夋嫨鏃ユ湡"></el-input></template> + <template v-else><el-date-picker v-model="scope.row.endDate" type="date" placeholder="璇烽�夋嫨鏃ユ湡" + :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd" + ></el-date-picker></template> </template> </el-table-column> <el-table-column label="涓昏瀛︿範缁忓巻銆佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" prop="content" sortable width="350" align="center" > @@ -332,7 +343,8 @@ 瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐� <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> + <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" @@ -383,7 +395,7 @@ <el-collapse-item name="4"> <template v-slot:title> <div class="title-wrapper"> - 鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐� + 鎸佹湁璇佷欢鎯呭喌 <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> @@ -417,13 +429,19 @@ <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" type="date" placeholder="閫夋嫨鏃ユ湡"></el-input></template> + <template v-else> + <el-date-picker v-model="scope.row.startTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡" + :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd" + ></el-date-picker></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" type="date" placeholder="閫夋嫨鏃ユ湡"></el-input></template> + <template v-else> + <el-date-picker v-model="scope.row.endTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡" + :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd" + ></el-date-picker></template> </template> </el-table-column> <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width"> @@ -452,13 +470,19 @@ <el-table-column label="寮�濮嬫椂闂�" prop="startTime" sortable width="200" 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" type="date" placeholder="閫夋嫨鏃ユ湡"></el-input></template> + <template v-else> + <el-date-picker v-model="scope.row.startTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡" + :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd" + ></el-date-picker></template> </template> </el-table-column> <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" type="date" placeholder="閫夋嫨鏃ユ湡"></el-input></template> + <template v-else> + <el-date-picker v-model="scope.row.endTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡" + :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd" + ></el-date-picker></template> </template> </el-table-column> <el-table-column label="鎵�鍒板浗瀹舵垨鑰呭湴鍖�" prop="destination" sortable width="300" align="center" > @@ -485,39 +509,45 @@ </el-table-column> </el-table> </el-collapse-item> + <!-- 鑷紶--> + <el-collapse-item name="6"> + <template v-slot:title> + <div class="title-wrapper"> + 鑷紶 + <div> + <el-button size='mini' type="text" class="btn_autobiography" @click="showDialog('autobiography')" > + <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn> + </el-button> + </div> + </div> + </template> + <el-contain> + <div> + <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></div> + </el-contain> + </el-collapse-item> + </el-collapse> - <!-- 鑷紶--> - <div style="padding-top:30px"> - <el-container> - <div style="width:100%"><h2 style="font-size:15px" >鑷紶</h2></div> - </el-container> - <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> <pagination v-show="total>0" @@ -528,13 +558,17 @@ /> <!-- 鏂板涓昏缁忓巻淇℃伅閰嶇疆瀵硅瘽妗� --> - <el-dialog :title="title" :visible.sync="dialogVisible.open" width="900px" append-to-body> + <el-dialog 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" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" ></el-input> + <el-date-picker v-model="formDat.startDate" type="date" placeholder="璇烽�夋嫨鏃ユ湡" + :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd" + ></el-date-picker> </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-date-picker v-model="formDat.endDate" type="date" placeholder="璇烽�夋嫨鏃ユ湡" + :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd" + ></el-date-picker> </el-form-item> <el-form-item label="涓昏瀛︿範缁忓巻銆佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" prop="content"> <el-input v-model="formDat.content" type="textarea" :rows="5" placeholder="璇疯緭鍏ヤ富瑕佸涔犵粡鍘嗐�佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" clearable :style="{width: '100%'}" > @@ -554,7 +588,7 @@ </div> </el-dialog> <!-- 鏂板瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐典俊鎭厤缃璇濇 --> - <el-dialog :title="title" :visible.sync="dialogVisible.relation1" width="900px" append-to-body> + <el-dialog title="鏂板瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�" :visible.sync="dialogVisible.relation1" width="900px" append-to-body> <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="140px"> <el-form-item label="涓庢湰浜哄叧绯�" prop="relation"> <el-input v-model="formDat.relation" placeholder="璇疯緭鍏ヤ笌鏈汉鍏崇郴" clearable :style="{width: '100%'}" ></el-input> @@ -584,18 +618,20 @@ <el-button @click="cancelData">鍙� 娑�</el-button> </div> </el-dialog> - <!-- 鏂板鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐典俊鎭厤缃璇濇 --> - <el-dialog :title="title" :visible.sync="dialogVisible.certificate" width="900px" append-to-body> + <!-- 鏂板鎸佹湁璇佷欢鎯呭喌淇℃伅閰嶇疆瀵硅瘽妗� --> + <el-dialog title="鏂板鎸佹湁璇佷欢鎯呭喌" :visible.sync="dialogVisible.certificate" width="900px" append-to-body> <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="140px"> <el-form-item label="璇佷欢鍚嶇О" prop="cerName"> <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-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-input v-model="newOption" v-if="showInput" placeholder="鑻ユ湭鍦ㄤ笂杩伴�夐」涓壘鍒板搴旂被鍨嬶紝璇峰湪姝よ緭鍏ユ柊鐨勮瘉浠剁被鍨�" @change="addNewOption"></el-input> + </el-form-item> <el-form-item label="鎸佹湁鎯呭喌" prop="ownStatus"> <el-input v-model="formDat.ownStatus" placeholder="璇疯緭鍏ユ寔鏈夋儏鍐�" clearable :style="{width: '100%'}" > @@ -606,11 +642,14 @@ </el-input> </el-form-item> <el-form-item label="寮�濮嬫棩鏈�" prop="startTime"> - <el-input v-model="formDat.startTime" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" ></el-input> - </el-form-item> + <el-date-picker v-model="formDat.startTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡" + :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd" + ></el-date-picker> + </el-form-item> <el-form-item label="缁撴潫鏃ユ湡" prop="endTime"> - <el-input v-model="formDat.endTime" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" ></el-input> - </el-form-item> + <el-date-picker v-model="formDat.endTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡" + :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd" + ></el-date-picker></el-form-item> </el-form> <h4 class="form-header"> </h4> @@ -620,14 +659,16 @@ </div> </el-dialog> <!-- 鏂板鍑哄浗锛堝锛夋儏鍐典俊鎭厤缃璇濇 --> - <el-dialog :title="title" :visible.sync="dialogVisible.abroad" width="900px" append-to-body> + <el-dialog 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" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" ></el-input> - </el-form-item> + <el-date-picker v-model="formDat.startTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡" + :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd" + ></el-date-picker></el-form-item> <el-form-item label="缁撴潫鏃ユ湡" prop="endTime"> - <el-input v-model="formDat.endTime" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" > - </el-input> + <el-date-picker v-model="formDat.endTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡" + :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd" + ></el-date-picker> </el-form-item> <el-form-item label="鎵�鍒板浗瀹舵垨鑰呭湴鍖�" prop="destination"> <el-input v-model="formDat.destination" type="textarea" :rows="5" placeholder="璇疯緭鍏ユ墍鍒板浗瀹舵垨鑰呭湴鍖�" clearable :style="{width: '100%'}" > @@ -695,12 +736,11 @@ import axios from 'axios'; //鍦╯ystem/note/index.js涓鍏ユ帴鍙e嚱鏁� --鎺ュソ浜� -import { - getIndividualList, addIndividual, updateIndividual, delIndividual, +import {getIndividualList, addIndividual, updateIndividual, delIndividual, listExperience, addExperience, updateExperience, delExperience, getIndividualRelation, addRelation, updateRelation, delRelation, getCertificateList, addCertificate, updateCertificate, delCertificate, - getAbroadList, addAbroad, updateAbroad, delAbroad, + getAbroadList, addAbroad, updateAbroad, delAbroad,listType, getAutobiographyList, getAutobiographyTermList, addAutobiography,updateAutobiography, getCategory, } from "@/api/self/index"; @@ -752,6 +792,7 @@ relationList:[], //鍑哄叆澧冭瘉浠舵儏鍐� certificateList:[], + typeList:[], //鍑哄浗鎯呭喌 AbroadList:[], @@ -783,8 +824,6 @@ }, // 寮瑰嚭灞傛爣棰� title: "", - // 鏄惁鏄剧ず寮瑰嚭灞� - open: false, // open:true, // 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛� @@ -979,16 +1018,9 @@ }, selectedOption:'', typeOptions:[], - typeOption: [{ - value:'鎶ょ収', - label:'鎶ょ収' - },{ - value:'閫氳璇�', - label:'閫氳璇�' - },{ - value:'韬唤璇�', - label:'韬唤璇�' - }], + typeOption:[], + newOption: undefined, + showInput: true }; }, created() { @@ -1018,7 +1050,7 @@ //涓嬫媺 handleChange(activeNames) { - // console.log(val); + // console.log(activeNames); this.reset(); }, showDialog(dialogName) { @@ -1064,7 +1096,14 @@ return '鈥斺�斺�斺�斺�斺��' } }, - +//绫诲埆 + addNewOption() { + const newOption = this.newOption.trim(); + if (newOption && !this.typeOption.includes(newOption)) { + this.typeOption.push(newOption); + this.$set(this.formDat, 'type', newOption); // 鏇存柊formDat.type鐨勫�间负鏂扮殑閫夐」 + } + }, /** 鏌ヨ瑙掕壊鍒楄〃 */ getList() { this.loading = true; @@ -1132,6 +1171,32 @@ // this.total = response.data.total; // this.loading = false; // }); + listType(this.queryParams).then(response => { + this.typeList = response.data; + this.total = response.data.total; + // console.log( this.typeList ) + // 鍦ㄥ洖璋冨嚱鏁颁腑璋冪敤 getTypeOptions() + this.getTypeOptions(); + this.loading = false; + } + ); + }, + getTypeOptions() { + const filteredOptions = this.typeList.filter(item => typeof item === 'string' && item !== ''); + // 鍒涘缓涓�涓┖瀵硅薄鐢ㄤ簬瀛樺偍鍞竴鐨勫瓧绗︿覆閫夐」 + const uniqueOptions = {}; + // 鏋勫缓涓嬫媺閫夐」鍒楄〃 + this.typeOption = filteredOptions.reduce((options, option) => { + if (!uniqueOptions[option]) { + uniqueOptions[option] = true; + options.push({ + label: option, + value: option + }); + } + return options; + }, []); + }, //鍥剧墖鐨勪笂浼犲強涓婁紶鎸夐挳闅愯棌 @@ -1212,12 +1277,6 @@ }); }, - handleRemoveFile(file) { - alert(23) - }, - handleRemove(file) { - alert("323") - }, handlePictureCardPreview(file) { this.dialogImageUrl = file.url; this.dialogVisible = true; @@ -1273,11 +1332,6 @@ }); }); - // if(AutobiographyList.ageEnd==null){ - // this.AgeEnd='?' - // }else{ - // this.AgeEnd=this.ageEnd - // } }, /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */ @@ -1667,9 +1721,7 @@ background: #FFEFF2; } -/*.co-item{*/ -/* background-color: #EBAFB4;*/ -/*}*/ + .el-collapse-item__header { background-color:#FEF7FC; } @@ -1679,11 +1731,19 @@ } .btn_autobiography{ background:center no-repeat url('../../assets/icons/add1.png') ; + margin-left: 76vw; } .btn_edit{ background:center no-repeat url('../../assets/icons/edit.png') ; } +.button-container { + text-align: right; + display: flex; + justify-content: flex-end; + align-items: center; + flex-grow: 1; +} .button { background:center no-repeat url('../../assets/icons/add1.png') ; margin-left: 69.5vw; @@ -1695,7 +1755,7 @@ } .button4 { background: center no-repeat url('../../assets/icons/add1.png') ; - margin-left: 69.5vw; + margin-left: 71.5vw; } .button5 { background:center no-repeat url('../../assets/icons/add1.png') ; -- Gitblit v1.9.1