Merge branch 'develop' into 'test'

Develop

See merge request LAWS/laws-system-front-FOTON!148

src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue

@@ -149,6 +149,18 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="technicalRequir"
+            align="center"
+            width="250"
+            label="核心技术要求/变化点">
+          </el-table-column>
+          <el-table-column
+            prop="changePoint"
+            width="250"
+            align="center"
+            label="基于上一版本差异">
+          </el-table-column>
           <el-table-column
             prop="xCXSSRQ"
             width="200"

src/pages/processCenter/pages/creatProcess/xmpg/step1.vue

@@ -554,6 +554,7 @@ export default {
           distributePerson: "", //分发责任人
           distributePersonId: "", //分发责任人id
           id: "",
+          pastProject: [], //用来存放上次选中的产品线信息
           sarStandProjectLibraries: [{
             projectManager: "",
             projectLevel: "",
@@ -685,6 +686,7 @@ export default {
     },
     //确认添加事件
     okStand() {
+      // this.pastProject = JSON.parse(localStorage.getItem('projectList'))
       let proData = [];
       if (this.dataList.length >= 1) {
         this.dataList.forEach(item => {
@@ -747,6 +749,7 @@ export default {
         this.isSubmit = true;
         this.listForm.commentText = this.commentText;
         var json = Object.assign(this.listForm, this.roleForm);
+        // localStorage.setItem('projectList', JSON.stringify(this.dataList))
         this.$refs["listForm"].validate((valid) => {
           if (valid) {
             this.$refs["roleForm"].validate((valid) => {

src/pages/processCenter/pages/creatProcess/xmpg/step3.vue

@@ -148,6 +148,16 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="technicalRequir"
+            align="center"
+            label="核心技术要求/变化点">
+          </el-table-column>
+          <el-table-column
+            prop="changePoint"
+            align="center"
+            label="基于上一版本差异">
+          </el-table-column>
           <el-table-column
             prop="xCXSSRQ"
             align="center"
@@ -481,6 +491,7 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
+      console.log(item);
       this.listForm = JSON.parse(JSON.stringify(item));
       if (item.form === undefined) {
         this.listForm.prcNum = this.prcNum;
@@ -499,6 +510,8 @@ export default {
             this.listForm.breakdownList.push({
               itemsName: item.pepdtos[i].breakdownList[j].itemsName,
               itemNum: item.pepdtos[i].breakdownList[j].itemsNum,
+              technicalRequir: item.pepdtos[i].breakdownList[j].technicalRequir,
+              changePoint: item.pepdtos[i].breakdownList[j].changePoint,
               responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer,
               responsibleUnit: item.pepdtos[i].breakdownList[j].responsibleUnit,
               productLine: item.pepdtos[i].sarStandProjectLibraries.productLine,

src/pages/processCenter/pages/creatProcess/xmpg/step4.vue

@@ -149,6 +149,18 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="technicalRequir"
+            align="center"
+            width="250"
+            label="核心技术要求/变化点">
+          </el-table-column>
+          <el-table-column
+            prop="changePoint"
+            width="250"
+            align="center"
+            label="基于上一版本差异">
+          </el-table-column>
           <el-table-column
             prop="xCXSSRQ"
             width="200"

src/pages/processCenter/pages/creatProcess/xmpg/step5.vue

@@ -149,6 +149,18 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="technicalRequir"
+            align="center"
+            width="250"
+            label="核心技术要求/变化点">
+          </el-table-column>
+          <el-table-column
+            prop="changePoint"
+            width="250"
+            align="center"
+            label="基于上一版本差异">
+          </el-table-column>
           <el-table-column
             prop="xCXSSRQ"
             width="200"

src/pages/processCenter/pages/creatProcess/xmpg/step6.vue

@@ -149,6 +149,18 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="technicalRequir"
+            align="center"
+            width="250"
+            label="核心技术要求/变化点">
+          </el-table-column>
+          <el-table-column
+            prop="changePoint"
+            width="250"
+            align="center"
+            label="基于上一版本差异">
+          </el-table-column>
           <el-table-column
             prop="xCXSSRQ"
             width="200"
@@ -551,11 +563,12 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList (item) {
+      console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item))
         this.listForm.prcNum = this.prcNum
         this.listForm.prcName = this.prcName
-        this.dataList = item.dataList
+        this.dataList = item.step3DTOS
         this.listForm.id = item.step3DTOS[0].id
         this.listForm.standName = item.step3DTOS[0].standName
         this.listForm.standNumber = item.step3DTOS[0].standNumber

src/pages/processCenter/pages/creatProcess/xmpg/step7.vue

@@ -149,6 +149,18 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="technicalRequir"
+            align="center"
+            width="250"
+            label="核心技术要求/变化点">
+          </el-table-column>
+          <el-table-column
+            prop="changePoint"
+            width="250"
+            align="center"
+            label="基于上一版本差异">
+          </el-table-column>
           <el-table-column
             prop="xCXSSRQ"
             width="200"

src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue

@@ -89,7 +89,7 @@
         tooltip-effect="dark"
         style="width: 100%"
         border
-        :height="tableHeight"
+        :height="400"
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px',
              fontWeight: 'normal', height: '48px'}"
         @selection-change="handleSelectionChange">
@@ -102,7 +102,7 @@
           show-overflow-tooltip
           prop="projectPlatfor"
           align="center"
-          label="产品平台">
+          label="产品平台789">
         </el-table-column>
         <el-table-column
           prop="projectNumber"