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

src/pages/details/otherLawsStandDetails/index.vue

@@ -17,7 +17,7 @@
       >
         <el-collapse v-model="activeNames" @change="handleChange">
           <div v-if="item.label === '基础信息'" class="details-content-modular basic-information"
-               style="border-top:none;position: absolute;right: 36px;border: none">
+               style="border-top:none; position: absolute;right: 36px;border: none">
             <div class="modular-header" style="height: 50px;">
               <div class="modular-header-btn">
                 <el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="el-icon-star-on" :loading="isSubmit"></el-button>

src/pages/details/otherStandardDetails/index.vue

@@ -46,7 +46,7 @@
             </template>
             <div class="modular-content">
               <template v-if="item.label === '基础信息'">
-                <div class="details-content-modular basic-information" style="border-top:none">
+                <div class="details-content-modular basic-information" style="border-top:none; border-bottom: none;">
                   <div class="basic-information-content">
                     <!--                <p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>-->
                     <p class="">
@@ -906,7 +906,6 @@
         <!--适用车型-->
         <template>
           <custom-select-array
-              :key="applyArcticOptions.options"
               :config="applyArcticOptions"
               v-model="resolveListForm.applyArctic"
           ></custom-select-array>
@@ -1020,7 +1019,6 @@
           </el-form-item>
           <el-row>
             <custom-org
-                key="responsibleUnit"
                 :config="{
                 attrName: '责任部门',
                 attrField: 'responsibleUnit',
@@ -1036,7 +1034,6 @@
           </el-row>
           <el-row>
             <custom-org
-                key="FO"
                 :config="{
                 attrName: 'FO',
                 attrField: 'FO',
@@ -1052,7 +1049,6 @@
           </el-row>
           <el-row>
             <custom-org
-                key="dutyEngineer"
                 :config="{
                 attrName: '责任工程师',
                 attrField: 'dutyEngineer',
@@ -1068,7 +1064,6 @@
           </el-row>
           <el-row>
             <custom-SVPPS
-                key="svpps"
                 :config="{
                 attrName: 'SVPPS',
                 attrField: 'SVPPS',
@@ -1081,8 +1076,8 @@
           <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"
+                  v-for="(opt, index) in applyArcticOptions"
-                  :key="opt.value"
+                  :key="index"
                   :label="opt.label"
                   :value="opt.value">
               </el-option>
@@ -1091,8 +1086,8 @@
           <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"
+                  v-for="(opt, index) in requestOptions"
-                  :key="opt.value"
+                  :key="index"
                   :label="opt.label"
                   :value="opt.value">
               </el-option>
@@ -1105,8 +1100,8 @@
                 placeholder="请选择"
             >
               <el-option
-                  v-for="item in BZFGGXOUIUJ"
+                  v-for="(item, index) in BZFGGXOUIUJ"
-                  :key="item.value"
+                  :key="index"
                   :value="item.value"
                   :label="item.label"
               ></el-option>
@@ -1152,22 +1147,22 @@
       <div class="see-drawer-content">
         <div class="see-drawer-div">
           <label class="see-drawer-name" style="font-size: 14px" title="条款号">条款号</label>
-          <span class="see-drawer-val" :title="standShowItemEO.itemsNum">{{ standShowItemEO.itemsNum }}</span>
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.itemsNum">{{ standShowItemEO.itemsNum }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="条款名称">条款名称</label>
+          <label class="see-drawer-name" style="font-size: 14px" title="条款名称">条款名称</label>
-          <span class="see-drawer-val" :title="standShowItemEO.itemsName">{{ standShowItemEO.itemsName }}</span>
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.itemsName">{{ standShowItemEO.itemsName }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="内容简介">条款内容</label>
+          <label class="see-drawer-name" style="font-size: 14px" title="内容简介">条款内容</label>
-          <span class="see-drawer-val"
+          <span class="see-drawer-val" style="font-size: 12px"
                 :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" style="font-size: 15px" title="解读内容">解读内容</label>
+          <label class="see-drawer-name" style="font-size: 14px" title="解读内容">解读内容</label>
-          <span class="see-drawer-val"
+          <span class="see-drawer-val" style="font-size: 12px"
                 :title="standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''">
             {{
               standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''
@@ -1175,49 +1170,49 @@
         </div>
 
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="新车型实施日期">新车型实施日期</label>
+          <label class="see-drawer-name" style="font-size: 14px" title="新车型实施日期">新车型实施日期</label>
-          <span class="see-drawer-val"
+          <span class="see-drawer-val" style="font-size: 12px"
                 :title="standShowItemEO.xcxssrq">{{
               standShowItemEO.xccssrq
             }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="在产车实施日期">在产车实施日期</label>
+          <label class="see-drawer-name" style="font-size: 14px" title="在产车实施日期">在产车实施日期</label>
-          <span class="see-drawer-val"
+          <span class="see-drawer-val" style="font-size: 12px"
                 :title="standShowItemEO.zccssrq">{{
               standShowItemEO.zccssrq
             }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="适用车型">适用车型</label>
+          <label class="see-drawer-name" style="font-size: 14px" title="适用车型">适用车型</label>
-          <span class="see-drawer-val" :title="standShowItemEO.applyArctic">{{ standShowItemEO.applyArctic }}</span>
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.applyArctic">{{ standShowItemEO.applyArctic }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="责任部门">责任部门</label>
+          <label class="see-drawer-name" style="font-size: 14px" title="责任部门">责任部门</label>
-          <span class="see-drawer-val" :title="standShowItemEO.responsibleUnit">{{
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.responsibleUnit">{{
               standShowItemEO.responsibleUnit
             }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="责任工程师">责任工程师</label>
+          <label class="see-drawer-name" style="font-size: 14px" title="责任工程师">责任工程师</label>
-          <span class="see-drawer-val" :title="standShowItemEO.dutyEngineer">
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.dutyEngineer">
             {{ standShowItemEO.dutyEngineer }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="基于上一版本差异">基于上一版本差异</label>
+          <label class="see-drawer-name" style="font-size: 14px" title="基于上一版本差异">基于上一版本差异</label>
-          <span class="see-drawer-val" :title="standShowItemEO.comparedWithPrevious">
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.comparedWithPrevious">
             {{ standShowItemEO.comparedWithPrevious }}</span>
         </div>
 
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="符合性状态">符合性状态</label>
+          <label class="see-drawer-name" style="font-size: 14px" title="符合性状态">符合性状态</label>
-          <span class="see-drawer-val" :title="standShowItemEO.complianceRequire">
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceRequire">
             {{ standShowItemEO.complianceRequire }}</span>
         </div>
 
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="合规性分析">合规性分析</label>
+          <label class="see-drawer-name" style="font-size: 14px" title="合规性分析">合规性分析</label>
-          <span class="see-drawer-val" :title="standShowItemEO.complianceState">
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceState">
             {{ standShowItemEO.complianceState }}</span>
         </div>
         <!--        <div class="see-drawer-div">-->

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

@@ -410,7 +410,7 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.PPTX' || fileSuffix === '.pptx') {
                     return true
                 } else {
                     this.spinShow = false

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

@@ -402,7 +402,7 @@ export default {
       var fileSuffix = filename.substring(index1, index2)
       // const fileSuffix = file.name.split('.')[1] // 后缀名
       // 判断上传文件格式
-      if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
+      if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.PPTX' || fileSuffix === '.pptx') {
         return true
       } else {
         this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件')

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

@@ -68,6 +68,7 @@
                                         <el-date-picker
                                                 v-model="form.endTime"
                                                 type="date"
+                                                :picker-options="pickerOptions"
                                                 placeholder="请选择截止日期"
                                                 value-format="yyyy-MM-dd">
                                         </el-date-picker>
@@ -553,6 +554,11 @@
         name: "bzjdStep1-1",
         data() {
             return {
+                pickerOptions: {
+                    disabledDate(time) {
+                        return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
+                    }
+                },
                 similarityDegree: '',
                 leftData: [],
                 rightData: [],

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

@@ -139,51 +139,51 @@
          fontWeight: 'bold', height: '48px'}"
                 row-key="id"
       >
-        <el-table-column type="selection" width="55" align="center"/>
         <el-table-column
-          prop="itemsNum"
+                prop="itemsNum"
-          label="条款号"
+                label="条款号"
-          width="70"
+                width="70"
-          align="center">
+                align="center">
         </el-table-column>
         <el-table-column
-          prop="itemsName"
+                prop="itemsName"
-          label="条款名称"
+                label="条款名称"
-          show-overflow-tooltip
+                show-overflow-tooltip
-          align="center">
+                align="center">
         </el-table-column>
         <el-table-column
-          prop="itermsConditions"
+                prop="itermsConditions"
-          label="条款内容"
+                label="条款内容"
-          width="200"
+                width="200"
-          show-overflow-tooltip
+                show-overflow-tooltip
-          align="center">
+                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
+                show-overflow-tooltip
-          prop="technicalRequir"
+                prop="technicalRequir"
-          width="200"
+                width="200"
-          label="核心技术要求"
+                v-if="!form.itemsNum1"
-          align="center">
+                label="核心技术要求"
+                align="center">
         </el-table-column>
         <el-table-column
-          show-overflow-tooltip
+                show-overflow-tooltip
-          v-if="sarType === 'INLAND' && form.itemsNum1"
+                v-if="sarType === 'INLAND' && form.itemsNum1"
-          prop="changePoint"
+                prop="changePoint"
-          width="150"
+                width="150"
-          label="基于上一版本差异"
+                label="基于上一版本差异"
-          align="center">
+                align="center">
         </el-table-column>
         <el-table-column
-          show-overflow-tooltip
+                show-overflow-tooltip
-          v-if="sarType === 'FOREIGN'"
+                v-if="sarType === 'FOREIGN'"
-          prop="changePoint"
+                prop="changePoint"
-          width="150"
+                width="150"
-          label="相对于国行标差异点"
+                label="相对于国行标差异点"
-          align="center">
+                align="center">
         </el-table-column>
         <el-table-column
           prop="complianceRequir"
@@ -236,9 +236,18 @@
         <el-table-column
           label="责任人"
           width="170"
-          prop="zrUserIdName"
+          prop="zrUserName"
           align="center">
         </el-table-column>
+        <el-table-column
+                label="操作"
+                v-if="form.itemsNum1"
+                width="140"
+                align="center">
+          <template slot-scope="scope">
+            <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
+          </template>
+        </el-table-column>
       </el-table>
       <el-collapse accordion>
         <el-collapse-item title="审批意见">
@@ -323,6 +332,16 @@
       </div>
     </el-dialog>
     <loading :loading="loading">加载中...</loading>
+    <el-dialog
+            title="查看比对内容"
+            :visible.sync="BDmodel"
+            size="1100px">
+      <div>相似度:{{ similarityDegree }}</div>
+      <div style="height: 600px;overflow: auto;display: flex;">
+        <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+        <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -336,6 +355,11 @@ export default {
   name: "bzjdStep1-6",
   data() {
     return {
+      similarityDegree: '',
+      BDmodel: false,
+      oldNumber: '',
+      leftData: '',
+      rightData: '',
       //折叠的标志，true为折叠，false为不折叠
       foldFormFlag: false,
       itermsConditionsFlag: false,
@@ -366,6 +390,57 @@ export default {
     ProcessTitle
   },
   methods: {
+    getBDList () {
+      this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
+        standHisId: this.oldNumber,
+        leftOrRight: 'LEFT'
+      }, {
+        _this: this
+      }, res => {
+        for (let a = 0; a < this.itemList.length; a++) {
+          for (let b = 0; b < res.data.length; b++) {
+            if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
+              this.itemList[a].itemsId = res.data[b].itemsId
+            }
+          }
+        }
+      }, e => {
+      })
+      this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
+        standHisId: this.oldNumber,
+        leftOrRight: 'RIGHT'
+      }, {
+        _this: this
+      }, res => {
+        for (let a = 0; a < this.itemList.length; a++) {
+          for (let b = 0; b < res.data.length; b++) {
+            if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
+              this.itemList[a].itemsId2 = res.data[b].itemsId
+            }
+          }
+        }
+      }, e => {
+      })
+    },
+    checkBD (id,id2) {
+      let itemsEoPage = {
+        oldItemId: id,
+        newItemId: id2,
+        flag: 1
+      }
+      this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
+        _this: this
+      }, res => {
+        if (res.data.leftString === '' && res.data.rightString === '') {
+          this.$message.warning('暂无找到相似的文本')
+        } else {
+          this.leftData = res.data.leftString
+          this.rightData = res.data.rightString
+          this.BDmodel = true
+          this.similarityDegree = res.data.similarityDegree
+        }
+      })
+    },
     //折叠/展开基础信息方法
     foldForm() {
       this.foldFormFlag = !this.foldFormFlag
@@ -418,12 +493,18 @@ export default {
           let data = JSON.parse(res.mesg)
           this.form.itemsNum = data.itemsNum || data.form.itemsNum
           this.form.itemsName = data.itemsName || data.form.itemsName
-          this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
+          if (data.form) {
-          this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
+            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.itemList = data.itemList
           this.loading = false
+          this.getBDList()
         }).catch(e => {
         })
       })

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

@@ -69,6 +69,7 @@
                   <el-date-picker
                           v-model="form.endTime"
                           type="date"
+                          :picker-options="pickerOptions"
                           placeholder="请选择截止日期"
                           value-format="yyyy-MM-dd">
                   </el-date-picker>
@@ -95,11 +96,14 @@
                 tooltip-effect="dark"
                 style="width: 100%;"
                 height="100%"
-                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',fontWeight: 'bold', height: '48px'}"
-         fontWeight: 'bold', height: '48px'}"
                 @selection-change="handleSelectionChange"
                 row-key="id">
-        <el-table-column type="selection" width="55" align="center"/>
+        <el-table-column
+                type="selection"
+                width="55"
+                align="center">
+        </el-table-column>
         <el-table-column
           prop="itemsNum"
           label="条款号"
@@ -563,6 +567,11 @@ export default {
   name: "bzjdStep1",
   data() {
     return {
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
+        }
+      },
       similarityDegree: '',
       leftData: [],
       rightData: [],

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

@@ -525,6 +525,7 @@
                         this.json = data
                         this.itemList = data.itemList
                         this.loading = false
+                        this.getBDList()
                     }).catch(e => {
                     })
                 })

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

@@ -396,21 +396,6 @@
                     }
                 })
             },
-            itemEdit (row) {
-                this.itemId = row.id
-                this.modalshowflag2 = true
-                this.editForm = {
-                    technicalRequir: row.technicalRequir, // 核心技术要求
-                    changePoint: row.changePoint, // 国内标准的差异点
-                    complianceRequir: row.complianceRequir || '1', // 符合性要求
-                    complianceState: row.complianceState, // 合规性分析
-                    newData: row.newData, // 新车型实施日期
-                    onlineData: row.onlineData, // 在产车实施日期
-                    applyArctic: row.applyArctic, // 适用车型
-                    itemsId: row.itemsId,
-                    itemsId2: row.itemsId2
-                }
-            },
             handleTransfer() {
                 this.drawerModal = true
             },
@@ -524,6 +509,7 @@
                         this.json = data
                         this.itemList = data.itemList
                         this.loading = false
+                        this.getBDList()
                     }).catch(e => {
                     })
                 })

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

@@ -399,10 +399,7 @@ export default {
           {required: true, message: '请输入标准编号', trigger: 'change'},
         ],
         endTime: [
-          {required: true, message: '请输入标准结束日期', trigger: 'change'},
+          {required: true, message: '请输入征求意见结束日期', trigger: 'change'},
-        ],
-        cname: [
-          {required: true, message: '请输入标准名称', trigger: 'change'},
         ],
         fjListId: [
           {required: true, message: '请选择附件', trigger: 'change'},

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

@@ -410,7 +410,7 @@ export default {
           {required: true, message: '请输入标准编号', trigger: 'change'},
         ],
         endTime: [
-          {required: true, message: '请输入标准结束日期', trigger: 'change'},
+          {required: true, message: '请输入征求意见结束日期', trigger: 'change'},
         ],
         fjListId: [
           {required: true, message: '请选择附件', trigger: 'change'},

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

@@ -184,7 +184,7 @@
         </el-table>
       </div>
       <el-collapse accordion>
-        <el-collapse-item title="审批意见">
+        <el-collapse-item title="回执说明">
           <div style="margin: 10px 0;">
             <el-input
               type="textarea"

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

@@ -179,7 +179,7 @@
         </el-table>
       </div>
       <el-collapse accordion>
-        <el-collapse-item title="审批意见">
+        <el-collapse-item title="回执说明">
           <div style="margin: 10px 0;">
             <el-input
                     type="textarea"

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

@@ -892,13 +892,16 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      let standList = []
+      if(this.breakdownList < 1){
-      this.breakdownList.forEach(item => {
+        this.$message.warning('请添加产品线数据')
-        if (item.implementer) {
+      }else{
-          standList.push(item);
+        let standList = [];
-        }
+        this.breakdownList.forEach(item => {
-      });
+          if (item.implementer) {
-        this.listForm.breakdownList = standList
+            standList.push(item);
+          }
+        });
+        this.listForm.breakdownList = standList;
         this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
         this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
         this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
@@ -922,6 +925,7 @@ export default {
           this.isSubmit = false;
         }, e => {
         });
+      }
     },
     drawerCheck(data) {
       var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());

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

@@ -774,28 +774,19 @@
                                     this.$refs['Form'].validate((valid) => {
                                         if (valid) {
                                             this.isSubmit = true
-                                            this.$http.get('lawss/activiti/startProcess', {
+                                            var json = Object.assign(this.rhform, this.roleForm)
-                                                type: '18'
+                                            json.commentText = this.commentText
+                                            json.data1 = this.data1
+                                            json.data2 = this.data2
+                                            this.$http.post('lawss/activiti/completeTask', {
+                                                json: JSON.stringify(json),
+                                                taskId: res.data,
+                                                userId: this.$store.getters.userInfo.userId
                                             }, {}, res => {
-                                                if (res.ok) {
+                                                if (res.success) {
-                                                    var json = Object.assign(this.rhform, this.roleForm)
+                                                    this.$message.success('流程发起成功')
-                                                    json.commentText = this.commentText
+                                                    this.$router.push('/processCenter')
-                                                    json.data1 = this.data1
+                                                    this.isSubmit = false
-                                                    json.data2 = this.data2
-                                                    this.$http.post('lawss/activiti/completeTask', {
-                                                        json: JSON.stringify(json),
-                                                        taskId: res.data,
-                                                        userId: this.$store.getters.userInfo.userId
-                                                    }, {}, res => {
-                                                        if (res.success) {
-                                                            this.$message.success('流程发起成功')
-                                                            this.$router.push('/processCenter')
-                                                            this.isSubmit = false
-                                                        } else {
-                                                            this.$message.warning('流程启动失败')
-                                                            this.isSubmit = false
-                                                        }
-                                                    })
                                                 } else {
                                                     this.$message.warning('流程启动失败')
                                                     this.isSubmit = false

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

@@ -752,28 +752,19 @@
                                     this.$refs['Form'].validate((valid) => {
                                         if (valid) {
                                             this.isSubmit = true
-                                            this.$http.get('lawss/activiti/startProcess', {
+                                            var json = Object.assign(this.rhform, this.roleForm)
-                                                type: '17'
+                                            json.commentText = this.commentText
+                                            json.data1 = this.data1
+                                            json.data2 = this.data2
+                                            this.$http.post('lawss/activiti/completeTask', {
+                                                json: JSON.stringify(json),
+                                                taskId: res.data,
+                                                userId: this.$store.getters.userInfo.userId
                                             }, {}, res => {
-                                                if (res.ok) {
+                                                if (res.success) {
-                                                    var json = Object.assign(this.rhform, this.roleForm)
+                                                    this.$message.success('流程发起成功')
-                                                    json.commentText = this.commentText
+                                                    this.$router.push('/processCenter')
-                                                    json.data1 = this.data1
+                                                    this.isSubmit = false
-                                                    json.data2 = this.data2
-                                                    this.$http.post('lawss/activiti/completeTask', {
-                                                        json: JSON.stringify(json),
-                                                        taskId: res.data,
-                                                        userId: this.$store.getters.userInfo.userId
-                                                    }, {}, res => {
-                                                        if (res.success) {
-                                                            this.$message.success('流程发起成功')
-                                                            this.$router.push('/processCenter')
-                                                            this.isSubmit = false
-                                                        } else {
-                                                            this.$message.warning('流程启动失败')
-                                                            this.isSubmit = false
-                                                        }
-                                                    })
                                                 } else {
                                                     this.$message.warning('流程启动失败')
                                                     this.isSubmit = false

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

@@ -9,7 +9,7 @@
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
-    <div class="content" v-show="active == '1'">
+    <div class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>

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

@@ -0,0 +1,464 @@
+<template>
+  <div class="xmpg2-step3 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 === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          :model="listForm"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.projectNumber"
+                  placeholder="请输入项目编号"
+                  disabled
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.projectName"
+                  disabled
+                  placeholder="请输入项目名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="架构经理" prop="jgUser" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.jgUserId"
+                  style="display: none"
+                />
+                <el-input
+                  v-model="listForm.jgUser"
+                  placeholder="请选择架构经理"
+                  clearable
+                  @click.native="choiceZRR"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title>
+          <template slot="title">填写信息</template>
+        </process-title>
+        <el-table
+          :data="dataList"
+          border
+          ref="selection"
+          height="70%"
+          style="width: 100%; border:1px solid #ccc"
+          @selection-change="selectStandChange"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="standId"
+            align="center"
+            label="标准号"
+          >
+            <template slot-scope="scope">
+              <a v-if="scope.row.standYear" class="table-jump"
+                 @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber
+                }}-{{ scope.row.standYear }}</a>
+              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
+                {{ scope.row.standNumber }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="standName"
+            align="center"
+            label="中文名称"
+          >
+            <template slot-scope="scope">
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="standEnName"
+            label="英文名称"
+            align="center"
+          >
+            <template slot-scope="scope">
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            align="center"
+            label="标准实施日期">
+          </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"
+            label="责任部门"
+            align="center"
+          >
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <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>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list" style="height: 100%">
+        <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
+      </div>
+    </div>
+    <ProcessFooter
+      show-save
+      show-transfer
+      show-submit
+      :submitLoading="isSubmit"
+      :transfer-loading="isTransfer"
+      :saveLoading="saveLoading"
+      @save="handleSave"
+      @transfer="handleTransfer"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <phone-role
+      :role-title="drawerTitle"
+      :result-list="phoneRoleList"
+      :is-show-phone.sync="modalshowflag"
+      @checkedRole="drawerCheck"
+    />
+  </div>
+</template>
+
+<script>
+import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew} from "api/process";
+
+export default {
+  name: "phoneXmpg2Step3",
+  components: {
+    ProcessHeaderPhone,
+    ProcessTitle,
+    ProcessFooter
+  },
+  data() {
+    return {
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
+      active: "1",
+      loading: false,
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      isSubmit: false,
+      saveLoading: false,
+      showColumn: true,
+      drawerTitle: "", //drawer标题
+      modalshowflag: false, // drawer开关
+      selectList: [],
+      treeData: [], // 人员数据
+      roleForm: {
+        jgUser: ""
+      },
+      nodeList: [],
+      defaultProps: {
+        children: "children",
+        label: "name"
+      },
+      //表单的数据
+      listForm: {
+        jgUserId: '',
+        projectNumber: "",  //项目编号
+        projectName: "",  //项目名称
+        jgUser: "", //架构经理
+        dataList: [], //项目下的标准数据
+        breakdownList: [] //标准下的分解单数据
+
+      },
+      dataList: [], //展示的标准数据
+      commentText: "", //审批意见
+      detailData: [], //流程历史数据
+      userId: this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      phoneRoleList: [],
+    };
+  },
+  methods: {
+    // 请求转换流程图
+    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 => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.phoneRoleList = [],
+      this.modalshowflag = true
+      this.drawerTitle = '转办处理人'
+    },
+    // 点击查看
+    //查询项目下的标准
+    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 => {
+      });
+    },
+    //tab改变
+    handleTabs(type) {
+      this.active = type;
+    },
+    //获取数据
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    //动态表单读取
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.listForm = JSON.parse(JSON.stringify(item));
+        if (item.form === undefined) {
+          this.listForm.prcNum = this.prcNum;
+          this.listForm.prcName = this.prcName;
+          this.listForm["id"] = item.id;
+          this.listForm.dataList = item.dataList;
+          this.dataList = item.dataList;
+          this.dataList.forEach(item => {
+            if(item.zrbm === "[]"){
+              item.zrbm = ''
+            }
+          })
+          this.dataList.distributePerson = item.dataList[0].distributePerson;
+          this.listForm.breakdownList = item.breakdownList;
+        } else {
+          this.listForm = item.form
+          this.dataList = item.form.dataList
+        }
+
+      });
+    },
+    //保存事件
+    handleSave() {
+      this.saveLoading = true;
+      let _formData = new FormData();
+      _formData.append("id", this.bpnId || "");
+      _formData.append("prcType", "6");
+      _formData.append("taskIds", this.taskIds);
+      _formData.append("json", JSON.stringify({
+        form: this.listForm,
+        commentText: this.commentText
+      }));
+      saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false;
+        this.$message.success("保存成功");
+        this.bpnId = res.result;
+      }).catch(e => {
+        this.saveLoading = false;
+      });
+    },
+    //提交事件
+    handleSubmit() {
+      if (!this.listForm.jgUser) {
+        this.$message.warning("请选择架构经理");
+      } else {
+        this.isSubmit = true;
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+          this.isSubmit = false;
+        }, e => {
+        });
+      }
+    },
+    choiceZRR() {
+      this.drawerTitle = '选择架构经理'
+      if (this.listForm.jgUserId.length > 0 ) {
+        this.phoneRoleList = this.listForm.jgUserId.split(',')
+      }
+      this.modalshowflag = true;
+    },
+    //标准表格选择框改变
+    selectStandChange(data) {
+      this.selectList = data;
+    },
+
+    drawerCheck(data) {
+     if (this.drawerTitle = '选择架构经理') {
+       if (data.length > 0) {
+         this.listForm.jgUserId = data[0].id
+         this.listForm.jgUser = data[0].name
+       }
+     } else {
+       if (data.length > 0) {
+         changeAssigneeNew({
+           taskId: this.$route.query.taskIds, // 任务id
+           assignee: data[0].id, // 被委托人
+           userId: this.$store.getters.userInfo.userId, // 委托人
+           pId: this.$route.query.prcId // 流程实例
+         }).then(res => {
+           this.isTransfer = false
+           if (res.success) {
+             this.$message.success('调整成功')
+             this.$router.push("/processCenter");
+             this.processNum()
+           } else {
+             this.$message.warning(res.message)
+           }
+         })
+       }
+     }
+    },
+  },
+  mounted() {
+    this.getData();
+  }
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/phone';
+
+.xmpg2-step3 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  /deep/.van-dialog__content {
+    min-height: 300px;
+    padding: 10px;
+  }
+  .prc-content-border {
+    overflow: auto;
+  }
+  /deep/.prc-content-border .el-form-item__content {
+    width: 270px;
+  }
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    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;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>

src/pages/processCenter/pages/processDetail/index.vue

@@ -83,7 +83,7 @@
             sortable="custom"
             align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -91,7 +91,7 @@
             label="完成时间"
             align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
           </template>
         </el-table-column>
         <el-table-column

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

@@ -81,9 +81,9 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="标准号/标准名称" class="search-item">
+            <el-form-item label="标准号" class="search-item">
               <el-input
-                  v-model="sarAccessInfoSearch.standName"
+                  v-model="sarAccessInfoSearch.standNumber"
                   placeholder="请输入"
                   :maxlength="100"
               ></el-input>
@@ -202,7 +202,6 @@
           </el-table-column>
           <el-table-column
               prop="issueTime"
-              sortable
               align="center"
               width="110"
               label="发布日期">
@@ -212,7 +211,6 @@
           </el-table-column>
           <el-table-column
               prop="xcxssrq"
-              sortable
               align="center"
               width="150"
               label="新车型实施日期">
@@ -220,7 +218,6 @@
           <el-table-column
               show-overflow-tooltip
               prop="zccssrq"
-              sortable
               align="center"
               width="150"
               label="在产车实施日期">
@@ -327,7 +324,6 @@
         </el-table-column>
         <el-table-column
             prop="ssrq"
-            sortable
             align="center"
             width="210px"
             label="标准实施日期">
@@ -335,14 +331,12 @@
         <el-table-column
             show-overflow-tooltip
             prop="zccssrqgj"
-            sortable
             width="210px"
             align="center"
             label="在产车实施日期">
         </el-table-column>
         <el-table-column
             prop="xcxssrqgj"
-            sortable
             align="center"
             width="210px"
             label="新车型实施日期">
@@ -635,9 +629,10 @@ export default {
       // 新增、编辑 数据搜索字段
       sarAccessInfoSearch: {
         id: '',
-        standName: '',
+        standNumber: '',
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
+        pageNo: 1,
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         validFlag: 0,
@@ -649,6 +644,7 @@ export default {
         standName: '',
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
+        pageNo: 1,
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         validFlag: 0,
@@ -998,7 +994,7 @@ export default {
     clearSearchLaws() {
       this.sarAccessInfoSearch.askType = '' // 监管类型
       this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
-      this.sarAccessInfoSearch.standName = ''
+      this.sarAccessInfoSearch.standNumber = ''
       this.sarAccessInfo.standName = ''
       this.sarAccessInfo.standNumber = ''
       this.isListType = false
@@ -1476,6 +1472,8 @@ export default {
       })
     },
     pageInfo() {
+      this.sarAccessInfoSearch.pageNo = 1
+      this.sarAccessInfoSearch.page = 1
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
         StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
           this.sarAccessInfoSearchList = res.data.list
@@ -1526,6 +1524,8 @@ export default {
 
     },
     selectPage() {
+      this.sarAccessInfo.pageNo = 1
+      this.sarAccessInfo.page = 1
       StandardsInfoPage(this.sarAccessInfo).then(res => {
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {

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

@@ -182,12 +182,10 @@
           <el-table-column
             prop="issueTime"
             align="center"
-            sortable
             label="发布日期">
           </el-table-column>
           <el-table-column
             prop="xcxssrq"
-            sortable
             align="center"
             label="新车型实施日期">
           </el-table-column>
@@ -195,7 +193,6 @@
             show-overflow-tooltip
             prop="zccssrq"
             align="center"
-            sortable
             label="在产车实施日期">
           </el-table-column>
           <el-table-column
@@ -297,7 +294,6 @@
         </el-table-column>
         <el-table-column
           prop="ssrq"
-          sortable
           align="center"
           width="210px"
           label="标准实施日期">
@@ -305,14 +301,12 @@
         <el-table-column
           show-overflow-tooltip
           prop="zccssrq"
-          sortable
           width="210px"
           align="center"
           label="在产车实施日期">
         </el-table-column>
         <el-table-column
           prop="xcxssrq"
-          sortable
           align="center"
           width="210px"
           label="新车型实施日期">
@@ -499,6 +493,7 @@ export default {
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
         page: 1,
+        pageNo: 1,
         Size: this.$store.getters.userInfo.configContent,
         validFlag: 0,
         advanceSearchVOStr: ''
@@ -510,6 +505,7 @@ export default {
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
         page: 1,
+        pageNo: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         validFlag: 0,
         advanceSearchVOStr: ''
@@ -832,6 +828,8 @@ export default {
     // 点数据搜索 查询按钮 事件
     searchLawsStands () {
       this.showTableFlag = false
+      this.sarAccessInfoSearch.pageNo = 1
+      this.sarAccessInfoSearch.page = 1
       this.selectLawsStands()
     },
     // 点击清空查询条件 按钮事件
@@ -1232,6 +1230,8 @@ export default {
       })
     },
     pageInfo() {
+      this.sarAccessInfoSearch.pageNo = 1
+      this.sarAccessInfoSearch.page = 1
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
         StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
           this.sarAccessInfoSearchList = res.data.list
@@ -1282,6 +1282,8 @@ export default {
       }
     },
     selectPage() {
+      this.sarAccessInfo.page = 1
+      this.sarAccessInfo.pageNo = 1
       StandardsInfoPage(this.sarAccessInfo).then(res =>{
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
@@ -1297,6 +1299,7 @@ export default {
     },
     // 高级检索查询按钮
     selectBtn() {
+      this.sarAccessInfo.pageNo = 1
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfoSearch.standType = 'INLAND'
         this.selectPage()

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

@@ -238,20 +238,17 @@
           </el-table-column>
           <el-table-column
               prop="issueTime"
-              sortable
               align="center"
               label="发布日期">
           </el-table-column>
           <el-table-column
               prop="xcxssrq"
-              sortable
               align="center"
               label="新车型实施日期">
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
               prop="zccssrq"
-              sortable
               align="center"
               label="在产车实施日期">
           </el-table-column>
@@ -355,7 +352,6 @@
         </el-table-column>
         <el-table-column
             prop="ssrq"
-            sortable
             align="center"
             width="210px"
             label="标准实施日期">
@@ -363,14 +359,12 @@
         <el-table-column
             show-overflow-tooltip
             prop="zccssrq"
-            sortable
             width="210px"
             align="center"
             label="在产车实施日期">
         </el-table-column>
         <el-table-column
             prop="xcxssrq"
-            sortable
             align="center"
             width="210px"
             label="新车型实施日期">
@@ -569,6 +563,7 @@ export default {
         syrz: '',
         typeApplicable: '',
         dataSource: 'INLAND_STAND', // 数据来源
+        pageNo: 1,
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         validFlag: 0,
@@ -582,6 +577,7 @@ export default {
         typeApplicable: '',
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
+        pageNo: 1,
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         validFlag: 0,
@@ -1355,6 +1351,8 @@ export default {
     },
     //  查询按钮
     selectLawsStands() {
+      this.sarAccessInfoSearch.pageNo = 1
+      this.sarAccessInfoSearch.page = 1
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfoSearch.standType = 'INLAND'
         this.pageInfo()
@@ -1371,6 +1369,8 @@ export default {
     },
     /** 高级查询查询按钮*/
     selectPage() {
+      this.sarAccessInfo.pageNo = 1
+      this.sarAccessInfo.page = 1
       StandardsInfoPage(this.sarAccessInfo).then(res => {
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {

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

@@ -144,7 +144,7 @@
               <el-col :span="8">
                 <el-form-item label="标准状态" class="search-item">
                   <el-select v-model="sarBussionessSearch.standStatus" placeholder="根据标准状态查找" clearable @keyup.enter.native="getBussionStandTableBtn(sarBussionessSearch)">
-                    <el-option v-for="opt in standStateOptions" :value="opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                    <el-option v-for="(opt,index) in standStateOptions" :value="opt.value" :key="index" :label="opt.label">{{ opt.label}}</el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -158,14 +158,14 @@
               <el-col :span="8">
                 <el-form-item label="密级" class="search-item">
                   <el-select v-model="sarBussionessSearch.MJ" placeholder="根据密级查找" clearable @keyup.enter.native="getBussionStandTableBtn(sarBussionessSearch)">
-                    <el-option v-for="opt in allSelectOptions['MJ']" :value="opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                    <el-option v-for="(opt,index) in allSelectOptions['MJ']" :value="opt.value" :key="index" :label="opt.label">{{ opt.label}}</el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="授权" class="search-item">
                   <el-select v-model="sarBussionessSearch.SQ" placeholder="根据授权查找" clearable @keyup.enter.native="getBussionStandTableBtn(sarBussionessSearch)">
-                    <el-option v-for="opt in allSelectOptions['SHIFOU']" :value="opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                    <el-option v-for="(opt,index) in allSelectOptions['SHIFOU']" :value="opt.value" :key="index" :label="opt.label">{{ opt.label}}</el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -471,9 +471,9 @@
                     <el-form-item label="企标类别" prop="standSort" label-width="150px" class="add-form-item">
                         <el-select v-model="sarBussionessStandEO.standSort" filterable>
                             <el-option
-                                    v-for="item in standSortOptions"
+                                    v-for="(item, indexs) in standSortOptions"
                                     placeholder="请选择"
-                                    :key="item.value"
+                                    :key="indexs"
                                     :value="item.value"
                                     :label="item.label"
                             ></el-option>
@@ -515,8 +515,8 @@
                                    placeholder="请选择文本状态"
                                    clearable>
                             <el-option
-                                    v-for="opt in standStateOptions"
+                                    v-for="(opt,index) in standStateOptions"
-                                    :key="opt.value"
+                                    :key="index"
                                     :value="opt.value === undefined ? '' :opt.value" :label="opt.label"
                             >
                                 {{ opt.label }}
@@ -546,7 +546,6 @@
                     >
                       <template slot="label">起草部门</template>
                       <el-input
-                          :key="field.attrField"
                           :config="field"
                           clearable
                           v-model="sarBussionessStandEO[field.attrField]"
@@ -577,7 +576,6 @@
                   </template>
                 <template v-if="field.attrField === 'SVPPS'">
                   <custom-SVPPS
-                    :key="field.attrField"
                     :config="field"
                     v-model="sarBussionessStandEO[field.attrField]"
                     :disabled="formdisableflag"
@@ -586,7 +584,6 @@
                 <template v-else-if="field.attrType === 'INPUT_STR' && field.attrField !== 'XGLC' && field.attrField !== 'XGJLBUSS' && field.attrField !== 'XGJH'">
                   <template v-if="field.attrField === 'GFXYYWJ'">
                     <custom-input-for-standards
-                      :key="field.attrField"
                       :config="field"
                       v-model="sarBussionessStandEO[field.attrField]"
                       :disabled="formdisableflag"
@@ -594,7 +591,6 @@
                   </template>
                   <template v-else-if="field.attrField === 'FSRQBUSS'">
                     <custom-input
-                      :key="field.attrField"
                       :config="field"
                       v-model="sarBussionessStandEO[field.attrField]"
                       :disabled="true"
@@ -681,7 +677,6 @@
                     </template>
                     <template v-else-if="field.attrField === 'DTQBBHBUSS'">
                         <custom-input-for-standards
-                                :key="field.attrField"
                                 :config="field"
                                 :class="field.attrField === 'BYYBJ' ? 'classDisplay' : ''"
                                 v-model="sarBussionessStandEO[field.attrField]"
@@ -691,7 +686,6 @@
                     </template>
                     <template v-else-if="field.attrField === 'BDTQBBHBUSS'">
                         <custom-input
-                                :key="field.attrField"
                                 :config="field"
                                 v-model="sarBussionessStandEO[field.attrField]"
                                 :disabled="true"
@@ -699,7 +693,6 @@
                     </template>
                     <template v-else-if="field.attrField === 'XCSJBUSS'">
                         <custom-input
-                                :key="field.attrField"
                                 :config="field"
                                 v-model="sarBussionessStandEO[field.attrField]"
                                 :disabled="true"
@@ -707,7 +700,6 @@
                     </template>
                     <template v-else>
                         <custom-input
-                                :key="field.attrField"
                                 :config="field"
                                 v-model="sarBussionessStandEO[field.attrField]"
                                 :disabled="formdisableflag"
@@ -716,7 +708,6 @@
                 </template>
                 <template v-else-if="field.attrType === 'DATE_PICKER'">
                   <custom-date-pick
-                    :key="field.attrField"
                     :config="field"
                     v-model="sarBussionessStandEO[field.attrField]"
                     :disabled="formdisableflag"
@@ -724,7 +715,6 @@
                 </template>
                 <template v-else-if="field.attrType === 'FILE'">
                   <custom-file
-                    :key="field.attrField"
                     :config="field"
                     v-model="sarBussionessStandEO[field.attrField]"
                     :disabled="formdisableflag"
@@ -732,7 +722,6 @@
                 </template>
                 <template v-else-if="field.attrType === 'TEXTAREA'">
                   <custom-textarea
-                    :key="field.attrField"
                     :config="field"
                     v-model="sarBussionessStandEO[field.attrField]"
                     :disabled="formdisableflag"
@@ -755,7 +744,6 @@
                   <template v-else>
                     <custom-org
                       v-if="field.attrField !== 'WFSPJS'"
-                      :key="field.attrField"
                       :config="field"
                       :zNodes="orgData"
                       v-model="sarBussionessStandEO[field.attrField]"
@@ -767,7 +755,6 @@
                 </template>
                 <template v-else-if="field.attrType === 'SEL_OPTION'">
                   <custom-select
-                    :key="field.attrField"
                     :config="field"
                     v-model="sarBussionessStandEO[field.attrField]"
                     :disabled="formdisableflag"
@@ -775,7 +762,6 @@
                 </template>
                 <template v-else-if="field.attrType === 'SEL_OPTS' && field.attrField !== 'QCDW' && field.attrField !== 'QCRBUSS'">
                   <custom-select-array
-                    :key="field.attrField"
                     :config="field"
                     v-model="sarBussionessStandEO[field.attrField]"
                     :disabled="formdisableflag || field.attrField === 'YQLX'"
@@ -1041,9 +1027,9 @@
                               <el-form-item label="企标类别" title="企标类别" class="add-form-item form-item-disabled">
                                   <el-select v-model="sarBussionessSearch.standSort" filterable clearable>
                                       <el-option
-                                              v-for="item in standSortOptions"
+                                              v-for="(item, index) in standSortOptions"
                                               placeholder="请选择"
-                                              :key="item.value"
+                                              :key="index"
                                               :value="item.value"
                                               :label="item.label"
                                       ></el-option>
@@ -1099,8 +1085,8 @@
                                              placeholder="请选择文本状态"
                                              clearable>
                                       <el-option
-                                              v-for="opt in standStateOptions"
+                                              v-for="(opt,index) in standStateOptions"
-                                              :key="opt.value"
+                                              :key="index"
                                               :value="opt.value === undefined ? '' :opt.value" :label="opt.label"
                                       >
                                           {{ opt.label }}
@@ -1146,7 +1132,6 @@
                             >
                               <template slot="label">起草部门</template>
                               <el-input
-                                  :key="qcdwOptions.options"
                                   :config="qcdwOptions"
                                   clearable
                                   v-model="sarBussionessSearch.QCDW"
@@ -1169,7 +1154,6 @@
                             <!--            适用车型-->
                             <template>
                               <custom-select-array
-                                  :key="applyArcticOptions.options"
                                   :config="applyArcticOptions"
                                   style="margin-left: -14px"
                                   v-model="sarBussionessSearch['SYCXCLASS']"
@@ -1219,7 +1203,6 @@
                             <!--            能源类型-->
                             <template>
                               <custom-select-array
-                                  :key="categoryOptions.options"
                                   :config="categoryOptions"
                                   style="margin-left: -14px"
                                   v-model="sarBussionessSearch['NYLXCLASS']"
@@ -1239,7 +1222,6 @@
                             <!--            适用产品线（新增字段）-->
                             <template>
                               <custom-select-array
-                                  :key="sycpxOptions.options"
                                   :config="sycpxOptions"
                                   style="margin-left: -14px"
                                   v-model="sarBussionessSearch['SYCPXCLASS']"
@@ -1304,10 +1286,10 @@
 <!--      @getDomesticStandardTableBtn="(advancedSearch) => getBussionStandTableBtn(sarBussionessSearch, advancedSearch)"-->
 <!--    ></AdvancedQuery>-->
     <!--企标编号生成组件-->
-    <GenerationNumber
+<!--    <GenerationNumber-->
-      :is-show.sync="isShow"
+<!--      :is-show.sync="isShow"-->
-      @isOk="isOk"
+<!--      @isOk="isOk"-->
-    ></GenerationNumber>
+<!--    ></GenerationNumber>-->
 
     <Role-tree
         :is-title="drawerTitle"

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -23,9 +23,9 @@
                                   clearable
                                   :maxlength="100"></el-input>
                     </el-form-item>
-                    <el-form-item label="起草责任部门" class="search-item">
+                    <el-form-item label="起草责任单位" class="search-item">
                         <el-input v-model="form.unit"
-                                  placeholder="请输入起草责任部门"
+                                  placeholder="请输入起草责任单位"
                                   clearable
                                   :maxlength="100"></el-input>
                     </el-form-item>
@@ -110,9 +110,9 @@
                                 width="150"
                                 align="center"
                                 label="制修订状态">
-                            <template slot-scope="scope">
+<!--                            <template slot-scope="scope">-->
-                                <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
+<!--                                <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>-->
-                            </template>
+<!--                            </template>-->
                         </el-table-column>
                         <el-table-column
                                 prop="drafterName"
@@ -468,6 +468,9 @@
                 this.modalshowflagZRBM = false
             },
             choiceZRBM(id) {
+                if (this.DrawerType === 'see') {
+                    return
+                }
                 this.nodeListZRBM = []
                 if (id) {
                     this.nodeListZRBM = id.split(',')

src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue

@@ -732,22 +732,22 @@
                         </el-table-column>
                         <el-table-column
                                 v-if="itemType !== '3'"
-                                prop="XCXSSRQ"
+                                prop="xcxssrq"
                                 sortable="custom"
                                 width="150"
                                 label="新车型实施日期">
                             <template slot-scope="scope">
-                                <span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                                <span>{{ scope.row.xcxssrq ? scope.row.xcxssrq : '-' }}</span>
                             </template>
                         </el-table-column>
                         <el-table-column
                                 v-if="itemType !== '3'"
-                                prop="ZCCSSRQ"
+                                prop="zccssrq"
                                 sortable="custom"
                                 width="150"
                                 label="在产车实施日期">
                             <template slot-scope="scope">
-                                <span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                                <span>{{ scope.row.zccssrq ? scope.row.zccssrq : '-' }}</span>
                             </template>
                         </el-table-column>
                     </el-table>

src/router/index.js

@@ -2211,7 +2211,7 @@ const routes = [
       },
       {
         path: '/phoneXmpg2Step2',
-        name: 'phoneXmpg2Step22',
+        name: 'phoneXmpg2Step2',
         component: () => import('@/pages/processCenter/pages/phone/xmpg2/step2.vue'),
         meta: {
           isBoolean: true,
@@ -2219,6 +2219,16 @@ const routes = [
           title: '项目合规评估流程'
         }
       },
+      {
+        path: '/phoneXmpg2Step3',
+        name: 'phoneXmpg2Step3',
+        component: () => import('@/pages/processCenter/pages/phone/xmpg2/step3.vue'),
+        meta: {
+          isBoolean: true,
+          requireAuth: true,
+          title: '项目合规评估流程'
+        }
+      },
       {
         path: '/phoneXmpg2Step7',
         name: 'phoneXmpg2Step7',