Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

src/views/report/project/components/projectEdit.vue

@@ -595,6 +595,9 @@
       <!-- 项目安排及阶段目标 -->
       <proj-stage-goals :stageGoals.sync="formData.stageGoals" />
 
+      <!-- 项目课题设置 -->
+      <project-sub-edit :projectSubList.sync="formData.projectSubList" />
+
       <!-- 附件 -->
       <file-edit :fileList.sync="formData.fileList" />
     </a-form-model>
@@ -614,6 +617,7 @@ import budgetEdit from '@/views/report/project/components/budgetEdit'
 import fundPlanEdit from '@/views/report/project/components/fundPlanEdit'
 import projectKpiEdit from '@/views/report/project/components/projectKpiEdit'
 import manufactureEdit from '@/views/report/project/components/manufactureEdit'
+import projectSubEdit from '@/views/report/project/components/projectSubEdit'
 import fileEdit from '@/views/report/project/components/fileEdit'
 import { isEmptyParams } from "@/views/utils/common"
 import moment from 'moment'
@@ -666,7 +670,7 @@ import cascaderSelect from '@/views/components/common/cascaderSelect'
 export default {
   name: 'projectEdit',
   components: {
-    projectMemberEdit, cooperativeUnitsEdit, budgetEdit, fundPlanEdit, projectKpiEdit, fileEdit, previewFile, documentView, cascaderSelect, equipmentsEdit, deviceEdit, projStageGoalsEdit, manufactureEdit
+    projectMemberEdit, cooperativeUnitsEdit, budgetEdit, fundPlanEdit, projectKpiEdit, fileEdit, previewFile, documentView, cascaderSelect, deviceEdit, projStageGoalsEdit, manufactureEdit, projectSubEdit
   },
   props: {
     value: {
@@ -730,6 +734,7 @@ export default {
         deviceList: [],
         manufactureList: [],
         stageGoals: [],
+        projectSubList: [],
         fileList: [],
         auditList: [],
         managerDept: "",
@@ -814,6 +819,8 @@ export default {
       if (!!!this.formData.stageGoals || this.formData.stageGoals.length == 0)
         this.formData.stageGoals = []
 
+      if (!!!this.formData.projectSubList || this.formData.projectSubList.length == 0)
+        this.formData.projectSubList = [{ ...ProjectSub }]
 
       if (!!!this.formData.fileList || !this.formData.fileList.length || this.formData.fileList.length == 0) {
         this.formData.fileList = []

src/views/report/project/components/projectInfo.vue

@@ -534,6 +534,8 @@
       </a-row>
       <!-- 项目安排及阶段目标 -->
       <proj-stage-goals-info :stageGoals.sync="value.stageGoals" />
+      <!-- 项目课题设置 -->
+      <project-sub-info :dataList.sync="value.projectSubList" />
     </div>
 
   </div>
@@ -548,6 +550,7 @@ import projectKpiInfo from '@/views/report/project/components/projectKpiInfo.vue
 import budgetInfo from '@/views/report/project/components/budgetInfo'
 import fundPlanInfo from '@/views/report/project/components/fundPlanInfo'
 import projStageGoalsInfo from "@/views/report/project/components/keyProject/projStageGoalsInfo";
+import projectSubInfo from '@/views/report/project/components/projectSubInfo'
 import fileInfo from "@/views/report/project/components/fileInfo";
 import documentView from '@/views/components/common/documentView'
 import AuditList from '@/views/audit/components/auditInfo'
@@ -556,7 +559,7 @@ import { toTextarea } from '@/views/utils/common'
 
 export default {
   components: {
-    cooperativeUnitsInfo, projectMemberInfo, projectKpiInfo, budgetInfo, fundPlanInfo, fileInfo, documentView, AuditList,projStageGoalsInfo
+    cooperativeUnitsInfo, projectMemberInfo, projectKpiInfo, budgetInfo, fundPlanInfo, fileInfo, documentView, AuditList, projStageGoalsInfo,projectSubInfo
   },
   name: "ProjectInfo",
   data () {