fix : 修复页面bug

2024-07-18 22:06:23 +08:00
parent 3ec7a9c78e
commit 9d5c393ebe
28 changed files with 562 additions and 286 deletions
--- a/src/views/project-management/mobledetail/ApprovalDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/ApprovalDetailMoblie.vue
@@ -1,5 +1,33 @@
 <template>
  <div v-loading="loading">
+    <el-row  v-if="type==='execute'">
+      <el-col :span="24">
+        <baseTitle :title="'附件信息'"></baseTitle>
+      </el-col>
+      <el-form :model="attachmentParam" inline style="margin-top: 15px" @submit.prevent>
+        <el-form-item label="标签" prop="tag">
+          <el-select v-model="attachmentParam.tag" placeholder="请选择标签" clearable filterable style="width: 200px">
+            <el-option
+                v-for="item in tagsOption"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleSearch" color="#DED0B2">搜索</el-button>
+        </el-form-item>
+      </el-form>
+      <fvTable style="width: 100%;min-height:162px;max-height: 162px" v-if="showAttachmentTable" height="162"  :tableConfig="tableConfig"
+               :data="otherAttachmentList" :isSettingCol="false" :pagination="false">
+        <template #empty>
+          <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
+        </template>
+      </fvTable>
+    </el-row>
+    <baseTitle v-if="type!='phase'" :title="getTagName(type)+'信息'" ></baseTitle>
+
    <fvForm :schema="schema" @getInstance="(e)=>form = e"></fvForm>
    <el-form :model="formData" label-width="auto">
      <file-component
@@ -46,10 +74,60 @@
 <script setup lang="jsx">
 import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
-import {ElLoading} from 'element-plus';
+import {ElLoading, ElNotification} from 'element-plus';
 import {downloadFile} from "@/api/project-demand";
+import {searchImplementationFileList} from "@/api/project-manage/attachment";
+import {getTags} from "@/api/project-manage";

+
+const tableConfig = reactive({
+  columns: [
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width: 85,
+    },
+    {
+      prop: 'originalFileName',
+      label: '文件名',
+      align: 'center',
+    },
+    {
+      prop: 'tag',
+      label: '标签',
+      align: 'center'
+    },
+    {
+      prop: 'size',
+      label: '文件大小',
+      align: 'center',
+      width: 150,
+      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        return (
+            <div>
+              <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
+            </div>
+        )
+      }
+    }
+  ]
+})
+const attachmentParam = reactive({
+  tag: ''
+})
+
+const tagsOption = ref([])
 const changeDiagram = ref(false)
+const showAttachmentTable = ref(true)
 const props = defineProps({
  formData: {
    type: Object,
@@ -90,10 +168,43 @@ const props = defineProps({
  }
 })
 const form = ref()
+const otherAttachmentList = ref([])
 const schema = computed(() => {
  let arr
  if (props.type == 'approval') {
    arr = [
+      {
+        label: '项目负责人',
+        prop: 'projectChargePerson',
+        colProps: {
+          span: 24
+        },
+        component: () => (
+            <div>
+              {
+                props.formData.projectChargePerson ?
+                    <span>{props.formData.projectChargePerson.name} </span>
+                    : <span>{'--'}</span>
+              }
+            </div>
+        )
+      },
+      {
+        label: '项目成员',
+        prop: 'projectPersonList',
+        colProps: {
+          span: 24
+        },
+        component: () => (
+            <div>
+              {
+                props.formData.projectPersonList ? props.formData.projectPersonList.map(item => {
+                  return <span>{item.name} </span>
+                }) : <span>{'--'}</span>
+              }
+            </div>
+        )
+      },
      {
        label: '前置流程',
        prop: 'preProcess',
@@ -231,6 +342,7 @@ const schema = computed(() => {
 })

 const emit = defineEmits(['update:value'])
+const route = useRoute()
 const _value = computed({
  get() {
    return props.value;
@@ -239,7 +351,49 @@ const _value = computed({
    emit("update:value", val);
  }
 })
-
+const getTagsOption = () => {
+  if (!route.query.projectId) return
+  getTags(route.query.projectId).then(res => {
+    if (res.code === 1000) {
+      tagsOption.value = res.data
+    }else{
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: 'error'
+      })
+    }
+  })
+}
+const handleSearch = () => {
+  let params = {
+    targetId: route.query.projectId,
+    targetState: "40"
+  }
+  if (attachmentParam.tag) {
+    tagsOption.value.forEach(item => {
+      if (item.value === attachmentParam.tag) {
+        attachmentParam.tag = item.label
+      }
+    })
+    params.tag = attachmentParam.tag
+  }
+  searchImplementationFileList(params).then(res => {
+    showAttachmentTable.value = false
+    if (res.code === 1000) {
+      otherAttachmentList.value = res.data.fileList
+      nextTick(() => {
+        showAttachmentTable.value = true
+      })
+    }else{
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: 'error'
+      })
+    }
+  })
+}
 const getTagName = (type) => {
  switch (type) {
    case 'approval':
@@ -263,6 +417,10 @@ const handleDownload = (row) => {
    loading.close()
  })
 }
+if(props.type&&props.type==='execute'){
+  handleSearch()
+  getTagsOption()
+}
 watchEffect(() => {
  Object.keys(props.formData).length && (form.value?.setValues(props.formData))
 })
--- a/src/views/project-management/mobledetail/CollectionDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/CollectionDetailMoblie.vue
@@ -17,6 +17,12 @@
            <span>{{ formData.deadline }}</span>
          </el-form-item>
        </el-col>
+        <el-col :span="24" v-if="formData.isSpecialFund">
+          <el-form-item label="专项资金名称">
+            <span>{{ formData.specialFund }}</span>
+          </el-form-item>
+        </el-col>
+
        <el-col :span="24" v-if="type==='singleDetail'">
          <el-form-item label="征集公司">
            <span :class="showExpendClass(showMoreCompany,formData.companyIds)">{{
@@ -27,11 +33,6 @@
            </div>
          </el-form-item>
        </el-col>
-        <el-col :span="24" v-if="formData.isSpecialFund">
-          <el-form-item label="专项资金名称">
-            <span>{{ formData.specialFund }}</span>
-          </el-form-item>
-        </el-col>
        <baseTitle title="征集说明"></baseTitle>
        <el-col :span="24">
          <el-form-item>
--- a/src/views/project-management/mobledetail/ShareDetailMobile.vue
+++ b/src/views/project-management/mobledetail/ShareDetailMobile.vue
@@ -1,59 +1,62 @@
 <template>
-  <baseTitle title="费用分摊详情"></baseTitle>
-  <el-form :model="formData" ref="form" class="query-form" label-width="auto">
-    <el-row>
-      <el-col :span="24">
-        <el-form-item label="分摊名称">
-          <span>{{ formData.shareName }}</span>
-        </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item label="分摊月份">
-          <span>{{ formData.apportionmentMonth }}</span>
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </el-form>
-  <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane label="分摊明细" name="first">
-      <expense-detail-mobile/>
-    </el-tab-pane>
-    <el-tab-pane label="分摊汇总" name="second" v-loading="loading">
-      <allocation-summary-detail-mobile/>
-    </el-tab-pane>
-  </el-tabs>
-  <div v-if="shareData.taskId">
-    <baseTitle title="审核意见"></baseTitle>
-    <el-form-item prop="auditOpinion">
-      <el-input
-          v-model="auditOpinion"
-          :rows="3"
-          type="textarea"
-          placeholder="请输入审核意见"
-      />
-    </el-form-item>
-  </div>
-  <div class="approval-record">
-    <div class="approval-title">
-      <baseTitle title="审批记录"></baseTitle>
-      <div class="diagram">
-        <div class="base-title">流程图</div>
-        <el-switch
-            v-model="changeDiagram"
-            style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd"
+  <div style="padding: 0 10px;">
+    <baseTitle title="费用分摊详情"></baseTitle>
+    <el-form :model="formData" ref="form" class="query-form" label-width="auto">
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="分摊名称">
+            <span>{{ formData.shareName }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="分摊月份">
+            <span>{{ formData.apportionmentMonth }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+      <el-tab-pane label="分摊明细" name="first">
+        <expense-detail-mobile/>
+      </el-tab-pane>
+      <el-tab-pane label="分摊汇总" name="second" v-loading="loading">
+        <allocation-summary-detail-mobile/>
+      </el-tab-pane>
+    </el-tabs>
+    <div v-if="shareData.taskId">
+      <baseTitle title="审核意见"></baseTitle>
+      <el-form-item prop="auditOpinion">
+        <el-input
+            v-model="auditOpinion"
+            :rows="3"
+            type="textarea"
+            placeholder="请输入审核意见"
        />
+      </el-form-item>
+    </div>
+    <div class="approval-record">
+      <div class="approval-title">
+        <baseTitle title="审批记录"></baseTitle>
+        <div class="diagram">
+          <div class="base-title">流程图</div>
+          <el-switch
+              v-model="changeDiagram"
+              style="--el-switch-on-color:#BEA266; --el-switch-off-color:#cecdcd"
+          />
+        </div>
+      </div>
+      <div class="process">
+        <operation-render
+            v-if="shareProcessViewer&& shareData.operationList && shareData.operationList.length > 0&&!changeDiagram"
+            :isColumn="true"
+            :operation-list="shareData.operationList"
+            :state="shareData.state"/>
+        <process-diagram-viewer v-if="shareProcessViewer&&changeDiagram" id-name="shareProcess"/>
      </div>
    </div>
-    <div class="process">
-      <operation-render
-          v-if="shareProcessViewer&& shareData.operationList && shareData.operationList.length > 0&&!changeDiagram"  :isColumn="true"
-          :operation-list="shareData.operationList"
-          :state="shareData.state"/>
-      <process-diagram-viewer v-if="shareProcessViewer&&changeDiagram" id-name="shareProcess"/>
-    </div>
+    <opinion-moblie v-if="shareData.taskId" :formData="shareData.formData" :taskId="shareData.taskId"
+                    v-model:value="auditOpinion"></opinion-moblie>
  </div>
-  <opinion-moblie v-if="shareData.taskId" :formData="shareData.formData" :taskId="shareData.taskId"
-           v-model:value="auditOpinion"></opinion-moblie>
 </template>

 <script setup lang="jsx">
--- a/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue
+++ b/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue
@@ -114,7 +114,7 @@ const projectTable = reactive({
      type: 'index',
      label: '序号',
      align: 'center',
-      width: '80',
+      width: 120
    },
    {
      prop: 'projectName',
--- a/src/views/project-management/mobledetail/StepsMoblie.vue
+++ b/src/views/project-management/mobledetail/StepsMoblie.vue
@@ -21,7 +21,6 @@

  <!-- 步骤内容 -->
  <div>
-    <baseTitle title="各流程信息"></baseTitle>
    <slot name="content" :localActive="localActive"></slot>
    <!-- <template v-for="(item, index) in stepList" :key="item.key">
      <component v-if="localActive == index" v-bind="item.props || {}" :is="item.component" />
@@ -97,20 +96,6 @@ const baseForm = ref()

 const schema = computed(() => {
  return [
-    {
-      label: '征集名称',
-      prop: 'requirementName',
-      colProps: {
-        span: 24
-      }
-    },
-    {
-      label: '征集描述',
-      prop: 'collectExplain',
-      colProps: {
-        span: 24
-      }
-    },
    {
      label: '项目名称',
      prop: 'projectName',
@@ -125,6 +110,20 @@ const schema = computed(() => {
        span: 24
      }
    },
+    {
+      label: '征集名称',
+      prop: 'requirementName',
+      colProps: {
+        span: 24
+      }
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 24
+      }
+    }
  ]
 })

@@ -328,4 +327,11 @@ watchEffect(() => {
 .is-end {
  color: #BEA266;
 }
+:deep(.el-step__title.is-success) {
+  color: #A8abb2;
+}
+
+:deep(.el-step__head.is-success) {
+  border-color: #A8abb2;
+}
 </style>
--- a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
@@ -39,11 +39,11 @@
            <span>{{ filterDict(cacheStore.getDict('invest_type'), localFormData.investmentType) }}</span>
          </el-form-item>
        </el-col>
-        <el-col :span="24">
-          <el-form-item label="项目影响" prop="projectImpact">
-            <span>{{ filterDict(cacheStore.getDict('project_impact'), localFormData.projectImpact) }}</span>
-          </el-form-item>
-        </el-col>
+<!--        <el-col :span="24">-->
+<!--          <el-form-item label="项目影响" prop="projectImpact">-->
+<!--            <span>{{ filterDict(cacheStore.getDict('project_impact'), localFormData.projectImpact) }}</span>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
        <el-col :span="24">
          <el-form-item label="所属业务板块" prop="businessSegment">
            <span>{{ filterDict(cacheStore.getDict('business_segment'), localFormData.businessSegment) }}</span>
@@ -172,11 +172,16 @@
        <div class="process">
          <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0&&!changeDiagram" :isColumn="true"
                            :operation-list="data.operationList"
+                            :step="'report'"
                            :state="data.state"/>
          <process-diagram-viewer v-if="processViewer&&changeDiagram" id-name="summaryProcess"/>
        </div>
      </div>
    </el-form>
+    <div class="oper-page-btn" v-perm="['annual:plan:approve']" v-if="data.state==='4'">
+      <el-button type="danger" @click="handleRejectPlan">驳回年度计划</el-button>
+      <el-button color="#DED0B2" @click="handleAgreePlan">通过年度计划</el-button>
+    </div>
  </div>
 </template>

@@ -190,6 +195,8 @@ import {getFundOption} from "@/api/special-fund";
 import {useCacheStore} from '@/stores/cache.js'
 import {getSubCompOpt} from "@/api/user/user";
 import FileComponent from "@/components/DetailComponent/FileComponent.vue";
+import {ElNotification} from "element-plus";
+import {approvePlan} from "@/api/project-demand/summary";

 const emit = defineEmits(['update:value'])
 const tagsViewStore = useTagsView()
@@ -201,7 +208,9 @@ const props = defineProps({
  },
  data: {
    type: Object,
-    default: {}
+    default: {
+      state: '1'
+    }
  },
  processViewer: {
    type: Boolean,
@@ -237,12 +246,58 @@ const _value = computed({
    emit("update:value", val);
  }
 })
+const handleRejectPlan = async () => {
+  // const values = form.value.getValues()
+  // console.log('route',route.query.projectId)
+  if (!_value.value) {
+    ElNotification({
+      title: '提示',
+      message: '请填写审核意见',
+      type: 'warning'
+    })
+    return
+  }
+  const params = {
+    auditOpinion:_value.value,
+    projectId:parseInt(route.query.projectId),
+    state:false
+  }
+  console.log('params', params)
+  const res = await approvePlan(params)
+  ElNotification({
+    title: '提示',
+    message: res.msg,
+    type: res.code === 1000 ? 'success' : 'error'
+  })
+  tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+  router.push({
+    name: 'Summary'
+  })
+}
+const handleAgreePlan = async () => {
+  const params = {
+    auditOpinion:_value.value,
+    projectId:parseInt(route.query.projectId),
+    state:true
+  }
+  console.log('params', params)
+  const res = await approvePlan(params)
+  ElNotification({
+    title: '提示',
+    message: res.msg,
+    type: res.code === 1000 ? 'success' : 'error'
+  })
+  tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+  router.push({
+    name: 'Summary'
+  })
+}
 const filterDict = (data, value) => {
  if (data === undefined || value === undefined) return;
  let label = ''
  let result = []
-  if (JSON.parse(value) instanceof Array) {
-    JSON.parse(value).forEach(item1 => {
+  if (value instanceof Array) {
+    value.forEach(item1 => {
      data.find(item => {
        if (item.value == item1) {
          result.push(item.label)
--- a/src/views/project-management/mobledetail/index.vue
+++ b/src/views/project-management/mobledetail/index.vue
@@ -1,52 +1,53 @@
 <template>
  <div style="padding: 0 10px;">
-    <StepsMoblie :active="route.query.id==='-1'?currentStep-1:currentStep" @setDetail="setDetail" @stepChange="stepChange"
-          :reportType="route.query.id==='-1'?'direct':''">
+    <StepsMoblie :active="route.query.id==='-1'?currentStep-1:currentStep" @setDetail="setDetail"
+                 @stepChange="stepChange"
+                 :reportType="route.query.id==='-1'?'direct':''">
      <template #content>
        <collection-detail :formData="detailData.formData"
-                          :data="detailData"
-                          :processViewer="commonProvessViewer"
-                          v-show="showActive == '00'"
-                          :fileListShow="fileListShow"
-                          v-model:value="auditOpinion"
+                           :data="detailData"
+                           :processViewer="commonProvessViewer"
+                           v-if="showActive == '00'"
+                           :fileListShow="fileListShow"
+                           v-model:value="auditOpinion"
        />
-        <summary-detail v-show="showActive == '10'"
+        <summary-detail v-if="showActive == '10'"
                        :formData="detailData.formData"
                        :data="detailData"
                        :processViewer="commonProvessViewer"
                        :fileListShow="fileListShow"
                        v-model:value="auditOpinion"/>
        <ApprovalDetail type="approval"
-                        v-if="showActive == '20'&&!editShow"
+                        v-if="showActive == '20'"
                        :formData="detailData.formData"
                        :data="detailData"
                        :processViewer="commonProvessViewer"
                        :fileListShow="fileListShow"
                        v-model:value="auditOpinion"/>
        <ApprovalDetail type="execute"
-                        v-if="showActive == '40'&&!editShow"
+                        v-if="showActive == '40'"
                        :formData="detailData.formData"
                        :data="detailData"
                        :processViewer="commonProvessViewer"
                        :fileListShow="fileListShow"
                        v-model:value="auditOpinion"/>
        <ApprovalDetail type="archivist"
-                        v-show="showActive == '50'&&!editShow"
+                        v-if="showActive == '50'"
                        :formData="detailData.formData"
                        :data="detailData"
                        :processViewer="commonProvessViewer"
                        :fileListShow="fileListShow"
                        v-model:value="auditOpinion"/>
-        <project-apply-moblie :title="applyTitle"
-                      v-if="editShow"
-                      :mode="mode"
-                      :step="showActive"
-                      :data="detailData"
-                      :formData="detailData.formData"/>
+        <!--        <project-apply-moblie :title="applyTitle"-->
+        <!--                      v-if="editShow"-->
+        <!--                      :mode="mode"-->
+        <!--                      :step="showActive"-->
+        <!--                      :data="detailData"-->
+        <!--                      :formData="detailData.formData"/>-->
      </template>
    </StepsMoblie>
    <opinion-moblie v-if="detailData.taskId" :formData="detailData.formData" :taskId="detailData.taskId"
-            v-model:value="auditOpinion"/>
+                    v-model:value="auditOpinion"/>
  </div>
 </template>

@@ -60,7 +61,7 @@ import SummaryDetail from './SummaryDetailMoblie.vue';
 import StepsMoblie from './StepsMoblie.vue';
 import {getMapProjectStateInfo} from "./api";
 import OpinionMoblie from "./OpinionMoblie.vue";
-import ProjectApplyMoblie from "./ProjectApplyMoblie.vue";
+// import ProjectApplyMoblie from "./ProjectApplyMoblie.vue";


 const route = useRoute()
@@ -82,6 +83,9 @@ const commonProvessViewer = ref(true)

 const getAllInfo = async (state) => {
  const loading = ElLoading.service({fullscreen: true})
+  detailData.value = {
+    state: "0"
+  }
  try {
    fileListShow.value = 'READ'
    commonProvessViewer.value = false
@@ -121,9 +125,9 @@ const getAllInfo = async (state) => {
  }
 }
 const changeModel = (active, mode) => {
-  editShow.value = false
+  // editShow.value = false
  nextTick(() => {
-    editShow.value = mode === 'submit' || mode === 'resubmit';
+    // editShow.value = mode === 'submit' || mode === 'resubmit';
    if (route.query.step === '20' && active === '20') {
      applyTitle.value = 'apply'
    } else if (route.query.step === '40' && active === '40') {