fix : 修复审核意见位置

2024-06-05 00:51:27 +08:00
parent df6f49caeb
commit a7d91a8f32
11 changed files with 252 additions and 69 deletions
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -23,9 +23,9 @@
          <el-config-provider>
            <el-date-picker
                v-model="formData.deadline"
-                type="datetime"
+                type="date"
                placeholder="截止时间"
-                value-format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD"
            />
          </el-config-provider>
        </el-form-item>
@@ -317,7 +317,6 @@ const handleResubmit = () => {
 const getDetailInfo = async () => {
  getFormInfo(route.query.id).then(res => {
    if (res.code === 1000) {
-      ElMessage.success(res.msg)
      formData.value = res.data
      showTinymce.value = false
      showTable.value = false
@@ -326,7 +325,11 @@ const getDetailInfo = async () => {
        showTable.value = true
      })
    } else {
-      ElMessage.error(res.msg)
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: 'error'
+      })
    }
  })
 }
@@ -341,13 +344,21 @@ const handleDelete = (row) => {
    type: 'warning'
  }).then(() => {
    deleteFile(row.fileId).then(res => {
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: res.code === 1000 ? 'success' : 'error'
+      })
      if (res.code === 1000) {
-        ElMessage.success("删除成功");
        formData.value.fileList.splice(formData.value.fileList.findIndex((item) => item.id === row.fileId), 1);
      }
    });
  }).catch(() => {
-    ElMessage.warning("用户取消删除! ");
+    ElNotification({
+      title: '提示',
+      message: '用户取消删除! ',
+      type: 'warning'
+    })
  })
 }

--- a/src/views/project-demand/requirement/detail.vue
+++ b/src/views/project-demand/requirement/detail.vue
@@ -2,8 +2,8 @@
  <baseTitle title="需求征集详情"></baseTitle>
  <collection-detail :formData="collectData.formData" :data="collectData" type="singleDetail"
                     :fileListShow="fileListShow"
-                     :processViewer="processViewer" :loading="loading"/>
-  <opinion v-if="collectData.taskId" :formData="formData" :taskId="collectData.taskId"></opinion>
+                     :processViewer="processViewer" :loading="loading" v-model:value="auditOpinion"/>
+  <opinion v-if="collectData.taskId" :formData="formData" :taskId="collectData.taskId"  v-model:value="auditOpinion"></opinion>
 </template>

 <script setup lang="jsx">
@@ -25,6 +25,7 @@ const specialFundOption = ref([])
 const processInstanceData = ref({})
 const fileListShow = ref("READ")
 const showTable = ref(false)
+const auditOpinion = ref('')
 const processViewer = ref(false)
 const processTree = ref()
 const collectData = ref([])
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -238,7 +238,7 @@
      <!--      </div>-->
    </div>
    <div class="oper-page-btn">
-      <el-button type="info" @click="staging">存为草稿</el-button>
+<!--      <el-button type="info" @click="staging">存为草稿</el-button>-->
      <el-button color="#DED0B2" v-if="name==='Summary/add'" @click="handleSubmit(summaryForm)">发布</el-button>
      <el-button color="#DED0B2" v-else @click="handleResubmit">重新发布</el-button>
    </div>
--- a/src/views/project-demand/summary/detail.vue
+++ b/src/views/project-demand/summary/detail.vue
@@ -1,19 +1,26 @@
 <template>
-  <steps :active="route.query.id==='-1'?0:1" @setDetail="setDetail" @stepChange="stepChange" :reportType="route.query.id==='-1'?'direct':''">
+  <steps :active="route.query.id==='-1'?0:1" @setDetail="setDetail" @stepChange="stepChange"
+         :reportType="route.query.id==='-1'?'direct':''">
    <template #content>
      <collection-detail v-show="showActive == '00'" :formData="summaryData.formData" :data="summaryData"
-                         :processViewer="summaryProcessViewer"  :loading="loading" :fileListShow="fileListShow"/>
+                         :processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"
+                         v-model:value="auditOpinion"/>
      <summary-detail v-show="showActive == '10'" :formData="summaryData.formData" :data="summaryData"
-                      :processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"/>
+                      :processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"
+                      v-model:value="auditOpinion"/>
      <ApprovalDetail v-show="showActive == '20'" :formData="summaryData.formData" :data="summaryData"
-                      :processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"/>
+                      :processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"
+                      v-model:value="auditOpinion"/>
      <ApprovalDetail type="execute" v-show="showActive == '40'" :formData="summaryData.formData" :data="summaryData"
-                      :processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"/>
+                      :processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"
+                      v-model:value="auditOpinion"/>
      <ApprovalDetail type="archivist" v-show="showActive == '50'" :formData="summaryData.formData" :data="summaryData"
-                      :processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"/>
+                      :processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"
+                      v-model:value="auditOpinion"/>
    </template>
  </steps>
-  <opinion v-if="summaryData.taskId" :formData="summaryData.formData" :taskId="summaryData.taskId"></opinion>
+  <opinion v-if="summaryData.taskId" :formData="summaryData.formData" :taskId="summaryData.taskId"
+           v-model:value="auditOpinion"></opinion>
 </template>

 <script setup lang="jsx">
@@ -30,14 +37,15 @@ const loading = ref(false)
 const fileListShow = ref('READ')
 const processStore = useProcessStore()
 const active = ref(route.query.state)
+const auditOpinion = ref('')
 const showActive = ref()
 const getInfo = async (state) => {
-  fileListShow.value='READ'
+  fileListShow.value = 'READ'
  const projectId = route.query.projectId
  summaryProcessViewer.value = false
  loading.value = true
-  const {code, data,msg} = await getMapProjectStateInfo(projectId, state)
-  if(code===1000){
+  const {code, data, msg} = await getMapProjectStateInfo(projectId, state)
+  if (code === 1000) {
    summaryData.value = data;
    loading.value = false
    processStore.setDesign(data)
@@ -52,14 +60,14 @@ const getInfo = async (state) => {
        fileListShow.value = data.formPermMap["fileList"].perm
      }
    })
-  }else {
+  } else {
    ElNotification({
      title: '提示',
      message: msg,
-      type:  'error'
+      type: 'error'
    })
-    if(msg==='查询结果为空'){
-      summaryData.value=[]
+    if (msg === '查询结果为空') {
+      summaryData.value = []
    }
    loading.value = false
  }
@@ -71,6 +79,7 @@ const setDetail = (active) => {
 }

 const stepChange = (data) => {
+  auditOpinion.value = ''
  showActive.value = data.active
  getInfo(data.active)
 }