|
@@ -74,8 +74,8 @@
|
|
</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" :isShowmyEdit="isShowEdit"/>
|
|
|
|
- <HcLogsContent :data="logDetail" :edit="false" v-else/>
|
|
|
|
|
|
+ <HcLogsContent :data="logForm" ref="logsRef" v-if="isEditState" :isShowmyEdit="isShowEdit" />
|
|
|
|
+ <HcLogsContent :data="logDetail" :edit="false" v-else :undefinedNum="undefinedNum"/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</HcCard>
|
|
</HcCard>
|
|
@@ -174,6 +174,7 @@ const userItemId = ref({})
|
|
const userItemClick = (item) => {
|
|
const userItemClick = (item) => {
|
|
if (!isEditState.value) {
|
|
if (!isEditState.value) {
|
|
userItemId.value = item
|
|
userItemId.value = item
|
|
|
|
+ isShowEdit.value=false
|
|
getLogDetail()
|
|
getLogDetail()
|
|
} else {
|
|
} else {
|
|
window.$message?.warning('请先提交日志或退出填写日志状态')
|
|
window.$message?.warning('请先提交日志或退出填写日志状态')
|
|
@@ -182,6 +183,7 @@ const userItemClick = (item) => {
|
|
|
|
|
|
//日志填报详情
|
|
//日志填报详情
|
|
const logDetail = ref({})
|
|
const logDetail = ref({})
|
|
|
|
+const undefinedNum=ref(null)
|
|
const getLogDetail = async () => {
|
|
const getLogDetail = async () => {
|
|
const item = userItemId.value
|
|
const item = userItemId.value
|
|
if(item.id){
|
|
if(item.id){
|
|
@@ -196,6 +198,7 @@ const getLogDetail = async () => {
|
|
console.log(logTitle,'logTitle');
|
|
console.log(logTitle,'logTitle');
|
|
let index = logTitle.lastIndexOf("的");
|
|
let index = logTitle.lastIndexOf("的");
|
|
let str = logTitle.substring(0,index);
|
|
let str = logTitle.substring(0,index);
|
|
|
|
+ //判断是否编辑自己的日志
|
|
if(real_name===str){
|
|
if(real_name===str){
|
|
isShowEdit.value=true
|
|
isShowEdit.value=true
|
|
}
|
|
}
|
|
@@ -203,6 +206,16 @@ const getLogDetail = async () => {
|
|
logDetail.value = {}
|
|
logDetail.value = {}
|
|
window.$message?.error(msg)
|
|
window.$message?.error(msg)
|
|
}
|
|
}
|
|
|
|
+ //计算未完成数量
|
|
|
|
+ console.log(logDetail.value.taskList,'taskList');
|
|
|
|
+ let arr=[]
|
|
|
|
+ arr=logDetail.value.taskList.filter((ele)=>{
|
|
|
|
+ if(ele?.isOverdue==1){
|
|
|
|
+ return ele
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ undefinedNum.value=arr.length
|
|
|
|
+ console.log( undefinedNum.value,' undefinedNum.value');
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
@@ -220,6 +233,7 @@ const logForm = ref({
|
|
//当前状态,false查看模式,true写日志模式
|
|
//当前状态,false查看模式,true写日志模式
|
|
const isEditState = ref(false)
|
|
const isEditState = ref(false)
|
|
const editLogsClick = () => {
|
|
const editLogsClick = () => {
|
|
|
|
+ console.log('写日志');
|
|
logForm.value={
|
|
logForm.value={
|
|
headPicture: '',
|
|
headPicture: '',
|
|
logTitle: '',
|
|
logTitle: '',
|
|
@@ -237,6 +251,7 @@ const editLogsClick = () => {
|
|
//修改自己的日志
|
|
//修改自己的日志
|
|
|
|
|
|
const editmyLog=()=>{
|
|
const editmyLog=()=>{
|
|
|
|
+ console.log('修改自己的');
|
|
isEditState.value = true
|
|
isEditState.value = true
|
|
logForm.value=logDetail.value
|
|
logForm.value=logDetail.value
|
|
|
|
|
|
@@ -244,6 +259,7 @@ const editmyLog=()=>{
|
|
//返回到查看日志界面
|
|
//返回到查看日志界面
|
|
const gobackLog=()=>{
|
|
const gobackLog=()=>{
|
|
isEditState.value = false
|
|
isEditState.value = false
|
|
|
|
+ isShowEdit.value=false
|
|
}
|
|
}
|
|
const logsRef = ref(null)
|
|
const logsRef = ref(null)
|
|
const logLoading = ref(false)
|
|
const logLoading = ref(false)
|