Merge pull request 'master' (#440) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/440
2024-06-30 12:04:14 +00:00
parent 43703f3366 3ba97bca2d
commit 6e3b1e8b54
12 changed files with 188 additions and 64 deletions
--- a/src/components/steps/index.vue
+++ b/src/components/steps/index.vue
@@ -103,6 +103,20 @@ const schema = computed(() => {
        span: 12
      }
    },
+    {
+      label: '项目名称',
+      prop: 'projectName',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
    {
      label: '所属公司',
      prop: 'affiliatedCompany',
@@ -110,13 +124,6 @@ const schema = computed(() => {
        span: 12
      }
    },
-    {
-      label: '项目名称',
-      prop: 'projectName',
-      colProps: {
-        span: 12
-      }
-    }

  ]
 })
--- a/src/views/project-management/filing/attachment.vue
+++ b/src/views/project-management/filing/attachment.vue
@@ -39,7 +39,21 @@ const schema = computed(() => {
      colProps: {
        span: 12
      }
-    }
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+    },
  ]
 })
 const baseForm = ref()
--- a/src/views/project-management/filing/upload.vue
+++ b/src/views/project-management/filing/upload.vue
@@ -45,7 +45,21 @@ const schema = computed(() => {
      colProps: {
        span: 12
      }
-    }
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+    },
  ]
 })
 const baseForm = ref()
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -38,35 +38,35 @@ const formDataArray = ref([
    label: '征集名称',
    prop: 'requirementName',
    colProps: {
-      span: 12
+      span: 8
    }
  },
  {
    label: '项目名称',
    prop: 'projectName',
    colProps: {
-      span: 12
+      span: 8
    }
  },
  {
    label: '项目负责人',
-    prop: 'projectChargePerson',
+    prop: 'projectChargePersonName',
    colProps: {
-      span: 12
+      span: 8
    }
  },
  {
    label: '项目开始时间',
    prop: 'startTime',
    colProps: {
-      span: 12
+      span: 8
    }
  },
  {
    label: '项目预计持续时间',
    prop: 'endTime',
    colProps: {
-      span: 12
+      span: 8
    }
  },
  {
@@ -84,7 +84,7 @@ const formDataArray = ref([
    }
  },
  {
-    label: '项目总体完成率（%）',
+    label: '项目总体完成率',
    prop: 'projectCompletionRate',
    colProps: {
      span: 6
@@ -101,11 +101,11 @@ const formDataArray = ref([
 ])
 const tableData = ref({})
 const schema = computed(() => {
-  if (JSON.stringify(tableData.value) !== '{}') {
+  // if (JSON.stringify(tableData.value) !== '{}') {
    return formDataArray.value
-  } else {
-    return formArray.value
-  }
+  // } else {
+  //   return formArray.value
+  // }
 })
 const baseForm = ref()
 const tableIns = ref()
@@ -257,10 +257,25 @@ const getBaseInfo = async () => {
  try {
    const {code, data} = await getBaseInfoApi(route.query.id)
    baseForm.value.setValues(data)
+    await init()
  } catch {
  }
 }
-
+const init = async () => {
+  const {code, msg, data} = await searchUpdateLedgerData(route.query.id)
+  console.log('data',data)
+  if (data) {
+    tableData.value = data
+    baseForm.value.setValues(data)
+  }
+  // if (code !== 1000) {
+  //   ElNotification({
+  //     title: '提示',
+  //     message: msg,
+  //     type: 'error'
+  //   })
+  // }
+}
 getBaseInfo()
 const headBtnClick = (key) => {
  switch (key) {
@@ -308,21 +323,7 @@ const search = (val) => {
  tableConfig.params = {...val, projectId: route.query.id}
  tableIns.value.refresh()
 }
-const init = async () => {
-  const {code, msg, data} = await searchUpdateLedgerData(route.query.id)
-  if (data) {
-    tableData.value = data
-    baseForm.value.setValues(data)
-  }
-  // if (code !== 1000) {
-  //   ElNotification({
-  //     title: '提示',
-  //     message: msg,
-  //     type: 'error'
-  //   })
-  // }
-}
-init()
+
 </script>

 <style scoped>
--- a/src/views/project-management/implementation/attachment.vue
+++ b/src/views/project-management/implementation/attachment.vue
@@ -56,6 +56,20 @@ const schema = computed(() => {
        span: 12
      }
    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+    },
  ]
 })
 const baseForm = ref()
--- a/src/views/project-management/implementation/phase.vue
+++ b/src/views/project-management/implementation/phase.vue
@@ -74,7 +74,21 @@ const schema = computed(() => {
      colProps: {
        span: 12
      }
-    }
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+    },
  ]
 })
 const baseForm = ref()
--- a/src/views/project-management/implementation/phaseDetail.vue
+++ b/src/views/project-management/implementation/phaseDetail.vue
@@ -38,7 +38,21 @@ const schema = computed(() => {
      colProps: {
        span: 12
      }
-    }
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+    },
  ]
 })
 const baseForm = ref()
--- a/src/views/project-management/implementation/share.vue
+++ b/src/views/project-management/implementation/share.vue
@@ -10,10 +10,8 @@
 </template>

 <script setup lang="jsx">
-import fvSelect from '@/fvcomponents/fvSelect/index.vue'
 import {computed, ref} from "vue";
 import {getBaseInfoApi} from "@/components/steps/api";
-import {getResearchUser} from "@/api/expense-manage";

 const route = useRoute()
 const schema = computed(() => {
@@ -31,7 +29,21 @@ const schema = computed(() => {
      colProps: {
        span: 12
      }
-    }
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+    },
  ]
 })
 const baseForm = ref()
--- a/src/views/project-management/implementation/updateTable.vue
+++ b/src/views/project-management/implementation/updateTable.vue
@@ -11,7 +11,7 @@
        <el-form-item prop="projectChargePerson" label="项目负责人">
          {{tableForm.projectChargePersonName}}
          <el-button @click="showPersonnelPicker">
-            {{ tableForm.projectChargePersonName ? '更改' : '请选择研发人员' }}
+            {{ tableForm.projectChargePersonName ? '更改' : '请选择项目负责人' }}
          </el-button>
        </el-form-item>
      </el-col>
--- a/src/views/project-management/implementation/upload.vue
+++ b/src/views/project-management/implementation/upload.vue
@@ -59,7 +59,21 @@ const schema = computed(() => {
      colProps: {
        span: 12
      }
-    }
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+    },
  ]
 })
 const baseForm = ref()
--- a/src/views/project-management/implementation/uploadFee.vue
+++ b/src/views/project-management/implementation/uploadFee.vue
@@ -2,7 +2,7 @@
  <baseTitle title="基础信息"></baseTitle>
  <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
  <el-form :model="tableForm" ref="form" class="query-form">
-    <el-table :data="tableForm.tableData" style="width: 100%">
+    <el-table :data="tableForm.tableData">
      <el-table-column prop="time" label="时间" width="180">
        <template #default="scope">
          <el-form-item prop="time" :rules="scope.row.time?'1':rules.time">
@@ -33,7 +33,7 @@
      </el-table-column>
      <el-table-column prop="researchStage" label="研发阶段" width="220">
        <template #default="scope">
-          <el-form-item prop="researchStage"  :rules="scope.row.researchStage?'1':rules.researchStage">
+          <el-form-item prop="researchStage" :rules="scope.row.researchStage?'1':rules.researchStage">
            <el-select v-model="scope.row.researchStage" placeholder="请选择研发阶段" clearable filterable>
              <el-option
                  v-for="item in cacheStore.getDict('fee_stage')"
@@ -56,7 +56,7 @@
      <el-table-column prop="afterTax" label="税后余额(元)" width="220">
        <template #default="scope">
          <el-form-item prop="afterTax" :rules="scope.row.afterTax?'1':rules.afterTax">
-            <el-input-number v-model="scope.row.afterTax" placeholder="请输入税后余额"  :controls="false">
+            <el-input-number v-model="scope.row.afterTax" placeholder="请输入税后余额" :controls="false">
            </el-input-number>
          </el-form-item>
        </template>
@@ -92,7 +92,7 @@ const router = useRouter()
 const tagsViewStore = useTagsView()
 const formData = ref({})
 const form = ref()
-const projectName=ref()
+const projectName = ref()
 const schema = computed(() => {
  return [
    {
@@ -108,7 +108,21 @@ const schema = computed(() => {
      colProps: {
        span: 12
      }
-    }
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+    },
  ]
 })
 const baseForm = ref()
@@ -166,10 +180,10 @@ const handleSubmit = (instance) => {
      })
    }
    instance.clearValidate()
-    tableForm.tableData.forEach(item=>{
-      item.projectName=projectName.value
+    tableForm.tableData.forEach(item => {
+      item.projectName = projectName.value
    })
-    const res =await addLedger(tableForm.tableData)
+    const res = await addLedger(tableForm.tableData)
    ElNotification({
      title: '提示',
      message: res.msg,
@@ -179,8 +193,8 @@ const handleSubmit = (instance) => {
      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
      router.push({
        name: 'Implementation/account',
-        query:{
-          id:route.query.id
+        query: {
+          id: route.query.id
        }
      })
    }
--- a/src/views/project-management/mobledetail/StepsMoblie.vue
+++ b/src/views/project-management/mobledetail/StepsMoblie.vue
@@ -101,24 +101,30 @@ const schema = computed(() => {
      label: '征集名称',
      prop: 'requirementName',
      colProps: {
-        span: 24
-      }
-    },
-    {
-      label: '所属公司',
-      prop: 'affiliatedCompany',
-      colProps: {
-        span: 24
+        span: 12
      }
    },
    {
      label: '项目名称',
      prop: 'projectName',
      colProps: {
-        span: 24
+        span: 12
      }
-    }
-
+    },
+    {
+      label: '征集描述',
+      prop: 'collectExplain',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+    },
  ]
 })