Merge remote-tracking branch 'origin/qirui-v2' into qirui-v2

# Conflicts:
#	src/providers/http.js

src/providers/http.js

@@ -497,6 +497,11 @@ export const api = {
     initSelectList: function (paramObj) {
         return fetch('/DFMEA/dvp/fullVehicle/getConfigList', paramObj);
     },
+    // dvp编制-基本信息初始化
+    initDvpBasicInformation: function (paramObj) {
+        return fetch('/DFMEA/dvp/fullVehicle/getDvpBasicInformation', paramObj);
+    },
+    // dvp编制-计划页试验数据编辑初始化
     editDvpTestInit: function (paramObj) {
         return post('/DFMEA/dvp/fullVehicle/editDvpTestDetailInit', paramObj);
     }

src/views/fullVehicle/baseInfo/baseInfo/index.vue

@@ -1,18 +1,18 @@
 <template>
   <a-card class="backCard">
     <!-- 编辑 -->
-    <a-button 
+    <a-button
       v-if="$api.btnPms && !isEdit"
-      class="mr-24" 
+      class="mr-24"
       slot="extra"
       type="primary"
       @click="doEdit()" >
       {{ $t('global-btn.edit') }}
     </a-button>
     <!-- 保存 -->
-    <a-button 
+    <a-button
       v-if="$api.btnPms && isEdit"
-      class="mr-24" 
+      class="mr-24"
       slot="extra"
       type="primary"
       @click="doSave()">
@@ -24,25 +24,25 @@
           <!-- 项目编号 -->
           <a-col :xl="6" :lg="8" :md="12" :sm="24" :xs="24">
             <a-form-item :label="$t('base.info.project.number')">
-              <span  class="ml8">{{ BaseInfo.projectCode }}</span>
+              <span  class="ml8">{{ baseInfo.projectNo }}</span>
             </a-form-item>
           </a-col>
           <!-- 项目名称 -->
           <a-col :xl="6" :lg="8" :md="12" :sm="24" :xs="24">
           <a-form-item :label="$t('base.info.project.name')">
-            <span  class="ml8">{{ BaseInfo.projectName }}</span>
+            <span  class="ml8">{{ baseInfo.projectName }}</span>
           </a-form-item>
           </a-col>
           <!-- 项目状态 -->
           <a-col :xl="6" :lg="8" :md="12" :sm="24" :xs="24">
             <a-form-item :label="$t('base.info.project.status')">
-              <span  class="ml8">{{ BaseInfo.projectStatus }}</span>
+              <span  class="ml8">{{ baseInfo.projectState }}</span>
             </a-form-item>
           </a-col>
           <!-- 当前节点 -->
           <a-col :xl="6" :lg="8" :md="12" :sm="24" :xs="24">
             <a-form-item :label="$t('base.info.current.node')">
-              <span  class="ml8">{{ BaseInfo.projectNode }}</span>
+              <span  class="ml8">{{ baseInfo.projectNode }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -50,25 +50,25 @@
           <!-- 车型 -->
           <a-col :xl="6" :lg="8" :md="12" :sm="24" :xs="24">
             <a-form-item :label="$t('base.info.vehicle.model')">
-              <span  class="ml8">{{ BaseInfo.vehicleModel }}</span>
+              <span  class="ml8">{{ baseInfo.vehicleModel }}</span>
             </a-form-item>
           </a-col>
           <!-- 产品类型 -->
           <a-col :xl="6" :lg="8" :md="12" :sm="24" :xs="24">
             <a-form-item :label="$t('base.info.product.type')">
-              <span  class="ml8">{{ BaseInfo.productType }}</span>
+              <span  class="ml8">{{ baseInfo.productType }}</span>
             </a-form-item>
           </a-col>
           <!-- 年 -->
           <a-col :xl="6" :lg="8" :md="12" :sm="24" :xs="24">
             <a-form-item :label="$t('base.info.year')">
-              <span  class="ml8">{{ BaseInfo.projectDate }}</span>
+              <span  class="ml8">{{ baseInfo.year }}</span>
             </a-form-item>
           </a-col>
           <!-- 平台 -->
           <a-col :xl="6" :lg="8" :md="12" :sm="24" :xs="24">
             <a-form-item :label="$t('base.info.platform')">
-              <span  class="ml8">{{ BaseInfo.platform }}</span>
+              <span  class="ml8">{{ baseInfo.platform }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -76,25 +76,25 @@
           <!-- 项目等级 -->
           <a-col :xl="6" :lg="8" :md="12" :sm="24" :xs="24">
             <a-form-item :label="$t('base.info.project.level')">
-              <span  class="ml8">{{ BaseInfo.projectLevel }}</span>
+              <span  class="ml8">{{ baseInfo.projectLevel }}</span>
             </a-form-item>
           </a-col>
           <!-- 项目总监 -->
           <a-col :xl="6" :lg="8" :md="12" :sm="24" :xs="24">
             <a-form-item :label="$t('base.info.project.director')">
-              <span  class="ml8">{{ BaseInfo.projectDirector }}</span>
+              <span  class="ml8">{{ baseInfo.projectDirector }}</span>
             </a-form-item>
           </a-col>
           <!-- 项目经理 -->
           <a-col :xl="6" :lg="8" :md="12" :sm="24" :xs="24">
             <a-form-item :label="$t('base.info.project.manager')">
-              <span  class="ml8">{{ BaseInfo.projectManager }}</span>
+              <span  class="ml8">{{ baseInfo.projectManager }}</span>
             </a-form-item>
           </a-col>
           <!-- 计划完成时间 -->
           <a-col :xl="6" :lg="8" :md="12" :sm="24" :xs="24">
             <a-form-item :label="$t('base.info.Planned.Completion.date')">
-              <span  class="ml8">{{ BaseInfo.plannedCompletionDate }}</span>
+              <span  class="ml8">{{ baseInfo.plannedCompletionDate }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -102,19 +102,19 @@
           <!-- 性能模块 -->
           <a-col :xl="6" :lg="8" :md="12" :sm="24" :xs="24">
             <a-form-item :label="$t('base.info.performance.module')">
-              <span  class="ml8">{{ BaseInfo.fmeaBusiType }}</span>
+              <span  class="ml8">{{ baseInfo.performanceModuleCode }}</span>
             </a-form-item>
           </a-col>
           <!-- 需求部门 -->
           <a-col :xl="6" :lg="8" :md="12" :sm="24" :xs="24">
             <a-form-item :label="$t('base.info.demand.department')">
-              <span  class="ml8">{{ BaseInfo.dfmeaCode }}</span>
+              <span  class="ml8">{{ baseInfo.department }}</span>
             </a-form-item>
           </a-col>
           <!-- 需求负责人 -->
           <a-col :xl="12" :lg="8" :md="12" :sm="24" :xs="24">
             <a-form-item :label="$t('base.info.requirement.owner')">
-              <span v-if="!isEdit" class="ml8">{{ BaseInfo.cpacCode }}</span>
+              <span v-if="!isEdit" class="ml8">{{ baseInfo.owner }}</span>
               <a-select
                 v-else
                 class="selectWidth"
@@ -139,7 +139,7 @@
           <!-- 开发范围 -->
           <a-col :xl="6" :lg="8" :md="12" :sm="24" :xs="24">
             <a-form-item :label="$t('base.info.development.scope')">
-              <span  class="ml8">{{ BaseInfo.systemName }}</span>
+              <span  class="ml8">{{ baseInfo.developRange }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -150,86 +150,42 @@
 
 <script>
 
-import { getUrlParam } from "@/common/common";
 
 export default {
-  name: "BaseInfo",
+  name: "baseInfo",
   components: {
   },
   data() {
     return {
-      BaseInfo: {},
-      isEdit: false, // 编辑标识
-      owner: undefined, // 责任人
-      ownerList: [
-        {id: 1, name: 'qasdadad'}
-      ], // 责任人字典
+      dvpId: undefined,    //dvpId
+      baseInfo: {},        //基本信息
+      isEdit: false,      // 编辑标识
+      owner: undefined,   // 责任人
+      ownerList: []      // 责任人字典
     };
   },
   created() {},
   mounted() {
+    this.initBaseInfo();
   },
   methods: {
     //获取基本信息
     async initBaseInfo() {
-      var t = this.fmeaId;
-      let url = "/DFMEA/plan/getRdfmBasicInfo.do?fmeaId=" + this.fmeaId;
-      this.$api.post(url, null).then((response) => {
-        if (response.flag) {
-          this.drawFlag = response.data.drawFlag;
-          this.BaseInfo = {
-            key: 1,
-            projectCode: response.data.projectNo,// (项目编号)
-            projectName: response.data.projectName, // 项目名称
-            dfmeaCode: response.data.fmeaCode, // (DFMEA编号)
-            partName: response.data.partName, // (零部件名称)
-            systemName: response.data.systemName, // 系统名称
-            creator: response.data.creator, // (DFMEA创建者)
-            dfmeaOwner: response.data.ownerName, // (DFMEA owner)
-            deptId: response.data.departmentId, // (部门)
-            rank: response.data.changeLevel, //
-            isOrganization: response.data.drawFlag, // 是否编制
-            masterFmeaCode: response.data.familyFmeaCode, // (家族FMEA编号)
-            masterFmeaId: response.data.masterFmeaId, // (家族FMEA id)
-            useFmeaId: response.data.extendsFmeaCode,
-            reason: response.data.cause == null ? "" : response.data.cause, // 原因说明
-            partLevel: response.data.partLevel,
-            fmeaBusiType: response.data.fmeaBusiType,
-            fmeaType: response.data.fmeaBusiType, // (FMEA类型)
-            departmentName: response.data.department, // (部门名称)
-            flag: response.data.flag,
-            lifeState: response.data.lifeState,
-            // 奇瑞新增字段
-            projectStatus: response.data.projectState, // 项目状态
-            projectNode: response.data.projectNode, // 项目节点
-            vehicleModel: response.data.vehicleModel, // 车型
-            productType: response.data.productType, // 产品类型
-            projectDate: response.data.year.slice(0,4), // 年
-            plannedCompletionDate: response.data.plannedCompletionDate, //计划完成时间
-            platform: response.data.platform, // 平台
-            cpacCode: response.data.cpacCoding, //  CPAC编码
-            fndCode: response.data.fndCode, // FND代码
-            customer: response.data.customerName, // 客户名称
-            secrecyLevel: response.data.secrecyLevel, // 保密级别
-            company: response.data.company, // 公司
-            projectLocation: response.data.projectLocation, // 工程地点
-            projectLevel: response.data.projectLevel, //  项目等级
-            projectDirector: response.data.projectDirector, //  项目总监
-            projectManager: response.data.projectManager, //  项目经理
-          };
-          let u = localStorage.getItem("userInfo") || "{}";
-          let userInfo = JSON.parse(u);
-
-          this.isOwner = userInfo.userId == response.data.dfmeaOwnerId;
-          //储存 是否能添加评审意见 flag
-          this.$store.dispatch("fmeaTree/set", {
-            key: "commentsFlag",
-            value: response.data.commentsFlag
-          });
-        } else {
-          this.$message.error(response.message, 1);
+      let _that = this;
+      let data = {
+        dvpId: _that.$store.getters.dvpId
+      }
+      _that.$api.initDvpBasicInformation(data).then(res =>{
+        if (res.flag){
+          _that.baseInfo = res.data;
+          //处理"年"，只显示年份不显示后面日期与时间
+          if (_that.baseInfo.year){
+            _that.baseInfo.year = _that.baseInfo.year.slice(0,4)
+          }
+        } else{
+          _that.$message.error(res.message, 1);
         }
-      });
+      })
     },
     // 保存
     doSave() {