|
@@ -36,10 +36,18 @@
|
|
<HcIcon name="check-double"/>
|
|
<HcIcon name="check-double"/>
|
|
<span>提交日志</span>
|
|
<span>提交日志</span>
|
|
</el-button>
|
|
</el-button>
|
|
- <el-button size="large" type="primary" v-else @click="editLogsClick">
|
|
|
|
- <HcIcon name="add"/>
|
|
|
|
- <span>写日志</span>
|
|
|
|
- </el-button>
|
|
|
|
|
|
+ <template v-else>
|
|
|
|
+ <el-button size="large" type="primary" @click="editLogsClick" v-if="!isShowEdit">
|
|
|
|
+ <HcIcon name="add"/>
|
|
|
|
+ <span>写日志</span>
|
|
|
|
+ </el-button>
|
|
|
|
+ <!-- 修改自己的日志 -->
|
|
|
|
+ <el-button size="large" type="primary" v-else @click="editmyLog">
|
|
|
|
+ <HcIcon name="add"/>
|
|
|
|
+ <span>写日志</span>
|
|
|
|
+ </el-button>
|
|
|
|
+ </template>
|
|
|
|
+
|
|
<el-button size="large" type="primary" v-if="isEditState" @click="gobackLog">
|
|
<el-button size="large" type="primary" v-if="isEditState" @click="gobackLog">
|
|
<HcIcon name="arrow-go-back"/>
|
|
<HcIcon name="arrow-go-back"/>
|
|
<span>取消</span>
|
|
<span>取消</span>
|
|
@@ -66,7 +74,7 @@
|
|
</HcCardItem>
|
|
</HcCardItem>
|
|
</div>
|
|
</div>
|
|
<div class="hac-logs-content-body" v-loading="logLoading">
|
|
<div class="hac-logs-content-body" v-loading="logLoading">
|
|
- <HcLogsContent :data="logForm" ref="logsRef" v-if="isEditState"/>
|
|
|
|
|
|
+ <HcLogsContent :data="logForm" ref="logsRef" v-if="isEditState" :isShowmyEdit="isShowEdit"/>
|
|
<HcLogsContent :data="logDetail" :edit="false" v-else/>
|
|
<HcLogsContent :data="logDetail" :edit="false" v-else/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -85,12 +93,14 @@ import { getdepartmentList,getuserList} from "~api/other";
|
|
|
|
|
|
const useAppState = useAppStore()
|
|
const useAppState = useAppStore()
|
|
const userInfo = ref(useAppState.getUserInfo);
|
|
const userInfo = ref(useAppState.getUserInfo);
|
|
-
|
|
|
|
|
|
+const isShowEdit=ref(false)//编辑自己的日志
|
|
// 调用时机为首次挂载, 以及每次从缓存中被重新插入时
|
|
// 调用时机为首次挂载, 以及每次从缓存中被重新插入时
|
|
onActivated(() => {
|
|
onActivated(() => {
|
|
isEditState.value = false
|
|
isEditState.value = false
|
|
getLogList()
|
|
getLogList()
|
|
getDepartmentDict()
|
|
getDepartmentDict()
|
|
|
|
+
|
|
|
|
+
|
|
})
|
|
})
|
|
const department=ref([])
|
|
const department=ref([])
|
|
//获取部门列表
|
|
//获取部门列表
|
|
@@ -181,6 +191,14 @@ const getLogDetail = async () => {
|
|
//判断状态
|
|
//判断状态
|
|
if (!error && code === 200) {
|
|
if (!error && code === 200) {
|
|
logDetail.value = getObjValue(data)
|
|
logDetail.value = getObjValue(data)
|
|
|
|
+ const {real_name, avatar} = userInfo.value
|
|
|
|
+ let logTitle=logDetail.value['logTitle']
|
|
|
|
+ console.log(logTitle,'logTitle');
|
|
|
|
+ let index = logTitle.lastIndexOf("的");
|
|
|
|
+ let str = logTitle.substring(0,index);
|
|
|
|
+ if(real_name===str){
|
|
|
|
+ isShowEdit.value=true
|
|
|
|
+ }
|
|
} else {
|
|
} else {
|
|
logDetail.value = {}
|
|
logDetail.value = {}
|
|
window.$message?.error(msg)
|
|
window.$message?.error(msg)
|
|
@@ -202,12 +220,27 @@ const logForm = ref({
|
|
//当前状态,false查看模式,true写日志模式
|
|
//当前状态,false查看模式,true写日志模式
|
|
const isEditState = ref(false)
|
|
const isEditState = ref(false)
|
|
const editLogsClick = () => {
|
|
const editLogsClick = () => {
|
|
|
|
+ logForm.value={
|
|
|
|
+ headPicture: '',
|
|
|
|
+ logTitle: '',
|
|
|
|
+ createTime: '',
|
|
|
|
+ riskWarning: '',
|
|
|
|
+ workDesc: '',
|
|
|
|
+ expenseReimbursementAmount: '',
|
|
|
|
+}
|
|
const {real_name, avatar} = userInfo.value
|
|
const {real_name, avatar} = userInfo.value
|
|
isEditState.value = true
|
|
isEditState.value = true
|
|
logForm.value.headPicture = avatar || avatarPng
|
|
logForm.value.headPicture = avatar || avatarPng
|
|
logForm.value.logTitle = real_name + '的日志'
|
|
logForm.value.logTitle = real_name + '的日志'
|
|
logForm.value.createTime = dayjs().format('YYYY-MM-DD')
|
|
logForm.value.createTime = dayjs().format('YYYY-MM-DD')
|
|
}
|
|
}
|
|
|
|
+//修改自己的日志
|
|
|
|
+
|
|
|
|
+const editmyLog=()=>{
|
|
|
|
+ isEditState.value = true
|
|
|
|
+ logForm.value=logDetail.value
|
|
|
|
+
|
|
|
|
+}
|
|
//返回到查看日志界面
|
|
//返回到查看日志界面
|
|
const gobackLog=()=>{
|
|
const gobackLog=()=>{
|
|
isEditState.value = false
|
|
isEditState.value = false
|