Merge branch 'develop' into 'FOTON'

Develop

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

src/api/process.js

@@ -77,6 +77,14 @@ export function processCreateStand (data) {
   })
 }
 
+export function processCreateBuss (data) {
+  return axios({
+    url: '/api/lawss/actSarItemsLaws/processCreateBuss',
+    method: 'post',
+    data
+  })
+}
+
 export function processCreateLaws (data) {
   return axios({
     url: '/api/lawss/actSarItemsLaws/processCreateLaws',
@@ -432,6 +440,14 @@ export function isEnd (data) {
   })
 }
 
+export function evaluationHisList (data) {
+  return axios({
+    url: '/api/lawss/activiti/evaluationHisList',
+    method: 'get',
+    params: data
+  })
+}
+
 export function execTask (data) {
   return axios({
     url: '/api/lawss/activiti/execTask',

src/pages/details/complianceDetails/index.vue

@@ -134,7 +134,17 @@ export default {
         }, res => {
           if (res.ok) {
             this.fit = res.data.fit.records
+            this.fit.forEach(item => {
+              if(item.standardItem){
+                  item.standNumber = item.standardItem
+              }
+            })
             this.unfit = res.data.unfit.records
+            this.unfit.forEach(item => {
+              if(item.standardItem){
+                item.standNumber = item.standardItem
+              }
+            })
           } else {
             this.$message.warning(res.message)
           }

src/pages/details/otherBussStandardDetails/index.vue

@@ -127,6 +127,7 @@
                             <el-table
                                 v-if="commentAverageScoreTag === '1'"
                                 :data="qualityHistoryPeopleTable"
+                                empty-text="无人评价"
                                 style="width: 100%"
                                 height="345px"
                                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -135,19 +136,22 @@
                                   prop="historyPeopleName"
                                   align="center"
                                   label="质量评价人"
-                                  width="130px"
-                              show-overflow-tooltip>
+                                  width="200px">
                                 <template slot-scope="scope">
+                                  <el-tooltip class="item" effect="dark" :content="scope.row.processNode" placement="right">
                                   <el-button type="default"
-                                             style="width: 100px;" size="mini" @click="historyPeopleChange(scope.row)">
-                                    {{ scope.row.userName }}
+                                             style="width: 180px;" size="mini"
+                                             @click="historyPeopleChange(scope.row)">
+                                    {{ scope.row.userName + '-' + scope.row.processNode.substring(0,9) }}
                                   </el-button>
+                                  </el-tooltip>
                                 </template>
                               </el-table-column>
                             </el-table>
                             <el-table
                                 v-else-if="commentAverageScoreTag === '2'"
                                 :data="dynamicHistoryPeopleTable"
+                                empty-text="无人评价"
                                 style="width: 100%"
                                 height="345px"
                                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -174,7 +178,9 @@
                                   :summary-method="getSummaries"
                                   show-summary
                                   :span-method="(({row, column, rowIndex, columnIndex})=>objectSpanMethod({row, column, rowIndex, columnIndex},qualityHistoryCommentTable))"
-                                  style="width: 100%">
+                                  style="width: 100%"
+                                  :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
+                                   fontWeight: 'bold', height: '48px'}">
                                 <el-table-column label="企业标准编写质量评价表" align="center" label-class-name="column1">
                                   <el-table-column
                                       label="标准代号"
@@ -228,10 +234,8 @@
                                         width = '200'
                                     >
                                       <template slot-scope="scope">
-                                        <el-form-item
-                                            :prop="'qualityHistoryCommentTable.'+scope.$index + '.targetScore'">
-                                          <el-input v-model.number="scope.row.targetScore" placeholder="请填写分值" />
-                                        </el-form-item>
+                                        <span v-if="scope.row.targetScore">{{ scope.row.targetScore }}</span>
+                                        <span v-else style="color: #c0c4cc">该用户没有填写分值</span>
                                       </template>
                                     </el-table-column>
                                     <el-table-column
@@ -250,10 +254,8 @@
                                         label="简述扣分理由（不合格＜6分，必填）"
                                     >
                                       <template slot-scope="scope" v-if="scope.row.valueType !== 'add'">
-                                        <el-form-item
-                                            :prop="'qualityHistoryCommentTable.'+scope.$index + '.commentReason'">
-                                          <el-input v-model="scope.row.commentReason" placeholder="请填写扣分理由" />
-                                        </el-form-item>
+                                        <span v-if="scope.row.commentReason">{{ scope.row.commentReason }}</span>
+                                        <span v-else style="color: #c0c4cc">该用户没有填写理由</span>
                                       </template>
                                     </el-table-column>
                                   </el-table-column>
@@ -291,7 +293,8 @@
                               </el-table-column>
                               <el-table-column property="reason" label="简述理由">
                                 <template slot-scope="scope">
-                                  <el-input clearable size="mini" placeholder="该用户没有填写评分理由" disabled v-model="scope.row.commentReason" />
+                                  <span v-if="scope.row.commentReason">{{scope.row.commentReason}}</span>
+                                  <span v-else style="color: #c0c4cc">该用户没有填写评分理由</span>
                                 </template>
                               </el-table-column>
                             </el-table>
@@ -1292,19 +1295,20 @@ export default {
   data () {
     return {
       commentAverageScoreTag: '1',
-      firstHistoryPeopleId: '',//最新评价的人的id
+      qualityFirstHistoryPeopleId: '',//质量评价最新评价的人的id
+      dynamicFirstHistoryPeopleId: '',//动态评价最新评价的人的id
       historyInfoLoading: false,//历史评价信息的loading
       historyCommentForm: {
         averageScore: 0, // 平均分值
         revise: '',
         reviseReason: '', // 修订理由
       }, // 历史评价表单
-      dynamicHistoryCommentTable: [], // 动态评价历史评价表格
       qualityHistoryCommentTable: [], // 质量评价历史评价表格
-      dynamicHistoryPeopleTable: [], // 动态评价历史评价人表格
+      dynamicHistoryCommentTable: [], // 动态评价历史评价表格
       qualityHistoryPeopleTable: [], // 质量评价历史评价人表格
-      dynamicCommentScore: 0,// 动态评价总平均分
+      dynamicHistoryPeopleTable: [], // 动态评价历史评价人表格
       qualityCommentScore: 0,// 质量评价总平均分
+      dynamicCommentScore: 0,// 动态评价总平均分
       commentActiveName: 'dynamicComment',
       indexType: 'dynamic',
       commentReason: '', // 评价理由
@@ -1535,13 +1539,19 @@ export default {
   methods: {
     historyPeopleChange(row){
       this.historyInfoLoading = true
-      const allData = {
-        lawId: this.sarStandardsInfoEO.id,
+      const qualityAllData = {
+        lawId: this.$route.params.id,
+        userId: row.userId,
+        evaluationType: this.indexType,
+        processNode: row.processNode
+      }
+      const dynamicAllData = {
+        lawId: this.$route.params.id,
         userId: row.userId,
         evaluationType: this.indexType
       }
       if (this.indexType === 'quality'){
-        this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
+        this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', qualityAllData , {
           _this: this
         }, res => {
           this.qualityHistoryCommentTable = res.data
@@ -1551,7 +1561,7 @@ export default {
           this.historyInfoLoading = false
         })
       }else  if (this.indexType === 'dynamic'){
-        this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
+        this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', dynamicAllData , {
           _this: this
         }, res => {
           this.dynamicHistoryCommentTable = res.data
@@ -1580,9 +1590,10 @@ export default {
         this.indexType = 'quality'
         //查询评分表
         const allData = {
-          lawId: this.sarStandardsInfoEO.id,
-          userId: this.firstHistoryPeopleId,
-          evaluationType: this.indexType
+          lawId: this.$route.params.id,
+          userId: this.qualityFirstHistoryPeopleId,
+          evaluationType: this.indexType,
+          processNode: this.qualityHistoryPeopleTable.length>0?this.qualityHistoryPeopleTable[0].processNode:null
         }
         this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
           _this: this
@@ -1598,8 +1609,8 @@ export default {
         this.indexType = 'dynamic'
         //查询评分表
         const allData = {
-          lawId: this.sarStandardsInfoEO.id,
-          userId: this.firstHistoryPeopleId,
+          lawId: this.$route.params.id,
+          userId: this.dynamicFirstHistoryPeopleId,
           evaluationType: this.indexType
         }
           this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
@@ -1624,7 +1635,7 @@ export default {
       }
 
       //查询动态评价总平均分和质量评价总平均分
-      let standId = this.sarStandardsInfoEO.id
+      let standId = this.$route.params.id
       this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, {
         _this: this
       }, res => {
@@ -1634,6 +1645,32 @@ export default {
       }, e => {
       })
 
+      // 刷新质量评价评分人表格和动态评价评分人表格
+      const qualityRequest = {
+        lawId: standId,
+        evaluationType: 'quality'
+      }
+      this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', qualityRequest, {
+        _this: this
+      }, res => {
+        this.qualityHistoryPeopleTable = res.data.records
+        this.qualityFirstHistoryPeopleId = res.data.records[0].userId
+
+      }, e => {
+      })
+      const dynamicRequest = {
+        lawId: standId,
+        evaluationType: 'dynamic'
+      }
+      this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', dynamicRequest, {
+        _this: this
+      }, res => {
+        this.dynamicHistoryPeopleTable = res.data.records
+        this.dynamicFirstHistoryPeopleId = res.data.records[0].userId
+
+      }, e => {
+      })
+
     },
     targetScoreChange(row){
       if (this.targetScore1 === '') {
@@ -1714,9 +1751,9 @@ export default {
         const allData = {
           tableData: this.businessCommentTable,
           formData: JSON.stringify(this.businessCommentForm),
-          standId: this.sarStandardsInfoEO.id,
+          standId: this.$route.params.id,
           userId: this.$store.getters.userInfo.userId,
-          evaluationType: this.indexType
+          evaluationType: 'dynamic'
         }
 
         this.$http.postData('sarEnterpriseStandardEvaluation/quality-evaluation/submitEvaluationForm', allData, {
@@ -1726,16 +1763,17 @@ export default {
             this.$message.success('提交成功')
             this.commentSubmitLoading = false
             //重新评分之后刷新历史评分人
-            let standId = this.sarStandardsInfoEO.id
-            this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', {lawId:standId}, {
+            let standId = this.$route.params.id
+            const dynamicRequest = {
+              lawId: standId,
+              evaluationType: 'dynamic'
+            }
+            this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', dynamicRequest, {
               _this: this
             }, res => {
               this.dynamicHistoryPeopleTable = []
               this.dynamicHistoryPeopleTable = res.data.records
-              this.firstHistoryPeopleId = res.data.records[0].userId
-              // for (let i = 0; i < res.data.records.length; i++) {
-              //   this.dynamicHistoryPeopleTable.push(res.data.records[i].userName)
-              // }
+              this.dynamicFirstHistoryPeopleId = res.data.records[0].userId
 
             }, e => {
             })
@@ -2819,27 +2857,28 @@ export default {
     // }
   },
   async mounted () {
+    let standId = this.$route.params.id
     const qualityRequest = {
-      lawId: this.sarStandardsInfoEO.id,
+      lawId: standId,
       evaluationType: 'quality'
     }
     this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', qualityRequest, {
       _this: this
     }, res => {
       this.qualityHistoryPeopleTable = res.data.records
-      this.firstHistoryPeopleId = res.data.records[0].userId
+      this.qualityFirstHistoryPeopleId = res.data.records[0].userId
 
     }, e => {
     })
     const dynamicRequest = {
-      lawId: this.sarStandardsInfoEO.id,
+      lawId: standId,
       evaluationType: 'dynamic'
     }
     this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', dynamicRequest, {
       _this: this
     }, res => {
       this.dynamicHistoryPeopleTable = res.data.records
-      this.firstHistoryPeopleId = res.data.records[0].userId
+      this.dynamicFirstHistoryPeopleId = res.data.records[0].userId
 
     }, e => {
     })

src/pages/details/otherStandardDetails/index.vue

@@ -735,10 +735,10 @@
               width="90"
           >
           </el-table-column>
-          <el-table-column
-              prop="responsibleUnit"
-              label="责任部门">
-          </el-table-column>
+<!--          <el-table-column-->
+<!--              prop="responsibleUnit"-->
+<!--              label="责任部门">-->
+<!--          </el-table-column>-->
           <el-table-column
               prop="dutyEngineer"
               label="责任工程师"
@@ -958,22 +958,22 @@
     >
       <div class="see-drawer-content">
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="条款号">条款号</label>
+          <label class="see-drawer-name" style="font-size: 14px" title="条款号">条款号</label>
           <span class="see-drawer-val" :title="standShowItemEO.itemsNum">{{ standShowItemEO.itemsNum }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="条款名称">条款名称</label>
+          <label class="see-drawer-name" style="font-size: 15px" title="条款名称">条款名称</label>
           <span class="see-drawer-val" :title="standShowItemEO.itemsName">{{ standShowItemEO.itemsName }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="内容简介">条款内容</label>
+          <label class="see-drawer-name" style="font-size: 15px" title="内容简介">条款内容</label>
           <span class="see-drawer-val"
                 :title="standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : ''">{{
               standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : ''
             }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="解读内容">解读内容</label>
+          <label class="see-drawer-name" style="font-size: 15px" title="解读内容">解读内容</label>
           <span class="see-drawer-val"
                 :title="standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''">
             {{
@@ -982,48 +982,48 @@
         </div>
 
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="新车型实施日期">新车型实施日期</label>
+          <label class="see-drawer-name" style="font-size: 15px" title="新车型实施日期">新车型实施日期</label>
           <span class="see-drawer-val"
                 :title="standShowItemEO.xcxssrq">{{
-              standShowItemEO.xccssrq ? $moment(standShowItemEO.xccssrq).format('YYYY-MM-DD') : ''
+              standShowItemEO.xccssrq
             }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="在产车实施日期">在产车实施日期</label>
+          <label class="see-drawer-name" style="font-size: 15px" title="在产车实施日期">在产车实施日期</label>
           <span class="see-drawer-val"
                 :title="standShowItemEO.zccssrq">{{
-              standShowItemEO.zccssrq ? $moment(standShowItemEO.zccssrq).format('YYYY-MM-DD') : ''
+              standShowItemEO.zccssrq
             }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="适用车型">适用车型</label>
+          <label class="see-drawer-name" style="font-size: 15px" title="适用车型">适用车型</label>
           <span class="see-drawer-val" :title="standShowItemEO.applyArctic">{{ standShowItemEO.applyArctic }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="责任部门">责任部门</label>
+          <label class="see-drawer-name" style="font-size: 15px" title="责任部门">责任部门</label>
           <span class="see-drawer-val" :title="standShowItemEO.responsibleUnit">{{
               standShowItemEO.responsibleUnit
             }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="责任工程师">责任工程师</label>
+          <label class="see-drawer-name" style="font-size: 15px" title="责任工程师">责任工程师</label>
           <span class="see-drawer-val" :title="standShowItemEO.dutyEngineer">
             {{ standShowItemEO.dutyEngineer }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="基于上一版本差异">基于上一版本差异</label>
+          <label class="see-drawer-name" style="font-size: 15px" title="基于上一版本差异">基于上一版本差异</label>
           <span class="see-drawer-val" :title="standShowItemEO.comparedWithPrevious">
             {{ standShowItemEO.comparedWithPrevious }}</span>
         </div>
 
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="符合性状态">符合性状态</label>
+          <label class="see-drawer-name" style="font-size: 15px" title="符合性状态">符合性状态</label>
           <span class="see-drawer-val" :title="standShowItemEO.complianceRequire">
             {{ standShowItemEO.complianceRequire }}</span>
         </div>
 
         <div class="see-drawer-div">
-          <label class="see-drawer-name" title="合规性分析">合规性分析</label>
+          <label class="see-drawer-name" style="font-size: 15px" title="合规性分析">合规性分析</label>
           <span class="see-drawer-val" :title="standShowItemEO.complianceState">
             {{ standShowItemEO.complianceState }}</span>
         </div>

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue

@@ -564,12 +564,12 @@ export default {
           this.newDataList = this.fileTextList
           this.newDataList.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         } else {
           this.newDataList.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         }
         this.fileListData.fileText = this.newDataList

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue

@@ -535,12 +535,12 @@ export default {
           this.newDataList = this.fillFileList
           this.newDataList.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         } else {
           this.newDataList.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         }
         this.rh_pageData.fillFile = this.newDataList

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue

@@ -460,7 +460,7 @@ export default {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
-    height: calc(~'100% - 103px');
+    height: calc(~'100% - 100px');
     overflow: auto;
 
     .tableTitle {

src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue

@@ -375,12 +375,12 @@ export default {
           this.newDataList = this.reData
             this.newDataList.push({
               id: res.data.attId,
-              name: res.data.standName
+              name: res.data.name
           })
         } else {
             this.newDataList.push({
               id: res.data.attId,
-              name: res.data.standName
+              name: res.data.name
             })
         }
 
@@ -449,12 +449,12 @@ export default {
           this.newThemeFile = this.themeData
           this.newThemeFile.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         } else {
           this.newDataList.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         }
         this.themeDataList.meetingFile = this.newThemeFile
@@ -510,12 +510,12 @@ export default {
           this.newOtherFile = this.hh_pageData.otherFileList
           this.newOtherFile.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         } else {
           this.newOtherFile.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         }
         this.hh_pageData.otherFileList = this.newOtherFile

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue

@@ -487,12 +487,12 @@ export default {
           this.newDataList = this.ch_pageData.fileTextList
           this.newDataList.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         } else {
           this.newDataList.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         }
         this.ch_pageData.fileTextList = this.newDataList

src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue

@@ -171,7 +171,7 @@
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
-          v-if="sarType === 'INLAND'"
+          v-if="sarType === 'INLAND' && form.itemsNum1"
           prop="changePoint"
           width="150"
           label="基于上一版本差异"
@@ -205,30 +205,31 @@
         <el-table-column
           prop="newData"
           width="150"
+          show-overflow-tooltip
           label="新车型实施日期"
           align="center">
-          <template slot-scope="scope">
-            <div>{{ scope.row.newData ? $moment(scope.row.newData).format('YYYY-MM-DD')  : scope.row.newData }}</div>
-          </template>
         </el-table-column>
         <el-table-column
           prop="onlineData"
           width="150"
+          show-overflow-tooltip
           label="在产车型实施日期"
           align="center">
-          <template slot-scope="scope">
-            <div>{{ scope.row.onlineData ? $moment(scope.row.onlineData).format('YYYY-MM-DD')  : scope.row.onlineData }}</div>
-          </template>
         </el-table-column>
         <el-table-column
           prop="applyArctic"
           width="150"
+          show-overflow-tooltip
           label="适用车型"
           align="center">
+          <template slot-scope="scope">
+            {{ scope.row.applyArctic.toString() }}
+          </template>
         </el-table-column>
         <el-table-column
           prop="unitDeptName"
           label="责任部门"
+          show-overflow-tooltip
           width="170"
           align="center">
         </el-table-column>

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

@@ -392,23 +392,15 @@
                         ></el-input>
                     </el-form-item>
                     <el-form-item label="新车型实施日期" prop="newData" class="add-form-item" >
-<!--                        <el-date-picker-->
-<!--                                v-model="plForm.newData"-->
-<!--                                type="date"-->
-<!--                                placeholder="选择新车型实施日期">-->
-<!--                        </el-date-picker>-->
                         <custom-date-pick-group
+                                class="myDataPick"
                                 :config="plForm"
                                 v-model="plForm.newData"
                         ></custom-date-pick-group>
                     </el-form-item>
                     <el-form-item label="在产车实施日期" prop="onlineData" class="add-form-item" >
-<!--                        <el-date-picker-->
-<!--                                v-model="plForm.onlineData"-->
-<!--                                type="date"-->
-<!--                                placeholder="选择在产车实施日期">-->
-<!--                        </el-date-picker>-->
                         <custom-date-pick-group
+                                class="myDataPick"
                                 :config="plForm"
                                 v-model="plForm.onlineData"
                         ></custom-date-pick-group>
@@ -470,12 +462,14 @@
                     </el-form-item>
                     <el-form-item label="新车型实施日期" prop="newData" class="add-form-item" >
                         <custom-date-pick-group
+                                class="myDataPick"
                                 :config="editForm"
                                 v-model="editForm.newData"
                         ></custom-date-pick-group>
                     </el-form-item>
                     <el-form-item label="在产车实施日期" prop="onlineData" class="add-form-item" >
                         <custom-date-pick-group
+                                class="myDataPick"
                                 :config="editForm"
                                 v-model="editForm.onlineData"
                         ></custom-date-pick-group>
@@ -842,7 +836,7 @@
                             itemList = data.itemList
                         }
                         itemList.forEach(item => {
-                            item.unitDeptName = this.$store.getters.userInfo.orgName
+                            item.unitDeptName = this.$store.getters.userInfo.institutionName
                             item.onlineData = item.onlineData || ''
                             item.newData = item.newData || ''
                             item.complianceState = item.complianceState || ''
@@ -853,6 +847,8 @@
                             item.itemsTitle = item.itermsConditions
                             item.applyArctic = item.applyArctic || []
                         })
+
+
                         this.itemList = itemList
                         this.loading = false
                     }).catch(e => {
@@ -884,6 +880,11 @@
                 padding: 0 20px 0;
             }
         }
+        .myDataPick {
+            /deep/.el-form-item__content {
+                margin-left: 0px !important;
+            }
+        }
         .fileClass {
             cursor: pointer;
         }

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

@@ -170,7 +170,7 @@
                 </el-table-column>
                 <el-table-column
                         show-overflow-tooltip
-                        v-if="sarType === 'INLAND'"
+                        v-if="sarType === 'INLAND' && form.itemsNum1"
                         prop="changePoint"
                         width="150"
                         label="基于上一版本差异"

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

@@ -170,7 +170,7 @@
                 </el-table-column>
                 <el-table-column
                         show-overflow-tooltip
-                        v-if="sarType === 'INLAND'"
+                        v-if="sarType === 'INLAND' && form.itemsNum1"
                         prop="changePoint"
                         width="150"
                         label="基于上一版本差异"

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

@@ -171,7 +171,7 @@
                 </el-table-column>
                 <el-table-column
                         show-overflow-tooltip
-                        v-if="sarType === 'INLAND'"
+                        v-if="sarType === 'INLAND' && form.itemsNum1"
                         prop="changePoint"
                         width="150"
                         label="基于上一版本差异"

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

@@ -593,7 +593,7 @@
               style="width: 100%"
               border
               ref="table"
-              height="100%"
+              class="table-height"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectThree"
@@ -796,7 +796,7 @@ export default {
       ListModel: false, //选择清单抽屉状态
       standModel: false, // 选择标准抽屉状态
       active: "1",
-      signFlag: "1",   //是否会签 1为会签 2为不会签
+      signFlag: "",   //是否会签 1为会签 2为不会签
       listType: "country",  //选择的清单类型
       isSubmit: false,
       saveLoading: false,
@@ -818,7 +818,7 @@ export default {
         model: "", // 上传模板
         modelName: "",
         standId: "", //选择的清单的id
-        signFlag: "1",  //是否会签  1为会签 2为不会签
+        signFlag: "",  //是否会签  1为会签 2为不会签
         inforlist: " ", //用来存放标准列表的标准id
         dataList: [{
           code: "", //标准号
@@ -865,6 +865,7 @@ export default {
           this.fileInfoList.push(itemId)
           this.getFileInfo();
         });
+        this.signFlag = mes.form.signFlag
         this.listForm = mes.form;
         this.dataList = mes.form.dataList;
         this.roleForm = mes.roleForm;
@@ -938,9 +939,9 @@ export default {
     //判断当前是否会签
     selectSign(type) {
       if (type === "1") {
-        this.listForm.signFlag = 1;
+        this.listForm.signFlag = '1';
       } else if (type == "2") {
-        this.listForm.signFlag = 2;
+        this.listForm.signFlag = '2';
       }
     },
     queryDetailsData() {
@@ -1595,5 +1596,9 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
 }
 </style>

src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue

@@ -101,25 +101,19 @@
           </el-table-column>
           <el-table-column
             prop="issueTime"
-            sortable
             label="发布日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="XCXSSRQ"
-            sortable
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="ZCCSSRQ"
-            sortable
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -181,7 +175,6 @@
           <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>
@@ -319,18 +312,12 @@
                 prop="XCXSSRQ"
                 align="center"
                 label="新车型实施日期">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-                </template>
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
                 prop="ZCCSSRQ"
                 align="center"
                 label="在产车实施日期">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-                </template>
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
@@ -527,13 +514,8 @@ export default {
       }, res => {
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
-          if(item.attrInfoMap === null){
-            this.$set(item, "ZCCSSRQ", '');
-            this.$set(item, "XCXSSRQ", '');
-          }else{
-            this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
-            this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
-          }
+          this.$set(item, "ZCCSSRQ", item.zccssrq);
+          this.$set(item, "XCXSSRQ", item.xcxssrq);
         })
         this.totalNo = res.data.count;
       }, e => {

src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue

@@ -97,25 +97,19 @@
           </el-table-column>
           <el-table-column
             prop="issueTime"
-            sortable
             label="发布日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="XCXSSRQ"
-            sortable
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="ZCCSSRQ"
-            sortable
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -177,7 +171,6 @@
           <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>

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

@@ -563,7 +563,7 @@
               style="width: 100%"
               border
               ref="table"
-              height="90%"
+              class="table-height"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectThree"
@@ -870,9 +870,9 @@ export default {
     //判断当前是否会签
     selectSign(type) {
       if (type === "1") {
-        this.listForm.signFlag = 1;
+        this.listForm.signFlag = '1';
       } else if (type == "2") {
-        this.listForm.signFlag = 2;
+        this.listForm.signFlag = '2';
       }
     },
     queryDetailsData() {
@@ -1528,5 +1528,9 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
 }
 </style>

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

@@ -97,25 +97,19 @@
           </el-table-column>
           <el-table-column
             prop="issueTime"
-            sortable
             label="发布日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="XCXSSRQ"
-            sortable
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="ZCCSSRQ"
-            sortable
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -177,7 +171,6 @@
           <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>

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

@@ -116,25 +116,19 @@
           </el-table-column>
           <el-table-column
             prop="issueTime"
-            sortable
             label="发布日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="XCXSSRQ"
-            sortable
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="ZCCSSRQ"
-            sortable
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -196,7 +190,6 @@
           <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>
@@ -293,7 +286,7 @@
               style="width: 100%"
               border
               ref="table"
-              height="100%"
+              class="table-height"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectThree"
@@ -338,18 +331,12 @@
                 prop="XCXSSRQ"
                 align="center"
                 label="新车型实施日期">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-                </template>
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
                 prop="ZCCSSRQ"
                 align="center"
                 label="在产车实施日期">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-                </template>
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
@@ -595,13 +582,8 @@ export default {
         this.standardData = res.data.list;
         this.loading = false
         this.standardData.forEach(item => {
-          if(item.attrInfoMap === null){
-            this.$set(item, "ZCCSSRQ", '');
-            this.$set(item, "XCXSSRQ", '');
-          }else{
-            this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
-            this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
-          }
+          this.$set(item, "ZCCSSRQ", item.zccssrq);
+          this.$set(item, "XCXSSRQ", item.xcxssrq);
         })
         this.totalNo = res.data.count;
       }, e => {
@@ -994,6 +976,10 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
 }
 </style>
 

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

@@ -98,25 +98,19 @@
           </el-table-column>
           <el-table-column
             prop="issueTime"
-            sortable
             label="发布日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="XCXSSRQ"
-            sortable
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="ZCCSSRQ"
-            sortable
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -178,7 +172,6 @@
           <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>

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

@@ -1202,69 +1202,6 @@
                     modelDataZrUserVerify:[],
                     // 基础信息
                     country:[],
-                    textStatus: '', // 文本状态
-                    standInData: '0', // 标准类型
-                    standNumber: '', // 标准编号
-                    standNature: '', // 标准性质
-                    signFlag: '1', // 是否需要会签
-                    standSystem: '',// 标准体系
-                    standSystemName: '',// 标准体系名称
-                    gxhbq: '', // 标签
-                    // 实施日期
-                    ssrq: '', // 实施日期(标准文本)
-                    xcxssrq: '', // 新车型实施日期(标准文本)
-                    zccssrq: '', // 在产车实施日期(标准文本)
-                    ssrqgj: '', // 实施日期(国际)
-                    xcxssrqgj: '', // 新车型实施日期(国际)
-                    zccssrqgj: '', // 在产车实施日期(国际)
-                    // 文本信息
-                    ca: '', // 草案
-                    FBGBJBD: '', // 发布稿
-                    xgd: '', // 修改单
-                    bpg: '', // 报批稿
-                    ssg: '', // 送审稿
-                    zqyjg: '', // 征求意见稿
-                    jdwj: '', // 解读文件
-                    zbjbd: '', // 增补件
-                    kwj: '', // 勘 误件
-                    caName: '', // 草案
-                    fbgbjbdName: '', // 发布稿
-                    xgdName: '', // 修改单
-                    bpgName: '', // 报批稿
-                    ssgName: '', // 送审稿
-                    zqyjgName: '', // 征求意见稿
-                    jdwjName: '', // 解读文件
-                    zbjbdName: '', // 增补件
-                    kwjName: '', // 勘误件
-                    glwjName: '', // 关联文件
-                    // 适用范围
-                    txlb: '', // 体系类别
-                    gkdw: '', // 归口管理部门
-                    qcdw: [], // 起草单位
-                    wssmr: [], // 我司署名人
-                    cysd: '', // 我司参与深度
-                    cllx: [], // 适用车型
-                    nylx: [],// 能源类型
-                    sycpx: [],// 适用产品线
-                    syrz: [], // 适用认证
-                    zrbm: [], // 责任部门
-                    zrgcs: [], // 责任工程师
-                    cycvppsbm: '', // 关联模块--乘用车VPPS编码
-                    cycvppscn: '', // 关联模块--乘用车vpps中文名称
-                    kccvppsbm: '', // 关联模块--卡车VPPS编码
-                    kccvppscn: '', // 关联模块--卡车vpps中文名称
-                    dybxh: '', // 模块结构单元变型号
-                    dymc: '', // 模块结构单元名称
-                    // 关联信息
-                    dtbjh: '', // 代替标准号
-                    cbbh: '', // 采标编号
-                    cbcd: '', // 采标程度
-                    yybj: '', // 引用标准
-                    bfbdtbzh: '', // 部分代替标准号
-                    byybj: '', // 被引用标准
-                    glwj: '', // 关联文件
-                    xglc: '', // 相关流程
-                    chjl: '', // 参会记录
                     // 基础信息
                     standSort: '',
                     standCode: '',

src/pages/processCenter/pages/creatProcess/qbrk/step10.vue

@@ -1037,69 +1037,6 @@
                     modelDataZrUserVerify:[],
                     // 基础信息
                     country:[],
-                    textStatus: '', // 文本状态
-                    standInData: '0', // 标准类型
-                    standNumber: '', // 标准编号
-                    standNature: '', // 标准性质
-                    signFlag: '1', // 是否需要会签
-                    standSystem: '',// 标准体系
-                    standSystemName: '',// 标准体系名称
-                    gxhbq: '', // 标签
-                    // 实施日期
-                    ssrq: '', // 实施日期(标准文本)
-                    xcxssrq: '', // 新车型实施日期(标准文本)
-                    zccssrq: '', // 在产车实施日期(标准文本)
-                    ssrqgj: '', // 实施日期(国际)
-                    xcxssrqgj: '', // 新车型实施日期(国际)
-                    zccssrqgj: '', // 在产车实施日期(国际)
-                    // 文本信息
-                    ca: '', // 草案
-                    FBGBJBD: '', // 发布稿
-                    xgd: '', // 修改单
-                    bpg: '', // 报批稿
-                    ssg: '', // 送审稿
-                    zqyjg: '', // 征求意见稿
-                    jdwj: '', // 解读文件
-                    zbjbd: '', // 增补件
-                    kwj: '', // 勘 误件
-                    caName: '', // 草案
-                    fbgbjbdName: '', // 发布稿
-                    xgdName: '', // 修改单
-                    bpgName: '', // 报批稿
-                    ssgName: '', // 送审稿
-                    zqyjgName: '', // 征求意见稿
-                    jdwjName: '', // 解读文件
-                    zbjbdName: '', // 增补件
-                    kwjName: '', // 勘误件
-                    glwjName: '', // 关联文件
-                    // 适用范围
-                    txlb: '', // 体系类别
-                    gkdw: '', // 归口管理部门
-                    qcdw: [], // 起草单位
-                    wssmr: [], // 我司署名人
-                    cysd: '', // 我司参与深度
-                    cllx: [], // 适用车型
-                    nylx: [],// 能源类型
-                    sycpx: [],// 适用产品线
-                    syrz: [], // 适用认证
-                    zrbm: [], // 责任部门
-                    zrgcs: [], // 责任工程师
-                    cycvppsbm: '', // 关联模块--乘用车VPPS编码
-                    cycvppscn: '', // 关联模块--乘用车vpps中文名称
-                    kccvppsbm: '', // 关联模块--卡车VPPS编码
-                    kccvppscn: '', // 关联模块--卡车vpps中文名称
-                    dybxh: '', // 模块结构单元变型号
-                    dymc: '', // 模块结构单元名称
-                    // 关联信息
-                    dtbjh: '', // 代替标准号
-                    cbbh: '', // 采标编号
-                    cbcd: '', // 采标程度
-                    yybj: '', // 引用标准
-                    bfbdtbzh: '', // 部分代替标准号
-                    byybj: '', // 被引用标准
-                    glwj: '', // 关联文件
-                    xglc: '', // 相关流程
-                    chjl: '', // 参会记录
                     // 基础信息
                     standSort: '',
                     standCode: '',

src/pages/processCenter/pages/creatProcess/qbrk/step11.vue

@@ -1035,71 +1035,7 @@
                     modelData:[],
                     modelDataNameVerify:[],
                     modelDataZrUserVerify:[],
-                    // 基础信息
                     country:[],
-                    textStatus: '', // 文本状态
-                    standInData: '0', // 标准类型
-                    standNumber: '', // 标准编号
-                    standNature: '', // 标准性质
-                    signFlag: '1', // 是否需要会签
-                    standSystem: '',// 标准体系
-                    standSystemName: '',// 标准体系名称
-                    gxhbq: '', // 标签
-                    // 实施日期
-                    ssrq: '', // 实施日期(标准文本)
-                    xcxssrq: '', // 新车型实施日期(标准文本)
-                    zccssrq: '', // 在产车实施日期(标准文本)
-                    ssrqgj: '', // 实施日期(国际)
-                    xcxssrqgj: '', // 新车型实施日期(国际)
-                    zccssrqgj: '', // 在产车实施日期(国际)
-                    // 文本信息
-                    ca: '', // 草案
-                    FBGBJBD: '', // 发布稿
-                    xgd: '', // 修改单
-                    bpg: '', // 报批稿
-                    ssg: '', // 送审稿
-                    zqyjg: '', // 征求意见稿
-                    jdwj: '', // 解读文件
-                    zbjbd: '', // 增补件
-                    kwj: '', // 勘 误件
-                    caName: '', // 草案
-                    fbgbjbdName: '', // 发布稿
-                    xgdName: '', // 修改单
-                    bpgName: '', // 报批稿
-                    ssgName: '', // 送审稿
-                    zqyjgName: '', // 征求意见稿
-                    jdwjName: '', // 解读文件
-                    zbjbdName: '', // 增补件
-                    kwjName: '', // 勘误件
-                    glwjName: '', // 关联文件
-                    // 适用范围
-                    txlb: '', // 体系类别
-                    gkdw: '', // 归口管理部门
-                    qcdw: [], // 起草单位
-                    wssmr: [], // 我司署名人
-                    cysd: '', // 我司参与深度
-                    cllx: [], // 适用车型
-                    nylx: [],// 能源类型
-                    sycpx: [],// 适用产品线
-                    syrz: [], // 适用认证
-                    zrbm: [], // 责任部门
-                    zrgcs: [], // 责任工程师
-                    cycvppsbm: '', // 关联模块--乘用车VPPS编码
-                    cycvppscn: '', // 关联模块--乘用车vpps中文名称
-                    kccvppsbm: '', // 关联模块--卡车VPPS编码
-                    kccvppscn: '', // 关联模块--卡车vpps中文名称
-                    dybxh: '', // 模块结构单元变型号
-                    dymc: '', // 模块结构单元名称
-                    // 关联信息
-                    dtbjh: '', // 代替标准号
-                    cbbh: '', // 采标编号
-                    cbcd: '', // 采标程度
-                    yybj: '', // 引用标准
-                    bfbdtbzh: '', // 部分代替标准号
-                    byybj: '', // 被引用标准
-                    glwj: '', // 关联文件
-                    xglc: '', // 相关流程
-                    chjl: '', // 参会记录
                     // 基础信息
                     standSort: '',
                     standCode: '',

src/pages/processCenter/pages/creatProcess/qbrk/step12.vue

@@ -52,6 +52,7 @@
                             </el-form-item>
                             <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
                                 <el-datePicker v-model="form.putTime" :disabled="disabledState"
+                                               value-format="yyyy-MM-dd"
                                                :editable="false"></el-datePicker>
                             </el-form-item>
                             <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">
@@ -92,6 +93,7 @@
                             </el-form-item>
                             <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
                                 <el-datePicker v-model="form.issueTime" :disabled="disabledState"
+                                               value-format="yyyy-MM-dd"
                                                :editable="false"
                                                ></el-datePicker>
                             </el-form-item>
@@ -804,7 +806,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process";
+    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processCreateBuss,evaluationHisList} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     let Base64 = require('js-base64').Base64;
@@ -1022,71 +1024,7 @@
                     modelData:[],
                     modelDataNameVerify:[],
                     modelDataZrUserVerify:[],
-                    // 基础信息
                     country:[],
-                    textStatus: '', // 文本状态
-                    standInData: '0', // 标准类型
-                    standNumber: '', // 标准编号
-                    standNature: '', // 标准性质
-                    signFlag: '1', // 是否需要会签
-                    standSystem: '',// 标准体系
-                    standSystemName: '',// 标准体系名称
-                    gxhbq: '', // 标签
-                    // 实施日期
-                    ssrq: '', // 实施日期(标准文本)
-                    xcxssrq: '', // 新车型实施日期(标准文本)
-                    zccssrq: '', // 在产车实施日期(标准文本)
-                    ssrqgj: '', // 实施日期(国际)
-                    xcxssrqgj: '', // 新车型实施日期(国际)
-                    zccssrqgj: '', // 在产车实施日期(国际)
-                    // 文本信息
-                    ca: '', // 草案
-                    FBGBJBD: '', // 发布稿
-                    xgd: '', // 修改单
-                    bpg: '', // 报批稿
-                    ssg: '', // 送审稿
-                    zqyjg: '', // 征求意见稿
-                    jdwj: '', // 解读文件
-                    zbjbd: '', // 增补件
-                    kwj: '', // 勘 误件
-                    caName: '', // 草案
-                    fbgbjbdName: '', // 发布稿
-                    xgdName: '', // 修改单
-                    bpgName: '', // 报批稿
-                    ssgName: '', // 送审稿
-                    zqyjgName: '', // 征求意见稿
-                    jdwjName: '', // 解读文件
-                    zbjbdName: '', // 增补件
-                    kwjName: '', // 勘误件
-                    glwjName: '', // 关联文件
-                    // 适用范围
-                    txlb: '', // 体系类别
-                    gkdw: '', // 归口管理部门
-                    qcdw: [], // 起草单位
-                    wssmr: [], // 我司署名人
-                    cysd: '', // 我司参与深度
-                    cllx: [], // 适用车型
-                    nylx: [],// 能源类型
-                    sycpx: [],// 适用产品线
-                    syrz: [], // 适用认证
-                    zrbm: [], // 责任部门
-                    zrgcs: [], // 责任工程师
-                    cycvppsbm: '', // 关联模块--乘用车VPPS编码
-                    cycvppscn: '', // 关联模块--乘用车vpps中文名称
-                    kccvppsbm: '', // 关联模块--卡车VPPS编码
-                    kccvppscn: '', // 关联模块--卡车vpps中文名称
-                    dybxh: '', // 模块结构单元变型号
-                    dymc: '', // 模块结构单元名称
-                    // 关联信息
-                    dtbjh: '', // 代替标准号
-                    cbbh: '', // 采标编号
-                    cbcd: '', // 采标程度
-                    yybj: '', // 引用标准
-                    bfbdtbzh: '', // 部分代替标准号
-                    byybj: '', // 被引用标准
-                    glwj: '', // 关联文件
-                    xglc: '', // 相关流程
-                    chjl: '', // 参会记录
                     // 基础信息
                     standSort: '',
                     standCode: '',
@@ -1126,6 +1064,12 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
+                    //流程信息
+                    topId:'',
+                    prcNum:'',
+                    commentText:'',
+                    prcName:'',
+                    standType: '',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,
@@ -1614,6 +1558,7 @@
                                     this.form.YYRZLAWS = JSON.parse(JSON.stringify(json)).YYRZLAWS && JSON.parse(JSON.stringify(json)).YYRZLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).YYRZLAWS.split(',') : []
                                     this.form.ZRBMLAWS = JSON.parse(JSON.stringify(json)).ZRBMLAWS && JSON.parse(JSON.stringify(json)).ZRBMLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).ZRBMLAWS.split(',') : []
                                     this.form.ZRGCSLAWS = JSON.parse(JSON.stringify(json)).ZRGCSLAWS && JSON.parse(JSON.stringify(json)).ZRGCSLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).ZRGCSLAWS.split(',') : []
+                                    this.form.topId = this.pid
                                     this.form.prcNum = this.prcNum
                                     this.form.prcName = this.prcName
                                     this.form['id'] = bringData.id
@@ -2462,7 +2407,9 @@
                         this.isSubmit = true
                         this.form.commentText = this.formTongGuo.commentText
                         this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                        this.form.topId = this.pId
                         const json = JSON.stringify(this.form);
+                        this.processCreateBuss(json)
                         this.$http.post('lawss/activiti/completeTask', {
                             taskIds: this.taskIds,
                             userId : this.userId,
@@ -2474,7 +2421,7 @@
                                 this.$message.success(res.message)
                                 // 流程提交之后，应该流转至待办任务页面
                                 this.isSubmit = false
-                                this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                this.processCreateLaws(json)
                                 // if(this.formTongGuo.approvalOpinion === '1'){
                                 //     this.$message.warning("驳回成功")
                                 //     this.isSubmit = false
@@ -2489,6 +2436,28 @@
                         })
               }})
             },
+            /**
+             * @description: 流程入库
+             * @date: 2020-11-18 21:47:58
+             */
+            processCreateBuss(json) {
+                const _formData = new FormData()
+                _formData.append('infoJson', json)
+                processCreateBuss(_formData).then(res => {
+                    if (res.result === '操作成功' || res.data === '入库成功') {
+                        this.$message.success(res.data)
+                        setTimeout(() => {
+                            this.$router.push({
+                                name: 'ProcessCenter'
+                            })
+                        }, 100)
+                        this.isSubmit = false
+                    } else {
+                        this.$message.warning(res.message)
+                        this.isSubmit = false
+                    }
+                })
+            },
             busVsFunc(){
                 this.$http.get('sarVppsTree/list', '', {
                     _this: this
@@ -2519,6 +2488,7 @@
             getFormFieldList (item) {
                 this.$nextTick(() => {
                     this.form = JSON.parse(JSON.stringify(item))
+                    this.form.topId = this.pId
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
@@ -2562,6 +2532,20 @@
                     })
                 }
             },
+            getEvaluationHisList() {
+                if(this.pId){
+                    return new Promise((resolve, reject) => {
+                        evaluationHisList({
+                            pId: this.pId
+                        }).then(res => {
+                            if (res) {
+
+                            }
+                        }).catch(e => {
+                        })
+                    })
+                }
+            },
             processTable () {
                 this.$nextTick(() => {
                     Promise.all([this.getTaskId()]).then((value) => {

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

@@ -1026,69 +1026,6 @@
                     modelDataZrUserVerify:[],
                     // 基础信息
                     country:[],
-                    textStatus: '', // 文本状态
-                    standInData: '0', // 标准类型
-                    standNumber: '', // 标准编号
-                    standNature: '', // 标准性质
-                    signFlag: '1', // 是否需要会签
-                    standSystem: '',// 标准体系
-                    standSystemName: '',// 标准体系名称
-                    gxhbq: '', // 标签
-                    // 实施日期
-                    ssrq: '', // 实施日期(标准文本)
-                    xcxssrq: '', // 新车型实施日期(标准文本)
-                    zccssrq: '', // 在产车实施日期(标准文本)
-                    ssrqgj: '', // 实施日期(国际)
-                    xcxssrqgj: '', // 新车型实施日期(国际)
-                    zccssrqgj: '', // 在产车实施日期(国际)
-                    // 文本信息
-                    ca: '', // 草案
-                    FBGBJBD: '', // 发布稿
-                    xgd: '', // 修改单
-                    bpg: '', // 报批稿
-                    ssg: '', // 送审稿
-                    zqyjg: '', // 征求意见稿
-                    jdwj: '', // 解读文件
-                    zbjbd: '', // 增补件
-                    kwj: '', // 勘 误件
-                    caName: '', // 草案
-                    fbgbjbdName: '', // 发布稿
-                    xgdName: '', // 修改单
-                    bpgName: '', // 报批稿
-                    ssgName: '', // 送审稿
-                    zqyjgName: '', // 征求意见稿
-                    jdwjName: '', // 解读文件
-                    zbjbdName: '', // 增补件
-                    kwjName: '', // 勘误件
-                    glwjName: '', // 关联文件
-                    // 适用范围
-                    txlb: '', // 体系类别
-                    gkdw: '', // 归口管理部门
-                    qcdw: [], // 起草单位
-                    wssmr: [], // 我司署名人
-                    cysd: '', // 我司参与深度
-                    cllx: [], // 适用车型
-                    nylx: [],// 能源类型
-                    sycpx: [],// 适用产品线
-                    syrz: [], // 适用认证
-                    zrbm: [], // 责任部门
-                    zrgcs: [], // 责任工程师
-                    cycvppsbm: '', // 关联模块--乘用车VPPS编码
-                    cycvppscn: '', // 关联模块--乘用车vpps中文名称
-                    kccvppsbm: '', // 关联模块--卡车VPPS编码
-                    kccvppscn: '', // 关联模块--卡车vpps中文名称
-                    dybxh: '', // 模块结构单元变型号
-                    dymc: '', // 模块结构单元名称
-                    // 关联信息
-                    dtbjh: '', // 代替标准号
-                    cbbh: '', // 采标编号
-                    cbcd: '', // 采标程度
-                    yybj: '', // 引用标准
-                    bfbdtbzh: '', // 部分代替标准号
-                    byybj: '', // 被引用标准
-                    glwj: '', // 关联文件
-                    xglc: '', // 相关流程
-                    chjl: '', // 参会记录
                     // 基础信息
                     standSort: '',
                     standCode: '',
@@ -2476,6 +2413,7 @@
                                 this.$message.success(res.message)
                                 // 流程提交之后，应该流转至待办任务页面
                                 this.isSubmit = false
+                                this.saveLoading = false
                                 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                                 // if(this.formTongGuo.approvalOpinion === '1'){
                                 //     this.$message.warning("驳回成功")

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

@@ -1025,69 +1025,6 @@
                     modelDataZrUserVerify:[],
                     // 基础信息
                     country:[],
-                    textStatus: '', // 文本状态
-                    standInData: '0', // 标准类型
-                    standNumber: '', // 标准编号
-                    standNature: '', // 标准性质
-                    signFlag: '1', // 是否需要会签
-                    standSystem: '',// 标准体系
-                    standSystemName: '',// 标准体系名称
-                    gxhbq: '', // 标签
-                    // 实施日期
-                    ssrq: '', // 实施日期(标准文本)
-                    xcxssrq: '', // 新车型实施日期(标准文本)
-                    zccssrq: '', // 在产车实施日期(标准文本)
-                    ssrqgj: '', // 实施日期(国际)
-                    xcxssrqgj: '', // 新车型实施日期(国际)
-                    zccssrqgj: '', // 在产车实施日期(国际)
-                    // 文本信息
-                    ca: '', // 草案
-                    FBGBJBD: '', // 发布稿
-                    xgd: '', // 修改单
-                    bpg: '', // 报批稿
-                    ssg: '', // 送审稿
-                    zqyjg: '', // 征求意见稿
-                    jdwj: '', // 解读文件
-                    zbjbd: '', // 增补件
-                    kwj: '', // 勘 误件
-                    caName: '', // 草案
-                    fbgbjbdName: '', // 发布稿
-                    xgdName: '', // 修改单
-                    bpgName: '', // 报批稿
-                    ssgName: '', // 送审稿
-                    zqyjgName: '', // 征求意见稿
-                    jdwjName: '', // 解读文件
-                    zbjbdName: '', // 增补件
-                    kwjName: '', // 勘误件
-                    glwjName: '', // 关联文件
-                    // 适用范围
-                    txlb: '', // 体系类别
-                    gkdw: '', // 归口管理部门
-                    qcdw: [], // 起草单位
-                    wssmr: [], // 我司署名人
-                    cysd: '', // 我司参与深度
-                    cllx: [], // 适用车型
-                    nylx: [],// 能源类型
-                    sycpx: [],// 适用产品线
-                    syrz: [], // 适用认证
-                    zrbm: [], // 责任部门
-                    zrgcs: [], // 责任工程师
-                    cycvppsbm: '', // 关联模块--乘用车VPPS编码
-                    cycvppscn: '', // 关联模块--乘用车vpps中文名称
-                    kccvppsbm: '', // 关联模块--卡车VPPS编码
-                    kccvppscn: '', // 关联模块--卡车vpps中文名称
-                    dybxh: '', // 模块结构单元变型号
-                    dymc: '', // 模块结构单元名称
-                    // 关联信息
-                    dtbjh: '', // 代替标准号
-                    cbbh: '', // 采标编号
-                    cbcd: '', // 采标程度
-                    yybj: '', // 引用标准
-                    bfbdtbzh: '', // 部分代替标准号
-                    byybj: '', // 被引用标准
-                    glwj: '', // 关联文件
-                    xglc: '', // 相关流程
-                    chjl: '', // 参会记录
                     // 基础信息
                     standSort: '',
                     standCode: '',
@@ -2460,6 +2397,7 @@
                 this.$refs['formTongGuo'].validate((valid) => {
                     if (valid) {
                         this.isSubmit = true
+                        this.saveLoading = true
                         this.form.commentText = this.formTongGuo.commentText
                         this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                         const json = JSON.stringify(this.form);
@@ -2473,6 +2411,7 @@
                             if (res.success) {
                                 this.$message.success(res.message)
                                 this.isSubmit = false
+                                this.saveLoading = false
                                 // 流程提交之后，应该流转至待办任务页面
                                 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
 

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

@@ -1037,69 +1037,6 @@
                     modelDataZrUserVerify:[],
                     // 基础信息
                     country:[],
-                    textStatus: '', // 文本状态
-                    standInData: '0', // 标准类型
-                    standNumber: '', // 标准编号
-                    standNature: '', // 标准性质
-                    signFlag: '1', // 是否需要会签
-                    standSystem: '',// 标准体系
-                    standSystemName: '',// 标准体系名称
-                    gxhbq: '', // 标签
-                    // 实施日期
-                    ssrq: '', // 实施日期(标准文本)
-                    xcxssrq: '', // 新车型实施日期(标准文本)
-                    zccssrq: '', // 在产车实施日期(标准文本)
-                    ssrqgj: '', // 实施日期(国际)
-                    xcxssrqgj: '', // 新车型实施日期(国际)
-                    zccssrqgj: '', // 在产车实施日期(国际)
-                    // 文本信息
-                    ca: '', // 草案
-                    FBGBJBD: '', // 发布稿
-                    xgd: '', // 修改单
-                    bpg: '', // 报批稿
-                    ssg: '', // 送审稿
-                    zqyjg: '', // 征求意见稿
-                    jdwj: '', // 解读文件
-                    zbjbd: '', // 增补件
-                    kwj: '', // 勘 误件
-                    caName: '', // 草案
-                    fbgbjbdName: '', // 发布稿
-                    xgdName: '', // 修改单
-                    bpgName: '', // 报批稿
-                    ssgName: '', // 送审稿
-                    zqyjgName: '', // 征求意见稿
-                    jdwjName: '', // 解读文件
-                    zbjbdName: '', // 增补件
-                    kwjName: '', // 勘误件
-                    glwjName: '', // 关联文件
-                    // 适用范围
-                    txlb: '', // 体系类别
-                    gkdw: '', // 归口管理部门
-                    qcdw: [], // 起草单位
-                    wssmr: [], // 我司署名人
-                    cysd: '', // 我司参与深度
-                    cllx: [], // 适用车型
-                    nylx: [],// 能源类型
-                    sycpx: [],// 适用产品线
-                    syrz: [], // 适用认证
-                    zrbm: [], // 责任部门
-                    zrgcs: [], // 责任工程师
-                    cycvppsbm: '', // 关联模块--乘用车VPPS编码
-                    cycvppscn: '', // 关联模块--乘用车vpps中文名称
-                    kccvppsbm: '', // 关联模块--卡车VPPS编码
-                    kccvppscn: '', // 关联模块--卡车vpps中文名称
-                    dybxh: '', // 模块结构单元变型号
-                    dymc: '', // 模块结构单元名称
-                    // 关联信息
-                    dtbjh: '', // 代替标准号
-                    cbbh: '', // 采标编号
-                    cbcd: '', // 采标程度
-                    yybj: '', // 引用标准
-                    bfbdtbzh: '', // 部分代替标准号
-                    byybj: '', // 被引用标准
-                    glwj: '', // 关联文件
-                    xglc: '', // 相关流程
-                    chjl: '', // 参会记录
                     // 基础信息
                     standSort: '',
                     standCode: '',

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

@@ -101,10 +101,10 @@
                                         align="center"
                                         label="简述扣分理由（不合格＜6分，必填）"
                                 >
-                                    <template slot-scope="scope" v-if="(scope.row.valueType !== 'add' && scope.row.score !== undefined && scope.row.score !== '' && scope.row.score < 6)">
+                                    <template slot-scope="scope" v-if="(scope.row.valueType !== 'add' && scope.row.score !== undefined && scope.row.score !== '' && scope.row.score < 10)">
                                         <el-form-item
                                                 :prop="'evaluationData.'+scope.$index + '.reason'"
-                                                :rules="rules.reason" >
+                                                :rules="scope.row.score < 6 ? rules.reason : rules.reasonNot" >
                                             <el-input v-model="scope.row.reason" placeholder="请填写扣分理由" />
                                         </el-form-item>
                                     </template>
@@ -1144,69 +1144,6 @@
                     modelDataZrUserVerify:[],
                     // 基础信息
                     country:[],
-                    textStatus: '', // 文本状态
-                    standInData: '0', // 标准类型
-                    standNumber: '', // 标准编号
-                    standNature: '', // 标准性质
-                    signFlag: '1', // 是否需要会签
-                    standSystem: '',// 标准体系
-                    standSystemName: '',// 标准体系名称
-                    gxhbq: '', // 标签
-                    // 实施日期
-                    ssrq: '', // 实施日期(标准文本)
-                    xcxssrq: '', // 新车型实施日期(标准文本)
-                    zccssrq: '', // 在产车实施日期(标准文本)
-                    ssrqgj: '', // 实施日期(国际)
-                    xcxssrqgj: '', // 新车型实施日期(国际)
-                    zccssrqgj: '', // 在产车实施日期(国际)
-                    // 文本信息
-                    ca: '', // 草案
-                    FBGBJBD: '', // 发布稿
-                    xgd: '', // 修改单
-                    bpg: '', // 报批稿
-                    ssg: '', // 送审稿
-                    zqyjg: '', // 征求意见稿
-                    jdwj: '', // 解读文件
-                    zbjbd: '', // 增补件
-                    kwj: '', // 勘 误件
-                    caName: '', // 草案
-                    fbgbjbdName: '', // 发布稿
-                    xgdName: '', // 修改单
-                    bpgName: '', // 报批稿
-                    ssgName: '', // 送审稿
-                    zqyjgName: '', // 征求意见稿
-                    jdwjName: '', // 解读文件
-                    zbjbdName: '', // 增补件
-                    kwjName: '', // 勘误件
-                    glwjName: '', // 关联文件
-                    // 适用范围
-                    txlb: '', // 体系类别
-                    gkdw: '', // 归口管理部门
-                    qcdw: [], // 起草单位
-                    wssmr: [], // 我司署名人
-                    cysd: '', // 我司参与深度
-                    cllx: [], // 适用车型
-                    nylx: [],// 能源类型
-                    sycpx: [],// 适用产品线
-                    syrz: [], // 适用认证
-                    zrbm: [], // 责任部门
-                    zrgcs: [], // 责任工程师
-                    cycvppsbm: '', // 关联模块--乘用车VPPS编码
-                    cycvppscn: '', // 关联模块--乘用车vpps中文名称
-                    kccvppsbm: '', // 关联模块--卡车VPPS编码
-                    kccvppscn: '', // 关联模块--卡车vpps中文名称
-                    dybxh: '', // 模块结构单元变型号
-                    dymc: '', // 模块结构单元名称
-                    // 关联信息
-                    dtbjh: '', // 代替标准号
-                    cbbh: '', // 采标编号
-                    cbcd: '', // 采标程度
-                    yybj: '', // 引用标准
-                    bfbdtbzh: '', // 部分代替标准号
-                    byybj: '', // 被引用标准
-                    glwj: '', // 关联文件
-                    xglc: '', // 相关流程
-                    chjl: '', // 参会记录
                     // 基础信息
                     standSort: '',
                     standCode: '',
@@ -1322,6 +1259,7 @@
                         { type: 'number',min: 0, max: 10, message: '分值 0 ~ 10 分 ', trigger: 'blur' },
                     ],
                     reason: [{ required: true, message: '请填写扣分理由', trigger: 'blur' }],
+                    reasonNot:[],
                     commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
                     approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
                     zrUserIdName: [
@@ -1478,8 +1416,10 @@
 
             },
             getSummaries(param) {
+                console.log(param)
                 const { columns, data } = param;
                 const sums = [];
+                console.log(columns)
                 columns.forEach((column, index) => {
                     if (index === 3) {
                         sums[index] = '合计：';
@@ -2667,6 +2607,7 @@
                             this.$refs['formTongGuo'].validate((valid) => {
                                 if (valid) {
                                     this.isSubmit = true
+                                    this.saveLoading = true
                                     this.form.commentText = this.formTongGuo.commentText
                                     this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                                     // 会签意见存储
@@ -2676,8 +2617,8 @@
                                     info.userName = this.userName
                                     info.commentText = this.formTongGuo.commentText
                                     infoList.push(info)
+                                    this.form.infoList = infoList
                                     const json = JSON.stringify(this.form);
-                                    json.infoList = infoList
                                     this.$http.post('lawss/activiti/completeTask', {
                                         taskIds: this.taskIds,
                                         userId : this.userId,
@@ -2689,6 +2630,7 @@
                                             this.$message.success(res.message)
                                             // 流程提交之后，应该流转至待办任务页面
                                             this.isSubmit = false
+                                            this.saveLoading = false
                                             this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                                             // if(this.formTongGuo.approvalOpinion === '1'){
                                             //     this.$message.warning("驳回成功")

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

@@ -5,8 +5,9 @@
         <template slot="proNode">主起草人修订并组织评审</template>
     </ProcessHeader>
     <div class="headerTabs">
-        <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-<!--        <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
+        <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">意见列表</div>
+        <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">基础信息</div>
+        <!--        <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
         <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
     <div class="content">
@@ -17,7 +18,80 @@
                 class="label-input-form"
                 label-width="210px"
         >
-            <div style="flex: auto;" v-show="active === '1'">
+            <div class="block" id="active2" v-show="active === '1'">
+                <ProcessTitle>
+                    <template slot="title">意见信息</template>
+                </ProcessTitle>
+                <template>
+                    <div class="prc-content-border" style="height: 66vh;position: relative;">
+                        <el-table
+                                ref="selection"
+                                tooltip-effect="dark"
+                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"
+                                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+                                        fontWeight: 'bold', height: '48px'}"
+                                @selection-change="handleSelectionChange"
+                                row-key="id"
+                                :data="form.infoList"
+                                border
+                                default-expand-all>
+                            <el-table-column
+                                    label="序号"
+                                    min-width="15%"
+                                    align="center">
+                                    <template slot-scope="scope">
+                                        {{scope.$index + 1}}
+                                    </template>
+                            </el-table-column>
+                            <el-table-column
+                                    prop="userName"
+                                    label="会签人"
+                                    align="center"
+                                    min-width="30%">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="commentText"
+                                    label="会签意见"
+                                    min-width="15%"
+                                    align="center">
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                </template>
+                <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 style="flex: auto;" v-show="active === '2'">
                 <ProcessTitle>
                     <template slot="title">基础信息</template>
                 </ProcessTitle>
@@ -267,38 +341,6 @@
                         </el-col>
                     </el-row>
                 </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="block" id="active2" v-show="active === '2'">-->
 <!--                <ProcessTitle>-->
@@ -2461,6 +2503,7 @@
                 this.$refs['formTongGuo'].validate((valid) => {
                     if (valid) {
                         this.isSubmit = true
+                        this.saveLoading = true
                         this.form.commentText = this.formTongGuo.commentText
                         this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                         const json = JSON.stringify(this.form);
@@ -2475,6 +2518,7 @@
                                 this.$message.success(res.message)
                                 // 流程提交之后，应该流转至待办任务页面
                                 this.isSubmit = false
+                                this.saveLoading = false
                                 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                                 // if(this.formTongGuo.approvalOpinion === '1'){
                                 //     this.$message.warning("驳回成功")

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

@@ -101,10 +101,10 @@
                                         align="center"
                                         label="简述扣分理由（不合格＜6分，必填）"
                                 >
-                                    <template slot-scope="scope" v-if="(scope.row.valueType !== 'add' && scope.row.score !== undefined && scope.row.score !== '' && scope.row.score < 6)">
+                                    <template slot-scope="scope" v-if="(scope.row.valueType !== 'add' && scope.row.score !== undefined && scope.row.score !== '' && scope.row.score < 10)">
                                         <el-form-item
                                                 :prop="'evaluationData.'+scope.$index + '.reason'"
-                                                :rules="rules.reason" >
+                                                :rules="scope.row.score < 6 ? rules.reason : rules.reasonNot" >
                                             <el-input v-model="scope.row.reason" placeholder="请填写扣分理由" />
                                         </el-form-item>
                                     </template>
@@ -115,7 +115,7 @@
                 </template>
                 <div>
                     <el-collapse accordion v-model="activeName">
-                        <el-collapse-item title="复审意见" name = "1">
+                        <el-collapse-item title="审批意见" name = "1">
                             <div style="margin: 10px 0;">
                                 <el-form
                                         ref="formTongGuo"
@@ -1321,6 +1321,7 @@
                         { type: 'number',min: 0, max: 10, message: '分值 0 ~ 10 分 ', trigger: 'blur' },
                     ],
                     reason: [{ required: true, message: '请填写扣分理由', trigger: 'blur' }],
+                    reasonNot:[],
                     commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
                     approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
                     zrUserIdName: [
@@ -2530,7 +2531,8 @@
                 this.active = name
             },
             //保存
-            handleSave() {this.form.country=this.countryArr;
+            handleSave() {
+            this.form.country=this.countryArr;
                 // if(item.country !== undefined && item.country !== null){
                 //   this.sarStandardsInfoEO.country = item.country.split(",");
                 // }
@@ -2665,6 +2667,7 @@
                             this.$refs['formTongGuo'].validate((valid) => {
                                 if (valid) {
                                     this.isSubmit = true
+                                    this.saveLoading = true
                                     this.form.commentText = this.formTongGuo.commentText
                                     this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                                     const json = JSON.stringify(this.form);
@@ -2679,6 +2682,7 @@
                                             this.$message.success(res.message)
                                             // 流程提交之后，应该流转至待办任务页面
                                             this.isSubmit = false
+                                            this.saveLoading = false
                                             this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                                             // if(this.formTongGuo.approvalOpinion === '1'){
                                             //     this.$message.warning("驳回成功")
@@ -2726,6 +2730,7 @@
             getFormFieldList (item) {
                 this.$nextTick(() => {
                     this.form = JSON.parse(JSON.stringify(item))
+                    this.form.evaluationData = []
                     this.getEvaluation()
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName

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

@@ -101,10 +101,10 @@
                                         align="center"
                                         label="简述扣分理由（不合格＜6分，必填）"
                                 >
-                                    <template slot-scope="scope" v-if="(scope.row.valueType !== 'add' && scope.row.score !== undefined && scope.row.score !== '' && scope.row.score < 6)">
+                                    <template slot-scope="scope" v-if="(scope.row.valueType !== 'add' && scope.row.score !== undefined && scope.row.score !== '' && scope.row.score < 10)">
                                         <el-form-item
                                                 :prop="'evaluationData.'+scope.$index + '.reason'"
-                                                :rules="rules.reason" >
+                                                :rules="scope.row.score < 6 ? rules.reason : rules.reasonNot" >
                                             <el-input v-model="scope.row.reason" placeholder="请填写扣分理由" />
                                         </el-form-item>
                                     </template>
@@ -1157,69 +1157,6 @@
                     modelDataZrUserVerify:[],
                     // 基础信息
                     country:[],
-                    textStatus: '', // 文本状态
-                    standInData: '0', // 标准类型
-                    standNumber: '', // 标准编号
-                    standNature: '', // 标准性质
-                    signFlag: '1', // 是否需要会签
-                    standSystem: '',// 标准体系
-                    standSystemName: '',// 标准体系名称
-                    gxhbq: '', // 标签
-                    // 实施日期
-                    ssrq: '', // 实施日期(标准文本)
-                    xcxssrq: '', // 新车型实施日期(标准文本)
-                    zccssrq: '', // 在产车实施日期(标准文本)
-                    ssrqgj: '', // 实施日期(国际)
-                    xcxssrqgj: '', // 新车型实施日期(国际)
-                    zccssrqgj: '', // 在产车实施日期(国际)
-                    // 文本信息
-                    ca: '', // 草案
-                    FBGBJBD: '', // 发布稿
-                    xgd: '', // 修改单
-                    bpg: '', // 报批稿
-                    ssg: '', // 送审稿
-                    zqyjg: '', // 征求意见稿
-                    jdwj: '', // 解读文件
-                    zbjbd: '', // 增补件
-                    kwj: '', // 勘 误件
-                    caName: '', // 草案
-                    fbgbjbdName: '', // 发布稿
-                    xgdName: '', // 修改单
-                    bpgName: '', // 报批稿
-                    ssgName: '', // 送审稿
-                    zqyjgName: '', // 征求意见稿
-                    jdwjName: '', // 解读文件
-                    zbjbdName: '', // 增补件
-                    kwjName: '', // 勘误件
-                    glwjName: '', // 关联文件
-                    // 适用范围
-                    txlb: '', // 体系类别
-                    gkdw: '', // 归口管理部门
-                    qcdw: [], // 起草单位
-                    wssmr: [], // 我司署名人
-                    cysd: '', // 我司参与深度
-                    cllx: [], // 适用车型
-                    nylx: [],// 能源类型
-                    sycpx: [],// 适用产品线
-                    syrz: [], // 适用认证
-                    zrbm: [], // 责任部门
-                    zrgcs: [], // 责任工程师
-                    cycvppsbm: '', // 关联模块--乘用车VPPS编码
-                    cycvppscn: '', // 关联模块--乘用车vpps中文名称
-                    kccvppsbm: '', // 关联模块--卡车VPPS编码
-                    kccvppscn: '', // 关联模块--卡车vpps中文名称
-                    dybxh: '', // 模块结构单元变型号
-                    dymc: '', // 模块结构单元名称
-                    // 关联信息
-                    dtbjh: '', // 代替标准号
-                    cbbh: '', // 采标编号
-                    cbcd: '', // 采标程度
-                    yybj: '', // 引用标准
-                    bfbdtbzh: '', // 部分代替标准号
-                    byybj: '', // 被引用标准
-                    glwj: '', // 关联文件
-                    xglc: '', // 相关流程
-                    chjl: '', // 参会记录
                     // 基础信息
                     standSort: '',
                     standCode: '',
@@ -1335,6 +1272,7 @@
                         { type: 'number',min: 0, max: 10, message: '分值 0 ~ 10 分 ', trigger: 'blur' },
                     ],
                     reason: [{ required: true, message: '请填写扣分理由', trigger: 'blur' }],
+                    reasonNot:[],
                     commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
                     approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
                     zrUserIdName: [
@@ -2713,6 +2651,7 @@
                 this.$refs['formTongGuo'].validate((valid) => {
                     if (valid) {
                         this.isSubmit = true
+                        this.saveLoading = true
                         this.form.commentText = this.formTongGuo.commentText
                         this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                         const json = JSON.stringify(this.form);
@@ -2731,6 +2670,7 @@
                                     // this.processCreateLaws(json)
                                 }
                                 this.isSubmit = false
+                                this.saveLoading = false
                                 // 流程提交之后，应该流转至待办任务页面
                                 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                             }else {
@@ -2769,6 +2709,7 @@
             getFormFieldList (item) {
                 this.$nextTick(() => {
                     this.form = JSON.parse(JSON.stringify(item))
+                    this.form.evaluationData = []
                     this.getEvaluation()
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName

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

@@ -101,10 +101,10 @@
                                         align="center"
                                         label="简述扣分理由（不合格＜6分，必填）"
                                 >
-                                    <template slot-scope="scope" v-if="(scope.row.valueType !== 'add' && scope.row.score !== undefined && scope.row.score !== '' && scope.row.score < 6)">
+                                    <template slot-scope="scope" v-if="(scope.row.valueType !== 'add' && scope.row.score !== undefined && scope.row.score !== '' && scope.row.score < 10)">
                                         <el-form-item
                                                 :prop="'evaluationData.'+scope.$index + '.reason'"
-                                                :rules="rules.reason" >
+                                                :rules="scope.row.score < 6 ? rules.reason : rules.reasonNot" >
                                             <el-input v-model="scope.row.reason" placeholder="请填写扣分理由" />
                                         </el-form-item>
                                     </template>
@@ -1156,69 +1156,6 @@
                     modelDataZrUserVerify:[],
                     // 基础信息
                     country:[],
-                    textStatus: '', // 文本状态
-                    standInData: '0', // 标准类型
-                    standNumber: '', // 标准编号
-                    standNature: '', // 标准性质
-                    signFlag: '1', // 是否需要会签
-                    standSystem: '',// 标准体系
-                    standSystemName: '',// 标准体系名称
-                    gxhbq: '', // 标签
-                    // 实施日期
-                    ssrq: '', // 实施日期(标准文本)
-                    xcxssrq: '', // 新车型实施日期(标准文本)
-                    zccssrq: '', // 在产车实施日期(标准文本)
-                    ssrqgj: '', // 实施日期(国际)
-                    xcxssrqgj: '', // 新车型实施日期(国际)
-                    zccssrqgj: '', // 在产车实施日期(国际)
-                    // 文本信息
-                    ca: '', // 草案
-                    FBGBJBD: '', // 发布稿
-                    xgd: '', // 修改单
-                    bpg: '', // 报批稿
-                    ssg: '', // 送审稿
-                    zqyjg: '', // 征求意见稿
-                    jdwj: '', // 解读文件
-                    zbjbd: '', // 增补件
-                    kwj: '', // 勘 误件
-                    caName: '', // 草案
-                    fbgbjbdName: '', // 发布稿
-                    xgdName: '', // 修改单
-                    bpgName: '', // 报批稿
-                    ssgName: '', // 送审稿
-                    zqyjgName: '', // 征求意见稿
-                    jdwjName: '', // 解读文件
-                    zbjbdName: '', // 增补件
-                    kwjName: '', // 勘误件
-                    glwjName: '', // 关联文件
-                    // 适用范围
-                    txlb: '', // 体系类别
-                    gkdw: '', // 归口管理部门
-                    qcdw: [], // 起草单位
-                    wssmr: [], // 我司署名人
-                    cysd: '', // 我司参与深度
-                    cllx: [], // 适用车型
-                    nylx: [],// 能源类型
-                    sycpx: [],// 适用产品线
-                    syrz: [], // 适用认证
-                    zrbm: [], // 责任部门
-                    zrgcs: [], // 责任工程师
-                    cycvppsbm: '', // 关联模块--乘用车VPPS编码
-                    cycvppscn: '', // 关联模块--乘用车vpps中文名称
-                    kccvppsbm: '', // 关联模块--卡车VPPS编码
-                    kccvppscn: '', // 关联模块--卡车vpps中文名称
-                    dybxh: '', // 模块结构单元变型号
-                    dymc: '', // 模块结构单元名称
-                    // 关联信息
-                    dtbjh: '', // 代替标准号
-                    cbbh: '', // 采标编号
-                    cbcd: '', // 采标程度
-                    yybj: '', // 引用标准
-                    bfbdtbzh: '', // 部分代替标准号
-                    byybj: '', // 被引用标准
-                    glwj: '', // 关联文件
-                    xglc: '', // 相关流程
-                    chjl: '', // 参会记录
                     // 基础信息
                     standSort: '',
                     standCode: '',
@@ -1334,6 +1271,7 @@
                         { type: 'number',min: 0, max: 10, message: '分值 0 ~ 10 分 ', trigger: 'blur' },
                     ],
                     reason: [{ required: true, message: '请填写扣分理由', trigger: 'blur' }],
+                    reasonNot:[],
                     commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
                     approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
                     zrUserIdName: [
@@ -2714,6 +2652,7 @@
                 this.$refs['formTongGuo'].validate((valid) => {
                     if (valid) {
                         this.isSubmit = true
+                        this.saveLoading = true
                         this.form.commentText = this.formTongGuo.commentText
                         this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                         const json = JSON.stringify(this.form);
@@ -2732,6 +2671,7 @@
                                     // this.processCreateLaws(json)
                                 }
                                 this.isSubmit = false
+                                this.saveLoading = false
                                 // 流程提交之后，应该流转至待办任务页面
                                 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                             }else {
@@ -2770,6 +2710,7 @@
             getFormFieldList (item) {
                 this.$nextTick(() => {
                     this.form = JSON.parse(JSON.stringify(item))
+                    this.form.evaluationData = []
                     this.getEvaluation()
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName

src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue

@@ -1023,69 +1023,6 @@
                     modelDataZrUserVerify:[],
                     // 基础信息
                     country:[],
-                    textStatus: '', // 文本状态
-                    standInData: '0', // 标准类型
-                    standNumber: '', // 标准编号
-                    standNature: '', // 标准性质
-                    signFlag: '1', // 是否需要会签
-                    standSystem: '',// 标准体系
-                    standSystemName: '',// 标准体系名称
-                    gxhbq: '', // 标签
-                    // 实施日期
-                    ssrq: '', // 实施日期(标准文本)
-                    xcxssrq: '', // 新车型实施日期(标准文本)
-                    zccssrq: '', // 在产车实施日期(标准文本)
-                    ssrqgj: '', // 实施日期(国际)
-                    xcxssrqgj: '', // 新车型实施日期(国际)
-                    zccssrqgj: '', // 在产车实施日期(国际)
-                    // 文本信息
-                    ca: '', // 草案
-                    FBGBJBD: '', // 发布稿
-                    xgd: '', // 修改单
-                    bpg: '', // 报批稿
-                    ssg: '', // 送审稿
-                    zqyjg: '', // 征求意见稿
-                    jdwj: '', // 解读文件
-                    zbjbd: '', // 增补件
-                    kwj: '', // 勘 误件
-                    caName: '', // 草案
-                    fbgbjbdName: '', // 发布稿
-                    xgdName: '', // 修改单
-                    bpgName: '', // 报批稿
-                    ssgName: '', // 送审稿
-                    zqyjgName: '', // 征求意见稿
-                    jdwjName: '', // 解读文件
-                    zbjbdName: '', // 增补件
-                    kwjName: '', // 勘误件
-                    glwjName: '', // 关联文件
-                    // 适用范围
-                    txlb: '', // 体系类别
-                    gkdw: '', // 归口管理部门
-                    qcdw: [], // 起草单位
-                    wssmr: [], // 我司署名人
-                    cysd: '', // 我司参与深度
-                    cllx: [], // 适用车型
-                    nylx: [],// 能源类型
-                    sycpx: [],// 适用产品线
-                    syrz: [], // 适用认证
-                    zrbm: [], // 责任部门
-                    zrgcs: [], // 责任工程师
-                    cycvppsbm: '', // 关联模块--乘用车VPPS编码
-                    cycvppscn: '', // 关联模块--乘用车vpps中文名称
-                    kccvppsbm: '', // 关联模块--卡车VPPS编码
-                    kccvppscn: '', // 关联模块--卡车vpps中文名称
-                    dybxh: '', // 模块结构单元变型号
-                    dymc: '', // 模块结构单元名称
-                    // 关联信息
-                    dtbjh: '', // 代替标准号
-                    cbbh: '', // 采标编号
-                    cbcd: '', // 采标程度
-                    yybj: '', // 引用标准
-                    bfbdtbzh: '', // 部分代替标准号
-                    byybj: '', // 被引用标准
-                    glwj: '', // 关联文件
-                    xglc: '', // 相关流程
-                    chjl: '', // 参会记录
                     // 基础信息
                     standSort: '',
                     standCode: '',

src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue

@@ -1024,69 +1024,6 @@
                     modelDataZrUserVerify:[],
                     // 基础信息
                     country:[],
-                    textStatus: '', // 文本状态
-                    standInData: '0', // 标准类型
-                    standNumber: '', // 标准编号
-                    standNature: '', // 标准性质
-                    signFlag: '1', // 是否需要会签
-                    standSystem: '',// 标准体系
-                    standSystemName: '',// 标准体系名称
-                    gxhbq: '', // 标签
-                    // 实施日期
-                    ssrq: '', // 实施日期(标准文本)
-                    xcxssrq: '', // 新车型实施日期(标准文本)
-                    zccssrq: '', // 在产车实施日期(标准文本)
-                    ssrqgj: '', // 实施日期(国际)
-                    xcxssrqgj: '', // 新车型实施日期(国际)
-                    zccssrqgj: '', // 在产车实施日期(国际)
-                    // 文本信息
-                    ca: '', // 草案
-                    FBGBJBD: '', // 发布稿
-                    xgd: '', // 修改单
-                    bpg: '', // 报批稿
-                    ssg: '', // 送审稿
-                    zqyjg: '', // 征求意见稿
-                    jdwj: '', // 解读文件
-                    zbjbd: '', // 增补件
-                    kwj: '', // 勘 误件
-                    caName: '', // 草案
-                    fbgbjbdName: '', // 发布稿
-                    xgdName: '', // 修改单
-                    bpgName: '', // 报批稿
-                    ssgName: '', // 送审稿
-                    zqyjgName: '', // 征求意见稿
-                    jdwjName: '', // 解读文件
-                    zbjbdName: '', // 增补件
-                    kwjName: '', // 勘误件
-                    glwjName: '', // 关联文件
-                    // 适用范围
-                    txlb: '', // 体系类别
-                    gkdw: '', // 归口管理部门
-                    qcdw: [], // 起草单位
-                    wssmr: [], // 我司署名人
-                    cysd: '', // 我司参与深度
-                    cllx: [], // 适用车型
-                    nylx: [],// 能源类型
-                    sycpx: [],// 适用产品线
-                    syrz: [], // 适用认证
-                    zrbm: [], // 责任部门
-                    zrgcs: [], // 责任工程师
-                    cycvppsbm: '', // 关联模块--乘用车VPPS编码
-                    cycvppscn: '', // 关联模块--乘用车vpps中文名称
-                    kccvppsbm: '', // 关联模块--卡车VPPS编码
-                    kccvppscn: '', // 关联模块--卡车vpps中文名称
-                    dybxh: '', // 模块结构单元变型号
-                    dymc: '', // 模块结构单元名称
-                    // 关联信息
-                    dtbjh: '', // 代替标准号
-                    cbbh: '', // 采标编号
-                    cbcd: '', // 采标程度
-                    yybj: '', // 引用标准
-                    bfbdtbzh: '', // 部分代替标准号
-                    byybj: '', // 被引用标准
-                    glwj: '', // 关联文件
-                    xglc: '', // 相关流程
-                    chjl: '', // 参会记录
                     // 基础信息
                     standSort: '',
                     standCode: '',

src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue

@@ -1023,69 +1023,6 @@
                     modelDataZrUserVerify:[],
                     // 基础信息
                     country:[],
-                    textStatus: '', // 文本状态
-                    standInData: '0', // 标准类型
-                    standNumber: '', // 标准编号
-                    standNature: '', // 标准性质
-                    signFlag: '1', // 是否需要会签
-                    standSystem: '',// 标准体系
-                    standSystemName: '',// 标准体系名称
-                    gxhbq: '', // 标签
-                    // 实施日期
-                    ssrq: '', // 实施日期(标准文本)
-                    xcxssrq: '', // 新车型实施日期(标准文本)
-                    zccssrq: '', // 在产车实施日期(标准文本)
-                    ssrqgj: '', // 实施日期(国际)
-                    xcxssrqgj: '', // 新车型实施日期(国际)
-                    zccssrqgj: '', // 在产车实施日期(国际)
-                    // 文本信息
-                    ca: '', // 草案
-                    FBGBJBD: '', // 发布稿
-                    xgd: '', // 修改单
-                    bpg: '', // 报批稿
-                    ssg: '', // 送审稿
-                    zqyjg: '', // 征求意见稿
-                    jdwj: '', // 解读文件
-                    zbjbd: '', // 增补件
-                    kwj: '', // 勘 误件
-                    caName: '', // 草案
-                    fbgbjbdName: '', // 发布稿
-                    xgdName: '', // 修改单
-                    bpgName: '', // 报批稿
-                    ssgName: '', // 送审稿
-                    zqyjgName: '', // 征求意见稿
-                    jdwjName: '', // 解读文件
-                    zbjbdName: '', // 增补件
-                    kwjName: '', // 勘误件
-                    glwjName: '', // 关联文件
-                    // 适用范围
-                    txlb: '', // 体系类别
-                    gkdw: '', // 归口管理部门
-                    qcdw: [], // 起草单位
-                    wssmr: [], // 我司署名人
-                    cysd: '', // 我司参与深度
-                    cllx: [], // 适用车型
-                    nylx: [],// 能源类型
-                    sycpx: [],// 适用产品线
-                    syrz: [], // 适用认证
-                    zrbm: [], // 责任部门
-                    zrgcs: [], // 责任工程师
-                    cycvppsbm: '', // 关联模块--乘用车VPPS编码
-                    cycvppscn: '', // 关联模块--乘用车vpps中文名称
-                    kccvppsbm: '', // 关联模块--卡车VPPS编码
-                    kccvppscn: '', // 关联模块--卡车vpps中文名称
-                    dybxh: '', // 模块结构单元变型号
-                    dymc: '', // 模块结构单元名称
-                    // 关联信息
-                    dtbjh: '', // 代替标准号
-                    cbbh: '', // 采标编号
-                    cbcd: '', // 采标程度
-                    yybj: '', // 引用标准
-                    bfbdtbzh: '', // 部分代替标准号
-                    byybj: '', // 被引用标准
-                    glwj: '', // 关联文件
-                    xglc: '', // 相关流程
-                    chjl: '', // 参会记录
                     // 基础信息
                     standSort: '',
                     standCode: '',

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

@@ -163,70 +163,68 @@
       </div>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
-        <el-table
-          height="100%"
-          ref="selection"
-          :data="detailData"
-          tooltip-effect="dark"
-          style="width: 100%"
-          border
-          row-key="id"
-          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+       <el-table
+        height="100%"
+        ref="selection"
+        :data="detailData"
+        tooltip-effect="dark"
+        style="width: 100%"
+        border
+        row-key="id"
+        :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"
         >
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="name"
-            label="任务步骤"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="assignee"
-            label="任务受理人"
-            align="center"
-          >
-          </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>
+        </el-table-column>
+        <el-table-column
+          prop="assignee"
+          label="任务受理人"
+          align="center"
+        >
+        </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-back

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

@@ -365,6 +365,7 @@ export default {
       this.rowDutyPeople = val
       this.nodeList = []
       this.nodeList.push(id)
+      this.drawerTitle = '选择分发责任人'
       this.modalshowflag = true
     },
     // 选择勾选项的集合

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

@@ -6,6 +6,7 @@
       <template slot="proNode">标准法规部领导审批</template>
     </ProcessHeader>
     <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
@@ -198,18 +199,12 @@
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zCCSSRQ"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="productType"

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

@@ -191,20 +191,14 @@
             label="基于上一版本差异">
           </el-table-column>
           <el-table-column
-            prop="xCXSSRQ"
+            prop="xcxssrq"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
-            prop="zCCSSRQ"
+            prop="zccssrq"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             label="落实人"
@@ -532,11 +526,11 @@ export default {
         this.listForm.breakdownList = [];
         for (let i = 0; i < item.pepdtos.length; i++) {
           for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
-            if (item.pepdtos[i].xCXSSRQ === null) {
-              item.pepdtos[i].xCXSSRQ = "";
+            if (item.pepdtos[i].xcxssrq === null) {
+              item.pepdtos[i].xcxssrq = "";
             }
-            if (item.pepdtos[i].zCCSSRQ === null) {
-              item.pepdtos[i].zCCSSRQ = "";
+            if (item.pepdtos[i].zccssrq === null) {
+              item.pepdtos[i].zccssrq = "";
             }
             this.listForm.breakdownList.push({
               itemsName: item.pepdtos[i].breakdownList[j].itemsName,
@@ -558,8 +552,8 @@ export default {
               standNumber: item.pepdtos[i].standNumber,
               standName: item.pepdtos[i].standName,
               id: item.pepdtos[0].id,
-              xCXSSRQ: item.pepdtos[i].XCXSSRQ,
-              zCCSSRQ: item.pepdtos[i].ZCCSSRQ
+              xcxssrq: item.pepdtos[i].XCXSSRQ,
+              zccssrq: item.pepdtos[i].ZCCSSRQ
             });
           }
         }

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

@@ -203,18 +203,12 @@
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zCCSSRQ"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
             <el-table-column
               prop="researchCompliance"

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

@@ -198,23 +198,13 @@
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zCCSSRQ"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
-            </template>
           </el-table-column>
-<!--          <el-table-column-->
-<!--            prop="productType"-->
-<!--            align="center"-->
-<!--            label="在研产品">-->
             <el-table-column
               prop="complianceReasons"
               align="center"
@@ -248,43 +238,6 @@
                 </template>
               </el-table-column>
             </el-table-column>
-<!--          </el-table-column>-->
-<!--          <el-table-column-->
-<!--            align="center"-->
-<!--            label="在产产品">-->
-<!--            <el-table-column-->
-<!--              prop="zcComplianceReasons"-->
-<!--              align="center"-->
-<!--              width="160"-->
-<!--              label="合规(具体情况)">-->
-<!--            </el-table-column>-->
-<!--            <el-table-column-->
-<!--              align="center"-->
-<!--              width="160"-->
-<!--              label="不合规">-->
-<!--              <el-table-column-->
-<!--                prop="zcNoCompliance"-->
-<!--                align="center"-->
-<!--                width="170"-->
-<!--                label="不合规项目">-->
-<!--              </el-table-column>-->
-<!--              <el-table-column-->
-<!--                prop="zcCountermeasures"-->
-<!--                align="center"-->
-<!--                width="160"-->
-<!--                label="应对措施">-->
-<!--              </el-table-column>-->
-<!--              <el-table-column-->
-<!--                prop="zcCompletionTime"-->
-<!--                align="center"-->
-<!--                width="120"-->
-<!--                label="完成时间">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--            </el-table-column>-->
-<!--          </el-table-column>-->
           <el-table-column
             fixed="right"
             align="center"

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

@@ -198,23 +198,13 @@
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zCCSSRQ"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
-            </template>
           </el-table-column>
-<!--          <el-table-column-->
-<!--            prop="productType"-->
-<!--            align="center"-->
-<!--            label="在研产品">-->
             <el-table-column
               prop="complianceReasons"
               align="center"
@@ -248,43 +238,6 @@
                 </template>
               </el-table-column>
             </el-table-column>
-<!--          </el-table-column>-->
-<!--          <el-table-column-->
-<!--            align="center"-->
-<!--            label="在产产品">-->
-<!--            <el-table-column-->
-<!--              prop="zcComplianceReasons"-->
-<!--              align="center"-->
-<!--              width="160"-->
-<!--              label="合规(具体情况)">-->
-<!--            </el-table-column>-->
-<!--            <el-table-column-->
-<!--              align="center"-->
-<!--              width="160"-->
-<!--              label="不合规">-->
-<!--              <el-table-column-->
-<!--                prop="zcNoCompliance"-->
-<!--                align="center"-->
-<!--                width="170"-->
-<!--                label="不合规项目">-->
-<!--              </el-table-column>-->
-<!--              <el-table-column-->
-<!--                prop="zcCountermeasures"-->
-<!--                align="center"-->
-<!--                width="160"-->
-<!--                label="应对措施">-->
-<!--              </el-table-column>-->
-<!--              <el-table-column-->
-<!--                prop="zcCompletionTime"-->
-<!--                align="center"-->
-<!--                width="120"-->
-<!--                label="完成时间">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--            </el-table-column>-->
-<!--          </el-table-column>-->
           <el-table-column
             fixed="right"
             align="center"

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

@@ -198,23 +198,13 @@
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zCCSSRQ"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
-            </template>
           </el-table-column>
-<!--          <el-table-column-->
-<!--            prop="productType"-->
-<!--            align="center"-->
-<!--            label="在研产品">-->
             <el-table-column
               prop="complianceReasons"
               align="center"
@@ -248,43 +238,6 @@
                 </template>
               </el-table-column>
             </el-table-column>
-<!--          </el-table-column>-->
-<!--          <el-table-column-->
-<!--            align="center"-->
-<!--            label="在产产品">-->
-<!--            <el-table-column-->
-<!--              prop="zcComplianceReasons"-->
-<!--              align="center"-->
-<!--              width="160"-->
-<!--              label="合规(具体情况)">-->
-<!--            </el-table-column>-->
-<!--            <el-table-column-->
-<!--              align="center"-->
-<!--              width="160"-->
-<!--              label="不合规">-->
-<!--              <el-table-column-->
-<!--                prop="zcNoCompliance"-->
-<!--                align="center"-->
-<!--                width="170"-->
-<!--                label="不合规项目">-->
-<!--              </el-table-column>-->
-<!--              <el-table-column-->
-<!--                prop="zcCountermeasures"-->
-<!--                align="center"-->
-<!--                width="160"-->
-<!--                label="应对措施">-->
-<!--              </el-table-column>-->
-<!--              <el-table-column-->
-<!--                prop="zcCompletionTime"-->
-<!--                align="center"-->
-<!--                width="120"-->
-<!--                label="完成时间">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--            </el-table-column>-->
-<!--          </el-table-column>-->
           <el-table-column
             fixed="right"
             align="center"

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

@@ -116,7 +116,6 @@
             prop="ssrq"
             width="190px"
             align="center"
-            sortable
             label="标准实施日期">
           </el-table-column>
           <el-table-column
@@ -128,7 +127,6 @@
           <el-table-column
             prop="zccssrq"
             align="center"
-            sortable
             width="190px"
             label="在产车实施日期">
           </el-table-column>

src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue

@@ -93,22 +93,22 @@
             label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="ssrq"
+            width="200"
+            align="center"
+            label="实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
-            prop="zccssrqgj"
+            prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
             <el-table-column
               prop="complianceReasons"
@@ -208,7 +208,6 @@
           <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>

src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue

@@ -86,7 +86,6 @@
             prop="ssrq"
             width="190px"
             align="center"
-            sortable
             label="标准实施日期">
             <template slot-scope="scope">
               <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
@@ -104,7 +103,6 @@
           <el-table-column
             prop="zccssrq"
             align="center"
-            sortable
             width="190px"
             label="在产车实施日期">
             <template slot-scope="scope">
@@ -169,7 +167,6 @@
           <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>

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

@@ -126,7 +126,6 @@
             prop="ssrq"
             width="190px"
             align="center"
-            sortable
             label="标准实施日期">
           </el-table-column>
           <el-table-column
@@ -138,7 +137,6 @@
           <el-table-column
             prop="zccssrq"
             align="center"
-            sortable
             width="190px"
             label="在产车实施日期">
           </el-table-column>

src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue

@@ -45,7 +45,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -95,23 +94,23 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="200"
+            align="center"
+            label="实施日期">
+          </el-table-column>
           <el-table-column
             prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
 <!--          <el-table-column-->
 <!--            prop="productType"-->
@@ -477,9 +476,7 @@ export default {
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
         this.listForm.dataList.forEach(item => {
-          if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
-            this.dataList.push(item)
-          }
+          this.dataList.push(item)
           item.children.forEach(items=> {
             if(items.key === item.standId){
               this.$set(items, "standName", item.standName);
@@ -487,6 +484,9 @@ export default {
               this.$set(items, "standYear", item.standYear);
               this.$set(items, "standSort", item.standSort);
               this.$set(items, "standNumber", item.standNumber);
+              this.$set(items, "zccssrq", item.zccssrq);
+              this.$set(items, "xcxssrq", item.xcxssrq);
+              this.$set(items, "ssrq", item.ssrq);
             }
           })
         })

src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue

@@ -45,7 +45,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -95,23 +94,23 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="200"
+            align="center"
+            label="实施日期">
+          </el-table-column>
           <el-table-column
             prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
-            prop="zccssrqgj"
+            prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
 <!--          <el-table-column-->
 <!--            prop="productType"-->
@@ -456,7 +455,6 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
@@ -476,9 +474,7 @@ export default {
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
         this.listForm.dataList.forEach(item => {
-          if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
-            this.dataList.push(item)
-          }
+          this.dataList.push(item)
           item.children.forEach(items=> {
             if(items.key === item.standId){
               this.$set(items, "standName", item.standName);
@@ -486,6 +482,9 @@ export default {
               this.$set(items, "standYear", item.standYear);
               this.$set(items, "standSort", item.standSort);
               this.$set(items, "standNumber", item.standNumber);
+              this.$set(items, "zccssrq", item.zccssrq);
+              this.$set(items, "xcxssrq", item.xcxssrq);
+              this.$set(items, "ssrq", item.ssrq);
             }
           })
         })

src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue

@@ -45,7 +45,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -95,23 +94,23 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="200"
+            align="center"
+            label="实施日期">
+          </el-table-column>
           <el-table-column
             prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
 <!--          <el-table-column-->
 <!--            prop="productType"-->
@@ -477,9 +476,7 @@ export default {
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
         this.listForm.dataList.forEach(item => {
-          if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
-            this.dataList.push(item)
-          }
+          this.dataList.push(item)
           item.children.forEach(items=> {
             if(items.key === item.standId){
               this.$set(items, "standName", item.standName);
@@ -487,6 +484,9 @@ export default {
               this.$set(items, "standYear", item.standYear);
               this.$set(items, "standSort", item.standSort);
               this.$set(items, "standNumber", item.standNumber);
+              this.$set(items, "zccssrq", item.zccssrq);
+              this.$set(items, "xcxssrq", item.xcxssrq);
+              this.$set(items, "ssrq", item.ssrq);
             }
           })
         })

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

@@ -86,30 +86,19 @@
             prop="ssrq"
             width="190px"
             align="center"
-            sortable
             label="标准实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="xcxssrq"
             width="190px"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zccssrq"
             align="center"
-            sortable
             width="190px"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zrbm"
@@ -169,7 +158,6 @@
           <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>

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

@@ -98,11 +98,19 @@
           <el-table-column
             prop="ssrq"
             align="center"
-            sortable
             label="标准实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
+          </el-table-column>
+          <el-table-column
+            prop="xcxssrq"
+            width="190px"
+            align="center"
+            label="新车型实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="zccssrq"
+            align="center"
+            width="190px"
+            label="在产车实施日期">
           </el-table-column>
           <el-table-column
             prop="zrbm"
@@ -161,7 +169,6 @@
           <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>

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

@@ -96,11 +96,19 @@
           <el-table-column
             prop="ssrq"
             align="center"
-            sortable
             label="标准实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
+          </el-table-column>
+          <el-table-column
+            prop="xcxssrq"
+            width="190px"
+            align="center"
+            label="新车型实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="zccssrq"
+            align="center"
+            width="190px"
+            label="在产车实施日期">
           </el-table-column>
           <el-table-column
             prop="zrbm"
@@ -169,7 +177,6 @@
           <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>
@@ -448,7 +455,6 @@ export default {
         this.isSubmit = true;
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
-        console.log(json);
         this.$http.post("lawss/activiti/completeTask", {
           taskIds: this.taskIds,
           userId: this.userId,

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

@@ -52,7 +52,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -104,23 +103,23 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="200"
+            align="center"
+            label="实施日期">
+          </el-table-column>
           <el-table-column
             prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
-            prop="zccssrqgj"
+            prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <!--          <el-table-column-->
           <!--            prop="productType"-->
@@ -804,7 +803,7 @@ export default {
           this.listForm["id"] = item.id;
           this.listForm.dataList = item.dataList;
           this.listForm.dataList.forEach(item => {
-            if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+            if(item.workPeopleId === this.$store.getters.userInfo.userId ){
                 this.dataList.push(item)
             }
               item.children.forEach(items=> {
@@ -814,6 +813,9 @@ export default {
                   this.$set(items, "standYear", item.standYear);
                   this.$set(items, "standSort", item.standSort);
                   this.$set(items, "standNumber", item.standNumber);
+                  this.$set(items, "zccssrq", item.zccssrq);
+                  this.$set(items, "xcxssrq", item.xcxssrq);
+                  this.$set(items, "ssrq", item.ssrq);
                 }
               })
           })

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

@@ -45,7 +45,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -95,23 +94,23 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="200"
+            align="center"
+            label="实施日期">
+          </el-table-column>
           <el-table-column
             prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
             <el-table-column
               prop="complianceReasons"
@@ -436,9 +435,7 @@ export default {
           this.listForm["id"] = item.id;
           this.listForm.dataList = item.dataList;
           this.listForm.dataList.forEach(item => {
-            if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
-              this.dataList.push(item)
-            }
+            this.dataList.push(item)
             item.children.forEach(items=> {
               if(items.key === item.standId){
                 this.$set(items, "standName", item.standName);
@@ -446,6 +443,9 @@ export default {
                 this.$set(items, "standYear", item.standYear);
                 this.$set(items, "standSort", item.standSort);
                 this.$set(items, "standNumber", item.standNumber);
+                this.$set(items, "zccssrq", item.zccssrq);
+                this.$set(items, "xcxssrq", item.xcxssrq);
+                this.$set(items, "ssrq", item.ssrq);
               }
             })
           })

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

@@ -45,7 +45,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -95,23 +94,23 @@
                   align="center"
                   label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="200"
+            align="center"
+            label="实施日期">
+          </el-table-column>
           <el-table-column
                   prop="xcxssrq"
                   width="200"
                   align="center"
                   label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
                   prop="zccssrq"
                   width="200"
                   align="center"
                   label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
 <!--          <el-table-column-->
 <!--                  prop="productType"-->
@@ -475,9 +474,7 @@ export default {
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
         this.listForm.dataList.forEach(item => {
-          if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
-            this.dataList.push(item)
-          }
+          this.dataList.push(item)
           item.children.forEach(items=> {
             if(items.key === item.standId){
               this.$set(items, "standName", item.standName);
@@ -485,6 +482,9 @@ export default {
               this.$set(items, "standYear", item.standYear);
               this.$set(items, "standSort", item.standSort);
               this.$set(items, "standNumber", item.standNumber);
+              this.$set(items, "zccssrq", item.zccssrq);
+              this.$set(items, "xcxssrq", item.xcxssrq);
+              this.$set(items, "ssrq", item.ssrq);
             }
           })
         })

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

@@ -45,7 +45,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -95,23 +94,23 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="200"
+            align="center"
+            label="实施日期">
+          </el-table-column>
           <el-table-column
             prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
 <!--          <el-table-column-->
 <!--            prop="productType"-->
@@ -477,9 +476,7 @@ export default {
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
         this.listForm.dataList.forEach(item => {
-          if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
-            this.dataList.push(item)
-          }
+          this.dataList.push(item)
           item.children.forEach(items=> {
             if(items.key === item.standId){
               this.$set(items, "standName", item.standName);
@@ -487,6 +484,9 @@ export default {
               this.$set(items, "standYear", item.standYear);
               this.$set(items, "standSort", item.standSort);
               this.$set(items, "standNumber", item.standNumber);
+              this.$set(items, "zccssrq", item.zccssrq);
+              this.$set(items, "xcxssrq", item.xcxssrq);
+              this.$set(items, "ssrq", item.ssrq);
             }
           })
         })

src/pages/processCenter/pages/phone/bzjd/step4.vue

@@ -169,7 +169,7 @@
                 </el-table-column>
                 <el-table-column
                         show-overflow-tooltip
-                        v-if="sarType === 'INLAND'"
+                        v-if="sarType === 'INLAND' && form.itemsNum1"
                         prop="changePoint"
                         width="150"
                         label="基于上一版本差异"
@@ -381,6 +381,9 @@
                 this.tableIndex++
                 let index = this.tableIndex * 20
                 let endIndex = index + 20
+                if (this.tableIndex * 20 > this.itemLists.length) {
+                    this.$message.warning('没有更多了')
+                }
                 let newData = this.itemLists.slice(index, endIndex)
                 this.itemList = this.itemList.concat(newData)
             },

src/pages/processCenter/pages/phone/bzjd/step5.vue

@@ -0,0 +1,577 @@
+<template>
+    <div class="phoneBzjdStep5 phoneBox">
+        <ProcessHeaderPhone toggle>
+            <template slot="proName">标准解读流程</template>
+            <template slot="proNode">工程师审核</template>
+        </ProcessHeaderPhone>
+        <div class="headerTabs">
+            <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+            <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
+        </div>
+        <div class="content" v-show="active === '1'">
+            <div style="overflow: auto;">
+                <el-form
+                        ref="bzzqyjForm"
+                        :model="form"
+                        class="label-input-form"
+                        label-width="210px"
+                >
+                    <ProcessTitle>
+                        <template slot="title">基础信息</template>
+                    </ProcessTitle>
+                    <el-collapse-transition>
+                        <div class="prc-content-border" v-if="foldFormFlag === false">
+                            <el-row :gutter="24">
+                                <el-col :span="24">
+                                    <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                                        <el-input
+                                                disabled
+                                                v-model="form.itemsNum"
+                                                placeholder="请输入标准编号"
+                                                clearable
+                                        ></el-input>
+                                    </el-form-item>
+                                    <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
+                                        <el-input
+                                                disabled
+                                                v-model="form.itemsName"
+                                                placeholder="请输入标准名称"
+                                                clearable
+                                        ></el-input>
+                                    </el-form-item>
+                                    <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                        <el-input
+                                                disabled
+                                                v-model="form.itemsNum1"
+                                                clearable
+                                        ></el-input>
+                                    </el-form-item>
+                                    <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                        <el-input
+                                                disabled
+                                                v-model="form.itemsNum1"
+                                                clearable
+                                        ></el-input>
+                                    </el-form-item>
+                                    <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                        <el-input
+                                                disabled
+                                                v-model="form.itemsName1"
+                                                clearable
+                                        ></el-input>
+                                    </el-form-item>
+                                    <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                        <el-input
+                                                disabled
+                                                v-model="form.itemsName1"
+                                                clearable
+                                        ></el-input>
+                                    </el-form-item>
+                                </el-col>
+                            </el-row>
+                        </div>
+                    </el-collapse-transition>
+                    <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>
+                    <div class="prc-content-border" v-if="foldFormFlag === true" style="display: none">
+                        <el-row :gutter="24">
+                            <el-col :span="24">
+                                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.itemsNum"
+                                            placeholder="请输入标准编号"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.itemsName"
+                                            placeholder="请输入标准名称"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.itemsNum1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.itemsNum1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.itemsName1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.itemsName1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                </el-form>
+            </div>
+            <ProcessTitle>
+                <template slot="title">拆分信息</template>
+            </ProcessTitle>
+            <el-table border
+                      ref="selection"
+                      :data="itemList"
+                      tooltip-effect="dark"
+                      style="width: 100%;"
+                      height="100%"
+                      row-key="id"
+                      :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+            >
+                <el-table-column
+                        prop="itemsNum"
+                        label="条款号"
+                        width="70"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itemsName"
+                        label="条款名称"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itermsConditions"
+                        label="条款内容"
+                        width="200"
+                        show-overflow-tooltip
+                        align="center">
+                    <template slot-scope="scope">
+                        <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        show-overflow-tooltip
+                        prop="technicalRequir"
+                        width="200"
+                        label="核心技术要求"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        show-overflow-tooltip
+                        v-if="sarType === 'INLAND' && form.itemsNum1"
+                        prop="changePoint"
+                        width="150"
+                        label="基于上一版本差异"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        show-overflow-tooltip
+                        v-if="sarType === 'FOREIGN'"
+                        prop="changePoint"
+                        width="150"
+                        label="相对于国行标差异点"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="complianceRequir"
+                        width="150"
+                        label="符合项状态"
+                        align="center">
+                    <template slot-scope="scope">
+                        <div v-if="scope.row.complianceRequir === '1'">符合</div>
+                        <div v-else>不符合</div>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        show-overflow-tooltip
+                        prop="complianceState"
+                        width="200"
+                        label="合规性分析"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="newData"
+                        width="180"
+                        show-overflow-tooltip
+                        label="新车型实施日期"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="onlineData"
+                        width="180"
+                        show-overflow-tooltip
+                        label="在产车型实施日期"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="applyArctic"
+                        width="150"
+                        show-overflow-tooltip
+                        label="适用车型"
+                        align="center">
+                    <template slot-scope="scope">
+                        {{ scope.row.applyArctic.toString() }}
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        prop="unitDeptName"
+                        label="责任部门"
+                        width="170"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        label="责任人"
+                        width="170"
+                        prop="zrUserIdName"
+                        align="center">
+                </el-table-column>
+            </el-table>
+            <el-button v-if="itemLists.length > 20 && tableIndex * 20 < itemLists.length" style="width: 100%; margin-top: 5px;" icon="el-icon-caret-bottom" @click="tableLoading">加载更多...</el-button>
+            <el-collapse accordion>
+                <el-collapse-item title="审批意见">
+                    <div style="margin: 10px 0;">
+                        <el-input
+                                type="textarea"
+                                :rows="3"
+                                resize="none"
+                                placeholder="请输入意见"
+                                v-model="commentText">
+                        </el-input>
+                    </div>
+                </el-collapse-item>
+            </el-collapse>
+        </div>
+        <div class="content" v-show="active === '2'">
+            <el-table
+                    height="100%"
+                    ref="selection"
+                    :data="histortData"
+                    tooltip-effect="dark"
+                    style="width: 100%"
+                    border
+                    row-key="id"
+                    :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+                <el-table-column
+                        prop="name"
+                        label="任务步骤"
+                        align="center"
+                        width="130"
+                >
+                </el-table-column>
+                <el-table-column
+                        prop="assignee"
+                        label="任务受理人"
+                        align="center"
+                        width="130"
+                >
+                </el-table-column>
+                <el-table-column
+                        prop="createTime"
+                        label="创建时间"
+                        width="130"
+                        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="完成时间"
+                        width="130"
+                        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="流程信息"
+                        width="130"
+                        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>
+        </div>
+        <ProcessFooter
+                show-submit
+                :submitLoading="isSubmit"
+                :saveLoading="saveLoading"
+                @save="handleSave"
+                @submit="handleSubmit"
+                show-back
+                @back="handleSubmitNo"
+                submitBTNText="同意"
+        >
+        </ProcessFooter>
+        <van-dialog v-model="dialogMadal" title="条款内容" @confirm="dialogOk">
+            <div v-html="itermsConditionsTitle"></div>
+        </van-dialog>
+    </div>
+</template>
+
+<script>
+    import { Dialog } from 'vant';
+    import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
+    import ProcessFooter from '../../components/ProcessFooter'
+    import ProcessTitle from '../../components/ProcessTitle'
+    import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
+    import axios from "axios";
+
+    export default {
+        name: "phoneBzjdStep5",
+        data() {
+            return {
+                tableIndex: 0,
+                itemLists: [],
+                dialogMadal: false,
+                drawerModal: false,
+                //折叠的标志，true为折叠，false为不折叠
+                foldFormFlag: false,
+                itermsConditionsFlag: false,
+                itermsConditionsTitle: '',
+                histortData: [],
+                sarType: '',
+                itemList: [],
+                loading: true,
+                commentText: '',
+                taskIds: this.$route.query.taskIds,
+                pId: this.$route.query.prcId,
+                textarea: '', // 意见
+                active: '1', // 默认显示
+                isSubmit: false,
+                saveLoading: false,
+                form: {
+                    itemsNum: '',
+                    itemsName: '',
+                    itemsNum1: '',
+                    itemsName1: '',
+                },
+                json: {},
+            }
+        },
+        components: {
+            [Dialog.Component.name]: Dialog.Component,
+            ProcessHeaderPhone,
+            ProcessFooter,
+            ProcessTitle
+        },
+        methods: {
+            tableLoading () {
+                this.tableIndex++
+                let index = this.tableIndex * 20
+                let endIndex = index + 20
+                if (this.tableIndex * 20 > this.itemLists.length) {
+                    this.$message.warning('没有更多了')
+                }
+                let newData = this.itemLists.slice(index, endIndex)
+                this.itemList = this.itemList.concat(newData)
+            },
+            dialogOk () {
+                this.dialogMadal = false
+            },
+            handleTransfer() {
+                this.drawerModal = true
+            },
+            checkedRole (data) {
+                changeAssigneeNew({
+                    taskId: this.$route.query.taskIds, // 任务id
+                    userId:this.$store.getters.userInfo.userId, // 委托人
+                    assignee: data[0].id, // 被委托人
+                    pId: this.$route.query.prcId, // 流程实例
+                }).then(res => {
+                    if (res.success) {
+                        this.drawerModal = false
+                        this.$message.success('调整成功')
+                        this.processNum()
+                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                })
+            },
+            // 请求转换流程图
+            processNum (row) {
+                axios.request({
+                    url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+                    responseType: 'blob',
+                    method: 'get',
+                    params: {
+                        prcNum: this.$route.query.prcNum
+                    }
+                }).then(res => {
+                    this.processStep = window.URL.createObjectURL(res.data)
+                })
+            },
+            //折叠/展开基础信息方法
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
+            itermsConditionsClose () {
+                this.itermsConditionsFlag = false
+            },
+            itermsConditionsOpen (row) {
+                this.dialogMadal = true
+                this.itermsConditionsTitle = row
+            },
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
+            handleTabs(name) {
+                this.active = name
+            },
+            handleSave() {},
+            handleSubmit() {
+                this.isSubmit = true
+                var json = this.json
+                json.resolveFlag = 1
+                json.commentText = this.commentText
+                this.$http.post('lawss/activiti/completeTask', {
+                    json: JSON.stringify(json),
+                    taskId: this.taskIds,
+                    userId: this.$store.getters.userInfo.userId
+                }, {}, res => {
+                    if (res.success) {
+                        this.$message.success('提交成功')
+                        this.$router.push('/processCenter')
+                    }
+                    this.isSubmit = false
+                })
+            },
+            handleSubmitNo () {
+                if (this.commentText) {
+                    this.isSubmit = true
+                    var json = this.json
+                    json.resolveFlag = 2
+                    json.commentText = this.commentText
+                    this.$http.post('lawss/activiti/completeTask', {
+                        json: JSON.stringify(json),
+                        taskId: this.taskIds,
+                        userId: this.$store.getters.userInfo.userId
+                    }, {}, res => {
+                        if (res.success) {
+                            this.$message.success('驳回成功')
+                            this.$router.push('/processCenter')
+                        }
+                        this.isSubmit = false
+                    })
+                } else {
+                    this.$message.warning('请输入反馈意见')
+                }
+            },
+            getData() {
+                return new Promise((resolve, reject) => {
+                    inboundLiaisonDetail({
+                        taskIds: this.taskIds,
+                        pId: this.pId
+                    }).then(res => {
+                        let data = JSON.parse(res.mesg)
+                        this.form.itemsNum = data.itemsNum || data.form.itemsNum
+                        this.form.itemsName = data.itemsName || data.form.itemsName
+                        if (data.form) {
+                            this.form.itemsName1 = data.form.itemsName1 || ''
+                            this.form.itemsNum1 = data.form.itemsNum1 || ''
+                        } else {
+                            this.form.itemsName1 = data.itemsName1 || ''
+                            this.form.itemsNum1 = data.itemsNum1 || ''
+                        }
+                        this.sarType = data.standInData || data.sarType
+                        this.json = data
+                        this.itemLists = data.itemList
+                        this.itemList = this.itemLists.slice(this.tableIndex, 20)
+                        this.loading = false
+                    }).catch(e => {
+                    })
+                })
+            },
+        },
+        mounted () {
+            this.getHistoryData()
+            this.getData()
+        },
+    }
+</script>
+
+<style lang="less" scoped>
+    @import '~@/assets/styles/phone';
+    .phoneBzjdStep5 {
+        /deep/.van-dialog__content {
+            min-height: 300px;
+            max-height: 500px;
+            overflow: auto;
+            padding: 10px;
+        }
+        .prc-content-border {
+            overflow: auto;
+        }
+        /deep/.prc-content-border .el-form-item__content {
+            width: 270px;
+        }
+        .headerTabs {
+            height: 52px;
+            display: flex;
+            align-items: center;
+            position: absolute;
+            top: 52px;
+            right: 10px;
+            .headerTabsItem {
+                border: 1px solid #c1c1c1;
+                padding: 0 5px;
+                height: 30px;
+                line-height: 30px;
+                cursor: pointer;
+            }
+            .active {
+                border: 1px solid #E6A23C;
+                color: #fff;
+                background: #E6A23C;
+            }
+        }
+        .content {
+            border-top: 1px solid #DCDFE6;
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+            margin-top: 52px;
+            height: calc(~'100% - 155px');
+            overflow: auto;
+            .tableTitle {
+                margin-bottom: 10px;
+                height: 30px;
+                line-height: 30px;
+                position: relative;
+                font-size: 13px;
+                font-weight: bold;
+                .tableButton {
+                    position: absolute;
+                    right: 0;
+                    top: 0;
+                }
+            }
+        }
+    }
+</style>

src/pages/processCenter/pages/phone/bzjd/step6.vue

@@ -0,0 +1,577 @@
+<template>
+    <div class="phoneBzjdStep6 phoneBox">
+        <ProcessHeaderPhone toggle>
+            <template slot="proName">标准解读流程</template>
+            <template slot="proNode">部长审批</template>
+        </ProcessHeaderPhone>
+        <div class="headerTabs">
+            <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+            <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
+        </div>
+        <div class="content" v-show="active === '1'">
+            <div style="overflow: auto;">
+                <el-form
+                        ref="bzzqyjForm"
+                        :model="form"
+                        class="label-input-form"
+                        label-width="210px"
+                >
+                    <ProcessTitle>
+                        <template slot="title">基础信息</template>
+                    </ProcessTitle>
+                    <el-collapse-transition>
+                        <div class="prc-content-border" v-if="foldFormFlag === false">
+                            <el-row :gutter="24">
+                                <el-col :span="24">
+                                    <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                                        <el-input
+                                                disabled
+                                                v-model="form.itemsNum"
+                                                placeholder="请输入标准编号"
+                                                clearable
+                                        ></el-input>
+                                    </el-form-item>
+                                    <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
+                                        <el-input
+                                                disabled
+                                                v-model="form.itemsName"
+                                                placeholder="请输入标准名称"
+                                                clearable
+                                        ></el-input>
+                                    </el-form-item>
+                                    <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                        <el-input
+                                                disabled
+                                                v-model="form.itemsNum1"
+                                                clearable
+                                        ></el-input>
+                                    </el-form-item>
+                                    <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                        <el-input
+                                                disabled
+                                                v-model="form.itemsNum1"
+                                                clearable
+                                        ></el-input>
+                                    </el-form-item>
+                                    <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                        <el-input
+                                                disabled
+                                                v-model="form.itemsName1"
+                                                clearable
+                                        ></el-input>
+                                    </el-form-item>
+                                    <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                        <el-input
+                                                disabled
+                                                v-model="form.itemsName1"
+                                                clearable
+                                        ></el-input>
+                                    </el-form-item>
+                                </el-col>
+                            </el-row>
+                        </div>
+                    </el-collapse-transition>
+                    <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>
+                    <div class="prc-content-border" v-if="foldFormFlag === true" style="display: none">
+                        <el-row :gutter="24">
+                            <el-col :span="24">
+                                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.itemsNum"
+                                            placeholder="请输入标准编号"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.itemsName"
+                                            placeholder="请输入标准名称"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.itemsNum1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.itemsNum1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.itemsName1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.itemsName1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                </el-form>
+            </div>
+            <ProcessTitle>
+                <template slot="title">拆分信息</template>
+            </ProcessTitle>
+            <el-table border
+                      ref="selection"
+                      :data="itemList"
+                      tooltip-effect="dark"
+                      style="width: 100%;"
+                      height="100%"
+                      row-key="id"
+                      :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+            >
+                <el-table-column
+                        prop="itemsNum"
+                        label="条款号"
+                        width="70"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itemsName"
+                        label="条款名称"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itermsConditions"
+                        label="条款内容"
+                        width="200"
+                        show-overflow-tooltip
+                        align="center">
+                    <template slot-scope="scope">
+                        <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        show-overflow-tooltip
+                        prop="technicalRequir"
+                        width="200"
+                        label="核心技术要求"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        show-overflow-tooltip
+                        v-if="sarType === 'INLAND' && form.itemsNum1"
+                        prop="changePoint"
+                        width="150"
+                        label="基于上一版本差异"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        show-overflow-tooltip
+                        v-if="sarType === 'FOREIGN'"
+                        prop="changePoint"
+                        width="150"
+                        label="相对于国行标差异点"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="complianceRequir"
+                        width="150"
+                        label="符合项状态"
+                        align="center">
+                    <template slot-scope="scope">
+                        <div v-if="scope.row.complianceRequir === '1'">符合</div>
+                        <div v-else>不符合</div>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        show-overflow-tooltip
+                        prop="complianceState"
+                        width="200"
+                        label="合规性分析"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="newData"
+                        width="180"
+                        show-overflow-tooltip
+                        label="新车型实施日期"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="onlineData"
+                        width="180"
+                        show-overflow-tooltip
+                        label="在产车型实施日期"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="applyArctic"
+                        width="150"
+                        show-overflow-tooltip
+                        label="适用车型"
+                        align="center">
+                    <template slot-scope="scope">
+                        {{ scope.row.applyArctic.toString() }}
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        prop="unitDeptName"
+                        label="责任部门"
+                        width="170"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        label="责任人"
+                        width="170"
+                        prop="zrUserIdName"
+                        align="center">
+                </el-table-column>
+            </el-table>
+            <el-button v-if="itemLists.length > 20 && tableIndex * 20 < itemLists.length" style="width: 100%; margin-top: 5px;" icon="el-icon-caret-bottom" @click="tableLoading">加载更多...</el-button>
+            <el-collapse accordion>
+                <el-collapse-item title="审批意见">
+                    <div style="margin: 10px 0;">
+                        <el-input
+                                type="textarea"
+                                :rows="3"
+                                resize="none"
+                                placeholder="请输入意见"
+                                v-model="commentText">
+                        </el-input>
+                    </div>
+                </el-collapse-item>
+            </el-collapse>
+        </div>
+        <div class="content" v-show="active === '2'">
+            <el-table
+                    height="100%"
+                    ref="selection"
+                    :data="histortData"
+                    tooltip-effect="dark"
+                    style="width: 100%"
+                    border
+                    row-key="id"
+                    :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+                <el-table-column
+                        prop="name"
+                        label="任务步骤"
+                        align="center"
+                        width="130"
+                >
+                </el-table-column>
+                <el-table-column
+                        prop="assignee"
+                        label="任务受理人"
+                        align="center"
+                        width="130"
+                >
+                </el-table-column>
+                <el-table-column
+                        prop="createTime"
+                        label="创建时间"
+                        width="130"
+                        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="完成时间"
+                        width="130"
+                        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="流程信息"
+                        width="130"
+                        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>
+        </div>
+        <ProcessFooter
+                show-submit
+                :submitLoading="isSubmit"
+                :saveLoading="saveLoading"
+                @save="handleSave"
+                @submit="handleSubmit"
+                show-back
+                @back="handleSubmitNo"
+                submitBTNText="同意"
+        >
+        </ProcessFooter>
+        <van-dialog v-model="dialogMadal" title="条款内容" @confirm="dialogOk">
+            <div v-html="itermsConditionsTitle"></div>
+        </van-dialog>
+    </div>
+</template>
+
+<script>
+    import { Dialog } from 'vant';
+    import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
+    import ProcessFooter from '../../components/ProcessFooter'
+    import ProcessTitle from '../../components/ProcessTitle'
+    import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
+    import axios from "axios";
+
+    export default {
+        name: "phoneBzjdStep6",
+        data() {
+            return {
+                tableIndex: 0,
+                itemLists: [],
+                dialogMadal: false,
+                drawerModal: false,
+                //折叠的标志，true为折叠，false为不折叠
+                foldFormFlag: false,
+                itermsConditionsFlag: false,
+                itermsConditionsTitle: '',
+                histortData: [],
+                sarType: '',
+                itemList: [],
+                loading: true,
+                commentText: '',
+                taskIds: this.$route.query.taskIds,
+                pId: this.$route.query.prcId,
+                textarea: '', // 意见
+                active: '1', // 默认显示
+                isSubmit: false,
+                saveLoading: false,
+                form: {
+                    itemsNum: '',
+                    itemsName: '',
+                    itemsNum1: '',
+                    itemsName1: '',
+                },
+                json: {},
+            }
+        },
+        components: {
+            [Dialog.Component.name]: Dialog.Component,
+            ProcessHeaderPhone,
+            ProcessFooter,
+            ProcessTitle
+        },
+        methods: {
+            tableLoading () {
+                this.tableIndex++
+                let index = this.tableIndex * 20
+                let endIndex = index + 20
+                if (this.tableIndex * 20 > this.itemLists.length) {
+                    this.$message.warning('没有更多了')
+                }
+                let newData = this.itemLists.slice(index, endIndex)
+                this.itemList = this.itemList.concat(newData)
+            },
+            dialogOk () {
+                this.dialogMadal = false
+            },
+            handleTransfer() {
+                this.drawerModal = true
+            },
+            checkedRole (data) {
+                changeAssigneeNew({
+                    taskId: this.$route.query.taskIds, // 任务id
+                    userId:this.$store.getters.userInfo.userId, // 委托人
+                    assignee: data[0].id, // 被委托人
+                    pId: this.$route.query.prcId, // 流程实例
+                }).then(res => {
+                    if (res.success) {
+                        this.drawerModal = false
+                        this.$message.success('调整成功')
+                        this.processNum()
+                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                })
+            },
+            // 请求转换流程图
+            processNum (row) {
+                axios.request({
+                    url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+                    responseType: 'blob',
+                    method: 'get',
+                    params: {
+                        prcNum: this.$route.query.prcNum
+                    }
+                }).then(res => {
+                    this.processStep = window.URL.createObjectURL(res.data)
+                })
+            },
+            //折叠/展开基础信息方法
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
+            itermsConditionsClose () {
+                this.itermsConditionsFlag = false
+            },
+            itermsConditionsOpen (row) {
+                this.dialogMadal = true
+                this.itermsConditionsTitle = row
+            },
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
+            handleTabs(name) {
+                this.active = name
+            },
+            handleSave() {},
+            handleSubmit() {
+                this.isSubmit = true
+                var json = this.json
+                json.resolveFlag = 1
+                json.commentText = this.commentText
+                this.$http.post('lawss/activiti/completeTask', {
+                    json: JSON.stringify(json),
+                    taskId: this.taskIds,
+                    userId: this.$store.getters.userInfo.userId
+                }, {}, res => {
+                    if (res.success) {
+                        this.$message.success('提交成功')
+                        this.$router.push('/processCenter')
+                    }
+                    this.isSubmit = false
+                })
+            },
+            handleSubmitNo () {
+                if (this.commentText) {
+                    this.isSubmit = true
+                    var json = this.json
+                    json.resolveFlag = 2
+                    json.commentText = this.commentText
+                    this.$http.post('lawss/activiti/completeTask', {
+                        json: JSON.stringify(json),
+                        taskId: this.taskIds,
+                        userId: this.$store.getters.userInfo.userId
+                    }, {}, res => {
+                        if (res.success) {
+                            this.$message.success('驳回成功')
+                            this.$router.push('/processCenter')
+                        }
+                        this.isSubmit = false
+                    })
+                } else {
+                    this.$message.warning('请输入反馈意见')
+                }
+            },
+            getData() {
+                return new Promise((resolve, reject) => {
+                    inboundLiaisonDetail({
+                        taskIds: this.taskIds,
+                        pId: this.pId
+                    }).then(res => {
+                        let data = JSON.parse(res.mesg)
+                        this.form.itemsNum = data.itemsNum || data.form.itemsNum
+                        this.form.itemsName = data.itemsName || data.form.itemsName
+                        if (data.form) {
+                            this.form.itemsName1 = data.form.itemsName1 || ''
+                            this.form.itemsNum1 = data.form.itemsNum1 || ''
+                        } else {
+                            this.form.itemsName1 = data.itemsName1 || ''
+                            this.form.itemsNum1 = data.itemsNum1 || ''
+                        }
+                        this.sarType = data.standInData || data.sarType
+                        this.json = data
+                        this.itemLists = data.itemList
+                        this.itemList = this.itemLists.slice(this.tableIndex, 20)
+                        this.loading = false
+                    }).catch(e => {
+                    })
+                })
+            },
+        },
+        mounted () {
+            this.getHistoryData()
+            this.getData()
+        },
+    }
+</script>
+
+<style lang="less" scoped>
+    @import '~@/assets/styles/phone';
+    .phoneBzjdStep6 {
+        /deep/.van-dialog__content {
+            min-height: 300px;
+            max-height: 500px;
+            overflow: auto;
+            padding: 10px;
+        }
+        .prc-content-border {
+            overflow: auto;
+        }
+        /deep/.prc-content-border .el-form-item__content {
+            width: 270px;
+        }
+        .headerTabs {
+            height: 52px;
+            display: flex;
+            align-items: center;
+            position: absolute;
+            top: 52px;
+            right: 10px;
+            .headerTabsItem {
+                border: 1px solid #c1c1c1;
+                padding: 0 5px;
+                height: 30px;
+                line-height: 30px;
+                cursor: pointer;
+            }
+            .active {
+                border: 1px solid #E6A23C;
+                color: #fff;
+                background: #E6A23C;
+            }
+        }
+        .content {
+            border-top: 1px solid #DCDFE6;
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+            margin-top: 52px;
+            height: calc(~'100% - 155px');
+            overflow: auto;
+            .tableTitle {
+                margin-bottom: 10px;
+                height: 30px;
+                line-height: 30px;
+                position: relative;
+                font-size: 13px;
+                font-weight: bold;
+                .tableButton {
+                    position: absolute;
+                    right: 0;
+                    top: 0;
+                }
+            }
+        }
+    }
+</style>

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -980,7 +980,7 @@ export default {
             })
           } else if (row.taskInfo === '责任人审核') {
             this.$router.push({
-              name: 'phoneBzjdStep4',
+              name: 'bzjdStep4',
               query: {
                 taskIds: row.taskIds,
                 prcId: row.prcId,

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

@@ -368,7 +368,7 @@
             align="center"
             label="适用产品线">
         </el-table-column>
-        <el-table-column
+<!--        <el-table-column
             show-overflow-tooltip
             prop="cycvppsbm"
             width="210px"
@@ -395,7 +395,7 @@
             align="center"
             width="210px"
             label="卡车VPPS中文名称">
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column width="240" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
             <el-button
@@ -463,6 +463,7 @@
 
     <el-drawer
         title="编辑清单条目"
+        :before-close='cancelInfo'
         :visible.sync="drawerEdit"
         :wrapperClosable="false"
         size="800px"
@@ -486,7 +487,7 @@
         <el-form-item label="标准实施日期" prop="putTime">
           <el-date-picker
               v-model.trim="editRowData.ssrq"
-              type="date"
+              type="dates"
               value-format="yyyy-MM-dd"
               placeholder="选择日期">
           </el-date-picker>
@@ -494,7 +495,7 @@
         <el-form-item label="在产车实施日期" prop="zccssrqgj">
           <el-date-picker
               v-model.trim="editRowData.zccssrqgj"
-              type="date"
+              type="dates"
               value-format="yyyy-MM-dd"
               placeholder="选择日期">
           </el-date-picker>
@@ -502,7 +503,7 @@
         <el-form-item label="新车型实施日期" prop="xcxssrqgj">
           <el-date-picker
               v-model.trim="editRowData.xcxssrqgj"
-              type="date"
+              type="dates"
               value-format="yyyy-MM-dd"
               placeholder="选择日期">
           </el-date-picker>
@@ -513,7 +514,7 @@
         <el-form-item label="适用产品线" prop="sycpx">
           <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
+<!--        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
           <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
         </el-form-item>
         <el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
@@ -524,7 +525,7 @@
         </el-form-item>
         <el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
           <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
-        </el-form-item>
+        </el-form-item>-->
       </el-form>
       <div class="demo-drawer-footer">
         <el-button
@@ -914,6 +915,7 @@ export default {
       allSelectOptions: {},
       dynamicFormField: [], // 动态数据
       uuid: '',
+      rowList: {}
     }
   },
   created() {
@@ -1257,7 +1259,6 @@ export default {
             this.$message.warning('请勿添加重复数据')
           } else {
             this.sarAccessInfoList.push(item)
-            console.log('1270',this.sarAccessInfoList)
             // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
@@ -1294,18 +1295,41 @@ export default {
     },
     // 编辑按钮
     editTghisRow(row) {
+      // 用来储存取消时原来的数据，防止取消时修改
+      localStorage.setItem('obj', JSON.stringify(row))
+
       this.rowList = row
       this.editRowData = this.rowList
-      this.editRowData.standNumber = this.rowList.standNumber
+      if (this.editRowData.ssrq !== null) {
+        this.editRowData.ssrq = this.editRowData.ssrq.split(',')
+      }
+      if (this.editRowData.zccssrqgj !== null) {
+        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.split(',')
+      }
+      if (this.editRowData.xcxssrqgj !== null) {
+        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.split(',')
+      }
       this.drawerEdit = true
     },
     // 抽屉取消按钮
     cancelInfo() {
+      let Item = JSON.parse(localStorage.getItem('obj'))
+      this.editRowData.ssrq = Item.ssrq
+      this.editRowData.xcxssrqgj = Item.xcxssrqgj
+      this.editRowData.zccssrqgj = Item.zccssrqgj
       this.drawerEdit = false
     },
     // 抽屉提交按钮
     saveInfo() {
-      this.rowList = this.editRowData
+      if (this.editRowData.ssrq !== null) {
+        this.editRowData.ssrq = this.editRowData.ssrq.join(',')
+      }
+      if (this.editRowData.xcxssrqgj !== null){
+        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',')
+      }
+      if (this.editRowData.zccssrqgj !== null){
+        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',')
+      }
       this.drawerEdit = false
     },
     // 点击清单条目导入按钮事件
@@ -1377,23 +1401,25 @@ export default {
             if (this.sarAccessInfoList[i].ssrq === null || this.sarAccessInfoList[i].ssrq === undefined) {
               rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
             } else {
-              rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
+              rowlist1.push(this.sarAccessInfoList[i].ssrq)
             }
             if (this.sarAccessInfoList[i].xcxssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === undefined) {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
             } else {
-              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
             }
             if (this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].zccssrqgj === undefined) {
               rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
             } else {
-              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
             }
           }
+          console.log(rowlist1)
           rowlist = rowlist.join(',')
-          rowlist1 = rowlist1.join(',')
-          rowlist2 = rowlist2.join(',')
-          rowlist3 = rowlist3.join(',')
+          rowlist1 = rowlist1.join(';')
+          console.log(rowlist1)
+          rowlist2 = rowlist2.join(';')
+          rowlist3 = rowlist3.join(';')
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
           sarAccessEO.inforlist = rowlist
           sarAccessEO.inforlist1 = rowlist1
@@ -1586,7 +1612,6 @@ export default {
     //   })
     // },
     pageInfo() {
-      console.log('1598',this.sarAccessInfoSearch)
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
         StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
           this.sarAccessInfoSearchList = res.data.list
@@ -1629,7 +1654,6 @@ export default {
         this.$http.get('lawss/sarLawsInfo/page', this.sarAccessInfoSearch, {
           _this: this,
         }, res => {
-          console.log('1640',res)
           this.sarAccessInfoSearchList = res.data.list
           this.drawerTotal = res.data.count
         }, e => {
@@ -2433,6 +2457,9 @@ export default {
     background: #ffffff;
     text-align: right;
   }
+  /deep/.el-date-editor.el-input {
+    width: 100%;
+  }
 }
 
 .labelBox {

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

@@ -180,12 +180,6 @@
             width="210px"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span v-if="scope.row.zccssrqgj === null">
-                {{ scope.row.zccssrqgj }}
-              </span>
-              <span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="xcxssrqgj"
@@ -193,12 +187,6 @@
             align="center"
             width="210px"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span v-if="scope.row.xcxssrqgj === null">
-                {{ scope.row.xcxssrqgj }}
-              </span>
-              <span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -214,34 +202,6 @@
             align="center"
             label="适用产品线">
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="cycvppsbm"
-            width="210px"
-            align="center"
-            label="乘用车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="cycvppscn"
-            width="210px"
-            align="center"
-            label="乘用车VPPS中文名称">
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="kccvppsbm"
-            align="center"
-            width="210px"
-            label="卡车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="kccvppscn"
-            align="center"
-            width="210px"
-            label="卡车VPPS中文名称">
-          </el-table-column>
         </el-table>
         <pagination :page="standardForm.page" :total="standardFormTotal" @pageChange="pageChange"
                     @pageSizeChange="pageSizeChange"></pagination>

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

@@ -341,7 +341,7 @@
           align="center"
           label="适用产品线">
         </el-table-column>
-        <el-table-column
+<!--        <el-table-column
           show-overflow-tooltip
           prop="cycvppsbm"
           width="210px"
@@ -368,7 +368,7 @@
           align="center"
           width="210px"
           label="卡车VPPS中文名称">
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column width="240" align="center"  fixed="right"  label="操作">
           <template slot-scope="scope">
             <el-button
@@ -430,6 +430,7 @@
       title="编辑清单条目"
       :visible.sync="drawerEdit"
       :wrapperClosable="false"
+      :before-close='cancelInfo'
       size="800px"
     >
       <el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
@@ -478,7 +479,7 @@
         <el-form-item label="适用产品线" prop="sycpx">
           <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
+<!--        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
           <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
         </el-form-item>
         <el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
@@ -489,7 +490,7 @@
         </el-form-item>
         <el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
           <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
-        </el-form-item>
+        </el-form-item>-->
       </el-form>
       <div class="demo-drawer-footer">
         <el-button
@@ -1228,18 +1229,41 @@ export default {
     },
     // 编辑按钮
     editTghisRow(row) {
+      // 用来储存取消时原来的数据，防止取消时修改
+      localStorage.setItem('obj', JSON.stringify(row))
+
       this.rowList = row
       this.editRowData = this.rowList
-      this.editRowData.standNumber = this.rowList.standNumber
+      if (this.editRowData.ssrq !== null) {
+        this.editRowData.ssrq = this.editRowData.ssrq.split(',')
+      }
+      if (this.editRowData.zccssrqgj !== null) {
+        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.split(',')
+      }
+      if (this.editRowData.xcxssrqgj !== null) {
+        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.split(',')
+      }
       this.drawerEdit = true
     },
     // 抽屉取消按钮
     cancelInfo() {
+      let Item = JSON.parse(localStorage.getItem('obj'))
+      this.editRowData.ssrq = Item.ssrq
+      this.editRowData.xcxssrqgj = Item.xcxssrqgj
+      this.editRowData.zccssrqgj = Item.zccssrqgj
       this.drawerEdit = false
     },
     // 抽屉提交按钮
     saveInfo() {
-      this.rowList = this.editRowData
+      if (this.editRowData.ssrq !== null) {
+        this.editRowData.ssrq = this.editRowData.ssrq.join(',')
+      }
+      if (this.editRowData.xcxssrqgj !== null){
+        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',')
+      }
+      if (this.editRowData.zccssrqgj !== null){
+        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',')
+      }
       this.drawerEdit = false
     },
     // 点击清单条目导入按钮事件
@@ -1324,9 +1348,9 @@ export default {
             }
           }
           rowlist = rowlist.join(',')
-          rowlist1 = rowlist1.join(',')
-          rowlist2 = rowlist2.join(',')
-          rowlist3 = rowlist3.join(',')
+          rowlist1 = rowlist1.join(';')
+          rowlist2 = rowlist2.join(';')
+          rowlist3 = rowlist3.join(';')
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
           sarAccessEO.inforlist = rowlist
           sarAccessEO.inforlist1 = rowlist1

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

@@ -399,7 +399,7 @@
             align="center"
             label="适用产品线">
         </el-table-column>
-        <el-table-column
+<!--        <el-table-column
             show-overflow-tooltip
             prop="cycvppsbm"
             width="210px"
@@ -426,7 +426,7 @@
             align="center"
             width="210px"
             label="卡车VPPS中文名称">
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column width="240" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
             <el-button
@@ -494,6 +494,7 @@
     <el-drawer
         title="编辑清单条目"
         :visible.sync="drawerEdit"
+        :before-close='cancelInfo'
         :wrapperClosable="false"
         size="800px"
     >
@@ -543,7 +544,7 @@
         <el-form-item label="适用产品线" prop="sycpx">
           <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
+<!--        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
           <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
         </el-form-item>
         <el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
@@ -554,7 +555,7 @@
         </el-form-item>
         <el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
           <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
-        </el-form-item>
+        </el-form-item>-->
       </el-form>
       <div class="demo-drawer-footer">
         <el-button
@@ -1227,18 +1228,40 @@ export default {
     },
     // 编辑按钮
     editTghisRow(row) {
+      // 用来储存取消时原来的数据，防止取消时修改
+      localStorage.setItem('obj', JSON.stringify(row))
       this.rowList = row
       this.editRowData = this.rowList
-      this.editRowData.standNumber = this.rowList.standNumber
+      if (this.editRowData.ssrq !== null) {
+        this.editRowData.ssrq = this.editRowData.ssrq.split(',')
+      }
+      if (this.editRowData.zccssrqgj !== null) {
+        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.split(',')
+      }
+      if (this.editRowData.xcxssrqgj !== null) {
+        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.split(',')
+      }
       this.drawerEdit = true
     },
     // 抽屉取消按钮
     cancelInfo() {
+      let Item = JSON.parse(localStorage.getItem('obj'))
+      this.editRowData.ssrq = Item.ssrq
+      this.editRowData.xcxssrqgj = Item.xcxssrqgj
+      this.editRowData.zccssrqgj = Item.zccssrqgj
       this.drawerEdit = false
     },
     // 抽屉提交按钮
     saveInfo() {
-      this.rowList = this.editRowData
+      if (this.editRowData.ssrq !== null) {
+        this.editRowData.ssrq = this.editRowData.ssrq.join(',')
+      }
+      if (this.editRowData.xcxssrqgj !== null){
+        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',')
+      }
+      if (this.editRowData.zccssrqgj !== null){
+        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',')
+      }
       this.drawerEdit = false
     },
     // 点击清单条目导入按钮事件
@@ -1324,9 +1347,9 @@ export default {
             }
           }
           rowlist = rowlist.join(',')
-          rowlist1 = rowlist1.join(',')
-          rowlist2 = rowlist2.join(',')
-          rowlist3 = rowlist3.join(',')
+          rowlist1 = rowlist1.join(';')
+          rowlist2 = rowlist2.join(';')
+          rowlist3 = rowlist3.join(';')
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
           sarAccessEO.inforlist = rowlist
           sarAccessEO.inforlist1 = rowlist1

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -17,7 +17,7 @@
               :indent="0"
               :props="props"
               :data="treeList"
-              default-expanded-keys="['2']"
+              :default-expanded-keys="['2']"
               highlight-current
               @node-click="treeClick"
               :filter-node-method="filterNode">
@@ -49,7 +49,6 @@
                     </span>
               </span>
             </el-tree>
-
           </el-card>
         </div>
       </div>

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

@@ -440,7 +440,7 @@
                       :disabled="true"
                       v-model="addForm.productType"
                       placeholder="请输入产品类型"
-                      />
+                    />
                   </el-form-item>
                   <el-form-item prop="productLine" label="产品线" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
@@ -448,7 +448,7 @@
                       :disabled="true"
                       v-model="addForm.productLine"
                       placeholder="请输入产品线"
-                      />
+                    />
                   </el-form-item>
                   <el-form-item prop="standSerialNumber" label="标准号" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
@@ -472,7 +472,7 @@
                       :disabled="true"
                       v-model="addForm.standName"
                       placeholder="请输入标准名称"
-                      />
+                    />
                   </el-form-item>
                   <el-form-item prop="itemsNum" label="条款号" style="width: 100%; margin-right:10px"
                                 class="add-form-item add-input">
@@ -495,7 +495,7 @@
                       v-model="addForm.responsibleUnit"
                       placeholder="请输入责任部门"
                       @click.native="choiceZRBM"
-                      />
+                    />
                   </el-form-item>
                   <el-form-item prop="reason" label="不合规项目" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
@@ -510,7 +510,7 @@
                       v-model="addForm.dutyEngineer"
                       placeholder="请输入责任工程师"
                       @click.native="choiceZRR"
-                      />
+                    />
                   </el-form-item>
                   <el-form-item prop="authEngineer" label="认证工程师" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
@@ -518,7 +518,7 @@
                       v-model="addForm.authEngineer"
                       placeholder="请输入认证工程师"
                       @click.native="choiceMore('authEngineer','选择认证工程师',addForm.authEngineer)"
-                      />
+                    />
                   </el-form-item>
                   <el-form-item prop="qaEngineer" label="质量工程师" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
@@ -526,7 +526,7 @@
                       v-model="addForm.qaEngineer"
                       placeholder="请输入质量工程师"
                       @click.native="choiceMore('qaEngineer','选择质量工程师',addForm.qaEngineer)"
-                      />
+                    />
                   </el-form-item>
                   <el-form-item prop="planCloseTime" label="计划关闭时间" style="width: 100%; margin-right:10px"
                                 class="add-form-item">

src/router/index.js

@@ -1984,6 +1984,26 @@ const routes = [
           title: '标准解读流程'
         }
       },
+      {
+        path: '/phoneBzjdStep5',
+        name: 'phoneBzjdStep5',
+        component: () => import('@/pages/processCenter/pages/phone/bzjd/step5.vue'),
+        meta: {
+          isBoolean: true,
+          requireAuth: true,
+          title: '标准解读流程'
+        }
+      },
+      {
+        path: '/phoneBzjdStep6',
+        name: 'phoneBzjdStep6',
+        component: () => import('@/pages/processCenter/pages/phone/bzjd/step6.vue'),
+        meta: {
+          isBoolean: true,
+          requireAuth: true,
+          title: '标准解读流程'
+        }
+      },
       {
         path: '/phoneBzqdfbStep4',
         name: 'phoneBzqdfbStep4',