Merge remote-tracking branch 'origin/develop' into develop

src/pages/details/otherStandardDetails/index.vue

@@ -533,15 +533,18 @@
             @selection-change="selectAllStand">
           <el-table-column
               type="selection"
-              width="55"
               fixed="left"
-              align="center">
+              align="center"
+              width="60"
+          >
           </el-table-column>
           <el-table-column
               sortable="custom"
               show-overflow-tooltip
               prop="itemsNum"
+              width="90"
               label="条款号"
+              align="center"
           >
           </el-table-column>
           <el-table-column
@@ -564,10 +567,18 @@
           </el-table-column>
           <el-table-column
               prop="readContent"
-              label="解读内容"
+              width="160"
+              label="核心技术要求/变化点"
               show-overflow-tooltip
+              align="center"
           >
-
+          </el-table-column>
+          <el-table-column
+              show-overflow-tooltip
+              align="center"
+              prop="comparedWithPrevious"
+              label="基于上一版本差异"
+              width="150">
           </el-table-column>
           <el-table-column
               prop="xccssrq"
@@ -580,7 +591,7 @@
           <el-table-column
               prop="zccssrq"
               label="在产车实施日期(文本)"
-              width="180">
+              width="170">
             <template slot-scope="scope">
               <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format('YYYY-MM-DD') : '' }}</span>
             </template>
@@ -589,6 +600,7 @@
               show-overflow-tooltip
               prop="applyArctic"
               label="适用车型"
+              width="90"
           >
           </el-table-column>
           <el-table-column
@@ -600,12 +612,6 @@
               label="责任工程师"
               width="100">
           </el-table-column>
-          <el-table-column
-              show-overflow-tooltip
-              prop="comparedWithPrevious"
-              label="基于上一版本差异"
-              width="150">
-          </el-table-column>
           <el-table-column
               show-overflow-tooltip
               label="符合性状态"

src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue

@@ -60,7 +60,7 @@
                                         </el-button>
                                     </div>
                                 </el-form-item>
-                                <el-form-item label="附件" prop="modelNameList" class="add-form-item form-item-disabled">
+                                <el-form-item label="相关附件" prop="modelNameList" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
                                             style="display: none;"

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

@@ -60,7 +60,7 @@
                     </el-button>
                   </div>
                 </el-form-item>
-                <el-form-item label="附件" prop="modelNameList" class="add-form-item form-item-disabled">
+                <el-form-item label="相关附件" prop="modelNameList" class="add-form-item form-item-disabled">
                   <el-input
                           disabled
                           style="display: none;"

src/pages/processCenter/pages/creatProcess/bzdy/step2.vue

@@ -50,7 +50,7 @@
                                         - -
                                     </div>
                                 </el-form-item>
-                                <el-form-item label="附件" prop="model" class="add-form-item form-item-disabled">
+                                <el-form-item label="相关附件" prop="model" class="add-form-item form-item-disabled">
                                     <div v-if="form.fjList.length > 0" style="display: flex;">
                                         <div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updateFile(item)">
                                             {{ item.name }}

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

@@ -50,7 +50,7 @@
                                         - -
                                     </div>
                                 </el-form-item>
-                                <el-form-item label="附件" prop="model" class="add-form-item form-item-disabled">
+                                <el-form-item label="相关附件" prop="model" class="add-form-item form-item-disabled">
                                     <div v-if="form.fjList.length > 0" style="display: flex;">
                                         <div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updateFile(item)">
                                             {{ item.name }}
@@ -91,12 +91,16 @@
                                         </el-button>
                                     </div>
                                 </el-form-item>
-                                <el-form-item label="回执说明" prop="title" class="add-form-item form-item-disabled">
+                                <el-form-item label="回执说明" prop="dyhz" class="add-form-item form-item-disabled">
                                     <el-input
                                             v-model="form.dyhz"
+                                            style="height: 150px"
+                                            type="textarea"
+                                            :autosize="{ minRows: 1, maxRows: 5}"
                                             placeholder="请输入回执说明"
                                             clearable
                                     ></el-input>
+<!--                                 用来把多行的那个标记取消掉 resize="none"-->
                                 </el-form-item>
                             </el-col>
                         </el-row>
@@ -249,6 +253,9 @@
                 formRules: {
                     fileName: [
                         { required: true, message: '请上传调研结果', trigger: 'change' },
+                    ],
+                    dyhz: [
+                        { required: true, message: '请输入回执说明', trigger: 'change' },
                     ]
                 },
                 json: {},

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

@@ -50,7 +50,7 @@
                                         - -
                                     </div>
                                 </el-form-item>
-                                <el-form-item label="附件" prop="model" class="add-form-item form-item-disabled">
+                                <el-form-item label="相关附件" prop="model" class="add-form-item form-item-disabled">
                                     <div v-if="form.fjList.length > 0" style="display: flex;">
                                         <div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updateFile(item)">
                                             {{ item.name }}
@@ -91,6 +91,9 @@
                                     <el-input
                                             disabled
                                             v-model="form.dyhz"
+                                            style="height: 150px"
+                                            type="textarea"
+                                            :autosize="{ minRows: 1, maxRows: 20}"
                                             placeholder="请输入调研回执"
                                             clearable
                                     ></el-input>

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

@@ -389,47 +389,22 @@ export default {
       if (this.data.length < 1) {
         this.$message.warning("请输入征求意见搞");
       } else {
-        var a = 0;
+        this.isSubmit = true;
-        var b = 0;
+        var json = this.json;
-        // var c = 0
+        json.oldinfo = this.oldData;
-        for (let s1 = 0; s1 < this.data.length; s1++) {
+        json.commentText = this.commentText;
-          if (!this.data[s1].chapterNumber) {
+        json.introduce = true;
-            a++;
+        this.$http.post("lawss/activiti/completeTask", {
+          json: JSON.stringify(json),
+          taskId: this.taskIds,
+          userId: this.$store.getters.userInfo.userId
+        }, {}, res => {
+          if (res.success) {
+            this.$message.success("提交成功");
+            this.$router.push("/processCenter");
           }
-          if (!this.data[s1].chapterName) {
+          this.isSubmit = false;
-            b++;
+        });
-          }
-          // if (!this.data[s1].commentText) {
-          //     c++
-          // }
-        }
-        if (a > 0) {
-          this.$message.warning("请输入章节编号");
-        } else if (b > 0) {
-          this.$message.warning("请输入章节名称");
-        }
-          // else if (c > 0) {
-          //     this.$message.warning('请输入意见内容')
-        // }
-        else {
-          this.isSubmit = true;
-          var json = this.json;
-          json.oldinfo = this.oldData;
-          json.commentText = this.commentText;
-          json.introduce = true;
-          console.log(json);
-          this.$http.post("lawss/activiti/completeTask", {
-            json: JSON.stringify(json),
-            taskId: this.taskIds,
-            userId: this.$store.getters.userInfo.userId
-          }, {}, res => {
-            if (res.success) {
-              this.$message.success("提交成功");
-              this.$router.push("/processCenter");
-            }
-            this.isSubmit = false;
-          });
-        }
       }
     },
     getData() {
@@ -457,7 +432,7 @@ export default {
           if (data.introduce) {
           } else {
             this.$http.get("slrs/sar-public-idea-all/getPublicIdea", {
-              unique: data.uniques
+              unique: data.unique
             }, {}, res => {
               res.data.forEach(item => {
                 item.chapterNumber = item.partCode;

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

@@ -62,12 +62,12 @@
           <el-button type="primary"
                      class="common-button-primary add-button"
                      @click="upload(data, '汇总单.xls')"
-                     size="mini">导出汇总单
+                     size="mini">生成汇总单
           </el-button>
           <el-button type="primary"
                      class="common-button-primary add-button"
-                     @click="upload(oldData, '征求意见搞.xls')"
+                     @click="upload(oldData, '上报意见.xls')"
-                     size="mini">导出征求意见稿
+                     size="mini">生成上报意见
           </el-button>
         </div>
         <el-table

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

@@ -62,12 +62,12 @@
           <el-button type="primary"
                      class="common-button-primary add-button"
                      @click="upload(data, '汇总单.xls')"
-                     size="mini">导出汇总单
+                     size="mini">生成汇总单
           </el-button>
           <el-button type="primary"
                      class="common-button-primary add-button"
-                     @click="upload(oldData, '征求意见搞.xls')"
+                     @click="upload(oldData, '上报意见.xls')"
-                     size="mini">导出征求意见搞
+                     size="mini">生成上报意见
           </el-button>
         </div>
         <el-table

src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue

@@ -62,12 +62,12 @@
           <el-button type="primary"
                      class="common-button-primary add-button"
                      @click="upload(data, '汇总单.xls')"
-                     size="mini">导出汇总单
+                     size="mini">生成汇总单
           </el-button>
           <el-button type="primary"
                      class="common-button-primary add-button"
-                     @click="upload(oldData, '征求意见搞.xls')"
+                     @click="upload(oldData, '上报意见.xls')"
-                     size="mini">导出征求意见搞
+                     size="mini">生成上报意见
           </el-button>
         </div>
         <el-table

src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue

@@ -62,12 +62,12 @@
           <el-button type="primary"
                      class="common-button-primary add-button"
                      @click="upload(data, '汇总单.xls')"
-                     size="mini">导出汇总单
+                     size="mini">生成汇总单
           </el-button>
           <el-button type="primary"
                      class="common-button-primary add-button"
-                     @click="upload(oldData, '征求意见搞.xls')"
+                     @click="upload(oldData, '上报意见.xls')"
-                     size="mini">导出征求意见搞
+                     size="mini">生成上报意见
           </el-button>
         </div>
         <el-table

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

@@ -15,6 +15,7 @@
           <template slot="title">基础信息</template>
         </process-title>
         <el-form
+            v-if="foldFormFlag === false"
           :model="listForm"
           :rules="formRules"
           ref="listForm"
@@ -61,6 +62,57 @@
             </el-col>
           </el-row>
         </el-form>
+        <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+        <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
+        <el-form
+            v-if="foldFormFlag === true"
+            style="display: none"
+            :model="listForm"
+            :rules="formRules"
+            ref="listForm"
+            class="label-input-form prc-content-border"
+            label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="选择标准" prop="orgName" class="add-form-item form-item-disabled">
+                <el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">选择已拆分标准</el-button>
+              </el-form-item>
+              <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                <el-input
+                    @click.native="handlePreview(listForm)"
+                    readonly
+                    v-model="listForm.standNumber"
+                    placeholder="请输入标准编号"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-input
+                    @click.native="handlePreview(listForm)"
+                    readonly
+                    v-model="listForm.standName"
+                    placeholder="请输入标准名称"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.certifiedEngineerName"
+                    placeholder="请选择认证工程师"
+                    clearable
+                    @click.native="choiceZRR(null,'certifiedEngineer', '选择认证工程师', roleForm.certifiedEngineer)"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.qualityEngineerName"
+                    placeholder="请选择质量工程师"
+                    clearable
+                    @click.native="choiceZRR(null,'qualityEngineer', '选择质量工程师', roleForm.qualityEngineer)"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <process-title>
           <template slot="title">填写信息</template>
         </process-title>
@@ -101,8 +153,8 @@
                 placeholder="请选择分发负责人"
                 readonly
                 @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"
-                v-if="!scope.row.distributePerson"></el-input>
+                ></el-input>
-              <span v-else>{{ scope.row.distributePerson }}</span>
+<!--              <span v-else>{{ scope.row.distributePerson }}</span>-->
             </template>
             <!--            <template slot-scope="scope,text" v-if="showColumn">-->
             <!--              <div>-->
@@ -401,6 +453,8 @@ export default {
   },
   data() {
     return {
+      //折叠的标志，true为折叠，false为不折叠
+      foldFormFlag: false,
       //用来判断提交事件条件是否满足
       satisfyFlag: true,
       active: "1",
@@ -509,6 +563,7 @@ export default {
           distributePerson: "", //分发责任人
           distributePersonId: "", //分发责任人id
           id: "",
+          pastProject: [], //用来存放上次选中的产品线信息
           sarStandProjectLibraries: [{
             projectManager: "",
             projectLevel: "",
@@ -532,6 +587,10 @@ export default {
     };
   },
   methods: {
+    //折叠/展开基础信息方法
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag
+    },
     getData() {
       queryTaskFirst({
         bpnId: this.$route.query.bpnId
@@ -652,6 +711,7 @@ export default {
     },
     //确认添加事件
     okStand() {
+      this.pastProject = JSON.parse(localStorage.getItem('projectList'))
       let proData = [];
       if (this.dataList.length >= 1) {
         this.dataList.forEach(item => {
@@ -669,9 +729,21 @@ export default {
         this.standModel = false;
       } else {
         if (this.standList.length >= 1) {
-          this.dataList = this.standList;
+          if (this.pastProject === null){
-          this.roleForm.directorUser = this.dataList[0].uname;
+            this.dataList = this.standList;
+          }else {
+            this.pastProject.forEach(item => {
+              this.standList.map(items => {
+                if( item.productLine === items.productLine){
+                  items.distributePersonId = item.distributePersonId
+                  items.distributePerson = item.distributePerson
+                }
+              })
+            })
+            this.dataList = this.standList
+          }
           this.listForm.dataList = this.standList;
+          this.roleForm.directorUser = this.dataList[0].uname;
           this.standModel = false;
         } else {
           this.$message.warning("请选择一条数据进行添加");
@@ -716,6 +788,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/step1-2.vue

@@ -15,6 +15,7 @@
           <template slot="title">基础信息</template>
         </process-title>
         <el-form
+            v-if="foldFormFlag === false"
           :model="listForm"
           class="label-input-form prc-content-border"
           label-width="150px"
@@ -54,6 +55,50 @@
             </el-col>
           </el-row>
         </el-form>
+        <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+        <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
+        <el-form
+            v-if="foldFormFlag === true"
+            style="display: none"
+            :model="listForm"
+            class="label-input-form prc-content-border"
+            label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.standNumber"
+                    placeholder="请输入标准编号"
+                    readonly
+                    @click.native="handlePreview(listForm)"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.standName"
+                    placeholder="请输入标准名称"
+                    readonly
+                    @click.native="handlePreview(listForm)"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                    readonly
+                    v-model="listForm.certifiedEngineerName"
+                    placeholder="请选择认证工程师"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                    readonly
+                    v-model="listForm.qualityEngineerName"
+                    placeholder="请选择质量工程师"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <process-title>
           <template slot="title">填写信息</template>
         </process-title>
@@ -191,6 +236,8 @@ export default {
   },
   data() {
     return {
+      //折叠的标志，true为折叠，false为不折叠
+      foldFormFlag: false,
       detailData: [],
       // 当前流程类型(1待办/2已办)
       processType: 1,
@@ -266,6 +313,10 @@ export default {
     };
   },
   methods: {
+    //折叠/展开基础信息方法
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag
+    },
     processTable () {
       this.$http.get('lawss/activiti/get_list_by_instance', {
         prcNum: this.$route.query.prcNum,

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

@@ -15,6 +15,7 @@
           <template slot="title">基础信息</template>
         </process-title>
         <el-form
+            v-if="foldFormFlag === false"
           :model="listForm"
           class="label-input-form prc-content-border"
           label-width="150px"
@@ -54,6 +55,50 @@
             </el-col>
           </el-row>
         </el-form>
+        <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+        <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
+        <el-form
+            v-if="foldFormFlag === true"
+            style="display: none"
+            :model="listForm"
+            class="label-input-form prc-content-border"
+            label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.standNumber"
+                    placeholder="请输入标准编号"
+                    readonly
+                    @click.native="handlePreview(listForm)"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.standName"
+                    placeholder="请输入标准名称"
+                    readonly
+                    @click.native="handlePreview(listForm)"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.certifiedEngineerName"
+                    placeholder="请选择认证工程师"
+                    readonly
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.qualityEngineerName"
+                    placeholder="请选择质量工程师"
+                    readonly
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <process-title>
           <template slot="title">填写信息</template>
         </process-title>
@@ -104,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"
@@ -314,6 +371,8 @@ export default {
   },
   data() {
     return {
+      //折叠的标志，true为折叠，false为不折叠
+      foldFormFlag: false,
       detailData: [],
       sarProStateTableHeight: null, // 项目列表高度
       // 当前流程类型(1待办/2已办)
@@ -388,6 +447,10 @@ export default {
     };
   },
   methods: {
+    //折叠/展开基础信息方法
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag
+    },
     processTable () {
       this.$http.get('lawss/activiti/get_list_by_instance', {
         prcNum: this.$route.query.prcNum,

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

@@ -15,6 +15,7 @@
           <template slot="title">基础信息</template>
         </process-title>
         <el-form
+            v-if="foldFormFlag === false"
           :model="listForm"
           :rules="formRules"
           ref="listForm"
@@ -61,6 +62,57 @@
             </el-col>
           </el-row>
         </el-form>
+        <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+        <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
+        <el-form
+            v-if="foldFormFlag === true"
+            style="display: none"
+            :model="listForm"
+            :rules="formRules"
+            ref="listForm"
+            class="label-input-form prc-content-border"
+            label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="选择标准" prop="orgName" class="add-form-item form-item-disabled">
+                <el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">选择已拆分标准</el-button>
+              </el-form-item>
+              <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                <el-input
+                    @click.native="handlePreview(listForm)"
+                    readonly
+                    v-model="listForm.standNumber"
+                    placeholder="请输入标准编号"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-input
+                    @click.native="handlePreview(listForm)"
+                    readonly
+                    v-model="listForm.standName"
+                    placeholder="请输入标准名称"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.certifiedEngineerName"
+                    placeholder="请选择认证工程师"
+                    clearable
+                    @click.native="choiceZRR(null,'certifiedEngineer', '选择认证工程师', roleForm.certifiedEngineer)"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.qualityEngineerName"
+                    placeholder="请选择质量工程师"
+                    clearable
+                    @click.native="choiceZRR(null,'qualityEngineer', '选择质量工程师', roleForm.qualityEngineer)"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <process-title>
           <template slot="title">填写信息</template>
         </process-title>
@@ -389,6 +441,8 @@ export default {
   },
   data() {
     return {
+      //折叠的标志，true为折叠，false为不折叠
+      foldFormFlag: false,
       //用来判断提交事件条件是否满足
       satisfyFlag: true,
       active: "1",
@@ -500,6 +554,7 @@ export default {
           distributePerson: "", //分发责任人
           distributePersonId: "", //分发责任人id
           id: "",
+          pastProject: [], //用来存放上次选中的产品线信息
           sarStandProjectLibraries: [{
             projectManager: "",
             projectLevel: "",
@@ -523,6 +578,10 @@ export default {
     };
   },
   methods: {
+    //折叠/展开基础信息方法
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag
+    },
     checkedRole(data) {
       if (this.type === "dockUser") {
         this.roleForm.dockUser = data[0].id;
@@ -627,6 +686,7 @@ export default {
     },
     //确认添加事件
     okStand() {
+      this.pastProject = JSON.parse(localStorage.getItem('projectList'))
       let proData = [];
       if (this.dataList.length >= 1) {
         this.dataList.forEach(item => {
@@ -644,9 +704,21 @@ export default {
         this.standModel = false;
       } else {
         if (this.standList.length >= 1) {
-          this.dataList = this.standList;
+          if (this.pastProject === null){
-          this.roleForm.directorUser = this.dataList[0].uname;
+            this.dataList = this.standList;
+          }else {
+            this.pastProject.forEach(item => {
+              this.standList.map(items => {
+                if( item.productLine === items.productLine){
+                  items.distributePersonId = item.distributePersonId
+                  items.distributePerson = item.distributePerson
+                }
+              })
+            })
+            this.dataList = this.standList
+          }
           this.listForm.dataList = this.standList;
+          this.roleForm.directorUser = this.dataList[0].uname;
           this.standModel = false;
         } else {
           this.$message.warning("请选择一条数据进行添加");
@@ -689,6 +761,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/step2.vue

@@ -15,6 +15,7 @@
           <template slot="title">基础信息</template>
         </process-title>
         <el-form
+            v-if="foldFormFlag === false"
           :model="listForm"
           class="label-input-form prc-content-border"
           label-width="150px"
@@ -54,6 +55,50 @@
             </el-col>
           </el-row>
         </el-form>
+        <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+        <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
+        <el-form
+            v-if="foldFormFlag === true"
+            style="display: none"
+            :model="listForm"
+            class="label-input-form prc-content-border"
+            label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.standNumber"
+                    placeholder="请输入标准编号"
+                    readonly
+                    @click.native="handlePreview(listForm)"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.standName"
+                    placeholder="请输入标准名称"
+                    readonly
+                    @click.native="handlePreview(listForm)"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                    readonly
+                    v-model="listForm.certifiedEngineerName"
+                    placeholder="请选择认证工程师"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                    readonly
+                    v-model="listForm.qualityEngineerName"
+                    placeholder="请选择质量工程师"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <process-title>
           <template slot="title">填写信息</template>
         </process-title>
@@ -213,6 +258,8 @@ export default {
   },
   data() {
     return {
+      //折叠的标志，true为折叠，false为不折叠
+      foldFormFlag: false,
       nodeList:[],
       isTransfer: false,
       drawerTitle:'',
@@ -293,6 +340,10 @@ export default {
     };
   },
   methods: {
+    //折叠/展开基础信息方法
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag
+    },
     //确认转办
     checkedRole (data) {
       this.assigneeNewLoading = true

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

@@ -15,6 +15,7 @@
           <template slot="title">基础信息</template>
         </process-title>
         <el-form
+            v-if="foldFormFlag === false"
           :model="listForm"
           class="label-input-form prc-content-border"
           label-width="150px"
@@ -54,6 +55,50 @@
             </el-col>
           </el-row>
         </el-form>
+        <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+        <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
+        <el-form
+            v-if="foldFormFlag === true"
+            style="display: none"
+            :model="listForm"
+            class="label-input-form prc-content-border"
+            label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.standNumber"
+                    placeholder="请输入标准编号"
+                    readonly
+                    @click.native="handlePreview(listForm)"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.standName"
+                    placeholder="请输入标准名称"
+                    readonly
+                    @click.native="handlePreview(listForm)"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.certifiedEngineerName"
+                    placeholder="请选择认证工程师"
+                    readonly
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.qualityEngineerName"
+                    placeholder="请选择质量工程师"
+                    readonly
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <process-title>
           <template slot="title">填写信息</template>
         </process-title>
@@ -103,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"
@@ -248,6 +303,8 @@ export default {
   },
   data() {
     return {
+      //折叠的标志，true为折叠，false为不折叠
+      foldFormFlag: false,
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,
@@ -343,6 +400,10 @@ export default {
     };
   },
   methods: {
+    //折叠/展开基础信息方法
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag
+    },
     //确认转办
     checkedTransferRole(data) {
       this.assigneeNewLoading = true;
@@ -430,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;
@@ -448,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

@@ -15,6 +15,7 @@
           <template slot="title">基础信息</template>
         </process-title>
         <el-form
+            v-if="foldFormFlag === false"
           :model="listForm"
           class="label-input-form prc-content-border"
           label-width="150px"
@@ -54,6 +55,50 @@
             </el-col>
           </el-row>
         </el-form>
+        <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+        <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
+        <el-form
+            v-if="foldFormFlag === true"
+            style="display: none"
+            :model="listForm"
+            class="label-input-form prc-content-border"
+            label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.standNumber"
+                    placeholder="请输入标准编号"
+                    readonly
+                    @click.native="handlePreview(listForm)"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.standName"
+                    placeholder="请输入标准名称"
+                    readonly
+                    @click.native="handlePreview(listForm)"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.certifiedEngineerName"
+                    placeholder="请选择认证工程师"
+                    readonly
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.qualityEngineerName"
+                    placeholder="请选择质量工程师"
+                    readonly
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <process-title>
           <template slot="title">填写信息</template>
         </process-title>
@@ -104,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"
@@ -372,6 +429,8 @@ export default {
   },
   data() {
     return {
+      //折叠的标志，true为折叠，false为不折叠
+      foldFormFlag: false,
       nodeList:[],
       drawerTitle:'',
       isTransfer: false,
@@ -436,6 +495,10 @@ export default {
     };
   },
   methods: {
+    //折叠/展开基础信息方法
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag
+    },
     //确认转办
     checkedTransferRole (data) {
       this.assigneeNewLoading = true

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

@@ -15,6 +15,7 @@
           <template slot="title">基础信息</template>
         </process-title>
         <el-form
+            v-if="foldFormFlag === false"
           :model="listForm"
           class="label-input-form prc-content-border"
           label-width="150px"
@@ -54,6 +55,50 @@
             </el-col>
           </el-row>
         </el-form>
+        <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+        <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
+        <el-form
+            v-if="foldFormFlag === true"
+            style="display: none"
+            :model="listForm"
+            class="label-input-form prc-content-border"
+            label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.standNumber"
+                    placeholder="请输入标准编号"
+                    readonly
+                    @click.native="handlePreview(listForm)"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.standName"
+                    placeholder="请输入标准名称"
+                    readonly
+                    @click.native="handlePreview(listForm)"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.certifiedEngineerName"
+                    placeholder="请选择认证工程师"
+                    readonly
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.qualityEngineerName"
+                    placeholder="请选择质量工程师"
+                    readonly
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <process-title>
           <template slot="title">填写信息</template>
         </process-title>
@@ -104,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"
@@ -336,6 +393,8 @@ export default {
   },
   data() {
     return {
+      //折叠的标志，true为折叠，false为不折叠
+      foldFormFlag: false,
       nodeList:[],
       drawerTitle:'',
       isTransfer: false,
@@ -415,6 +474,10 @@ export default {
     };
   },
   methods: {
+    //折叠/展开基础信息方法
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag
+    },
     //确认转办
     checkedTransferRole (data) {
       this.assigneeNewLoading = true

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

@@ -15,6 +15,7 @@
           <template slot="title">基础信息</template>
         </process-title>
         <el-form
+            v-if="foldFormFlag === false"
           :model="listForm"
           class="label-input-form prc-content-border"
           label-width="150px"
@@ -54,6 +55,50 @@
             </el-col>
           </el-row>
         </el-form>
+        <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+        <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
+        <el-form
+            v-if="foldFormFlag === true"
+            style="display: none"
+            :model="listForm"
+            class="label-input-form prc-content-border"
+            label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.standNumber"
+                    placeholder="请输入标准编号"
+                    readonly
+                    @click.native="handlePreview(listForm)"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.standName"
+                    placeholder="请输入标准名称"
+                    readonly
+                    @click.native="handlePreview(listForm)"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.certifiedEngineerName"
+                    placeholder="请选择认证工程师"
+                    readonly
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.qualityEngineerName"
+                    placeholder="请选择质量工程师"
+                    readonly
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <process-title>
           <template slot="title">填写信息</template>
         </process-title>
@@ -104,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"
@@ -335,6 +392,8 @@ export default {
   },
   data() {
     return {
+      //折叠的标志，true为折叠，false为不折叠
+      foldFormFlag: false,
       nodeList:[],
       drawerTitle:'',
       isTransfer: false,
@@ -414,6 +473,10 @@ export default {
     };
   },
   methods: {
+    //折叠/展开基础信息方法
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag
+    },
     //确认转办
     checkedTransferRole (data) {
       this.assigneeNewLoading = true
@@ -500,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

@@ -15,6 +15,7 @@
           <template slot="title">基础信息</template>
         </process-title>
         <el-form
+            v-if="foldFormFlag === false"
           :model="listForm"
           class="label-input-form prc-content-border"
           label-width="150px"
@@ -54,6 +55,50 @@
             </el-col>
           </el-row>
         </el-form>
+        <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+        <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
+        <el-form
+            v-if="foldFormFlag === true"
+            style="display: none"
+            :model="listForm"
+            class="label-input-form prc-content-border"
+            label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.standNumber"
+                    placeholder="请输入标准编号"
+                    readonly
+                    @click.native="handlePreview(listForm)"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.standName"
+                    placeholder="请输入标准名称"
+                    readonly
+                    @click.native="handlePreview(listForm)"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.certifiedEngineerName"
+                    placeholder="请选择认证工程师"
+                    readonly
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                    v-model="listForm.qualityEngineerName"
+                    placeholder="请选择质量工程师"
+                    readonly
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <process-title>
           <template slot="title">填写信息</template>
         </process-title>
@@ -104,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"
@@ -335,6 +392,8 @@ export default {
   },
   data() {
     return {
+      //折叠的标志，true为折叠，false为不折叠
+      foldFormFlag: false,
       nodeList:[],
       drawerTitle:'',
       isTransfer: false,
@@ -414,6 +473,10 @@ export default {
     };
   },
   methods: {
+    //折叠/展开基础信息方法
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag
+    },
     //确认转办
     checkedTransferRole (data) {
       this.assigneeNewLoading = true

src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue

@@ -24,11 +24,11 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                <el-form-item label="选择项目" prop="orgName" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="选择项目" prop="orgName" class="add-form-item form-item-disabled">-->
-                  <el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceProject">选择项目
+<!--                  <el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceProject">选择项目-->
-                  </el-button>
+<!--                  </el-button>-->
-                </el-form-item>
+<!--                </el-form-item>-->
-                <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
+                <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled" style="float: left">
                   <el-input
                     v-model="qdform.projectNumber"
                     placeholder="请输入项目编号"
@@ -36,6 +36,8 @@
                     clearable
                   ></el-input>
                 </el-form-item>
+                <el-button size="mini" type="primary" style="margin-top: 1%;" @click="choiceProject">选择项目
+                </el-button>
                 <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
                   <el-input
                     v-model="qdform.projectName"
@@ -44,10 +46,10 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="选择清单" prop="orgName" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="选择清单" prop="orgName" class="add-form-item form-item-disabled">-->
-                  <el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceList">选择清单</el-button>
+<!--                  <el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceList">选择清单</el-button>-->
-                </el-form-item>
+<!--                </el-form-item>-->
-                <el-form-item label="清单名称" prop="detailedListName" class="add-form-item form-item-disabled">
+                <el-form-item label="清单名称" prop="detailedListName" class="add-form-item form-item-disabled" style="float: left">
                   <el-input
                     v-model="qdform.detailedListName"
                     placeholder="请输入清单名称"
@@ -55,6 +57,7 @@
                     clearable
                   ></el-input>
                 </el-form-item>
+                <el-button size="mini" type="primary" style="margin-top: 1%;" @click="choiceList">选择清单</el-button>
               </el-col>
             </el-row>
           </div>

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

@@ -23,11 +23,11 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                <el-form-item label="选择项目" prop="orgName" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="选择项目" prop="orgName" class="add-form-item form-item-disabled">-->
-                  <el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceProject">选择项目
+<!--                  <el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceProject">选择项目-->
-                  </el-button>
+<!--                  </el-button>-->
-                </el-form-item>
+<!--                </el-form-item>-->
-                <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
+                <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled" style="float: left">
                   <el-input
                     v-model="qdform.projectNumber"
                     placeholder="请输入项目编号"
@@ -35,6 +35,8 @@
                     clearable
                   ></el-input>
                 </el-form-item>
+                <el-button size="mini" type="primary" style="margin-top: 1%;" @click="choiceProject">选择项目
+                </el-button>
                 <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
                   <el-input
                     v-model="qdform.projectName"
@@ -43,10 +45,10 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="选择清单" prop="orgName" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="选择清单" prop="orgName" class="add-form-item form-item-disabled">-->
-                  <el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceList">选择清单</el-button>
+<!--                  <el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceList">选择清单</el-button>-->
-                </el-form-item>
+<!--                </el-form-item>-->
-                <el-form-item label="清单名称" prop="detailedListName" class="add-form-item form-item-disabled">
+                <el-form-item label="清单名称" prop="detailedListName" class="add-form-item form-item-disabled" style="float: left">
                   <el-input
                     v-model="qdform.detailedListName"
                     placeholder="请输入清单名称"
@@ -54,6 +56,7 @@
                     clearable
                   ></el-input>
                 </el-form-item>
+                <el-button size="mini" type="primary" style="margin-top: 1%;" @click="choiceList">选择清单</el-button>
               </el-col>
             </el-row>
           </div>

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -7,7 +7,7 @@
       <div class="search-area">
         <div class="left">
           <el-form inline :model="sarAccessEO" ref="sarAccessForm" class="label-input-form" :rules="sarAccessEORules"
-                   label-width="80px">
+                   label-width="100px">
             <el-form-item label="清单名称" prop="detailedListName" class="search-item">
               <el-input v-model="sarAccessEO.detailedListName" :disabled="disabledFlag" placeholder="请输入"></el-input>
             </el-form-item>
@@ -42,7 +42,7 @@
               ></el-input>
             </el-form-item>
             <br/><br/>
-            <el-form-item label="附件" prop="relateFile" class="search-item">
+            <el-form-item label="清单说明附件" prop="relateFile" class="search-item">
               <el-upload
                   ref="relevantFile"
                   :action="uploadFileListPath"
@@ -278,6 +278,14 @@
             width="55"
             align="center">
         </el-table-column>
+        <el-table-column
+            label="序号"
+            align="center"
+            width="55"
+            fixed="left"
+            type="index"
+        >
+        </el-table-column>
         <el-table-column
             prop="code"
             show-overflow-tooltip

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -25,7 +25,7 @@
           <span class="transition-box-span">{{ sarAccessEO.remark || "-" }}</span>
         </p>
         <div class="transition-box-p">
-          <label class="transition-box-label">附件：</label>
+          <label class="transition-box-label">清单说明附件：</label>
           <div class="file-box" v-if="fileInfoList.length > 0">
             <p v-for="item in fileInfoList"
                :key="item.id"> {{ item.name }}
@@ -109,6 +109,14 @@
             width="55"
             align="center">
           </el-table-column>
+          <el-table-column
+              label="序号"
+              align="center"
+              width="55"
+              fixed="left"
+              type="index"
+          >
+          </el-table-column>
           <el-table-column
             prop="standNumber"
             fixed="left"
@@ -849,7 +857,7 @@ export default {
 
       .transition-box-label {
         display: inline-block;
-        width: 80px;
+        width: 100px;
         vertical-align: top;
       }
 

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue

@@ -6,7 +6,7 @@
       <el-divider content-position="left">基础信息</el-divider>
       <div class="search-area">
         <div class="left">
-          <el-form inline :model="sarAccessEO" ref="sarAccessForm" class="label-input-form" :rules="sarAccessEORules" label-width="80px">
+          <el-form inline :model="sarAccessEO" ref="sarAccessForm" class="label-input-form" :rules="sarAccessEORules" label-width="100px">
             <el-form-item label="清单名称" prop="detailedListName" class="search-item">
               <el-input v-model="sarAccessEO.detailedListName" :disabled="disabledFlag" placeholder="请输入"></el-input>
             </el-form-item>
@@ -26,7 +26,7 @@
               ></el-input>
             </el-form-item>
             <br/><br/>
-            <el-form-item label="附件" prop="relateFile" class="search-item">
+            <el-form-item label="清单说明附件" prop="relateFile" class="search-item">
               <el-upload
                 ref="relevantFile"
                 :action="uploadFileListPath"
@@ -253,6 +253,14 @@
           width="55"
           align="center">
         </el-table-column>
+        <el-table-column
+            label="序号"
+            align="center"
+            width="55"
+            fixed="left"
+            type="index"
+        >
+        </el-table-column>
         <el-table-column
           prop="standNumber"
           show-overflow-tooltip

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue

@@ -7,7 +7,7 @@
       <div class="search-area">
         <div class="left">
           <el-form inline :model="sarAccessEO" ref="sarAccessForm" class="label-input-form" :rules="sarAccessEORules"
-                   label-width="80px">
+                   label-width="100px">
             <el-form-item label="清单名称" prop="detailedListName" class="search-item">
               <el-input v-model="sarAccessEO.detailedListName" :disabled="disabledFlag" placeholder="请输入"></el-input>
             </el-form-item>
@@ -39,7 +39,7 @@
               ></el-input>
             </el-form-item>
             <br/><br/>
-            <el-form-item label="附件" prop="relateFile" class="search-item">
+            <el-form-item label="清单说明附件" prop="relateFile" class="search-item">
               <el-upload
                   ref="relevantFile"
                   :action="uploadFileListPath"
@@ -311,6 +311,14 @@
             width="55"
             align="center">
         </el-table-column>
+        <el-table-column
+            label="序号"
+            align="center"
+            width="55"
+            fixed="left"
+            type="index"
+        >
+        </el-table-column>
         <el-table-column
             prop="standNumber"
             show-overflow-tooltip

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -138,11 +138,16 @@
                    v-btn-permission="'b17f1d035219c47344032e261342d87d'"
                    title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"><i class="iconfont">&#xe6e9;</i>导出
         </el-button>
-        <el-button class="common-button-default delete-button"
+<!--        <el-button class="common-button-default delete-button"
                    :loading="delLoading"
                    size="mini"
                    @click="deleteStand(2)"
                    v-btn-permission="'c09dc12531085e30e39bbdc6cb6116ba'"><i class="iconfont">&#xe61b;</i>批量删除
+        </el-button>-->
+        <el-button class="common-button-default"
+                   size="mini"
+                   @click="configurationStandard"
+                   v-btn-permission="'8158aefd62cda676a6baf179532328c6'"><i class="iconfont">&#xe669;</i>配置标准
         </el-button>
         <el-button class="common-button-default"
                    size="mini"
@@ -154,11 +159,6 @@
         <!--                   :loading="searching"-->
         <!--                   @click="uploadImportModal(1)"-->
         <!--                   v-btn-permission="'86a8f92390bb4dcd7f1c2176c183c943'"><i class="iconfont">&#xe825;</i>模板下载</el-button>-->
-        <el-button class="common-button-default"
-                   size="mini"
-                   @click="configurationStandard"
-                   v-btn-permission="'8158aefd62cda676a6baf179532328c6'"><i class="iconfont">&#xe669;</i>配置标准
-        </el-button>
       </div>
       <div class="content">
         <div class="table-wrap">
@@ -182,6 +182,7 @@
             </el-table-column>
             <el-table-column
               label="标准号"
+              width="200"
             >
               <template slot-scope="scope">
                 <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
@@ -201,6 +202,7 @@
               show-overflow-tooltip
               prop="standName"
               label="标准名称"
+              width="300"
             >
               <template slot-scope="scope">
                 <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
@@ -220,7 +222,7 @@
             <el-table-column
               prop="SSRQ"
               sortable="custom"
-              width="150px"
+              width="110px"
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -242,12 +242,12 @@
 <!--          @click="uploadImportModal(1)"-->
 <!--          v-btn-permission="'afX1p2gh3c'"-->
 <!--        ><i class="iconfont">&#xe825;</i>模板下载</el-button>-->
-        <el-button
+<!--        <el-button
           class="common-button-default delete-button"
           round
           @click="deleteStand(2)"
           v-btn-permission="'374205ce36a859a158ca4db196d151b7'"
-        ><i class="iconfont">&#xe61b;</i>批量删除</el-button>
+        ><i class="iconfont">&#xe61b;</i>批量删除</el-button>-->
         <el-button
           class="common-button-default"
           round
@@ -293,7 +293,7 @@
           <el-table-column
             show-overflow-tooltip
             label="企标编号"
-            width="210"
+            width="200"
           >
             <template slot-scope="scope">
 <!--                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>-->
@@ -306,6 +306,7 @@
             show-overflow-tooltip
             prop="standName"
             label="中文名称"
+            width="300"
           >
             <template slot-scope="scope">
               <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -317,6 +318,7 @@
             show-overflow-tooltip
             prop="standEnName"
             label="英文名称"
+            width="300"
           >
             <template slot-scope="scope">
               <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -136,26 +136,26 @@
                    title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
                    v-btn-permission="'8871ed1be74cf65851659514880bb50a'"><i class="iconfont">&#xe6e9;</i>导出
         </el-button>
-        <el-button class="common-button-default delete-button"
+<!--        <el-button class="common-button-default delete-button"
                    :loading="delLoading"
                    size="mini"
                    @click="deleteStand(2)"
                    v-btn-permission="'4d01342db0f56f01bfceaee7b46904f4'"><i class="iconfont">&#xe61b;</i>批量删除
+        </el-button>-->
+        <el-button class="common-button-default"
+                   size="mini" @click="configurationStandard"
+                   v-btn-permission="'590049684c0af005c6b3d1f0ebcf897e'"><i class="iconfont">&#xe669;</i>配置标准
         </el-button>
         <el-button class="common-button-default"
                    size="mini"
                    @click="deleteStandFromKind(2)"
                    v-btn-permission="'29bf24bbd156c06f136cc89b1c7b2bb0'"><i class="iconfont">&#xe611;</i>移除标准
         </el-button>
-        <el-button class="common-button-default"
+<!--&lt;!&ndash;        <el-button class="common-button-default"
                    size="mini" :loading="searching"
                    @click="uploadImportModal(1)"
-                   v-btn-permission="'4mFaJU3fTS'"><i class="iconfont">&#xe825;</i>模板下载
+                   v-btn-permission="'4mFaJU3fTS'"><i class="iconfont">&#xe825;</i>模板下载&ndash;&gt;
-        </el-button>
+        </el-button>-->
-        <el-button class="common-button-default"
-                   size="mini" @click="configurationStandard"
-                   v-btn-permission="'590049684c0af005c6b3d1f0ebcf897e'"><i class="iconfont">&#xe669;</i>配置标准
-        </el-button>
       </div>
       <div class="content">
         <div class="table-wrap">
@@ -179,15 +179,19 @@
             </el-table-column>
             <el-table-column
               label="标准号"
+              width="200"
             >
               <template slot-scope="scope">
                 <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
                     scope.row.standSortShow
                   }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
-                <a v-else-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{
+                <a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">{{
                     scope.row.standSortShow
                   }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
-                <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
+                <a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">{{
+                    scope.row.standSortShow
+                  }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
                   {{ scope.row.standNumber }}</a>
               </template>
             </el-table-column>
@@ -195,10 +199,12 @@
               show-overflow-tooltip
               prop="standName"
               label="标准名称"
+              width="300"
             >
               <template slot-scope="scope">
                 <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
-                <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
               </template>
             </el-table-column>
             <el-table-column
@@ -210,7 +216,10 @@
                 <div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
                     {{ formatIssueDate(scope.row.issueTime) }}
                 </div>
-                <div v-else style="color: #2d8cf0">
+                <div v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">
+                  {{ formatIssueDate(scope.row.issueTime) }}
+                </div>
+                <div v-else style="color: #333333">
                     {{ formatIssueDate(scope.row.issueTime) }}
                 </div>
               </template>
@@ -218,12 +227,13 @@
             <el-table-column
               prop="SSRQ"
               sortable="custom"
-              width="150px"
+              width="110px"
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
                 <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</span>
-                <span v-else style="color: #2d8cf0">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</span>
+                <span v-else style="color: #333333">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</span>
 
               </template>
             </el-table-column>
@@ -234,7 +244,8 @@
               label="新车型实施日期">
               <template slot-scope="scope">
                 <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
-                <span v-else style="color: #2d8cf0">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
+                <span v-else style="color: #333333">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -244,7 +255,8 @@
               label="在产车实施日期">
               <template slot-scope="scope">
                 <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
-                <span v-else style="color: #2d8cf0">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
+                <span v-else style="color: #333333">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -259,7 +271,8 @@
               <!--              </template>-->
               <template slot-scope="scope">
                 <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ textStatusMap[scope.row.textStatus] }}</span>
-                <span v-else style="color: #2d8cf0">{{ textStatusMap[scope.row.textStatus] }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{ textStatusMap[scope.row.textStatus] }}</span>
+                <span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="50" fixed="right">

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">

src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue

@@ -154,6 +154,10 @@
               prop="productType"
               width="180"
               label="产品类型">
+              <template slot-scope="scope">
+                <div v-if="scope.row.productType === 'research'">在研</div>
+                <div v-if="scope.row.productType === 'product'">在产</div>
+              </template>
             </el-table-column>
             <el-table-column
               prop="productLine"

src/sysConfig/index.js

@@ -4,10 +4,10 @@
  * @date: 2018-09-04 17:47:46
  */
 // 服务器地址
-const devIp = '62.234.136.153'
+// const devIp = '62.234.136.153'
-const devInterfacePORT = '8033'
+// const devInterfacePORT = '8033'
-// const devIp = '10.5.103.101'
+const devIp = '192.168.10.247'
-// const devInterfacePORT = '9999'
+const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
 const simpleFilePath = 'att/attFile/upload'