Merge pull request 'dd' (#546) from dd into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/546
2024-07-14 08:43:41 +00:00
parent f1237de72a 8791d220e6
commit 02bf07f4da
33 changed files with 600 additions and 144 deletions
--- a/src/components/DetailComponent/FileComponent.vue
+++ b/src/components/DetailComponent/FileComponent.vue
@@ -2,10 +2,10 @@
  <el-form :label-position="labelAlign">
    <el-form-item :label="title?'其他文件':''" v-if="fileListShow === 'READ' || fileListShow === 'EDIT'" :label-position="labelAlign" :label-width="title?95:''">
      <file-upload @getFile="getOtherFile" v-if="fileListShow === 'EDIT'"/>
-      <fvTable style="width: 100%;max-height: 300px;" v-if="processViewer"  height="300" :tableConfig="tableConfig"
+      <fvTable style="width: 100%;max-height: 162px;" v-if="processViewer"  height="162" :tableConfig="tableConfig"
              :data="_value" :isSettingCol="false" :pagination="false">
        <template #empty>
-          <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+          <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
        </template>
      </fvTable>
    </el-form-item>
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -32,13 +32,13 @@
        </el-col>
        <el-col :span="24">
          <el-form-item label="前置流程" :required="preProcessRequired" prop="preProcess" label-width="125">
+            <el-button color="#DED0B2" @click="handleShowPreTable" style="margin-right: 10px">
+              {{ localFormData.preProcess ? '更改' : '请选择' }}
+            </el-button>
            <div v-for="item in localFormData.preProcess" :key="item.requestId">
              <a :href="item.baseUrl" target="_blank"
                 style="color: #2a99ff;margin-right: 10px;cursor: pointer">{{ item.requestName }}</a>
            </div>
-            <el-button color="#DED0B2" @click="handleShowPreTable">
-              {{ localFormData.preProcess ? '更改' : '请选择' }}
-            </el-button>
          </el-form-item>
        </el-col>
      </el-row>
@@ -135,7 +135,7 @@ import UserPicker from "@/views/workflow/process/common/UserPicker.vue";
 const router = useRouter()
 const route = useRoute()
 const changeDiagram = ref(false)
-const preProcessTable = ref()
+const formRef = ref()
 const showSingleTable = ref(false)
 const projectChargePersonUserList = ref([])
 const projectChargePersonUserPicker = ref()
@@ -257,6 +257,8 @@ const handleShowProjectChargePersonTable = () => {
  projectChargePersonUserPicker.value.showUserPicker()
 }
 const projectChargePersonUserPickerOk = (userList) => {
+  console.log('dsfsdfs',formRef.value,formRef.value?.validateField('projectChargePerson'))
+
  projectChargePersonUserList.value = userList
 }
 const handleShowProjectPersonTable = () => {
@@ -375,92 +377,103 @@ const getFileParam = (item) => {
  }
 }
 const handleSubmit = async () => {
-  if (deploymentData.value.deploymentName === '重大项目立项' || deploymentData.value.deploymentName === '重大项目验收') {
-    if (localFormData.value.preProcess === undefined) {
+  // if (!instance) return
+  // instance.validate(async (valid) => {
+    if (!valid) {
      ElNotification({
        title: '提示',
-        message: '请选择前置流程!',
+        message: '请完善数据,再提交!',
        type: 'error'
      })
+      return;
+    }
+    if (deploymentData.value.deploymentName === '重大项目立项' || deploymentData.value.deploymentName === '重大项目验收') {
+      if (localFormData.value.preProcess === undefined) {
+        ElNotification({
+          title: '提示',
+          message: '请选择前置流程!',
+          type: 'error'
+        })
+      }
+    }
+    let files = []
+    if (props.mode === 'resubmit') {
+      attachment.value.allFileList.forEach(item => {
+        files.push(getFileParam(item))
+      })
+    } else {
+      otherFileList.value.forEach(item => {
+        files.push(getFileParam(item))
+      })
+    }
+    if (attachment.value.singleFile == null) {
+      attachment.value.validate()
+      ElNotification({
+        title: '提示',
+        message: '请上传附件',
+        type: 'error'
+      })
+      return;
+    } else {
+      attachment.value.clearValidate()
+    }
+    let projectPersonIds = []
+    for (const item of projectPersonUserList.value) {
+      projectPersonIds.push(parseInt(item.id))
+    }
+    let params = {
+      deploymentId: deploymentId.value,
+      requirementId: route.query.id,
+      fileList: files,
+      singleFile: attachment.value.singleFile,
+      projectId: projectId.value,
+      preProcess: JSON.stringify(localFormData.value.preProcess)
+    }
+    console.log(params)
+    let res
+    if (props.step === '20') {
+      params.projectChargePerson = parseInt(projectChargePersonUserList.value[0].id)
+      params.projectPersonIds = projectPersonIds
+      if (props.mode === 'resubmit') {
+        res = await resubmitApply(params)
+      } else {
+        res = await projectApply(params)
+      }
+    } else if (props.step === '40') {
+      if (props.mode === 'resubmit') {
+        res = await resubmitCheck(params)
+      } else {
+        res = await projectCheck(params)
+      }
+    } else if (props.step === '50') {
+      if (props.mode === 'resubmit') {
+        res = await resubmitConclusion(params)
+      } else {
+        res = await projectConclusion(params)
+      }
    }
-  }
-  let files = []
-  if (props.mode === 'resubmit') {
-    attachment.value.allFileList.forEach(item => {
-      files.push(getFileParam(item))
-    })
-  } else {
-    otherFileList.value.forEach(item => {
-      files.push(getFileParam(item))
-    })
-  }
-  if (attachment.value.singleFile == null) {
-    attachment.value.validate()
    ElNotification({
      title: '提示',
-      message: '请上传附件',
-      type: 'error'
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
    })
-    return;
-  } else {
-    attachment.value.clearValidate()
-  }
-  let projectPersonIds = []
-  for (const item of projectPersonUserList.value) {
-    projectPersonIds.push(parseInt(item.id))
-  }
-  let params = {
-    deploymentId: deploymentId.value,
-    requirementId: route.query.id,
-    fileList: files,
-    singleFile: attachment.value.singleFile,
-    projectId: projectId.value,
-    preProcess: JSON.stringify(localFormData.value.preProcess)
-  }
-  console.log(params)
-  let res
-  if (props.step === '20') {
-    params.projectChargePerson = parseInt(projectChargePersonUserList.value[0].id)
-    params.projectPersonIds = projectPersonIds
-    if (props.mode === 'resubmit') {
-      res = await resubmitApply(params)
-    } else {
-      res = await projectApply(params)
+    if (res.code === 1000) {
+      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+      if (props.step === '20') {
+        await router.push({
+          name: 'Initiation'
+        })
+      } else if (props.step === '40') {
+        await router.push({
+          name: 'Implementation'
+        })
+      } else if (props.step === '50') {
+        await router.push({
+          name: 'Filing'
+        })
+      }
    }
-  } else if (props.step === '40') {
-    if (props.mode === 'resubmit') {
-      res = await resubmitCheck(params)
-    } else {
-      res = await projectCheck(params)
-    }
-  } else if (props.step === '50') {
-    if (props.mode === 'resubmit') {
-      res = await resubmitConclusion(params)
-    } else {
-      res = await projectConclusion(params)
-    }
-  }
-  ElNotification({
-    title: '提示',
-    message: res.msg,
-    type: res.code === 1000 ? 'success' : 'error'
-  })
-  if (res.code === 1000) {
-    tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-    if (props.step === '20') {
-      await router.push({
-        name: 'Initiation'
-      })
-    } else if (props.step === '40') {
-      await router.push({
-        name: 'Implementation'
-      })
-    } else if (props.step === '50') {
-      await router.push({
-        name: 'Filing'
-      })
-    }
-  }
+  // })
 }
 const init = async () => {
  let id = projectId.value
--- a/src/components/DetailComponent/SpecialFundDetail.vue
+++ b/src/components/DetailComponent/SpecialFundDetail.vue
@@ -30,10 +30,10 @@
        <baseTitle title="关联项目"></baseTitle>
        <el-col :span="24">
          <el-form-item>
-            <fvTable style="width: 100%;max-height:300px" v-if="showTable" :tableConfig="projectTable"
+            <fvTable style="width: 100%;max-height:162px" height="162" v-if="showTable" :tableConfig="projectTable"
                     :data="formData.projects" :isSettingCol="false" :pagination="false">
              <template #empty>
-                <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+                <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
              </template>
            </fvTable>
          </el-form-item>
@@ -41,10 +41,10 @@
        <baseTitle title="附件列表"></baseTitle>
        <el-col :span="24">
          <el-form-item>
-            <fvTable style="width: 100%;max-height: 300px;"  height="300"  v-if="showTable" :tableConfig="fileTable"
+            <fvTable style="width: 100%;max-height: 162px;"  height="162"  v-if="showTable" :tableConfig="fileTable"
                     :data="formData.files" :isSettingCol="false" :pagination="false">
              <template #empty>
-                <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+                <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
              </template>
            </fvTable>
          </el-form-item>