feat: 布置工作收尾

src/mocp/components/global-date/global-date.vue

@@ -134,8 +134,8 @@ const confirm = (e) => {
     show.value = false
     labelValue.value = e.value
     defaultValue.value = e.value
-    es('update:modelValue', String(defaultValue.value))
-    es('change', String(defaultValue.value))
+    es('update:modelValue', defaultValue.value)
+    es('change', defaultValue.value)
 }
 //点击清空按钮
 const clear = () => {

src/mocp/store/assign-work.js

 import { getArrangeWorkDetailApi } from 'mocp/api/assign-work'
 import { defineStore } from 'pinia'
+import useUserStore from 'mocp/store/user'
 
+const userStore = useUserStore()
+const arrangeWorkExtendRouter = [
+    { name: '工作反馈', path: '/panel/assign-work/edit-work' },
+    { name: '领导批示', path: '/panel/assign-work/edit-approval' },
+    { name: '跟踪反馈', path: '/panel/assign-work/edit-gzFeedback' },
+    { name: '跟踪批示', path: '/panel/assign-work/edit-gzApproval' },
+    { name: '后续措施反馈', path: '/panel/assign-work/edit-followUpFeedback' },
+    { name: '工作验证', path: '/panel/assign-work/edit-validate' }
+]
 const useAssignWorkStore = defineStore('assignWork', {
     state: () => {
         return {
@@ -11,9 +21,66 @@ const useAssignWorkStore = defineStore('assignWork', {
         }
     },
     getters: {
+        //获取当前选中的责任单位的index
+        getArrangeWorkExtendIndex(state) {
+            return state.arrangeWorkExtendList.findIndex((item) => item.id == state.arrangeWorkExtend.id)
+        },
+        //是否创建人
+        isCreateUser(state) {
+            return state.details.createUserId == userStore.userInfo.id
+        },
+        //是否回复人
+        isReplyUser(state) {
+            const replyIds = JSON.parse(state.details.reply)[this.getArrangeWorkExtendIndex].map((item) => item.userId)
+            return replyIds.includes(userStore.userInfo.id)
+        },
+        //是否领导
+        isPresenterUser(state) {
+            return state.details.presenterId == userStore.userInfo.id
+        },
         //获取分解计划
         getDecompose(state) {
             return JSON.parse(state.arrangeWorkExtend?.decompose || '[]') || []
+        },
+        //获取详情页底部按钮的内容
+        getDetailsFooterBtn(state) {
+            if (!state.arrangeWorkExtend) return false
+            if (state.arrangeWorkExtend.feedbackTime == '0') {
+                if (this.isReplyUser) {
+                    return arrangeWorkExtendRouter[0]
+                }
+            } else {
+                if (state.arrangeWorkExtend.approvalTime == '0') {
+                    if (this.isPresenterUser) {
+                        return arrangeWorkExtendRouter[1]
+                    }
+                } else {
+                    if (state.arrangeWorkExtend.gzFeedbackTime == '0') {
+                        if (this.isReplyUser && state.arrangeWorkExtend.leaderState != '' && state.arrangeWorkExtend.leaderState != '1') {
+                            return arrangeWorkExtendRouter[2]
+                        }
+                    } else {
+                        if (state.arrangeWorkExtend.gzApprovalTime == '0') {
+                            if (this.isPresenterUser && state.arrangeWorkExtend.leaderState != '' && state.arrangeWorkExtend.leaderState != '1') {
+                                return arrangeWorkExtendRouter[3]
+                            }
+                        } else {
+                            if (state.arrangeWorkExtend.followUpFeedbackTime == '0') {
+                                if (this.isReplyUser && state.arrangeWorkExtend.followUpFeedback == '1') {
+                                    return arrangeWorkExtendRouter[4]
+                                }
+                            } else {
+                                if (state.arrangeWorkExtend.eventType == '') {
+                                    if (this.isCreateUser) {
+                                        return arrangeWorkExtendRouter[5]
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            return false
         }
     },
     actions: {

src/pages.json

@@ -92,7 +92,7 @@
 		{
 			"path": "pages/modules/mocp/panel/assign-work/edit-work",
 			"style": {
-				"navigationBarTitleText": "编辑早会工作详情"
+				"navigationBarTitleText": "添加工作反馈"
 			}
 		},
 		{

src/pages/modules/mocp/panel/assign-work/details.vue

@@ -4,8 +4,8 @@
         :title="arrangeWorkExtend?.companyFullName"
         :showNavRight="arrangeWorkExtendList.length > 1"
         navRightType="icon"
-        showFooterBtn
-        footerBtnText="领导批示"
+        :showFooterBtn="!!assignWorkStore.getDetailsFooterBtn"
+        :footerBtnText="assignWorkStore.getDetailsFooterBtn?.name"
         @handleRightClick="handleRightClick"
         @handleFooterClick="handleFooterClick"
     >
@@ -103,7 +103,11 @@
                     :rightValue="timeStampFormat(arrangeWorkExtend.approvalTime) || '-'"
                 ></card-details-footer>
             </card-details>
-            <card-details title="跟踪反馈" :showEmpty="arrangeWorkExtend.gzFeedbackTime == '0'">
+            <card-details
+                title="跟踪反馈"
+                :showEmpty="arrangeWorkExtend.gzFeedbackTime == '0'"
+                v-if="arrangeWorkExtend.leaderApprovalComments != '' && arrangeWorkExtend.leaderApprovalComments != '1'"
+            >
                 <card-details-item title="跟踪反馈" :content="arrangeWorkExtend.gzFeedbackContent"></card-details-item>
                 <card-details-footer
                     leftLabel="反馈人:"
@@ -112,7 +116,11 @@
                     :rightValue="timeStampFormat(arrangeWorkExtend.gzFeedbackTime)"
                 ></card-details-footer>
             </card-details>
-            <card-details title="跟踪批示" :showEmpty="arrangeWorkExtend.gzApprovalTime == '0'">
+            <card-details
+                title="跟踪批示"
+                :showEmpty="arrangeWorkExtend.gzApprovalTime == '0'"
+                v-if="arrangeWorkExtend.leaderApprovalComments != '' && arrangeWorkExtend.leaderApprovalComments != '1'"
+            >
                 <card-details-item
                     title="领导批示意见"
                     :content="useGetDictByValue('leaderState', arrangeWorkExtend.gzApprovalComments)"
@@ -125,7 +133,11 @@
                     :rightValue="timeStampFormat(arrangeWorkExtend.gzApprovalTime) || '-'"
                 ></card-details-footer>
             </card-details>
-            <card-details title="后续措施反馈" :showEmpty="arrangeWorkExtend.followUpFeedbackTime == '0'">
+            <card-details
+                title="后续措施反馈"
+                :showEmpty="arrangeWorkExtend.followUpFeedbackTime == '0'"
+                v-if="arrangeWorkExtend.followUpFeedback == '1'"
+            >
                 <card-details-item :borderBottom="false" title="反馈内容" :content="arrangeWorkExtend.followUpFeedbackContent"></card-details-item>
                 <card-details-item
                     :borderBottom="false"
@@ -173,7 +185,7 @@
 </template>
 
 <script setup>
-import { ref } from 'vue'
+import { computed, ref } from 'vue'
 import CardDetails from './components/card-details.vue'
 import CardDetailsItem from './components/card-details-item.vue'
 import CardDetailsFooter from './components/card-details-footer.vue'
@@ -200,7 +212,7 @@ const handleRightClick = () => {
 }
 //新增
 const handleFooterClick = () => {
-    uni.$mocpJump.navigateTo('/panel/assign-work/edit-approval')
+    uni.$mocpJump.navigateTo(assignWorkStore.getDetailsFooterBtn?.path)
 }
 onUnload(() => {
     assignWorkStore.$reset()

src/pages/modules/mocp/panel/assign-work/edit-decompose.vue

@@ -30,7 +30,7 @@
                         ></up-textarea>
                     </up-form-item>
                     <up-form-item label="完成时限" :borderBottom="true">
-                        <global-date pickAlign="right" clearable placeholder="请选择日期" v-model="item.time" emptyValue="null"></global-date>
+                        <global-date pickAlign="right" clearable placeholder="请选择日期" v-model="item.time" :emptyValue="null"></global-date>
                     </up-form-item>
                 </view>
             </template>
@@ -84,6 +84,7 @@ const handleSave = async () => {
             return uni.$mocpMessage.showToast(`请输入分解计划的内容`)
         }
     }
+    console.log(formData.value)
     uni.$emit('changeDecompose', formData.value)
     uni.$mocpJump.navigateBack()
 }