444

src/api/index.js

@@ -934,17 +934,11 @@ export default {
         refreshSystemParameter () {
             return fetch('/v1/science-admin/system-parameter/refreshSystemParameter')
         },
-        getParameterListBySystemCode (params) {
-            return fetch(`/v1/science-admin/system-parameter/getParameterListBySystemCode`, params)
+        getMultiLevelList (params) {
+            return fetch(`/v1/science-admin/system-parameter/getMultiLevelList`, params)
         },
-        getKnowledgeInfoList1 () {
-            return fetch(`/v1/science-admin/system-parameter/getKnowledgeInfoList1`)
-        },
-        getKnowledgeInfoList2 (params) {
-            return fetch(`/v1/science-admin/system-parameter/getKnowledgeInfoList2`, params)
-        },
-        getSpecArray (params) {
-            return fetch(`/v1/science-admin/system-parameter/getSpecArray`, params)
+        getMultiLevelIdList (params) {
+            return fetch(`/v1/science-admin/system-parameter/getMultiLevelIdList`, params)
         },
     },
     parameterType: {

src/views/assign/components/groupExpertSelect.vue

@@ -95,7 +95,7 @@ export default {
       this.$emit("close", 'cancel')
     },
     loadTreeSelect () {
-      this.$api.parameter.getKnowledgeInfoList1().then(({ data = {} }) => {
+      this.$api.parameter.getMultiLevelList({ typeId: 68 }).then(({ data = {} }) => {
         if (data) {
           this.treeData = data
           // this.defaultExpandedKeys = [this.treeData[0].key]

src/views/components/common/cascaderSelect.vue

@@ -40,7 +40,7 @@ export default {
       if (!!this.options && this.options.length > 0) {
         this.loadParaArray()
       } else {
-        this.$api.parameter.getKnowledgeInfoList2({ typeId: this.typeId }).then(({ data = {} }) => {
+        this.$api.parameter.getMultiLevelList({ typeId: this.typeId }).then(({ data = {} }) => {
           if (data) {
             this.options = data
             this.loadParaArray()
@@ -54,7 +54,7 @@ export default {
           this.selected = this.getSpecInfo(this.value)
         }
       } else {
-        this.$api.parameter.getSpecArray({ typeId: this.typeId }).then(({ data = {} }) => {
+        this.$api.parameter.getMultiLevelIdList({ typeId: this.typeId }).then(({ data = {} }) => {
           if (data) {
             this.paraArray = data
             if (!!this.value) {

src/views/components/common/knowledgeSelect.vue

-<template>
-  <div>
-    <a-select v-model="selected" placeholder="输入学科代码名称" :default-active-first-option="false" showSearch 
-    :show-arrow="false" :filter-option="false" @search="onSearch" @change="handleChange" :style="{width: width + 'px'}" allowClear>
-      <a-select-option v-for="item in selectArray" :key="item.key" :value="item.key"> 
-        {{ item.title }}
-      </a-select-option>
-    </a-select>
-  </div>
-</template>
-<!-- :filterOption="filterOption" -->
-<script>
-export default {
-  name: "knowledgeSelect",
-  props: {
-    value: {
-      type: undefined,
-      default () {
-        return null
-      }
-    },
-    width: {
-      type: Number,
-      default() {
-        return 180;
-      },
-    },
-  },
-  data() {
-    return {
-      selectArray: [],
-      selected: null,
-      defaultValue: {
-        title: "--请选择" + this.title + "--",
-        key: "",
-        description: "",
-        selected: true,
-        disabled: true,
-      }
-    };
-  },
-  created() {
-    if (this.value)
-      this.selected = this.value
-  },
-  methods: {
-    onSearch(value) {
-      if (value == '') {
-        return
-      }
-      let pars = { SystemCodeOrName: value }
-      this.$api.parameter.getParameterListBySystemCode(pars).then(({ data = {} }) => {
-        this.selectArray = []
-        // 模拟从数据库查询数据
-        if (data && data.length > 0) {
-          this.selectArray = data
-        }
-        // else {
-        //   this.selectArray.push({ title: value, key: "00000000-0000-0000-0000-000000000000" })
-        // }
-      })
-    },
-    // filterOption(input, option) {
-    //   // 自定义过滤逻辑，如果没有匹配的选项就保留输入值
-    //   return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0;
-    // },
-    handleChange(value) {
-      this.$emit("input", value);
-      var newArr = this.selectArray.filter(x => x.key == value);
-      if (value && !!newArr && newArr.length > 0) {
-        var text = !!value ? newArr[0].title : ''
-        this.$emit('changeTitle', text)
-      }
-      this.$emit("change");
-    },
-    loadValue () {
-      if (this.isAll) {
-        this.selectArray.unshift(this.defaultValue)
-      }
-      if (!!!this.selected) {
-        if (!!this.value) {
-          this.selected = this.value + ''
-        } else {
-          if (this.selectArray.length > 0)
-            this.selected = this.selectArray[0].key
-          else
-            this.selected = ''
-        }
-      }
-      this.$emit("input", this.selected)
-    },
-    reset() {
-      this.selected = undefined
-      this.selectArray = []
-      this.$nextTick(() => {
-        this.$emit('input', undefined)
-        this.$emit('change')
-      })
-    }
-  },
-  watch: {
-    value: {
-      handler (value) {
-        if (!value) {
-          this.selected = undefined
-          this.selectArray = []
-        } else {
-          this.selected = value + ''
-        }
-        this.$emit("input", this.selected)
-      },
-      immediate: true
-    },
-  }
-};
-</script>
\ No newline at end of file

src/views/report/project/Index.vue

@@ -65,7 +65,6 @@ import { isEmptyParams, filterExportExcelData, tableColumnsName, checkEmail, per
 import projectCreate from '@/views/report/project/components/projectCreate'
 import projectView from '@/views/report/project/components/projectView'
 import previewFile from '@/views/components/common/previewFile'
-import knowledgeSelect from '@/views/components/common/knowledgeSelect'
 import personInfoEdit from '@/views/basicSetting/person/edit'
 
 import axios from 'axios'
@@ -73,7 +72,7 @@ import axios from 'axios'
 export default {
   name: 'reportProject',
   components: {
-    projectView, projectCreate, previewFile, knowledgeSelect, personInfoEdit
+    projectView, projectCreate, previewFile, personInfoEdit
   },
   data () {
     return {

src/views/report/task/Index.vue

@@ -170,7 +170,7 @@ export default {
         this.projId = record.projId
         this.visibleEdit = true
       } else if (type === 'edit') {
-        this.createType = true
+        this.createType = false
         this.projId = record.projId
         this.visibleEdit = true
       } else {

src/views/report/task/components/taskEdit.vue

@@ -654,8 +654,9 @@
           </a-col>
         </a-row>
         <participate-units-info :dataList.sync="formData.participateUnits" />
+        <!-- 附件 -->
+        <file-edit :fileList.sync="formData.fileList" />
       </a-form-model>
-      <!-- 项目主要参与单位及分工 -->
 
     </div>
     <div v-if="tabsData[1].isShow">
@@ -1106,13 +1107,14 @@ import manufactureInfo from '@/views/report/project/components/manufactureInfo'
 import projStageGoalsInfo from "@/views/report/project/components/projStageGoalsInfo";
 import projectSubInfo from '@/views/report/project/components/projectSubInfo'
 import fileInfo from "@/views/report/project/components/fileInfo";
+import fileEdit from '@/views/report/project/components/fileEdit'
 import documentView from '@/views/components/common/documentView'
 import { toTextarea } from '@/views/utils/common'
 
 export default {
   name: 'projectEdit',
   components: {
-    cooperativeUnitsInfo, projectMemberInfo, projectKpiInfo, budgetInfo, fundPlanInfo, unitPaymentInfo, deviceInfo, manufactureInfo, fileInfo, projStageGoalsInfo, projectSubInfo, participateUnitsInfo, documentView
+    cooperativeUnitsInfo, projectMemberInfo, projectKpiInfo, budgetInfo, fundPlanInfo, unitPaymentInfo, deviceInfo, manufactureInfo, fileInfo, fileEdit, projStageGoalsInfo, projectSubInfo, participateUnitsInfo, documentView
   },
   props: {
     value: {

src/views/talentAssign/components/groupExpertSelect.vue

@@ -69,7 +69,7 @@ export default {
   },
   methods: {
     loadTreeSelect () {
-      this.$api.parameter.getKnowledgeInfoList1().then(({ data = {} }) => {
+      this.$api.parameter.getMultiLevelList({ typeId: 68 }).then(({ data = {} }) => {
         if (data) {
           this.treeData = data
           // this.defaultExpandedKeys = [this.treeData[0].key]