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

src/pages/details/otherStandardDetails/index.vue

@@ -69,7 +69,8 @@
                         <label style=" margin-right: 164px;">{{ child.attrName }}</label>
                         <template v-if="child.value && child.value.length > 0"
                                   v-for="(file, fileIndex) in child1Func(child.value)">
-                          <span>
+<!--                          单个文件时-->
+                          <span v-if="child.value && child.value.length > 0 && child.value.length === 1">
                           <a style="font-size: 16px;color: #409EFF;cursor: pointer"
                              @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
                              :title="file.oldFileName">{{ file.oldFileName }}</a>
@@ -87,6 +88,27 @@
                           />
                             <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                           </span>
+<!--                          多个文件时-->
+                          <span v-else-if="child.value && child.value.length > 0">
+                            <span style="margin-left: 19%">
+                              <a style="font-size: 16px;color: #409EFF;cursor: pointer"
+                                 @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
+                                 :title="file.oldFileName">{{ file.oldFileName }}</a>
+                              <i
+                                  title="下载"
+                                  @click="downloadFile(file.id)"
+                                  class="icon-download"
+                                  v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
+                              />
+                              <i
+                                  title="下载带水印"
+                                  @click="downloadFileByWater(file.id, file.fileSuffix)"
+                                  class="icon-download2"
+                                  v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
+                              />
+                            </span>
+                            <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
+                          </span>
                           <el-button
                               v-if="child.attrField === itemNam "
                               v-for="(itemNam,index) in itemExistList"
@@ -97,13 +119,13 @@
                               icon="icon-separate"
                           >标准分解单
                           </el-button>
-                          <el-button v-if="child.value && child.value.length > 1"
+<!--                          <el-button v-if="child.value && child.value.length > 1"-->
-                                     style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"
+<!--                                     style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"-->
-                                     class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">
+<!--                                     class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">-->
-                            更多
+<!--                            更多-->
-                          </el-button>
+<!--                          </el-button>-->
                         </template>
-                        <template v-if="child.value === null">-</template>
+                        <template v-else-if="child.value === null">-</template>
                       </p>
                     </template>
                     <!--修订本-->
@@ -244,9 +266,9 @@
                     <p class="half"><label style=" margin-right: 150px;">发布日期</label><span>{{
                         sarStandardsInfoEO.issueTime || '-'
                       }}</span></p>
-                    <p class="half"><label style=" margin-right: 150px;">标准性质</label><span>{{
+<!--                    <p class="half"><label style=" margin-right: 150px;">标准性质</label><span>{{-->
-                        standMap[sarStandardsInfoEO.standNature] || '-'
+<!--                        standMap[sarStandardsInfoEO.standNature] || '-'-->
-                      }}</span></p>
+<!--                      }}</span></p>-->
 
                     <p class="half" v-if="saveStandType === 'INLAND_STAND'"><label
                         style=" margin-right: 150px;">标准体系</label><span>{{
@@ -2076,7 +2098,9 @@ export default {
       console.log('1943',child1)
       const list = []
       if (child1 && child1.length > 1) {
-        list.push(child1[0])
+        for (let i = 0; i < child1.length; i++) {
+          list.push(child1[i])
+        }
         return list
       }
       return child1

src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue

@@ -319,7 +319,7 @@
       @close="showItemInfoModal = false"
       class="demo-drawer"
     >
-      <div class="see-drawer-content">
+<!--      <div class="see-drawer-content">
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="条款号">条款号</label>
           <span class="see-drawer-val" :title="showItemInfoEO.itemsNum">{{ showItemInfoEO.itemsNum }}</span>
@@ -332,7 +332,7 @@
           <label class="see-drawer-name" title="内容简介">内容简介</label>
           <span class="see-drawer-val" :title="showItemInfoEO.itermsConditions ? showItemInfoEO.itermsConditions.replace(/<.*?>/ig, ' ') : ''">{{ showItemInfoEO.itermsConditions ? showItemInfoEO.itermsConditions.replace(/<.*?>/ig, ' ') : '' }}</span>
         </div>
-<!--        <div class="see-drawer-div">
+        <div class="see-drawer-div">
           <label class="see-drawer-name" title="责任部门">责任部门</label>
           <span class="see-drawer-val" :title="showItemInfoEO.responsibleUnitShow">{{ showItemInfoEO.responsibleUnitShow }}</span>
         </div>
@@ -359,7 +359,123 @@
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="企标覆盖关系">企标覆盖关系</label>
           <span class="see-drawer-val" :title="getDicTypeName('BZFGGXOUIUJ', showItemInfoEO.busStandCover)">{{ getDicTypeName('BZFGGXOUIUJ', showItemInfoEO.busStandCover) }}</span>
-        </div>-->
+        </div>
+      </div>-->
+      <div class="demo-drawer-content">
+        <el-form
+          ref="sarStandardsItemForm"
+          :model="standItemEO"
+          class="label-input-form"
+          :rules="sarStandardItemRules"
+          label-width="150px"
+        >
+          <el-input v-model="standItemEO.id" v-if="false"></el-input>
+          <el-form-item  label="条款号" prop="itemsNum" class="add-form-item">
+            <el-input v-model="standItemEO.itemsNum" readonly placeholder="请输入内容"></el-input>
+          </el-form-item>
+          <el-form-item label="条款名称" prop="itemsName" class="add-form-item">
+            <el-input v-model="standItemEO.itemsName" readonly placeholder="请输入内容"></el-input>
+          </el-form-item>
+          <!--          <custom-org
+                        key="责任部门"
+                        :config="{
+                          attrName: '责任部门',
+                          attrField: 'responsibleUnit',
+                          selVal: 'ORGLIST',
+                          valueName: standItemEO.responsibleUnitShow
+                        }"
+                        v-model="standItemEO.ZRBM"
+                        @on-checked="onChecked"
+                    ></custom-org>
+                    <custom-org
+                      key="FO"
+                      :config="{
+                        attrName: 'FO',
+                        attrField: 'FO',
+                        selVal: 'ROLELIST',
+                        valueName: standItemEO.foShow
+                      }"
+                      v-model="standItemEO.fo"
+                      check-enable
+                      :data-model="standItemEO"
+                      @on-checked="checkedName => {standItemEO.foShow = checkedName}"
+                    ></custom-org>
+                    <custom-role-tree
+                      :key = "Math.random() + 'dutyEngineer'"
+                      :config="{
+                        attrName: '项目评估角色',
+                        attrField: 'dutyEngineer',
+                        valueName: standItemEO.dutyEngineerShow
+                      }"
+                      v-model="standItemEO.dutyEngineer"
+                      :data-model="standItemEO"
+                      @on-checked="checkedName => {standItemEO.dutyEngineerShow = checkedName}"
+                    ></custom-role-tree>
+                    <custom-SVPPS
+                      :key = "Math.random() + 'svpps'"
+                      :config="{
+                        attrName: 'SVPPS',
+                        attrField: 'svpps',
+                        valueName: standItemEO.svppsShow
+                      }"
+                      v-model="standItemEO.svpps"
+                      :data-model="standItemEO"
+                      @on-checked="checkedName => {standItemEO.svppsShow = checkedName}"
+                    ></custom-SVPPS>
+                    <el-form-item label="适用车辆类型" prop="applyArctic" class="add-form-item">
+                      <el-select v-model="standItemEO.applyArctic" multiple placeholder="请选择" :filterable="true">
+                        <el-option
+                          v-for="opt in applyArcticOptions"
+                          :key="opt.value"
+                          :label="opt.label"
+                          :value="opt.value">
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="要求类型" prop="claimType" class="add-form-item">
+                      <el-select v-model="standItemEO.claimType" placeholder="请选择" :filterable="true">
+                        <el-option
+                          v-for="opt in requestOptions"
+                          :key="opt.value"
+                          :label="opt.label"
+                          :value="opt.value">
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="企标覆盖关系" prop="busStandCover" class="add-form-item">
+                      <el-select v-model="standItemEO.busStandCover" placeholder="请选择">
+                        <el-option
+                          v-for="item in BZFGGXOUIUJ"
+                          :key="item.value"
+                          :value="item.value"
+                          :label="item.label"></el-option>
+                      </el-select>
+                    </el-form-item>-->
+          <el-divider content-position="left">内容简介</el-divider>
+          <div style="border:1px dashed #999;margin-bottom:20px;padding:10px">
+            <div v-for="(item, index) in itemsContentList" :key="index">
+              <el-row>
+                <el-col :span="18" v-if="item.type === 'TEXT'">
+                  <el-input v-model.trim="item.id" v-if="false"></el-input>
+                  <el-input type="textarea" :autosize="true" readonly class="updateContentInput" v-model.trim="item.itemContent" placeholder="请输入" clearable :maxlength="1000"></el-input>
+                </el-col>
+                <el-col :span="16" v-if="item.type === 'IMG'">
+                  <div style="padding-top: 10px">
+                    <el-input v-model.trim="item.id" v-if="false"></el-input>
+                    <div style="width: 30%;height: 30%;"  v-html="item.itemContent" @click="previewImage(item.itemContent)">{{item.itemContent}}</div>
+                  </div>
+                </el-col>
+                <el-col :span="16" v-if="item.type === 'TABLE'">
+                  <div style="padding-top: 10px" class="wordTableStyle">
+                    <el-input v-model.trim="item.id" v-if="false"></el-input>
+                    <div class="updateContentInput" v-html="item.itemContent">
+                    </div>
+                  </div>
+                </el-col>
+              </el-row>
+            </div>
+          </div>
+        </el-form>
       </div>
     </el-drawer>
     <!--编辑条款内容-->
@@ -1873,35 +1989,6 @@ export default {
         })
       }
     },
-    // 获取关联文件名称
-    getFileName (row) {
-      this.referanceStandList = []
-      if (row.referenceStand != null && row.referenceStand !== '') {
-        this.referanceStandList = row.referenceStand.split(',')
-      }
-      if (row.relevanceFile === null) {
-        this.standItemEO.FileNameList = []
-        this.showItemInfoModal = true
-        return false
-      } else {
-        this.$http.get('att/attFile/getMultiFileInfos', {
-          fileIds: row.relevanceFile
-        }, {
-          _this: this
-        }, res => {
-          // let fileNameList = []
-          // this.standItemEO.relevanceFileName = ''
-          // res.data.map((item) => {
-          //   fileNameList.push(item.oldFileName)
-          // })
-          // this.standItemEO.relevanceFileName = fileNameList.join('；')
-          this.standItemEO.FileNameList = res.data
-          this.showItemInfoModal = true
-        }, e => {
-          this.showItemInfoModal = true
-        })
-      }
-    },
     addSpecialRequest (item, index) {
       let specialObj = {
         description: '',
@@ -2084,7 +2171,7 @@ export default {
         //   this.clause(command[0])
         //   break
         case '属性':
-          this.attribute(command[0])
+          this.attribute(command[2], command[0])
           break
         case '编辑':
           this.editLawsInfo(command[2], command[0])
@@ -2154,9 +2241,65 @@ export default {
       this.showItemRequestDetails()
     },
     // 点击表格 属性按钮事件
-    attribute (row) {
+    attribute (index, row) {
-      this.getFileName(row)
+      this.isSubmit = false
-      this.showItemInfoEO = JSON.parse(JSON.stringify(row))
+      this.standItemEO.id = row.id
+      this.showItemInfoModal = true
+      this.saveEditItemIndex = index
+      this.standItemEO = JSON.parse(JSON.stringify(row))
+      if (this.standItemEO.applyArctic && !(this.standItemEO.applyArctic instanceof Array)) {
+        let a = this.standItemEO.applyArctic.split(',')
+        this.standItemEO.applyArctic = a // 适用车型
+      }
+      if (this.standItemEO.newcarPutTime != null && this.standItemEO.newcarPutTime !== '') {
+        this.standItemEO.newcarPutTime = this.standItemEO.newcarPutTime.replace(new RegExp(/-/gm), '/')
+        this.standItemEO.newcarPutTime = new Date(this.standItemEO.newcarPutTime)
+      }
+      if (this.standItemEO.productPutTime != null && this.standItemEO.productPutTime !== '') {
+        this.standItemEO.productPutTime = this.standItemEO.productPutTime.replace(new RegExp(/-/gm), '/')
+        this.standItemEO.productPutTime = new Date(this.standItemEO.productPutTime)
+      }
+      if (this.standItemEO.paramsList == null || this.standItemEO.paramsList.length < 1) {
+        let specialObj = {
+          description: '',
+          figure: ''
+        }
+        this.standItemEO.paramsList.push(specialObj)
+      }
+      this.standItemEO.ZRBM = this.standItemEO.responsibleUnit
+      this.saveItemId = row.id
+      this.showUpdateItemInfo()
+      // this.getFileName(row)
+      // this.showItemInfoEO = JSON.parse(JSON.stringify(row))
+    },
+    // 获取关联文件名称
+    getFileName (row) {
+      this.referanceStandList = []
+      if (row.referenceStand != null && row.referenceStand !== '') {
+        this.referanceStandList = row.referenceStand.split(',')
+      }
+      if (row.relevanceFile === null) {
+        this.standItemEO.FileNameList = []
+        this.showItemInfoModal = true
+        return false
+      } else {
+        this.$http.get('att/attFile/getMultiFileInfos', {
+          fileIds: row.relevanceFile
+        }, {
+          _this: this
+        }, res => {
+          // let fileNameList = []
+          // this.standItemEO.relevanceFileName = ''
+          // res.data.map((item) => {
+          //   fileNameList.push(item.oldFileName)
+          // })
+          // this.standItemEO.relevanceFileName = fileNameList.join('；')
+          this.standItemEO.FileNameList = res.data
+          this.showItemInfoModal = true
+        }, e => {
+          this.showItemInfoModal = true
+        })
+      }
     },
     getDicTypeName(opt, type) {
       const _type = type ? type.split(',') : []

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

@@ -103,18 +103,21 @@
                 <el-table-column
                         prop="itemsNum"
                         label="条款号"
+                        fixed
                         width="170"
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
+                        fixed
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itermsConditions"
                         label="条款内容"
+                        fixed
                         width="200"
                         show-overflow-tooltip
                         align="center">

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

@@ -143,17 +143,20 @@
                 prop="itemsNum"
                 label="条款号"
                 width="70"
+                fixed
                 align="center">
         </el-table-column>
         <el-table-column
                 prop="itemsName"
                 label="条款名称"
+                fixed
                 show-overflow-tooltip
                 align="center">
         </el-table-column>
         <el-table-column
                 prop="itermsConditions"
                 label="条款内容"
+                fixed
                 width="200"
                 show-overflow-tooltip
                 align="center">

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

@@ -107,12 +107,14 @@
         <el-table-column
           prop="itemsNum"
           label="条款号"
+          fixed
           width="120"
           align="center">
         </el-table-column>
         <el-table-column
           prop="itemsName"
           width="170"
+          fixed
           label="条款名称"
           show-overflow-tooltip
           align="center">
@@ -120,6 +122,7 @@
         <el-table-column
           prop="itermsConditions"
           label="条款内容"
+          fixed
           width="200"
           show-overflow-tooltip
           align="center">

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

@@ -82,6 +82,7 @@
                 <el-table-column
                         prop="itemsNum"
                         label="条款号"
+                        fixed
                         width="120"
                         align="center">
                 </el-table-column>
@@ -89,12 +90,14 @@
                         prop="itemsName"
                         width="170"
                         label="条款名称"
+                        fixed
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itermsConditions"
                         label="条款内容"
+                        fixed
                         width="200"
                         show-overflow-tooltip
                         align="center">

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

@@ -84,17 +84,20 @@
                         prop="itemsNum"
                         label="条款号"
                         width="70"
+                        fixed
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
                         show-overflow-tooltip
+                        fixed
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itermsConditions"
                         label="条款内容"
+                        fixed
                         width="200"
                         show-overflow-tooltip
                         align="center">
@@ -127,23 +130,6 @@
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
-                <el-table-column
-                        prop="complianceRequir"
-                        width="150"
-                        label="符合项状态"
-                        show-overflow-tooltip
-                        align="center">
-                    <template slot-scope="scope">
-                        {{ scope.row.complianceRequir === '1' ? '符合' : '不符合' }}
-                    </template>
-                </el-table-column>
-                <el-table-column
-                        prop="complianceState"
-                        width="200"
-                        label="合规性分析"
-                        show-overflow-tooltip
-                        align="center">
-                </el-table-column>
                 <el-table-column
                         prop="newData"
                         width="180"
@@ -182,6 +168,23 @@
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
+                <el-table-column
+                        prop="complianceRequir"
+                        width="150"
+                        label="符合项状态"
+                        show-overflow-tooltip
+                        align="center">
+                    <template slot-scope="scope">
+                        {{ scope.row.complianceRequir === '1' ? '符合' : '不符合' }}
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        prop="complianceState"
+                        width="200"
+                        label="合规性分析"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
                 <el-table-column
                         label="操作"
                         width="240"
@@ -355,27 +358,42 @@
             <div class="demo-drawer-content">
                 <el-form :model="editForm" class="label-input-form" ref="plForm" label-width=150>
                     <el-button v-if="form.itemsNum1" style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(editForm.itemsId, editForm.itemsId2)">查看比对</el-button>
-<!--                    <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item"  v-if="!form.itemsNum1">-->
+                    <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item"  v-if="!form.itemsNum1">
-<!--                        <el-input-->
+                        <el-input
-<!--                                v-model="editForm.technicalRequir"-->
+                                v-model="editForm.technicalRequir"
-<!--                                placeholder="请输入核心技术要求"-->
+                                placeholder="请输入核心技术要求"
-<!--                                maxlength="500"-->
+                                maxlength="500"
-<!--                        ></el-input>-->
+                        ></el-input>
-<!--                    </el-form-item>-->
+                    </el-form-item>
-<!--                    <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">-->
+                    <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
-<!--                        <el-input-->
+                        <el-input
-<!--                                v-model="editForm.changePoint"-->
+                                v-model="editForm.changePoint"
-<!--                                placeholder="请输入国内标准的差异点"-->
+                                placeholder="请输入国内标准的差异点"
-<!--                                maxlength="500"-->
+                                maxlength="500"
-<!--                        ></el-input>-->
+                        ></el-input>
-<!--                    </el-form-item>-->
+                    </el-form-item>
-<!--                    <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">-->
+                    <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
-<!--                        <el-input-->
+                        <el-input
-<!--                                v-model="editForm.changePoint"-->
+                                v-model="editForm.changePoint"
-<!--                                placeholder="请输入上一版本差异点"-->
+                                placeholder="请输入上一版本差异点"
-<!--                                maxlength="500"-->
+                                maxlength="500"
-<!--                        ></el-input>-->
+                        ></el-input>
-<!--                    </el-form-item>-->
+                    </el-form-item>
+                    <custom-date-pick-group
+                            class="myDataPick"
+                            :config="{attrName: '新车型实施日期'}"
+                            v-model="editForm.newData"
+                    ></custom-date-pick-group>
+                    <custom-date-pick-group
+                            class="myDataPick"
+                            :config="{attrName: '在产车实施日期'}"
+                            v-model="editForm.onlineData"
+                    ></custom-date-pick-group>
+                    <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
+                        <el-select multiple  v-model="editForm.applyArctic">
+                            <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
+                        </el-select>
+                    </el-form-item>
                     <el-form-item label="符合性要求" prop="complianceRequir" class="add-form-item" >
                         <el-select
                                 v-model="editForm.complianceRequir"
@@ -391,21 +409,6 @@
                                 maxlength="500"
                         ></el-input>
                     </el-form-item>
-<!--                    <custom-date-pick-group-->
-<!--                            class="myDataPick"-->
-<!--                            :config="{attrName: '新车型实施日期'}"-->
-<!--                            v-model="editForm.newData"-->
-<!--                    ></custom-date-pick-group>-->
-<!--                    <custom-date-pick-group-->
-<!--                            class="myDataPick"-->
-<!--                            :config="{attrName: '在产车实施日期'}"-->
-<!--                            v-model="editForm.onlineData"-->
-<!--                    ></custom-date-pick-group>-->
-<!--                    <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >-->
-<!--                        <el-select multiple  v-model="editForm.applyArctic">-->
-<!--                            <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>-->
-<!--                        </el-select>-->
-<!--                    </el-form-item>-->
                 </el-form>
             </div>
             <div id="roleFormButton3" class="demo-drawer-footer">
@@ -475,20 +478,20 @@
                 plForm: {
                     technicalRequir: '', // 核心技术要求
                     changePoint: '', // 国内标准的差异点
-                    complianceRequir: '1', // 符合性要求
+                    complianceRequir: '', // 符合性要求
                     complianceState: '', // 合规性分析
                     newData: '', // 新车型实施日期
                     onlineData: '', // 在产车实施日期
                     applyArctic: '', // 适用车型
                 },
                 editForm: {
-                    // technicalRequir: '', // 核心技术要求
+                    technicalRequir: '', // 核心技术要求
-                    // changePoint: '', // 国内标准的差异点
+                    changePoint: '', // 国内标准的差异点
-                    complianceRequir: '1', // 符合性要求
+                    complianceRequir: '', // 符合性要求
                     complianceState: '', // 合规性分析
-                    // newData: '', // 新车型实施日期
+                    newData: '', // 新车型实施日期
-                    // onlineData: '', // 在产车实施日期
+                    onlineData: '', // 在产车实施日期
-                    // applyArctic: '', // 适用车型
+                    applyArctic: '', // 适用车型
                     itemsId: '',
                 },
                 modalshowflag: false,
@@ -577,13 +580,13 @@
                 this.itemId = row.id
                 this.modalshowflag2 = true
                 this.editForm = {
-                    // technicalRequir: row.technicalRequir, // 核心技术要求
+                    technicalRequir: row.technicalRequir, // 核心技术要求
-                    // changePoint: row.changePoint, // 国内标准的差异点
+                    changePoint: row.changePoint, // 国内标准的差异点
                     complianceRequir: row.complianceRequir || '1', // 符合性要求
                     complianceState: row.complianceState, // 合规性分析
-                    // newData: row.newData, // 新车型实施日期
+                    newData: row.newData, // 新车型实施日期
-                    // onlineData: row.onlineData, // 在产车实施日期
+                    onlineData: row.onlineData, // 在产车实施日期
-                    // applyArctic: row.applyArctic, // 适用车型
+                    applyArctic: row.applyArctic, // 适用车型
                     itemsId: row.itemsId,
                     itemsId2: row.itemsId2
                 }
@@ -591,13 +594,13 @@
             saveUserInfo2 () {
                 for( let a = 0; a < this.itemList.length; a++) {
                     if (this.itemList[a].id === this.itemId) {
-                        // this.itemList[a].technicalRequir = this.editForm.technicalRequir
+                        this.itemList[a].technicalRequir = this.editForm.technicalRequir
-                        // this.itemList[a].changePoint = this.editForm.changePoint
+                        this.itemList[a].changePoint = this.editForm.changePoint
                         this.itemList[a].complianceRequir = this.editForm.complianceRequir
                         this.itemList[a].complianceState = this.editForm.complianceState
-                        // this.itemList[a].newData = this.editForm.newData
+                        this.itemList[a].newData = this.editForm.newData
-                        // this.itemList[a].onlineData = this.editForm.onlineData
+                        this.itemList[a].onlineData = this.editForm.onlineData
-                        // this.itemList[a].applyArctic = this.editForm.applyArctic
+                        this.itemList[a].applyArctic = this.editForm.applyArctic
                     }
                 }
                 this.modalshowflag2 = false
@@ -660,13 +663,13 @@
                 for( let a = 0; a < this.itemList.length; a++) {
                     for ( let b = 0; b < this.idList.length; b++) {
                         if (this.itemList[a].id === this.idList[b]) {
-                            // this.itemList[a].technicalRequir = this.plForm.technicalRequir
+                            this.itemList[a].technicalRequir = this.plForm.technicalRequir
-                            // this.itemList[a].changePoint = this.plForm.changePoint
+                            this.itemList[a].changePoint = this.plForm.changePoint
                             this.itemList[a].complianceRequir = this.plForm.complianceRequir
                             this.itemList[a].complianceState = this.plForm.complianceState
-                            // this.itemList[a].newData = this.plForm.newData
+                            this.itemList[a].newData = this.plForm.newData
-                            // this.itemList[a].onlineData = this.plForm.onlineData
+                            this.itemList[a].onlineData = this.plForm.onlineData
-                            // this.itemList[a].applyArctic = this.plForm.applyArctic
+                            this.itemList[a].applyArctic = this.plForm.applyArctic
                         }
                     }
                 }
@@ -732,14 +735,56 @@
             handleSubmit() {
                 this.$refs['bzzqyjForm'].validate((valid) => {
                     if (valid) {
-                        let num3 = 0
+                        let num1 = 0, num2 = 0, num4 = 0, num5 = 0, num6 = 0, b = 0, num3 = 0
                         for (let a = 0; a < this.itemList.length; a++) {
+                            if (!this.itemList[a].technicalRequir) {
+                                num1++
+                            }
+                            if (!this.itemList[a].changePoint) {
+                                num2++
+                            }
                             if (!this.itemList[a].complianceRequir) {
                                 num3++
                             }
+                            if (!this.itemList[a].newData) {
+                                num4++
+                            }
+                            if (!this.itemList[a].onlineData) {
+                                num5++
+                            }
+                            if (!this.itemList[a].applyArctic.length) {
+                                num6++
+                            }
+                            if (!this.itemList[a].zrUserId) {
+                                b++
+                            }
+                        }
+                        if (!this.form.itemsNum1) {
+                            if (num1 > 0) {
+                                this.$message.warning('请输入核心技术要求')
+                                return
+                            }
+                        } else {
+                            if (num2 > 0) {
+                                if (this.sarType !== 'INLAND') {
+                                    this.$message.warning('请输入国内标准的差异点')
+                                    return
+                                } else {
+                                    this.$message.warning('请输入基于上一版本差异')
+                                    return
+                                }
+                            }
                         }
                         if (num3 > 0) {
                             this.$message.warning('请输入符合性要求')
+                        } else if (num4 > 0) {
+                            this.$message.warning('请输入新车型实施日期')
+                        } else if (num5 > 0) {
+                            this.$message.warning('请输入在产车实施日期')
+                        } else if (num6 > 0) {
+                            this.$message.warning('请选择适用车型')
+                        } else if (b > 0) {
+                            this.$message.warning('请选择责任人')
                         } else {
                             this.isSubmit = true
                             var json = this.json

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

@@ -79,17 +79,20 @@
                         prop="itemsNum"
                         label="条款号"
                         width="70"
+                        fixed
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
+                        fixed
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itermsConditions"
                         label="条款内容"
+                        fixed
                         width="200"
                         show-overflow-tooltip
                         align="center">
@@ -121,23 +124,6 @@
                         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"
                         show-overflow-tooltip
@@ -174,6 +160,23 @@
                         prop="zrUserName"
                         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
                         label="操作"
                         width="140"

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

@@ -78,18 +78,21 @@
                 <el-table-column
                         prop="itemsNum"
                         label="条款号"
+                        fixed
                         width="70"
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
+                        fixed
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itermsConditions"
                         label="条款内容"
+                        fixed
                         width="200"
                         show-overflow-tooltip
                         align="center">
@@ -121,23 +124,6 @@
                         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
                         show-overflow-tooltip
                         prop="newData"
@@ -174,6 +160,23 @@
                         prop="zrUserName"
                         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
                         label="操作"
                         v-if="form.itemsNum1"

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

@@ -79,18 +79,21 @@
                 <el-table-column
                         prop="itemsNum"
                         label="条款号"
+                        fixed
                         width="70"
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
+                        fixed
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itermsConditions"
                         label="条款内容"
+                        fixed
                         width="200"
                         show-overflow-tooltip
                         align="center">
@@ -122,23 +125,6 @@
                         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="150"
@@ -175,6 +161,23 @@
                         prop="zrUserName"
                         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
                         label="操作"
                         v-if="form.itemsNum1"

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

@@ -49,7 +49,7 @@
                     />
                     <i
                       title="下载带水印"
-                      @click.stop="downloadFileByWater(item.id, item.name)"
+                      @click.stop="downloadFileByWater(item.id, item.fileSuffix)"
                       class="icon-download2"
                       v-btn-permission="''"
                     />
@@ -360,7 +360,8 @@ export default {
               name: item.oldFileName,
               uid: item.uid,
               status: item.status,
-              id: item.id
+              id: item.id,
+              fileSuffix: item.fileSuffix
             });
           });
         });

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

@@ -274,75 +274,77 @@
                 </el-form-item>
               </el-form>
             </div>
-            <el-table
+            <div class="table-height">
-              :data="standardData"
+              <el-table
-              v-loading="loading"
+                :data="standardData"
-              tooltip-effect="dark"
+                v-loading="loading"
-              style="width: 100%"
+                tooltip-effect="dark"
-              border
+                style="width: 100%"
-              ref="table"
+                border
-              class="table-height"
+                ref="table"
-              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+                height="100%"
+                :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-              @selection-change="selectThree"
+                @selection-change="selectThree"
-            >
-              <el-table-column
-                type="selection"
-                width="55"
-                align="center">
-              </el-table-column>
-              <el-table-column
-                prop="code"
-                align="center"
-                label="标准号">
-                <template slot-scope="scope">
-                  <a v-if="scope.row.standYear" class="table-jump"
-                     @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
-                      scope.row.standNumber
-                    }}-{{ scope.row.standYear }}</a>
-                  <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
-                      scope.row.standSortShow }}
-                    {{ scope.row.standNumber }}</a>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="standName"
-                align="center"
-                label="标准名称"
               >
-                <template slot-scope="scope">
+                <el-table-column
-                  <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName}}</a>
+                  type="selection"
-                </template>
+                  width="55"
-              </el-table-column>
+                  align="center">
-              <el-table-column
+                </el-table-column>
-                prop="issueTime"
+                <el-table-column
-                align="center"
+                  prop="code"
-                label="发布日期">
+                  align="center"
-                <template slot-scope="scope">
+                  label="标准号">
-                  <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+                  <template slot-scope="scope">
-                </template>
+                    <a v-if="scope.row.standYear" class="table-jump"
-              </el-table-column>
+                       @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
-              <el-table-column
+                        scope.row.standNumber
-                prop="XCXSSRQ"
+                      }}-{{ scope.row.standYear }}</a>
-                align="center"
+                    <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
-                label="新车型实施日期">
+                        scope.row.standSortShow }}
-              </el-table-column>
+                      {{ scope.row.standNumber }}</a>
-              <el-table-column
+                  </template>
-                show-overflow-tooltip
+                </el-table-column>
-                prop="ZCCSSRQ"
+                <el-table-column
-                align="center"
+                  prop="standName"
-                label="在产车实施日期">
+                  align="center"
-              </el-table-column>
+                  label="标准名称"
-              <el-table-column
+                >
-                show-overflow-tooltip
+                  <template slot-scope="scope">
-                prop="textStatus"
+                    <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName}}</a>
-                align="center"
+                  </template>
-                label="文本状态">
+                </el-table-column>
-                <template slot-scope="scope">
+                <el-table-column
-                  <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                  prop="issueTime"
-                </template>
+                  align="center"
-              </el-table-column>
+                  label="发布日期">
-            </el-table>
+                  <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"
+                  align="center"
+                  label="新车型实施日期">
+                </el-table-column>
+                <el-table-column
+                  show-overflow-tooltip
+                  prop="ZCCSSRQ"
+                  align="center"
+                  label="在产车实施日期">
+                </el-table-column>
+                <el-table-column
+                  show-overflow-tooltip
+                  prop="textStatus"
+                  align="center"
+                  label="文本状态">
+                  <template slot-scope="scope">
+                    <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
           </div>
           <pagination
             :page="pageNo"

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

@@ -49,7 +49,7 @@
                     />
                     <i
                       title="下载带水印"
-                      @click.stop="downloadFileByWater(item.id, item.name)"
+                      @click.stop="downloadFileByWater(item.id, item.fileSuffix)"
                       class="icon-download2"
                       v-btn-permission="''"
                     />
@@ -429,7 +429,8 @@ export default {
               name: item.oldFileName,
               uid: item.uid,
               status: item.status,
-              id: item.id
+              id: item.id,
+              fileSuffix: item.fileSuffix
             });
           });
         });

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

@@ -126,6 +126,7 @@
                     <el-radio label="1">是</el-radio>
                     <el-radio label="2">否</el-radio>
                   </el-radio-group>
+                  <el-button @click="form.isRelateAccess = ''" v-show="form.isRelateAccess.length>0" size="mini" type="primary" circle icon="el-icon-close" style="margin-left: 10px;margin-bottom: 3px"></el-button>
                 </el-form-item>
                 <el-form-item v-if="verifySarStandard && form.standInData === '0' " label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
                   <el-input v-model="form.standSystem" clearable placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
@@ -1836,9 +1837,11 @@ export default {
       /** val === '1' (国外) val  === '0'（ 国内 ）*/
       // 国内英文名称不必填 国外必填 ，标准性质国内不体现
       if (val === '1') {
+        this.rules.standName[0].required = false
         this.rules.standEnName[0].required = true;
         this.rules.standNature[0].required = false
       } else {
+        this.rules.standName[0].required = true
         this.rules.standNature[0].required = true
         this.rules.standEnName[0].required = false;
       }
@@ -3120,6 +3123,9 @@ export default {
 @import '~@/assets/styles/style';
 
 .bzrkStep1 {
+  /deep/ .el-button--mini.is-circle {
+    padding: 2px;
+  }
   /deep/ .prc-content-border .form-item-disabled .el-form-item__content .el-input .el-input__inner {
     width: 70%;
   }

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

@@ -26,7 +26,7 @@
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
-                  <el-radio-group v-model="form.standInData">
+                  <el-radio-group v-model="form.standInData" @change="standInChange">
                     <el-radio label="0">国内标准入库</el-radio>
                     <el-radio label="1">海外标准入库</el-radio>
                   </el-radio-group>
@@ -1692,6 +1692,23 @@ export default {
     },
   },
   methods: {
+    // 标准来源改变事件
+    standInChange(val) {
+      this.verifySarStandard = false
+
+      /** val === '1' (国外) val  === '0'（ 国内 ）*/
+      // 国内英文名称不必填 国外必填 ，标准性质国内不体现
+      if (val === '1') {
+        this.rules.standName[0].required = false
+        this.rules.standNature[0].required = false
+        this.rules.standEnName[0].required = true;
+      } else {
+        this.rules.standName[0].required = true
+        this.rules.standNature[0].required = true
+        this.rules.standEnName[0].required = false;
+      }
+      this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN'
+    },
     getBusStandFileByAttId(attId) {
       return new Promise((resolve, reject) => {
         getBusStandFileByAttId({

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

@@ -155,6 +155,8 @@
           background
           :page-sizes="[20, 40, 60]"
           :total="total"
+          :page-size="pageSize"
+          @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
         >
         </el-pagination>
@@ -297,30 +299,6 @@ export default {
       });
       window.open(routeUrl.href, "_blank");
     },
-    //查询项目下的标准
-    getStandData() {
-      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
-        standType: this.standardSearch.standType,
-        standNumber: this.standardSearch.standNumber,
-        page: this.pageNo,
-        pageSize: this.pageSizeNo
-      }, {
-        _this: this
-      }, 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.totalNo = res.data.count;
-      }, e => {
-      });
-    },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,
@@ -398,6 +376,9 @@ export default {
     handleCurrentChange(currentPage) {
       this.currentPage = currentPage;
     },
+    handleSizeChange(size) {
+      this.pageSize = size;
+    },
     //驳回事件
     beforeBack() {
       if(this.commentText === null || this.commentText === undefined || this.commentText === ''){

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

@@ -200,6 +200,8 @@
           background
           :page-sizes="[20, 40, 60]"
           :total="total"
+          :page-size="pageSize"
+          @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
         >
         </el-pagination>
@@ -551,6 +553,9 @@ export default {
     handleCurrentChange(currentPage) {
       this.currentPage = currentPage;
     },
+    handleSizeChange(size) {
+      this.pageSize = size;
+    },
   },
   computed: {
     listNoDataText() {

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

@@ -200,6 +200,8 @@
           background
           :page-sizes="[20, 40, 60]"
           :total="total"
+          :page-size="pageSize"
+          @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
         >
         </el-pagination>
@@ -526,6 +528,9 @@ export default {
     handleCurrentChange(currentPage) {
       this.currentPage = currentPage;
     },
+    handleSizeChange(size) {
+      this.pageSize = size;
+    },
   },
 
   computed: {

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

@@ -200,6 +200,8 @@
           background
           :page-sizes="[20, 40, 60]"
           :total="total"
+          :page-size="pageSize"
+          @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
         >
         </el-pagination>
@@ -551,6 +553,9 @@ export default {
     handleCurrentChange(currentPage) {
       this.currentPage = currentPage;
     },
+    handleSizeChange(size) {
+      this.pageSize = size;
+    },
   },
   computed: {
     listNoDataText() {

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

@@ -226,6 +226,8 @@
           background
           :page-sizes="[20, 40, 60]"
           :total="total"
+          :page-size="pageSize"
+          @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
         >
         </el-pagination>
@@ -753,6 +755,9 @@ export default {
     handleCurrentChange(currentPage) {
       this.currentPage = currentPage;
     },
+    handleSizeChange(size) {
+      this.pageSize = size;
+    },
     //保存事件
     handleSave() {
       this.saveLoading = true;

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

@@ -158,6 +158,8 @@
           background
           :page-sizes="[20, 40, 60]"
           :total="total"
+          :page-size="pageSize"
+          @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
         >
         </el-pagination>
@@ -367,30 +369,6 @@ export default {
       });
       window.open(routeUrl.href, "_blank");
     },
-    //查询项目下的标准
-    getStandData() {
-      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
-        standType: this.standardSearch.standType,
-        standNumber: this.standardSearch.standNumber,
-        page: this.pageNo,
-        pageSize: this.pageSizeNo
-      }, {
-        _this: this
-      }, 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.totalNo = res.data.count;
-      }, e => {
-      });
-    },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,
@@ -509,6 +487,9 @@ export default {
     handleCurrentChange(currentPage) {
       this.currentPage = currentPage;
     },
+    handleSizeChange(size) {
+      this.pageSize = size;
+    },
   },
   computed: {
     listNoDataText() {

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

@@ -198,6 +198,8 @@
           background
           :page-sizes="[20, 40, 60]"
           :total="total"
+          :page-size="pageSize"
+          @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
         >
         </el-pagination>
@@ -549,6 +551,9 @@ export default {
     handleCurrentChange(currentPage) {
       this.currentPage = currentPage;
     },
+    handleSizeChange(size) {
+      this.pageSize = size;
+    },
   },
   computed: {
     listNoDataText() {

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

@@ -200,6 +200,8 @@
           background
           :page-sizes="[20, 40, 60]"
           :total="total"
+          :page-size="pageSize"
+          @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
         >
         </el-pagination>
@@ -551,6 +553,9 @@ export default {
     handleCurrentChange(currentPage) {
       this.currentPage = currentPage;
     },
+    handleSizeChange(size) {
+      this.pageSize = size;
+    },
   },
   computed: {
     listNoDataText() {