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

# Conflicts: # src/pages/home1/components/release/index.vue
2021-09-17 16:33:04 +08:00
parent 77f068cbd5 7156b1fa27
commit 18d0c7d822
41 changed files with 1363 additions and 594 deletions
@@ -415,6 +415,14 @@ export function isEnd (data) {
  })
 }

+export function get_verify_by_instance (data) {
+  return axios({
+    url: '/api/lawss/activiti/get_verify_by_instance',
+    method: 'get',
+    params: data
+  })
+}
+
 // 流程委托接口
 export function changeAssigneeNew (data) {
  return axios({
@@ -4,7 +4,6 @@ require('es6-promise').polyfill();
 require('es6-promise/auto');
 import Vue from 'vue'
 import App from './App'
-import router from './router'
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 // jQuery
@@ -42,6 +41,68 @@ import Contextmenu from 'vue-contextmenujs'

 import animate from 'animate.css'

+// 引入路由器
+import router from './router'
+// 路由解析器
+import Re from 'path-to-regexp'
+
+import { get_verify_by_instance } from 'api/process'
+
+
+// 路由拦截
+router.beforeEach(function (to, from, next) {
+  let path = to.path;
+  console.log("auth : to =>", to);
+  console.log("auth : path =>" + path);
+  let taskId = to.query.taskIds;
+  let prcId = to.query.prcId;
+  let prcNum = to.query.prcNum;
+  let prcName = to.query.prcName;
+  let prcType = to.query.prcType;
+  if(taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null){
+    get_verify_by_instance({
+      taskId: taskId, // 任务id
+      pId: prcId // 流程实例
+    }).then(res => {
+      if(res && res > 0){
+        let param = "?taskIds="+taskId+"&prcId="+prcId
+        +"&prcNum="+prcNum+"&prcName="+prcName+"&prcType="+prcType;
+        // 根据type判断跳转具体流程页面
+        if (prcType === '1') {
+          // 标准入库流程数据
+          next({path:"bzrkStep5"+param})
+        }else if(prcType === '4'){
+          //标准清单发布流程数据
+          next({path:"bzqdfbStep1-4"+param})
+        }else if (prcType === '5'){
+          //标准项目合规评估 标准维度
+          next({path:"xmpgStep1-2"+param})
+        }else if(prcType === '6'){
+          //标准项目合规评估 项目维度
+          next({path:"xmpg2Step1-2"+param})
+        } else if (prcType === '8') {
+          // 未符合项整改
+          next({path:"wfhxzgStep5-1"+param})
+        } else if(prcType === '9'){
+          next({path:"bzjdStep1-6"+param})
+          //标准调研流程
+        }else if(prcType === '2'){
+          next({path:"bzdyStep1-9"+param})
+        }else if(prcType === '3'){
+          //标准征求意见
+          next({path:"bzzqyjStep1-9"+param})
+        }else if(prcType === '10'){
+          //项目清单确认
+          next({path:"xmqdqrStep1-2"+param})
+        }
+      }
+      console.log("res : res =>", res);
+    })
+  }
+  next()
+})
+
+
 Vue.config.productionTip = false
 // jquery
 Vue.prototype.$ = $
@@ -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="符合性状态"
@@ -3,7 +3,7 @@
  <div class="link">
    <ul>
      <li v-for="(link, index) in linkList" v-if="index<5" :key="index">
-        <a v-if="link.name.length>15" @click="openLinkUrl(link.url)" v-html="link.name.substring(0,15)+'...'" :title="link.name"></a>
+        <a v-if="link.name.length>13" @click="openLinkUrl(link.url)" v-html="link.name.substring(0,13)+'...'" :title="link.name"></a>
        <a v-else @click="openLinkUrl(link.url)" v-html="link.name" :title="link.name"></a>


@@ -3,103 +3,86 @@
  <div class="release">
    <ul>
      <li v-for="item in standardReleaseList" :key="item.id" class="time-title" >
-        <div style="height: 18px;">
-          <a @click="handlePreview(item)" class="table-jump">{{ item.standName }}</a>
-          <span class="time">{{item.issueTime ? $moment(item.issueTime).format('YYYY-MM-DD') : '' }}</span>
-        </div>
+          <div style="height: 18px;">
+            <a @click="handlePreview(item)" class="table-jump">{{ item.standName }}</a>
+              <span class="time">{{item.issueTime ? $moment(item.issueTime).format('YYYY-MM-DD') : '' }}</span>
+          </div>
      </li>
    </ul>
  </div>
 </template>

 <script>
-  export default {
-    name: 'Release',
-    components: {},
-    mixins: [],
-    data() {
-      return {
-        putTime: '',
-        standardReleaseList: [],  //标准发布数据
-        updateTime:""
-      }
-    },
-    computed: {},
-    watch: {},
-    mounted() {
-      this.getDate()
-      this.getAdvice()
-      this.addDate()
-    },
-    methods: {
-      //获取当前年月日
-      addDate(){
-        const nowDate = new Date();
-        const date = {
-          year: nowDate.getFullYear(),
-          month: nowDate.getMonth() + 1,
-          date: nowDate.getDate(),
+export default {
+  name: 'Release',
+  components: {},
+  mixins: [],
+  data() {
+    return {
+      putTime: '',
+      standardReleaseList: [],  //标准发布数据
+    }
+  },
+  computed: {},
+  watch: {},
+  mounted() {
+    this.getDate()
+    this.getAdvice()
+    this.addDate()
+  },
+  methods: {
+    // 点击查看
+    handlePreview (item) {
+      let routeUrl = this.$router.resolve({
+        name: 'OtherStandardDetails',
+        params: {
+          id: item.id,
+          pageType: item.standType + '_STAND'
        }
-        const newmonth = date.month>10?date.month:'0'+date.month
-        const day = date.date>10?date.date:'0'+date.date
-        this.updateTime = date.year + '-' + newmonth + '-' + day
-        console.log("当前时间"+this.updateTime)
-      },
-      // 点击查看
-      handlePreview (item) {
-        let routeUrl = this.$router.resolve({
-          name: 'OtherStandardDetails',
-          params: {
-            id: item.id,
-            pageType: item.standType + '_STAND'
+      })
+      window.open(routeUrl.href, '_blank')
+    },
+    //截取时间
+    getDate (date) {
+      return date != null ? date.substring(0, date.indexOf(' ')) : ''
+    },
+    //获取数据
+    getAdvice() {
+      let obj = {}
+      obj.limit = 10
+      this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoByList', obj, {
+        _this: this
+      }, res => {
+        let arr = res.data
+        arr.forEach(item => {
+          if(item.standName !== ""){
+            this.standardReleaseList.push(item)
          }
        })
-        window.open(routeUrl.href, '_blank')
-      },
-      //截取时间
-      getDate (date) {
-        return date != null ? date.substring(0, date.indexOf(' ')) : ''
-      },
-      //获取数据
-      getAdvice() {
-        let obj = {}
-        obj.limit = 8
-        this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoByList', obj, {
-          _this: this
-        }, res => {
-          //与下文的循环重复, 会出现重复数据
-          // this.standardReleaseList = res.data
-          let arr = res.data
-          arr.forEach(item => {
-            if(item.standName !== ""){
-              this.standardReleaseList.push(item)
-            }
-          })
-        }, e => {
-        })
-      },
+      }, e => {
+      })
    },
+  },

-  }
+}
 </script>

 <style lang="less" scoped>
-  .release {
-    .time-title {
-      margin: 15px;
-      .time {
-        float: right;
-        color:#FFFFFF;
-      }
-      a {
-        color: #ffffff;
-        &:hover {
-          color: #e9c851;
-          cursor:pointer;
-          text-decoration: underline;
-        }
+.release {
+  .time-title {
+    margin: 15px;
+    .time {
+      float: right;
+      color:#FFFFFF;
+    }
+    a {
+      color: #ffffff;
+      &:hover {
+        color: #e9c851;
+        cursor:pointer;
+        text-decoration: underline;
      }
    }
  }
+}
 </style>
-
@@ -4,7 +4,7 @@
    <ul>
      <li v-for="item in domesticDynamics" :key="item.id" class="time-title">
        <div style="height: 18px">
-          <a class="title" :title="item.cname" @click="standForComments(item)">{{ item.cname }}</a>
+          <a class="title" :title="item.cname" @click="standForComments(item)">{{ item.cid }}</a>
          <span class="time">{{ item.endTime }}</span>
        </div>
      </li>
@@ -40,16 +40,11 @@ export default {
    getAdvice() {
      this.$http.get("slrs/sar-public-idea/SelectAllPage", {
        page: 1,
-        size: 1000
+        size: 10
      }, {
        _this: this
      }, res => {
-        let arr = res.data.records;
-        arr.forEach(item => {
-          if (item.cname !== "") {
-            this.domesticDynamics.push(item);
-          }
-        });
+        this.domesticDynamics = res.data.records
      }, e => {

      });
@@ -1,6 +1,6 @@
                                              <!-- ProcessFooter -->
 <template>
-  <div class="process-footer" v-if="showSave || showSubmit">
+  <div class="process-footer" v-if="showSave || showSubmit || showSubmit2">
    <div class="footer-line"></div>
    <div class="btn-group-wrap">
      <slot></slot>
@@ -39,14 +39,32 @@
              v-if="showOver"
      >撤销申请</el-button>
      <el-button
-        type="primary"
-        size="small"
-        class="common-button-primary"
-        icon="el-icon-s-promotion"
-        @click="handleTransfer"
-        :loading="transferLoading"
-        v-if="showTransfer"
+              type="primary"
+              size="small"
+              class="common-button-primary"
+              icon="el-icon-s-promotion"
+              @click="handleTransfer"
+              :loading="transferLoading"
+              v-if="showTransfer"
      >转办</el-button>
+      <el-button
+              type="primary"
+              size="small"
+              class="common-button-primary"
+              icon="el-icon-check"
+              @click="handleSubmit2"
+              :loading="submitLoading"
+              v-if="showSubmit2"
+      >通过</el-button>
+      <el-button
+              type="danger"
+              size="small"
+              class="common-button-danger"
+              icon="el-icon-close"
+              @click="handleOver2"
+              :loading="submitLoading"
+              v-if="showOver2"
+      >驳回</el-button>
      <el-button
        type="primary"
        size="mini"
@@ -129,6 +147,10 @@ export default {
      type: Boolean,
      default: false
    },
+    showOver2: {
+      type: Boolean,
+      default: false
+    },
    // 是否显示保存按钮
    showSave: {
      type: Boolean,
@@ -149,6 +171,10 @@ export default {
      type: Boolean,
      default: false
    },
+    showSubmit2: {
+      type: Boolean,
+      default: false
+    },
    showTransfer:{
      type: Boolean,
      default: false
@@ -237,9 +263,15 @@ export default {
    handleOver() {
      this.$emit('over')
    },
+    handleOver2() {
+      this.$emit('over2')
+    },
    handleSave() {
      this.$emit('save')
    },
+    handleSubmit2() {
+      this.$emit('submit2')
+    },
    handleSubmit() {
      this.$emit('submit')
    },
@@ -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;"
@@ -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;"
@@ -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 }}
@@ -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: {},
@@ -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>
@@ -165,6 +165,7 @@
                    </template>
                </el-table-column>
                <el-table-column
+                        v-if="!form.itemsNum1"
                        prop="technicalRequir"
                        width="150"
                        label="核心技术要求"
@@ -178,6 +179,7 @@
                <el-table-column
                        prop="changePoint"
                        width="150"
+                        v-if="form.itemsNum1"
                        label="基于上一版本差异"
                        align="center">
                    <template slot-scope="scope">
@@ -187,7 +189,7 @@
                    </template>
                </el-table-column>
                <el-table-column
-                        v-if="sarType === 'FOREIGN'"
+                        v-if="sarType === 'FOREIGN' && form.itemsNum1"
                        prop="changePoint"
                        width="150"
                        label="相对于国行标差异点"
@@ -363,21 +365,21 @@
                size="800px">
            <div class="demo-drawer-content">
                <el-form :model="plForm" class="label-input-form" ref="plForm" label-width="150">
-                    <el-formItem label="核心技术要求" prop="technicalRequir" class="add-form-item" >
+                    <el-formItem label="核心技术要求" prop="technicalRequir" class="add-form-item"  v-if="!form.itemsNum1">
                        <el-input
                                v-model="plForm.technicalRequir"
                                placeholder="请输入核心技术要求"
                                maxlength="500"
                        ></el-input>
                    </el-formItem>
-                    <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND'">
+                    <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
                        <el-input
                                v-model="plForm.changePoint"
                                placeholder="请输入国内标准的差异点"
                                maxlength="500"
                        ></el-input>
                    </el-form-item>
-                    <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND'">
+                    <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
                        <el-input
                                v-model="plForm.changePoint"
                                placeholder="请输入上一版本差异点"
@@ -636,7 +638,7 @@
                                num6++
                            }
                        }
-                        if (this.form.itemsNum1) {
+                        if (!this.form.itemsNum1) {
                            if (num1 > 0) {
                                this.$message.warning('请输入核心技术要求')
                                return
@@ -863,7 +863,7 @@
                                    <el-form-item prop="zrUserName" style="margin-bottom: 0">
                                        <h4>会签责任人</h4>
                                        <div style="margin-top: 10px;width: 300px;">
-                                            <el-input v-model="roleForm.zrUserName" placeholder="选择会签责任人" @click.native="choiceZRR('zrUserId', '选择责任人', form.zrUserId)">
+                                            <el-input v-model="roleForm.zrUserName" placeholder="选择会签责任人" @click.native="choiceZRRS('zrUserId', '选择责任人', form.zrUserId)">
                                            </el-input></div>
                                    </el-form-item>
                                </el-card>
@@ -1598,16 +1598,16 @@
            },
        },
        methods: {
-            choiceZRRS () {
-                if (this.userType === 'zrUserId') {
-                    this.roleForm.zrUserId = this.zrUserIds.map(item => item.id).join(",")
-                    this.roleForm.zrUserName = this.zrUserIds.map(item => item.name).join(",")
-                }
-                this.modalshowflag2 = true
-            },
+            // choiceZRRS () {
+            //     if (this.userType === 'zrUserId') {
+            //         this.roleForm.zrUserId = this.zrUserIds.map(item => item.id).join(",")
+            //         this.roleForm.zrUserName = this.zrUserIds.map(item => item.name).join(",")
+            //     }
+            //     this.modalshowflag2 = true
+            // },
            checkedRole2 (data) {
-                var idList = ''
-                var nameList = ''
+                let idList = ''
+                let nameList = ''
                data.forEach( item => {
                    if (nameList.length > 0) {
                        nameList += ','
@@ -1616,18 +1616,14 @@
                    idList += item.id
                    nameList += item.name
                })
-                this.zrUserIds = idList
-                this.zrUserIds = nameList
+                this.roleForm.zrUserId=idList;
+                this.roleForm.zrUserName=nameList;
            },
            checkedRole (data) {
              if (this.userType === 'jlUserId') {
                    this.roleForm.jlUserId = data[0].id
                    this.roleForm.jlUserName = data[0].name
-                }else if(this.userType === 'zrUserId'){
-                this.roleForm.zrUserId=data[0].id;
-                this.roleForm.zrUserName=data[0].name;
-
-              }
+                }


            },
@@ -1898,6 +1894,14 @@
                this.drawerTitle = title
                this.modalShowFlag = true
            },
+
+            choiceZRRS (type, title, id) {
+                this.nodeList = []
+                this.nodeList.push(id)
+                this.userType = type
+                this.drawerTitle = title
+                this.modalShowRoleFlag = true
+            },
            choiceZRR1 (type, title, id) {
                this.drawerTitle = title
                this.modalShowFlag1 = true
@@ -8,7 +8,7 @@
        <div class="headerTabs">
            <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
            <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
-<!--            <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">流程信息</div>-->
+            <!--            <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">流程信息</div>-->
        </div>
        <div class="content" v-if="active === '1'">
            <div style="flex: auto; overflow: auto;">
@@ -32,17 +32,17 @@
                                </el-form-item>


-                              <el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple disabled>
-                                  <el-option
-                                      v-for="item in countryOptions"
-                                      placeholder="请选择"
-                                      :key="item.value"
-                                      :value="item.value"
-                                      :label="item.label"
-                                  ></el-option>
-                                </el-select>
-                              </el-form-item>
+                                <el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
+                                    <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple disabled>
+                                        <el-option
+                                                v-for="item in countryOptions"
+                                                placeholder="请选择"
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>

                                <el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
                                    <el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
@@ -136,7 +136,7 @@
                                    <el-input v-model="form.standSystem" disabled></el-input>
                                </el-form-item>
                                <el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
-                                   <el-input
+                                    <el-input
                                            disabled
                                            v-model="form.gxhbq"
                                            placeholder="请输入标签"
@@ -181,33 +181,33 @@
                                            value-format="yyyy-MM-dd">
                                    </el-date-picker>
                                </el-form-item>
-<!--                                <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
-<!--                                    <el-date-picker-->
-<!--                                            disabled-->
-<!--                                            v-model="form.ssrqgj"-->
-<!--                                            type="date"-->
-<!--                                            placeholder="请选择实施日期(国际)"-->
-<!--                                            value-format="yyyy-MM-dd">-->
-<!--                                    </el-date-picker>-->
-<!--                                </el-form-item>-->
-<!--                                <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">-->
-<!--                                    <el-date-picker-->
-<!--                                            disabled-->
-<!--                                            v-model="form.xcxssrqgj"-->
-<!--                                            type="date"-->
-<!--                                            placeholder="请选择新车型实施日期(国家)"-->
-<!--                                            value-format="yyyy-MM-dd">-->
-<!--                                    </el-date-picker>-->
-<!--                                </el-form-item>-->
-<!--                                <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">-->
-<!--                                    <el-date-picker-->
-<!--                                            disabled-->
-<!--                                            v-model="form.zccssrqgj"-->
-<!--                                            type="date"-->
-<!--                                            placeholder="请选择在产车实施日期(国家)"-->
-<!--                                            value-format="yyyy-MM-dd">-->
-<!--                                    </el-date-picker>-->
-<!--                                </el-form-item>-->
+                                <!--                                <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
+                                <!--                                    <el-date-picker-->
+                                <!--                                            disabled-->
+                                <!--                                            v-model="form.ssrqgj"-->
+                                <!--                                            type="date"-->
+                                <!--                                            placeholder="请选择实施日期(国际)"-->
+                                <!--                                            value-format="yyyy-MM-dd">-->
+                                <!--                                    </el-date-picker>-->
+                                <!--                                </el-form-item>-->
+                                <!--                                <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">-->
+                                <!--                                    <el-date-picker-->
+                                <!--                                            disabled-->
+                                <!--                                            v-model="form.xcxssrqgj"-->
+                                <!--                                            type="date"-->
+                                <!--                                            placeholder="请选择新车型实施日期(国家)"-->
+                                <!--                                            value-format="yyyy-MM-dd">-->
+                                <!--                                    </el-date-picker>-->
+                                <!--                                </el-form-item>-->
+                                <!--                                <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">-->
+                                <!--                                    <el-date-picker-->
+                                <!--                                            disabled-->
+                                <!--                                            v-model="form.zccssrqgj"-->
+                                <!--                                            type="date"-->
+                                <!--                                            placeholder="请选择在产车实施日期(国家)"-->
+                                <!--                                            value-format="yyyy-MM-dd">-->
+                                <!--                                    </el-date-picker>-->
+                                <!--                                </el-form-item>-->
                            </el-col>
                        </el-row>
                    </div>
@@ -215,84 +215,84 @@
                        <template slot="title">文本信息</template>
                    </ProcessTitle>
                    <div class="prc-content-border">
-                      <el-row :gutter="24">
-                        <el-col :span="12">
-                          <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
-                            <div style="cursor: pointer;color: #00b7ee"  v-if="form.xgdName" @click="downloadFile('xgd')">
-                              {{ form.xgdName }}
-                            </div>
-                            <div v-else>
-                              - -
-                            </div>
-                          </el-form-item>
-                          <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
-                            <div style="cursor: pointer;color: #00b7ee" v-if="form.fbgbjbdName" @click="downloadFile('fbgbjbd')">
-                              {{ form.fbgbjbdName }}
-                            </div>
-                            <div v-else>
-                              - -
-                            </div>
-                          </el-form-item>
-                          <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
-                            <div v-if="form.zbjbdName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd')">
-                              {{ form.zbjbdName }}
-                            </div>
-                            <div v-else>
-                              - -
-                            </div>
-                          </el-form-item>
-                          <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
-                            <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
-                              {{ form.ssgName }}
-                            </div>
-                            <div v-else>
-                              - -
-                            </div>
-                          </el-form-item>
-                          <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
-                            <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
-                              {{ form.caName }}
-                            </div>
-                            <div v-else>
-                              - -
-                            </div>
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
-                            <div v-if="form.kwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj')">
-                              {{ form.kwjName }}
-                            </div>
-                            <div v-else>
-                              - -
-                            </div>
-                          </el-form-item>
-                          <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
-                            <div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">
-                              {{ form.jdwjName }}
-                            </div>
-                            <div v-else>
-                              - -
-                            </div>
-                          </el-form-item>
-                          <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
-                            <div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
-                              {{ form.bpgName }}
-                            </div>
-                            <div v-else>
-                              - -
-                            </div>
-                          </el-form-item>
-                          <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
-                            <div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
-                              {{ form.zqyjgName }}
-                            </div>
-                            <div v-else>
-                              - -
-                            </div>
-                          </el-form-item>
-                        </el-col>
-                      </el-row>
+                        <el-row :gutter="24">
+                            <el-col :span="12">
+                                <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
+                                    <div style="cursor: pointer;color: #00b7ee"  v-if="form.xgdName" @click="downloadFile('xgd')">
+                                        {{ form.xgdName }}
+                                    </div>
+                                    <div v-else>
+                                        - -
+                                    </div>
+                                </el-form-item>
+                                <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
+                                    <div style="cursor: pointer;color: #00b7ee" v-if="form.fbgbjbdName" @click="downloadFile('fbgbjbd')">
+                                        {{ form.fbgbjbdName }}
+                                    </div>
+                                    <div v-else>
+                                        - -
+                                    </div>
+                                </el-form-item>
+                                <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
+                                    <div v-if="form.zbjbdName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd')">
+                                        {{ form.zbjbdName }}
+                                    </div>
+                                    <div v-else>
+                                        - -
+                                    </div>
+                                </el-form-item>
+                                <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
+                                    <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
+                                        {{ form.ssgName }}
+                                    </div>
+                                    <div v-else>
+                                        - -
+                                    </div>
+                                </el-form-item>
+                                <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
+                                    <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
+                                        {{ form.caName }}
+                                    </div>
+                                    <div v-else>
+                                        - -
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
+                                    <div v-if="form.kwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj')">
+                                        {{ form.kwjName }}
+                                    </div>
+                                    <div v-else>
+                                        - -
+                                    </div>
+                                </el-form-item>
+                                <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
+                                    <div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">
+                                        {{ form.jdwjName }}
+                                    </div>
+                                    <div v-else>
+                                        - -
+                                    </div>
+                                </el-form-item>
+                                <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
+                                    <div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
+                                        {{ form.bpgName }}
+                                    </div>
+                                    <div v-else>
+                                        - -
+                                    </div>
+                                </el-form-item>
+                                <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
+                                    <div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
+                                        {{ form.zqyjgName }}
+                                    </div>
+                                    <div v-else>
+                                        - -
+                                    </div>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
                    </div>
                    <ProcessTitle>
                        <template slot="title">适用范围</template>
@@ -342,11 +342,11 @@
                                <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
                                    <el-input v-model="form.dybxh" disabled></el-input>
                                </el-form-item>
-                              <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false"  v-model="form.gkdw" placeholder="请选择归口管理部门">
-                                  <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
-                                </el-select>
-                              </el-form-item>
+                                <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
+                                    <el-select :popper-append-to-body="false"  v-model="form.gkdw" placeholder="请选择归口管理部门">
+                                        <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
+                                    </el-select>
+                                </el-form-item>
                                <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
                                    <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled>
                                        <el-option
@@ -466,36 +466,36 @@
                                </el-form-item>
                                <el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
                                    <el-select v-model="form.cbcd" placeholder="请选择采标程度" disabled>
-                                      <el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                                        <el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
                                    </el-select>
                                </el-form-item>
-                              <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
-                                <div v-if="form.glwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj')">
-                                  {{ form.glwjName }}
-                                </div>
-                                <div v-else>
-                                  - -
-                                </div>
-                              </el-form-item>
+                                <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
+                                    <div v-if="form.glwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj')">
+                                        {{ form.glwjName }}
+                                    </div>
+                                    <div v-else>
+                                        - -
+                                    </div>
+                                </el-form-item>
                            </el-col>
                            <el-col :span="12">
-                              <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
-                                <el-input
-                                    disabled
-                                    v-model="form.bfbdtbzh"
-                                    placeholder="请输入部分代替标准号"
-                                    clearable
-                                ></el-input>
-                              </el-form-item>
-                              <el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
-                                <el-input
-                                    disabled
-                                    v-model="form.cbbh"
-                                    placeholder="请输入采标编号"
-                                    clearable
-                                ></el-input>
-                              </el-form-item>
-                              <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
+                                <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.bfbdtbzh"
+                                            placeholder="请输入部分代替标准号"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.cbbh"
+                                            placeholder="请输入采标编号"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
                                    <el-input
                                            disabled
                                            v-model="form.yybj"
@@ -508,38 +508,38 @@
                    </div>
                </el-form>
            </div>
-          <div>
-            <el-collapse accordion v-model="activeName">
-              <el-collapse-item title="意见填写" name = "1">
-                <div style="margin: 10px 0;">
-                  <el-form
-                      ref="formTongGuo"
-                      :model="formTongGuo"
-                      :rules="rules">
-                    <el-form-item
-                        prop="approvalOpinion"
-                    >
-                      <el-select @change="getRule" v-model="formTongGuo.approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">
-                        <el-option label="驳回" value="1"></el-option>
-                        <el-option label="通过" value="0"></el-option>
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item
-                        prop="commentText"
-                    >
-                      <el-input
-                          type="textarea"
-                          :rows="3"
-                          resize="none"
-                          placeholder="请输入意见"
-                          v-model="formTongGuo.commentText">
-                      </el-input>
-                    </el-form-item>
-                  </el-form>
-                </div>
-              </el-collapse-item>
-            </el-collapse>
-          </div>
+            <div>
+                <el-collapse accordion v-model="activeName">
+                    <el-collapse-item title="意见填写" name = "1">
+                        <div style="margin: 10px 0;">
+                            <el-form
+                                    ref="formTongGuo"
+                                    :model="formTongGuo"
+                                    :rules="rules">
+                                <!--                    <el-form-item-->
+                                <!--                        prop="approvalOpinion"-->
+                                <!--                    >-->
+                                <!--                      <el-select @change="getRule" v-model="formTongGuo.approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">-->
+                                <!--                        <el-option label="驳回" value="1"></el-option>-->
+                                <!--                        <el-option label="通过" value="0"></el-option>-->
+                                <!--                      </el-select>-->
+                                <!--                    </el-form-item>-->
+                                <el-form-item
+                                        prop="commentText"
+                                >
+                                    <el-input
+                                            type="textarea"
+                                            :rows="3"
+                                            resize="none"
+                                            placeholder="请输入意见"
+                                            v-model="formTongGuo.commentText">
+                                    </el-input>
+                                </el-form-item>
+                            </el-form>
+                        </div>
+                    </el-collapse-item>
+                </el-collapse>
+            </div>
        </div>
        <div class="content" v-if="active === '2'">
            <div class="block" style="padding-top: 20px;">
@@ -588,84 +588,85 @@
            </div>
        </div>
        <div class="content" v-if="active === '3'">
-          <div class="flow-list">
-            <el-table
-                height="100%"
-                ref="selection"
-                :data="detailData"
-                tooltip-effect="dark"
-                style="width: 100%"
-                border
-                row-key="id"
-                :no-data-text="listNoDataText"
-                :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
-            >
-              <el-table-column
-                  type="selection"
-                  width="55"
-                  align="center">
-              </el-table-column>
-              <el-table-column
-                  prop="name"
-                  label="任务步骤"
-                  align="center"
-                  sortable="custom"
-              >
-              </el-table-column>
-              <el-table-column
-                  prop="assignee"
-                  label="任务受理人"
-                  align="center"
-                  sortable="custom"
-              >
-              </el-table-column>
-              <el-table-column
-                  prop="createTime"
-                  label="创建时间"
-                  sortable="custom"
-                  align="center">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                  prop="endTime"
-                  label="完成时间"
-                  align="center">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                  prop="comment"
-                  label="审批意见"
-                  align="center">
-                <template slot-scope="scope">
-            <span>{{scope.row.commentText}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                  prop="completeFlag"
-                  label="状态"
-                  align="center">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
-                </template>
-              </el-table-column>
-            </el-table>
-            <loading :loading="loading">流程列表加载中</loading>
-          </div>
+            <div class="flow-list">
+                <el-table
+                        height="100%"
+                        ref="selection"
+                        :data="detailData"
+                        tooltip-effect="dark"
+                        style="width: 100%"
+                        border
+                        row-key="id"
+                        :no-data-text="listNoDataText"
+                        :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+                >
+                    <el-table-column
+                            type="selection"
+                            width="55"
+                            align="center">
+                    </el-table-column>
+                    <el-table-column
+                            prop="name"
+                            label="任务步骤"
+                            align="center"
+                            sortable="custom"
+                    >
+                    </el-table-column>
+                    <el-table-column
+                            prop="assignee"
+                            label="任务受理人"
+                            align="center"
+                            sortable="custom"
+                    >
+                    </el-table-column>
+                    <el-table-column
+                            prop="createTime"
+                            label="创建时间"
+                            sortable="custom"
+                            align="center">
+                        <template slot-scope="scope">
+                            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="endTime"
+                            label="完成时间"
+                            align="center">
+                        <template slot-scope="scope">
+                            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="comment"
+                            label="审批意见"
+                            align="center">
+                        <template slot-scope="scope">
+                            <span>{{scope.row.commentText}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                            prop="completeFlag"
+                            label="状态"
+                            align="center">
+                        <template slot-scope="scope">
+                            <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <loading :loading="loading">流程列表加载中</loading>
+            </div>
        </div>
-<!--      提交-->
+        <!--      提交-->
        <ProcessFooter
                :show-save="false"
-                show-submit
+                show-over2
+                show-submit2
                show-transfer
                :submitLoading="isSubmit"
                :saveLoading="saveLoading"
                @transfer="handleTransfer"
-                @save="handleSave"
-                @submit="handleSubmit"
+                @submit2="handle2"
+                @over2="handle1"
        >
        </ProcessFooter>

@@ -691,36 +692,36 @@
        name: "bzrkStep2",
        data () {
            return {
-              // 调整处理人抽屉状态
-              drawerModal: false,
-              drawerTitle: '',
-              nodeList: [],
-              selectPeople:'',
-              xgdFileId: '',
-              fbgbjbdFileId: '',
-              bpgFileId: '',
-              ssgFileId: '',
-              zqyjgFileId: '',
-              jdwjFileId: '',
-              kwjFileId: '',
-              glwjFileId: '',
-              caFileId: '',
-              zbjbdFileId:'',
-              rules: {
-                commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
-                approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }]
-              },
-              activeName:'1',
-              // 当前流程类型(1待办/2已办)
-              processType: 1,
+                // 调整处理人抽屉状态
+                drawerModal: false,
+                drawerTitle: '',
+                nodeList: [],
+                selectPeople:'',
+                xgdFileId: '',
+                fbgbjbdFileId: '',
+                bpgFileId: '',
+                ssgFileId: '',
+                zqyjgFileId: '',
+                jdwjFileId: '',
+                kwjFileId: '',
+                glwjFileId: '',
+                caFileId: '',
+                zbjbdFileId:'',
+                rules: {
+                    commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
+                    approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }]
+                },
+                activeName:'1',
+                // 当前流程类型(1待办/2已办)
+                processType: 1,
                detailData: [],
                userId:this.$store.getters.userInfo.userId,
                taskIds: this.$route.query.taskIds,
                pId: this.$route.query.prcId,
-              formTongGuo: {
-                approvalOpinion: '', // 通过/驳回
-                commentText: '', // 意见
-              },
+                formTongGuo: {
+                    approvalOpinion: '', // 通过/驳回
+                    commentText: '', // 意见
+                },
                title: '', // 新增编辑抽屉标题
                ListModel: false, // 新增编辑抽屉开关
                active: '1', // 默认显示
@@ -764,7 +765,7 @@
                    zqyjg: '', // 征求意见稿
                    jdwj: '', // 解读文件
                    zbjbd: '', // 增补件
-                  bfbdtbzh: '', // 增补件
+                    bfbdtbzh: '', // 增补件
                    kwj: '', // 勘误件
                    caName: '', // 草案
                    fbgbjbdName: '', // 发布稿
@@ -835,7 +836,7 @@
                standSystemOptions: [], // 标准体系
                applyArcticOptions: [], // 适用车型
                gkglbmOptions: [], // 归口管理部门
-              cbcdOptions: [], // 采标程度
+                cbcdOptions: [], // 采标程度
                categoryOptions: [], // 能源类型
                applyAuthOptions: [], // 适用认证
                cysdOptions: [], // 我司参与深度
@@ -863,11 +864,11 @@
            ProcessTitle,
            TreeSelect
        },
-      computed: {
-        listNoDataText () {
-          return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
+        computed: {
+            listNoDataText () {
+                return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
+            },
        },
-      },
        methods: {
            checkedRole (data) {
                this.assigneeNewLoading = true
@@ -889,43 +890,43 @@
                    }
                })
            },
-          downloadFile (fileType) {
-            //文件id中出现了','字符,去除掉
-            if(fileType === 'fbgbjbd'){
-              if(this.fbgbjbdFileId.search(',')){
-                this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",","");
-                console.log(this.fbgbjbdFileId);
-              }
-               window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
-            }else if(fileType === 'xgd'){
-              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
-            }else if(fileType === 'bpg'){
-              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId
-            }else if(fileType === 'ssg'){
-              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId
-            }else if(fileType === 'zqyjg'){
-              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId
-            }else if(fileType === 'jdwj'){
-              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId
-            }else if(fileType === 'kwj'){
-              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId
-            }else if(fileType === 'glwj'){
-              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId
-            }else if(fileType === 'ca'){
-              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId
-            }else if(fileType === 'zbjbd'){
-              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId
-            }
-          },
-          getRule(){
+            downloadFile (fileType) {
+                //文件id中出现了','字符,去除掉
+                if(fileType === 'fbgbjbd'){
+                    if(this.fbgbjbdFileId.search(',')){
+                        this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",","");
+                        console.log(this.fbgbjbdFileId);
+                    }
+                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
+                }else if(fileType === 'xgd'){
+                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
+                }else if(fileType === 'bpg'){
+                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId
+                }else if(fileType === 'ssg'){
+                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId
+                }else if(fileType === 'zqyjg'){
+                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId
+                }else if(fileType === 'jdwj'){
+                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId
+                }else if(fileType === 'kwj'){
+                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId
+                }else if(fileType === 'glwj'){
+                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId
+                }else if(fileType === 'ca'){
+                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId
+                }else if(fileType === 'zbjbd'){
+                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId
+                }
+            },
+            getRule(){

-            if (this.formTongGuo.approvalOpinion === '0') {
-              this.rules.commentText[0].required = false;
-              this.$refs.formTongGuo.clearValidate('commentText')
-            }else {
-              this.rules.commentText[0].required = true;
-            }
-          },
+                if (this.formTongGuo.approvalOpinion === '0') {
+                    this.rules.commentText[0].required = false;
+                    this.$refs.formTongGuo.clearValidate('commentText')
+                }else {
+                    this.rules.commentText[0].required = true;
+                }
+            },
            popoverHide (checkedIds, checkedData) {
                if(checkedData) {
                    this.form.standSystem = checkedData.id
@@ -967,18 +968,18 @@
                    this.key3++
                })
            },
-          processTable () {
-            this.$http.get('lawss/activiti/get_list_by_instance', {
-              prcNum: this.$route.query.prcNum,
-              sortWord: this.shunxu ? this.paixu : '',
-              shunxu: this.shunxu
-            }, {
-              loading: 'loading',
-              _this: this
-            }, res => {
-              this.detailData = res
-            }, e => {})
-          },
+            processTable () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                    sortWord: this.shunxu ? this.paixu : '',
+                    shunxu: this.shunxu
+                }, {
+                    loading: 'loading',
+                    _this: this
+                }, res => {
+                    this.detailData = res
+                }, e => {})
+            },
            getData() {
                return new Promise((resolve, reject) => {
                    inboundLiaisonDetail({
@@ -986,20 +987,20 @@
                        pId: this.pId
                    }).then(res => {
                        if (res) {
-                          const processForm = JSON.parse(res.mesg)
-                          this.xgdFileId = processForm.xgd
-                          this.fbgbjbdFileId = processForm.fbgbjbd
-                          this.bpgFileId = processForm.bpg
-                          this.ssgFileId = processForm.ssg
-                          this.zqyjgFileId = processForm.zqyjg
-                          this.jdwjFileId = processForm.jdwj
-                          this.kwjFileId = processForm.kwj
-                          this.glwjFileId = processForm.glwj
-                          this.caFileId = processForm.ca
-                          this.zbjbdFileId = processForm.zbjbd
-                          this.getFormFieldList(processForm)
-                          console.log(processForm);
-                          console.log("processForm");
+                            const processForm = JSON.parse(res.mesg)
+                            this.xgdFileId = processForm.xgd
+                            this.fbgbjbdFileId = processForm.fbgbjbd
+                            this.bpgFileId = processForm.bpg
+                            this.ssgFileId = processForm.ssg
+                            this.zqyjgFileId = processForm.zqyjg
+                            this.jdwjFileId = processForm.jdwj
+                            this.kwjFileId = processForm.kwj
+                            this.glwjFileId = processForm.glwj
+                            this.caFileId = processForm.ca
+                            this.zbjbdFileId = processForm.zbjbd
+                            this.getFormFieldList(processForm)
+                            console.log(processForm);
+                            console.log("processForm");

                        }
                    }).catch(e => {
@@ -1019,9 +1020,9 @@
                    this.defaultCheckedKeys3 = [this.form.dybxh]
                    this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
                    this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
-                  if( this.form.country !== undefined &&   this.form.country !== null &&   this.form.country !== ''){
-                    this.form.country=this.form.country.split(",");
-                  }
+                    if( this.form.country !== undefined &&   this.form.country !== null &&   this.form.country !== ''){
+                        this.form.country=this.form.country.split(",");
+                    }
                    this.form.prcNum = this.prcNum
                    this.form.prcName = this.prcName
                    this.form['id'] = item.id
@@ -1049,42 +1050,50 @@
                this.drawerTitle = '转办处理人'
            },
            handleSave() {},
+            handle1(){
+                this.formTongGuo.approvalOpinion = 1
+                this.handleSubmit()
+            },
+            handle2(){
+                this.formTongGuo.approvalOpinion = 0
+                this.handleSubmit()
+            },
            handleSubmit() {
-              const val= this.form.country;
-              if (val !== '' && val !== null && typeof (val) !== 'undefined') {
-                if (val instanceof Array) {
-                  this.form.country = val.join(",");
-                } else {
-                  this.form.country = val
+                const val= this.form.country;
+                if (val !== '' && val !== null && typeof (val) !== 'undefined') {
+                    if (val instanceof Array) {
+                        this.form.country = val.join(",");
+                    } else {
+                        this.form.country = val
+                    }
+                } else if (val === '') {
+                    this.form.country = []
                }
-              } else if (val === '') {
-                this.form.country = []
-              }
-              this.$refs['formTongGuo'].validate((valid) => {
+                this.$refs['formTongGuo'].validate((valid) => {
                    if (valid) {
-                      this.isSubmit = true
-                      this.form.commentText = this.formTongGuo.commentText
-                      this.form.approvalOpinion = this.formTongGuo.approvalOpinion
-                      const json = JSON.stringify(this.form);
-                      this.$http.post('lawss/activiti/completeTask', {
-                        taskIds: this.taskIds,
-                        userId : this.userId,
-                        json: json
-                      }, {
-                        _this: this
-                      }, res => {
-                        console.log(res);
-                        if (res.success) {
-                          if(this.formTongGuo.approvalOpinion === '1'){
-                            this.$message.warning("驳回成功")
-                            this.isSubmit = false
-                            // 流程提交之后，应该流转至待办任务页面
-                            this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                          }else{
-                            this.processCreateStand(json)
-                          }
-                        }
-                      })
+                        this.isSubmit = true
+                        this.form.commentText = this.formTongGuo.commentText
+                        this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                        const json = JSON.stringify(this.form);
+                        this.$http.post('lawss/activiti/completeTask', {
+                            taskIds: this.taskIds,
+                            userId : this.userId,
+                            json: json
+                        }, {
+                            _this: this
+                        }, res => {
+                            console.log(res);
+                            if (res.success) {
+                                if(this.formTongGuo.approvalOpinion === '1'){
+                                    this.$message.warning("驳回成功")
+                                    this.isSubmit = false
+                                    // 流程提交之后，应该流转至待办任务页面
+                                    this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                }else{
+                                    this.processCreateStand(json)
+                                }
+                            }
+                        })
                    }})
            },

@@ -1116,11 +1125,11 @@
        },
        mounted () {
            this.getData()
-          this.processTable()
+            this.processTable()
            this.$http.get('sys/dictype/getDicTypeListCode', '', {
                _this: this
            }, res => {
-              this.countryOptions=res.data.COUNTRY//国家地区
+                this.countryOptions=res.data.COUNTRY//国家地区
                this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
                this.standNatureOptions = res.data.SARPROPERTY // 标准性质
                this.standStateOptions = res.data.WBZTCLASS // 文本状态
@@ -1136,7 +1145,7 @@
                this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
                this.txlbOptions = res.data.TXLBCLASS // 体系类别
                this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
-              this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
+                this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
                this.key++
            })
            this.busVsFunc()
@@ -94,6 +94,7 @@
                    <el-table-column
                            prop="chapterNumber"
                            align="center"
+                            sortable
                            label="章条编号"
                            width="170px">
                        <template slot-scope="scope">
@@ -76,6 +76,7 @@
          <el-table-column
            prop="chapterNumber"
            align="center"
+            sortable
            label="章条编号"
            width="170px">
          </el-table-column>
@@ -76,6 +76,7 @@
          <el-table-column
            prop="chapterNumber"
            align="center"
+            sortable
            label="章条编号"
            width="170px">
          </el-table-column>
@@ -456,7 +457,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;
@@ -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')"
-                     size="mini">导出征求意见搞
+                     @click="upload(oldData, '上报意见.xls')"
+                     size="mini">生成上报意见
          </el-button>
        </div>
        <el-table
@@ -88,6 +88,7 @@
          <el-table-column
            prop="chapterNumber"
            align="center"
+            sortable
            label="章条编号"
            width="170px">
          </el-table-column>
@@ -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')"
-                     size="mini">导出征求意见搞
+                     @click="upload(oldData, '上报意见.xls')"
+                     size="mini">生成上报意见
          </el-button>
        </div>
        <el-table
@@ -89,6 +89,7 @@
            prop="chapterNumber"
            align="center"
            label="章条编号"
+            sortable
            width="170px">
          </el-table-column>
          <el-table-column
@@ -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')"
-                     size="mini">导出征求意见搞
+                     @click="upload(oldData, '上报意见.xls')"
+                     size="mini">生成上报意见
          </el-button>
        </div>
        <el-table
@@ -87,6 +87,7 @@
          </el-table-column>
          <el-table-column
            prop="chapterNumber"
+            sortable
            align="center"
            label="章条编号"
            width="170px">
@@ -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')"
-                     size="mini">导出征求意见搞
+                     @click="upload(oldData, '上报意见.xls')"
+                     size="mini">生成上报意见
          </el-button>
        </div>
        <el-table
@@ -88,6 +88,7 @@
          <el-table-column
            prop="chapterNumber"
            align="center"
+            sortable
            label="章条编号"
            width="170px">
          </el-table-column>
@@ -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>
-              <span v-else>{{ scope.row.distributePerson }}</span>
+                ></el-input>
+<!--              <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,6 +729,14 @@ export default {
        this.standModel = false;
      } else {
        if (this.standList.length >= 1) {
+          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.roleForm.directorUser = this.dataList[0].uname;
          this.listForm.dataList = this.standList;
@@ -716,6 +784,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) => {
@@ -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,
@@ -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,
@@ -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,6 +704,14 @@ export default {
        this.standModel = false;
      } else {
        if (this.standList.length >= 1) {
+          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.roleForm.directorUser = this.dataList[0].uname;
          this.listForm.dataList = this.standList;
@@ -689,6 +757,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) => {
@@ -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
@@ -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,
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceProject">选择项目
-                  </el-button>
-                </el-form-item>
-                <el-form-item label="项目编号" prop="projectNumber" 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>-->
+<!--                </el-form-item>-->
+                <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-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceList">选择清单</el-button>
-                </el-form-item>
-                <el-form-item label="清单名称" prop="detailedListName" 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-form-item>-->
+                <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>
@@ -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-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceProject">选择项目
-                  </el-button>
-                </el-form-item>
-                <el-form-item label="项目编号" prop="projectNumber" 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>-->
+<!--                </el-form-item>-->
+                <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-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceList">选择清单</el-button>
-                </el-form-item>
-                <el-form-item label="清单名称" prop="detailedListName" 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-form-item>-->
+                <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>
@@ -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">
@@ -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
@@ -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>模板下载
-        </el-button>
-        <el-button class="common-button-default"
-                   size="mini" @click="configurationStandard"
-                   v-btn-permission="'590049684c0af005c6b3d1f0ebcf897e'"><i class="iconfont">&#xe669;</i>配置标准
-        </el-button>
+                   v-btn-permission="'4mFaJU3fTS'"><i class="iconfont">&#xe825;</i>模板下载&ndash;&gt;
+        </el-button>-->
      </div>
      <div class="content">
        <div class="table-wrap">
@@ -181,10 +181,16 @@
              label="标准号"
            >
              <template slot-scope="scope">
-                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{
+                <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 @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
+                <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-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>
@@ -194,7 +200,9 @@
              label="标准名称"
            >
              <template slot-scope="scope">
-                <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                <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-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
@@ -203,7 +211,13 @@
              width="110px"
              label="发布日期">
              <template slot-scope="scope">
-                <div style="color: #2d8cf0">
+                <div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
+                    {{ formatIssueDate(scope.row.issueTime) }}
+                </div>
+                <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>
@@ -215,7 +229,9 @@
              label="实施日期">
              <template slot-scope="scope">
                <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span style="color: #2d8cf0">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</span>
+                <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-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>
@@ -225,7 +241,9 @@
              width="150px"
              label="新车型实施日期">
              <template slot-scope="scope">
-                <span style="color: #2d8cf0">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
+                <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-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
@@ -234,7 +252,9 @@
              width="150px"
              label="在产车实施日期">
              <template slot-scope="scope">
-                <span style="color: #2d8cf0">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
+                <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-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
@@ -248,7 +268,9 @@
              <!--                </el-tooltip>-->
              <!--              </template>-->
              <template slot-scope="scope">
-                <span style="color: #2d8cf0">{{ textStatusMap[scope.row.textStatus] }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ 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">
@@ -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">
@@ -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"
@@ -74,11 +74,11 @@
              </template>
            </el-table-column>
            <el-table-column
-              prop="cname"
+              prop="cid"
              label="标准名称/政策名称"
              align="center">
              <template slot-scope="scope">
-                <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.cname }}</a>
+                <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.cid }}</a>
              </template>
            </el-table-column>
            <el-table-column
@@ -10,21 +10,21 @@
    <transition name="el-zoom-in-top">
      <div v-show="heightShow" class="transition-box">
        <p class="transition-box-p">
-          <label class="transition-box-label">标准号：</label>
+          <label class="transition-box-label">标准名称：</label>
          <span class="transition-box-span table-jump"
                @click="handlePreview(itemData)"
          >
                      {{ this.$route.query.item.cid }}
                    </span>
        </p>
-        <p class="transition-box-p">
-          <label class="transition-box-label">标准名称：</label>
-          <span class="transition-box-span table-jump"
-                @click="handlePreview(itemData)"
-          >
-                      {{ this.$route.query.item.cname || '-' }}
-                    </span>
-        </p>
+<!--        <p class="transition-box-p">-->
+<!--          <label class="transition-box-label">标准名称：</label>-->
+<!--          <span class="transition-box-span table-jump"-->
+<!--                @click="handlePreview(itemData)"-->
+<!--          >-->
+<!--                      {{ this.$route.query.item.cname || '-' }}-->
+<!--                    </span>-->
+<!--        </p>-->
        <p class="transition-box-p">
          <label class="transition-box-label">附件：</label>
          <span class="file-box" v-if="fileInfoList.length > 0">