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

# Conflicts:
#	src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

src/pages/config/pages/attributeCustom/components/stand.vue

@@ -2,8 +2,8 @@
 <template>
   <div class="attribute-custom v-class">
     <div class="action-bar1">
-      <el-button class="common-button-primary add-button" size="mini" v-btn-permission="'df57f63c9e993bbfb2a4b400d5257577'" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
+      <el-button class="common-button-primary add-button" size="mini" v-btn-permission="''" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
-      <el-button class="common-button-default" size="mini" v-btn-permission="'9557b51320a50728d7047448d01c57c6'" @click="showDisplayLocationDialog">展示区域管理</el-button>
+      <el-button class="common-button-default" size="mini" v-btn-permission="''" @click="showDisplayLocationDialog">展示区域管理</el-button>
     </div>
     <loading :loading="attributeDataLoading">数据处理中</loading>
     <div class="content">
@@ -76,8 +76,8 @@
               <el-dropdown trigger="click" @command="handleCommand">
 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item v-btn-permission="'abba040e019fad5092624ffd71a70372'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
+                  <el-dropdown-item v-btn-permission="''" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
-                  <el-dropdown-item v-btn-permission="'730c9240a8f80bcdb88c71adb37f2aa7'" :disabled="scope.row.isEdit==='1'" :command="[scope.row, '删除']">删除</el-dropdown-item>
+                  <el-dropdown-item v-btn-permission="''" :disabled="scope.row.isEdit==='1'" :command="[scope.row, '删除']">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>

src/pages/config/pages/attributeCustom/index.vue

@@ -6,11 +6,11 @@
           <stand v-if="tabValue === 'stand'"></stand>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="国内外政策" name="laws">
+<!--      <el-tab-pane label="国内外政策" name="laws">
         <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
           <laws v-if="tabValue === 'laws'"></laws>
         </div>
-      </el-tab-pane>
+      </el-tab-pane>-->
       <el-tab-pane label="企业标准库" name="buss">
         <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
           <buss v-if="tabValue === 'buss'"></buss>

src/pages/config/pages/standLawsAttrManage/pages/standLawsAttrDetails.vue

@@ -26,14 +26,14 @@
       </div>
       <div class="right">
         <el-button class="common-button-primary add-button"
-                   v-btn-permission="'8969811dc465528909628a3a13529023'"
+                   v-btn-permission="''"
                    type="primary"
                    icon="add"
                    size="small"
                    v-if="dictionaryId != 'ERDFGHGGJJ' && dictionaryId != 'D975E8V5KVQUY3DZFV7E' && dictionaryId != 'WQERWC39J4E8SV6WREP2'"
                    @click="productAdd">新增</el-button>
         <el-button class="common-button-default delete-button"
-                   v-btn-permission="'df889d64e87c977e4bc9f9a0851d4c27'"
+                   v-btn-permission="''"
                    v-if="dictionaryId != 'ERDFGHGGJJ' && dictionaryId != 'D975E8V5KVQUY3DZFV7E' && dictionaryId != 'WQERWC39J4E8SV6WREP2'"
                    icon="delete"
                    size="small"
@@ -85,8 +85,8 @@
                   <div v-if="relateDicId">
                     <el-dropdown-item :command="[scope.row, '查看']"  v-btn-permission="'AQCEYWZK8F4DL85BZPRB'">查看</el-dropdown-item>
                   </div>
-                  <el-dropdown-item :command="[scope.row, '编辑']"  v-if="dictionaryId !== 'ERDFGHGGJJ' && dictionaryId !== '48723deaa90798f56e939aea6aa49a23' && dictionaryId !== 'WQERWC39J4E8SV6WREP2'"  v-btn-permission="'27e0f6cdfb3e2af446c36f9923e90d76'">编辑</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '编辑']"  v-if="dictionaryId !== 'ERDFGHGGJJ' && dictionaryId !== '48723deaa90798f56e939aea6aa49a23' && dictionaryId !== 'WQERWC39J4E8SV6WREP2'"  v-btn-permission="''">编辑</el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '删除']"  v-if="dictionaryId !== 'ERDFGHGGJJ' && dictionaryId !== '982b2f92a26c3c91b6b868419f0e2d3b' && dictionaryId !== 'WQERWC39J4E8SV6WREP2'"  v-btn-permission="'27e0f6cdfb3e2af446c36f9923e90d76'">删除</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '删除']"  v-if="dictionaryId !== 'ERDFGHGGJJ' && dictionaryId !== '982b2f92a26c3c91b6b868419f0e2d3b' && dictionaryId !== 'WQERWC39J4E8SV6WREP2'"  v-btn-permission="''">删除</el-dropdown-item>
                   <!--                    <el-dropdown-item :command="[scope.row, '流程']">流程</el-dropdown-item>-->
                 </el-dropdown-menu>
               </el-dropdown>

src/pages/home1/components/release/index.vue

@@ -3,8 +3,8 @@
   <div class="release">
     <ul>
       <li v-for="item in standardReleaseList" :key="item.id" class="time-title">
-        <a class="title" :title="item.title">{{ item.title }}</a>
+        <a @click="handlePreview(item)" class="table-jump">{{ item.standName }}</a>
-        <span class="time">{{ getDate(item.pubTime) }}</span>
+        <span class="time">{{ getDate(item.issueTime) }}</span>
       </li>
     </ul>
   </div>
@@ -28,6 +28,17 @@ export default {
     this.getAdvice()
   },
   methods: {
+    // 点击查看
+    handlePreview (item) {
+      let routeUrl = this.$router.resolve({
+        name: 'OtherStandardDetails',
+        params: {
+          id: item.id,
+          pageType: item.standType + '_STAND'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+    },
     //截取时间
     getDate (date) {
       return date != null ? date.substring(0, date.indexOf(' ')) : ''
@@ -35,12 +46,11 @@ export default {
     //获取数据
     getAdvice() {
       let obj = {}
-      obj.msgType = 'RESOURCE'
+      obj.limit = 8
-      obj.rowLimit = 8
+      this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoByList', obj, {
-      this.$http.get('lawss/msgDynamicInfo/page', obj, {
         _this: this
       }, res => {
-        this.standardReleaseList = res.data.list
+        this.standardReleaseList = res.data
       }, e => {
       })
     },

src/pages/home1/index.vue

@@ -16,27 +16,29 @@
         <search-group></search-group>
         <div class="main-tabs">
           <div class="main-left-wrap">
+            <el-button type="text" class="more" @click="MORE">MORE</el-button>
             <el-tabs
-              v-model="activeName"
+                v-model="activeName"
-              class="home-tabs"
+                class="home-tabs"
-              @tab-click="handleTabClick"
+                @tab-click="handleTabClick"
-            >
+              >
-<!--              <el-tab-pane label="外部会议资料" name="conferenceMaterials">-->
+                <!--              <el-tab-pane label="外部会议资料" name="conferenceMaterials">-->
-<!--                <conference-materials></conference-materials>-->
+                <!--                <conference-materials></conference-materials>-->
-<!--              </el-tab-pane>-->
+                <!--              </el-tab-pane>-->
-<!--              <el-tab-pane label="会议通知" name="noticeOfMeeting">-->
+                <!--              <el-tab-pane label="会议通知" name="noticeOfMeeting">-->
-<!--               <notice-of-meeting></notice-of-meeting>-->
+                <!--               <notice-of-meeting></notice-of-meeting>-->
-<!--              </el-tab-pane>-->
+                <!--              </el-tab-pane>-->
-              <el-tab-pane label="标准征求意见" name="solicitOpinions">
+                <el-tab-pane label="标准征求意见" name="solicitOpinions">
-                <solicitOpinions></solicitOpinions>
+                  <solicitOpinions></solicitOpinions>
-              </el-tab-pane>
+                </el-tab-pane>
-<!--              <el-tab-pane label="标准发布" name="release">-->
+                <el-tab-pane label="标准发布" name="release">
-<!--                <release></release>-->
+                  <release></release>
-<!--              </el-tab-pane>-->
+                </el-tab-pane>
-<!--              <el-tab-pane label="外部资讯" name="realTimeInfo">-->
+                <!--              <el-tab-pane label="外部资讯" name="realTimeInfo">-->
-<!--                <realTimeInfo></realTimeInfo>-->
+                <!--                <realTimeInfo></realTimeInfo>-->
-<!--              </el-tab-pane>-->
+                <!--              </el-tab-pane>-->
-            </el-tabs>
+              </el-tabs>
+
           </div>
         </div>
       </div>
@@ -106,6 +108,27 @@ export default {
         }, e => {})
       }).catch(() => {
       })
+    },
+    MORE() {
+      switch (this.activeName) {
+        case 'solicitOpinions':
+          this.$router.push({name: 'standardForComments'})
+          break
+        case 'release':
+          this.$confirm('请选择国内/海外标准', {
+            confirmButtonText: '国内标准',
+            cancelButtonText: '海外标准',
+            type: 'warning',
+            center: true
+          }).then(() => {
+            this.$router.push({name: 'domesticStandardsAndRegulations'})
+          }).catch(() => {
+            this.$router.push({name: 'foreignStandardsAndRegulations'})
+          });
+          break
+        default:
+          break
+      }
     }
   },
 }
@@ -172,8 +195,20 @@ export default {
       width: 60vw;
       height: 100%;
       margin-right: 10px;
+      .more {
+        float: right;
+        color: #FFFFFF;
+        margin: 0px 15px;
+        &:hover {
+          color: red;
+          cursor: pointer;
+        }
+      }
       .home-tabs {
         margin-left: 2.34vw;
+        ::v-deep.el-tabs__header{
+          margin: 0 70px 15px 0px
+        }
         ::v-deep {
           .el-tabs__item {
             font-size: 16px;

src/pages/localTool/standAutoSplit/index.vue

@@ -28,8 +28,8 @@
     </table-tools-bar>
     <div class="content">
       <div class="action-bar">
-        <el-button size="mini"  @click="spiltStandFile" v-btn-permission="''"><i class="iconfont"></i>拆分</el-button>
+        <el-button size="small" type="primary" @click="spiltStandFile" v-btn-permission="''">拆分</el-button>
-        <el-button size="mini"  @click="batchDelete" v-btn-permission="''"><i class="iconfont">&#xe61b;</i>删除</el-button>
+        <el-button size="small" type="danger" @click="batchDelete" v-btn-permission="''">删除</el-button>
       </div>
       <div class="table-wrap">
         <div style="position: absolute;height: 100%;width: 100%;">
@@ -542,16 +542,17 @@
             </el-formItem>
             <el-form-item class="search-item btn-box">
               <el-button
-                icon="el-icon-search"
+                size="mini"
                 type="primary"
                 class="common-button-primary"
                 @click="getSearchSarBussStandPage">
+                搜索
               </el-button>
               <el-button
                 class="common-button-default"
-                icon="el-icon-refresh-left"
+                size="mini"
                 @click="handleResetCondition()"
-              ></el-button>
+              >清空</el-button>
             </el-form-item>
           </el-form>
         </div>
@@ -594,11 +595,11 @@
               <a @click="showLawsDetails(scope.row)">{{ scope.row.lawsName }}</a>
             </template>
           </el-table-column>
-<!--          <el-table-column-->
+<!--          <el-table-column
-<!--            prop="stateName"-->
+            prop="fileType"
-<!--            align="center"-->
+            align="center"
-<!--            label="文本状态">-->
+            label="文本状态">
-<!--          </el-table-column>-->
+          </el-table-column>-->
 <!--          <el-table-column-->
 <!--            prop="putTime"-->
 <!--            label="新车型实施日期"-->
@@ -931,7 +932,7 @@ export default {
         _this: this
       }, res => {
         this.addSpiltStandList = res.data.list
-        this.addFileStandtotal = res.data.count
+        this.addFileStandtotal = res.data.list.length
         this.loadData = false
       }, e => {
         this.loadData = false
@@ -1359,10 +1360,7 @@ export default {
         name: 'ItemSplitInfo',
         query: {
           infoId: row.id,
-          // standNumSplit: row.standNumSplit === null ? row.showNumber : row.standNumSplit,
-          // standNameSplit: row.standNameSplit === null ? row.standName : row.standNameSplit,
           result: row.result,
-          // fileType: row.fileType
         }
       })
     },

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

@@ -37,10 +37,10 @@
         <div class="content">
           <div class="action-bar">
             <el-button v-btn-permission="'SRE2ZRX3MJSSH5YYLRGH'"  size="mini" @click="importItemInfo" ><i class="iconfont">&#xe6de;</i>导入</el-button>
-            <el-button v-btn-permission="'KPEQQ6YM53S98RKUC9GZ'"   size="mini" @click="exportItemInfo"><i class="iconfont">&#xe6e9;</i>导出</el-button>
+            <el-button v-btn-permission="''"   size="mini" @click="exportItemInfo"><i class="iconfont">&#xe6e9;</i>导出</el-button>
-            <el-button v-btn-permission="'V4YJY54NVWSYHA2EF3PQ'"   size="mini" @click="judgebatchDeleteItem"><i class="iconfont">&#xe61b;</i>删除</el-button>
+            <el-button v-btn-permission="''"   size="mini" @click="judgebatchDeleteItem"><i class="iconfont">&#xe61b;</i>删除</el-button>
             <el-button v-btn-permission="'QULWGFSB3NMP84REU7BP'"   size="mini" @click="uploadImportModal"><i class="iconfont">&#xe825;</i>模板下载</el-button>
-            <el-button v-btn-permission="'8WS6LEYJSYNQU9YCS7U2'"   size="mini" @click="batchCopy">批量复制</el-button>
+            <el-button v-btn-permission="''"   size="mini" @click="batchCopy">批量复制</el-button>
             <el-button v-btn-permission="'TE39XUT4KRTPZGQH5KLF'"   size="mini" @click="combineItems">合并条款</el-button>
             <el-button v-btn-permission="'P5NLYUS4XTP9P676XDEW'"   size="mini" @click="openSubmitAndExamine" v-if="this.$route.query.result === '1'">提交</el-button>
             <el-button v-if="auditFlag==='1'"  size="mini" @click="splitCheckBtn">审核</el-button>
@@ -64,6 +64,7 @@
             <el-table-column
               prop="itemsNum"
               label="条款号"
+              width="150"
               fixed="left"
               :resizable="false"
               align="center">
@@ -80,7 +81,6 @@
             <el-table-column
               prop="itermsConditions"
               label="条款内容"
-              width="250"
               fixed="left"
               show-overflow-tooltip
               :resizable="false"
@@ -89,40 +89,16 @@
                 <div class="itemsText" @click="itemsTextDialog(scope.row.itemsNum, scope.row.itermsConditions)">{{ scope.row.itermsConditions ? scope.row.itermsConditions.replace(/<.*?>/ig, ' ') : '' }}</div>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="dutyEngineerShow"
-              label="解读内容"
-              width="150">
-            </el-table-column>
-            <el-table-column
-              prop="foShow"
-              label="实施日期">
-            </el-table-column>
-            <el-table-column
-              label="适用车型"
-              width="150">
-              <template slot-scope="scope">{{ getDicTypeName('applyArcticOptions', scope.row.applyArctic) }}</template>
-            </el-table-column>
-            <el-table-column
-              prop="responsibleUnitShow"
-              label="责任部门"
-              width="150">
-            </el-table-column>
-            <el-table-column
-              prop="svppsShow"
-              label="责任工程师"
-              width="150">
-            </el-table-column>
             <el-table-column :label="$t('m.operation')" align="center" width="50" :resizable="false" fixed="right">
               <template slot-scope="scope">
                 <div @click.stop style="display: inline-block">
                   <el-dropdown trigger="click" @command="handleCommand">
                     <i class="iconfont">&#xe61e;</i>
                     <el-dropdown-menu slot="dropdown">
-                      <el-dropdown-item :command="[scope.row, '属性']" v-btn-permission="'TMB2N38FC7NSKSLUBYLV'">属性</el-dropdown-item>
+                      <el-dropdown-item :command="[scope.row, '属性']" v-btn-permission="''">属性</el-dropdown-item>
-                      <el-dropdown-item :command="[scope.row, '编辑', scope.$index]" v-btn-permission="'EYLPEA9EG9XTTAJV2LJ2'">编辑</el-dropdown-item>
+                      <el-dropdown-item :command="[scope.row, '编辑', scope.$index]" v-btn-permission="''">编辑</el-dropdown-item>
-                      <el-dropdown-item :command="[scope.row, '复制']" v-btn-permission="'8WS6LEYJSYNQU9YCS7U2'">复制</el-dropdown-item>
+                      <el-dropdown-item :command="[scope.row, '复制']" v-btn-permission="''">复制</el-dropdown-item>
-                      <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'V4YJY54NVWSYHA2EF3PQ'">删除</el-dropdown-item>
+                      <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
                 </div>
@@ -216,7 +192,7 @@
           <el-form-item label="条款名称" prop="itemsName" class="add-form-item">
             <el-input v-model="standItemEO.itemsName" placeholder="请输入内容"></el-input>
           </el-form-item>
-          <custom-org
+<!--          <custom-org
               key="责任部门"
               :config="{
                 attrName: '责任部门',
@@ -290,7 +266,7 @@
                 :value="item.value"
                 :label="item.label"></el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item>-->
           <el-divider content-position="left">内容简介</el-divider>
           <div style="border:1px dashed #999;margin-bottom:20px;padding:10px">
             <el-row type="flex" class="row-bg" justify="space-between">
@@ -354,7 +330,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>
@@ -381,7 +357,7 @@
         <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>
     </el-drawer>
     <!--编辑条款内容-->

src/pages/processCenter/pages/components/ProcessMixin.vue

@@ -9,13 +9,33 @@ export default {
       return {
           processTypeList: [
               {
-                  label: '标准入库流程',
+                  label: '标准调研流程',
+                  value: '2'
+              },
+              {
+                  label:'标准入库流程',
                   value: '1'
               },
-            {
+              {
-              label:'标准清单发布流程',
+                  label:'标准征求意见流程',
-              value: '3'
+                  value: '3'
-            },
+              },
+              {
+                  label:'标准清单发布/更新流程',
+                  value: '6'
+              },
+              {
+                  label: '项目合规评估流程',
+                  value: '7'
+              },
+              {
+                  label: '未符合项整改流程',
+                  value: '8'
+              },
+              {
+                  label: '标准解读流程',
+                  value: '9'
+              },
           ],
           formDisableFlag: false,
           pickerOptions: {

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

@@ -343,11 +343,11 @@ export default {
       var fileSuffix = filename.substring(index1, index2)
       // const fileSuffix = file.name.split('.')[1] // 后缀名
       // 判断上传文件格式
-      if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+      if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
         return true
       } else {
         this.spinShow = false
-        this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+        this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
         return false
       }
       // 判断文件上传大小
@@ -441,11 +441,12 @@ export default {
                       this.$message.success('流程发起成功')
                       this.$router.push('/processCenter')
                     }
+                    this.isSubmit = false
                   })
                 } else {
+                  this.isSubmit = false
                   this.$message.warning('流程启动失败')
                 }
-                this.isSubmit = false
               })
             } else {
               return this.$message.warning('请完善人员信息')

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

@@ -169,11 +169,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
                     return false
                 }
                 // 判断文件上传大小

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

@@ -193,11 +193,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
                     return false
                 }
                 // 判断文件上传大小

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

@@ -191,11 +191,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
                     return false
                 }
                 // 判断文件上传大小

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

@@ -191,11 +191,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
                     return false
                 }
                 // 判断文件上传大小

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

@@ -191,11 +191,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
                     return false
                 }
                 // 判断文件上传大小

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

@@ -191,11 +191,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
                     return false
                 }
                 // 判断文件上传大小

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

@@ -577,6 +577,51 @@
       <div class="demo-drawer-content">
         <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
           <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+                        <div class="left">
+                          <el-form :modal="standardSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+                                            <el-form-item label="类型" class="search-item search-item-last">
+                                              <el-select
+                                                @change="typeChange"
+                                                v-model="standardSearch.standType"
+                                                placeholder="请选择"
+                                                filterable
+                                              >
+                                                <el-option
+                                                  v-for="item in standardTypeOptions"
+                                                  :value="item.value"
+                                                  :key="item.value"
+                                                  :label="item.label"
+                                                >
+                                                </el-option>
+                                              </el-select>
+                                            </el-form-item>
+                            <el-form-item label="标准号/标准名称" class="search-item search-item-last">
+                              <el-input
+                                v-model="standardSearch.standNumber"
+                                placeholder="请输入标准号或标准名称"
+                              ></el-input>
+                            </el-form-item>
+                            <el-form-item class="search-item btn-box">
+                              <el-button
+                                :loading="searching"
+                                type="primary"
+                                class="common-button-primary"
+                                size="small"
+                                v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
+                                @click="addList">
+                                查询
+                              </el-button>
+                            </el-form-item>
+                            <el-form-item class="search-item btn-box">
+                              <el-button
+                                class="common-button-default"
+                                size="small"
+                                v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
+                                @click="clearSearch">清空
+                              </el-button>
+                            </el-form-item>
+                          </el-form>
+                        </div>
             <el-table
               :data="standardData"
               tooltip-effect="dark"
@@ -729,13 +774,20 @@ export default {
       fileUrl: 'api/att/attFile/upload',
       fileMadel: false,
       searching: false,
-      // 查询相关参数
+      // 查询选择清单相关参数
       sarSarAccessEOSearch: {
         countryArea: "",
         detailedListName: "",
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent
       },
+      //查询添加标准相关数据
+      standardSearch: {
+        standType: '',
+        standNumber:'',
+        pageNo: 1,
+        pageSizeNo: this.$store.getters.userInfo.configContent
+    },
       standList: [], //新添加的标准
       modalshowflag: false, // drawer开关
       drawerTitle: "", //drawer标题
@@ -823,6 +875,18 @@ export default {
       },
       choiceForm: {}, //选择标准清单列表
       countryOptions: [], //适用区域下拉框数据
+      standardTypeOptions: [
+        {
+          value: 'INLAND',
+        label: '国内标准法规',
+        item:'INLAND',
+      },
+        {
+          value: 'FOREIGN',
+          label: '海外标准法规',
+          item:'FOREIGN',
+        },
+      ],
       user1: "",
       user2: "",
       user3: "",
@@ -878,7 +942,6 @@ export default {
     // //判断当前选中的是哪个清单
     selectionList(type) {
       type  = this.listType
-      console.log(type);
       if (type === "project") {
         this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
           page: this.page,
@@ -925,11 +988,18 @@ export default {
         countryArea: "",
         detailedListName: ""
       };
+      this.standardSearch ={
+        standType:'',
+        standNumber: '',
+      }
       this.selectionList();
+      this.addList()
     },
     //点击添加事件
     addList() {
       this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
+        standType: this.standardSearch.standType,
+        standNumber: this.standardSearch.standNumber,
         page: this.pageNo,
         pageSize: this.pageSizeNo
       }, {
@@ -1126,6 +1196,9 @@ export default {
     closeDrawer() {
       this.ListModel = false;
     },
+    typeChange(type) {
+      this.standardSearch.standType = type
+    },
     //添加标准取消事件
     cancelStand() {
       this.standModel = false;

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

@@ -135,46 +135,6 @@
         </el-collapse>
       </div>
     </div>
-    <div class="content" v-show="active == '2'">
-      <div class="block" style="padding-top: 20px;">
-        <el-timeline>
-          <el-timeline-item timestamp="发起流程" placement="top" :color="user1 ? '#66b1ff' : ''">
-            <el-card>
-              <h4>标准/政策法规工程师</h4>
-              <div style="margin-top: 10px;">
-                <el-input v-model="user1" placeholder="请输入"></el-input>
-              </div>
-            </el-card>
-          </el-timeline-item>
-          <el-timeline-item timestamp="选择责任人进行会签" placement="top" :color="user2 ? '#66b1ff' : ''">
-            <el-card>
-              <h4>责任人</h4>
-              <div style="margin-top: 10px;">
-                <el-input v-model="user2" placeholder="请输入">
-
-                </el-input>
-              </div>
-            </el-card>
-          </el-timeline-item>
-          <el-timeline-item timestamp="根据会签内容进行修订" placement="top" :color="user3 ? '#66b1ff' : ''">
-            <el-card>
-              <h4>标准/政策法规工程师</h4>
-              <div style="margin-top: 10px;">
-                <el-input v-model="user3" placeholder="请输入"></el-input>
-              </div>
-            </el-card>
-          </el-timeline-item>
-          <el-timeline-item timestamp="审核" placement="top" :color="user5 ? '#66b1ff' : ''">
-            <el-card>
-              <h4>业务经理</h4>
-              <div style="margin-top: 10px;">
-                <el-input v-model="user5" placeholder="请输入"></el-input>
-              </div>
-            </el-card>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
-    </div>
     <div class="content" v-show="active === '3'">
       <div class="flow-list">
         <el-table
@@ -197,14 +157,12 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column

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

@@ -161,14 +161,12 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column

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

@@ -158,14 +158,12 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column

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

@@ -1335,6 +1335,7 @@
                 categoryOptions: [], // 能源类型
                 applyAuthOptions: [], // 适用认证
                 cysdOptions: [], // 我司参与深度
+                wssmrOptions: [], // 我司署名人
                 sycpxOptions: [], // 适用产品线
                 zrbmOptions: [], // 责任部门
                 zrgcsOptions: [], // 责任工程师
@@ -2024,6 +2025,7 @@
                 this.categoryOptions = res.data.NYLXCLASS // 能源类型
                 this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
                 this.cysdOptions = res.data.WSCYSD // 我司参与深度
+                this.wssmrOptions = res.data.WSSMR // 我司署名人
                 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
                 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
                 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师

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

@@ -361,12 +361,15 @@
                                     ></el-input>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
-                                    <el-input
+                                    <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled>
-                                            disabled
+                                        <el-option
-                                            v-model="form.qcdw"
+                                                v-for="item in qcdwOptions"
-                                            placeholder="请选择起草单位"
+                                                placeholder="请选择"
-                                            clearable
+                                                :key="item.value"
-                                    ></el-input>
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
+                                    </el-select>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
                                     <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled>
@@ -437,8 +440,13 @@
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
                                     <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>
-                                        <el-option label="署名人1" value="1"></el-option>
+                                        <el-option
-                                        <el-option label="署名人2" value="2"></el-option>
+                                                v-for="item in wssmrOptions"
+                                                placeholder="请选择"
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
@@ -811,6 +819,8 @@
                 categoryOptions: [], // 能源类型
                 applyAuthOptions: [], // 适用认证
                 cysdOptions: [], // 我司参与深度
+                wssmrOptions: [], // 我司署名人
+                qcdwOptions: [], // 起草单位
                 sycpxOptions: [], // 适用产品线
                 zrbmOptions: [], // 责任部门
                 zrgcsOptions: [], // 责任工程师
@@ -1006,6 +1016,8 @@
                 this.categoryOptions = res.data.NYLXCLASS // 能源类型
                 this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
                 this.cysdOptions = res.data.WSCYSD // 我司参与深度
+                this.wssmrOptions = res.data.WSSMR // 我司署名人
+                this.qcdwOptions = res.data.QCDW // 起草单位
                 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
                 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
                 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师

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

@@ -354,12 +354,15 @@
                   ></el-input>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
-                  <el-input
+                    <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled>
-                      disabled
+                        <el-option
-                      v-model="form.qcdw"
+                                v-for="item in qcdwOptions"
-                      placeholder="请选择起草单位"
+                                placeholder="请选择"
-                      clearable
+                                :key="item.value"
-                  ></el-input>
+                                :value="item.value"
+                                :label="item.label"
+                        ></el-option>
+                    </el-select>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
                   <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled>
@@ -430,8 +433,13 @@
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
                   <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>
-                    <el-option label="署名人1" value="1"></el-option>
+                      <el-option
-                    <el-option label="署名人2" value="2"></el-option>
+                              v-for="item in wssmrOptions"
+                              placeholder="请选择"
+                              :key="item.value"
+                              :value="item.value"
+                              :label="item.label"
+                      ></el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
@@ -803,6 +811,8 @@ export default {
       categoryOptions: [], // 能源类型
       applyAuthOptions: [], // 适用认证
       cysdOptions: [], // 我司参与深度
+      wssmrOptions: [], // 我司署名人
+      qcdwOptions: [], // 起草单位
       sycpxOptions: [], // 适用产品线
       zrbmOptions: [], // 责任部门
       zrgcsOptions: [], // 责任工程师
@@ -994,6 +1004,8 @@ export default {
       this.categoryOptions = res.data.NYLXCLASS // 能源类型
       this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
       this.cysdOptions = res.data.WSCYSD // 我司参与深度
+      this.wssmrOptions = res.data.WSSMR // 我司署名人
+      this.qcdwOptions = res.data.QCDW // 起草单位
       this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
       this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
       this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师

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

@@ -519,11 +519,15 @@
                   ></el-input>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
-                  <el-input
+                    <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple>
-                      v-model="form.qcdw"
+                        <el-option
-                      placeholder="请选择起草单位"
+                                v-for="item in qcdwOptions"
-                      clearable
+                                placeholder="请选择"
-                  ></el-input>
+                                :key="item.value"
+                                :value="item.value"
+                                :label="item.label"
+                        ></el-option>
+                    </el-select>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
                   <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple>
@@ -594,8 +598,13 @@
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
                   <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple>
-                    <el-option label="署名人1" value="1"></el-option>
+                      <el-option
-                    <el-option label="署名人2" value="2"></el-option>
+                              v-for="item in wssmrOptions"
+                              placeholder="请选择"
+                              :key="item.value"
+                              :value="item.value"
+                              :label="item.label"
+                      ></el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
@@ -1173,6 +1182,8 @@ export default {
       categoryOptions: [], // 能源类型
       applyAuthOptions: [], // 适用认证
       cysdOptions: [], // 我司参与深度
+      wssmrOptions: [], // 我司署名人
+      qcdwOptions: [], // 起草单位
       sycpxOptions: [], // 适用产品线
       zrbmOptions: [], // 责任部门
       zrgcsOptions: [], // 责任工程师
@@ -1602,6 +1613,8 @@ export default {
       this.categoryOptions = res.data.NYLXCLASS // 能源类型
       this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
       this.cysdOptions = res.data.WSCYSD // 我司参与深度
+      this.wssmrOptions = res.data.WSSMR // 我司署名人
+      this.qcdwOptions = res.data.QCDW // 起草单位
       this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
       this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
       this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师

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

@@ -26,7 +26,7 @@
               <el-col :span="24">
                 <el-form-item label="选择征求意见" class="add-form-item form-item-disabled">
                   <div class="addButton">
-                    <el-button  size="small" type="primary" @click="addZqyjList">选择征求意见</el-button>
+                    <el-button  size="small" type="primary" @click="addZqyjList">选择标准</el-button>
                   </div>
                 </el-form-item>
                 <el-form-item label="标准号" prop="cid" class="add-form-item form-item-disabled">
@@ -164,46 +164,46 @@
     >
     </ProcessFooter>
     <el-drawer
-      title="标准征求意见数据库"
+      title="标准库"
       :visible.sync="listModel"
       size="900px"
       custom-class="demo-drawer"
     >
       <div class="standardForComments">
-
         <div class="content">
           <!-- 顶部工具栏 -->
           <table-tools-bar>
             <div slot="left">
               <div class="search-area">
-<!--                <el-form :model="standCommonlySearch" inline class="label-input-form">-->
+                <el-form :model="standCommonlySearch" inline class="label-input-form">
-<!--&lt;!&ndash;                  <el-formItem label="类别" class="search-item">&ndash;&gt;-->
+                  <el-formItem label="标准号/名称" prop="standNumber" class="search-item">
-<!--&lt;!&ndash;                    <el-input v-model="standCommonlySearch.categorg" class="s-c-input" placeholder="标准/政策" clearable :maxlength="100"></el-input>&ndash;&gt;-->
+                    <el-input v-model="standCommonlySearch.standNumber" placeholder="根据标准号/名称查找" clearable/>
-<!--&lt;!&ndash;                  </el-formItem>&ndash;&gt;-->
+                  </el-formItem>
-<!--&lt;!&ndash;                  <el-formItem label="关键字" class="search-item">&ndash;&gt;-->
+                  <el-formItem label="标准类别" prop="standSort" class="search-item">
-<!--&lt;!&ndash;                    <el-input v-model="standCommonlySearch.cname" class="s-c-input" placeholder="请输入关键字" clearable :maxlength="100"></el-input>&ndash;&gt;-->
+                    <el-select v-model="standCommonlySearch.standSort" placeholder="根据标准类别查找" clearable>
-<!--&lt;!&ndash;                  </el-formItem>&ndash;&gt;-->
+                      <el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label }}
-<!--&lt;!&ndash;                  <el-formItem label="开始日期" class="search-item">&ndash;&gt;-->
+                      </el-option>
-<!--&lt;!&ndash;                    <el-datePicker v-model="standCommonlySearch.start" :editable="false"&ndash;&gt;-->
+                    </el-select>
-<!--&lt;!&ndash;                                   placeholder="请选择开始日期"></el-datePicker>&ndash;&gt;-->
+                  </el-formItem>
-<!--&lt;!&ndash;                  </el-formItem>&ndash;&gt;-->
+                  <el-formItem label="标准来源" prop="standType" class="search-item">
-<!--&lt;!&ndash;                  <el-formItem label="结束日期" class="search-item">&ndash;&gt;-->
+                    <el-select v-model="standCommonlySearch.standType" placeholder="根据标准来源查找" clearable>
-<!--&lt;!&ndash;                    <el-datePicker v-model="standCommonlySearch.end" :editable="false"&ndash;&gt;-->
+                      <el-option value="INLAND" key="1" label="国内标准"></el-option>
-<!--&lt;!&ndash;                                   placeholder="请选择结束日期"></el-datePicker>&ndash;&gt;-->
+                      <el-option value="FOREIGN" key="2" label="海外标准"></el-option>
-<!--&lt;!&ndash;                  </el-formItem>&ndash;&gt;-->
+                    </el-select>
-<!--                  <el-formItem class="search-item btn-box">-->
+                  </el-formItem>
-<!--                    <el-button-->
+                  <el-formItem class="search-item btn-box">
-<!--                            type="primary"-->
+                    <el-button
-<!--                            size="mini"-->
+                            type="primary"
-<!--                            class="common-button-primary"-->
+                            size="mini"
+                            class="common-button-primary"
 
-<!--                            @click="sarStandCompareHisInfo">查询</el-button>-->
+                            @click="sarStandCompareHisInfo">查询</el-button>
-<!--                    <el-button-->
+                    <el-button
-<!--                            class="common-button-default"-->
+                            class="common-button-default"
-<!--                            size="mini"-->
+                            size="mini"
-<!--                            @click="clearSearchStand">清空</el-button>-->
+                            @click="clearSearchStand">清空</el-button>
-<!--                  </el-formItem>-->
+                  </el-formItem>
-<!--                </el-form>-->
+                </el-form>
               </div>
             </div>
           </table-tools-bar>
@@ -332,10 +332,9 @@ export default {
       },
       // 标准征求意见数据可库
       standCommonlySearch: {
-        // categorg: '',
+        standSort: '',
-        // cname: '',
+        standNumber: '',
-        // start: '',
+        standType: '',
-        // end: '',
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent
       },
@@ -383,6 +382,7 @@ export default {
         label: 'name'
       },
       roleRow: {},
+      standSortOptions: [],
     }
   },
   components: {
@@ -393,6 +393,12 @@ export default {
   mounted () {
     this.getTree()
     this.sarStandCompareHis()
+    this.$http.get('sys/dictype/getDicTypeListCode', '', {
+      _this: this
+    }, res => {
+      this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+    }, e => {
+    })
     this.tableHeight = $('.content').height() - 44
     window.onresize = () => {
       this.tableHeight = $('.content').height() - 44
@@ -408,15 +414,14 @@ export default {
     // 清空
     clearSearchStand () {
       this.standCommonlySearch.page = 1
-      this.standCommonlySearch.start = ''
+      this.standCommonlySearch.standSort = ''
-      this.standCommonlySearch.end = ''
+      this.standCommonlySearch.standNumber = ''
-      this.standCommonlySearch.categorg = ''
+      this.standCommonlySearch.standType = ''
-      this.standCommonlySearch.cname = ''
       this.sarStandCompareHis()
     },
     // 搜索
     sarStandCompareHisInfo() {
-      this.splitInfoPage = 1
+      this.standCommonlySearch.page = 1
       this.sarStandCompareHis()
     },
     // 查询表格

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

@@ -234,7 +234,7 @@
             handleSave() {},
             handleSubmit() {
                 if (this.data.length < 1) {
-                    this.$message.warning('请输入征求意见搞')
+                    this.$message.warning('请输入征求意见')
                 } else {
                     var a = 0
                     var b = 0

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

@@ -209,9 +209,6 @@
                     return '处理后上报'
                 }
             },
-            upload (row) {
-                console.log(row);
-            },
             handleTabs(name) {
                 this.active = name
             },

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

@@ -209,9 +209,6 @@
                     return '处理后上报'
                 }
             },
-            upload (row) {
-                console.log(row);
-            },
             handleTabs(name) {
                 this.active = name
             },

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

@@ -209,9 +209,6 @@
                     return '处理后上报'
                 }
             },
-            upload (row) {
-                console.log(row);
-            },
             handleTabs(name) {
                 this.active = name
             },

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

@@ -340,7 +340,7 @@ export default {
 
     // 点击批量删除事件
     deleteList() {
-      if (this.selectList.length < 1) {
+      if (this.selectedList.length < 1) {
         this.$message.warning("请选择一条数据进行删除");
       } else {
         this.$confirm("您确认删除这些数据?", "提示", {
@@ -350,7 +350,7 @@ export default {
           type: "warning"
         }).then(() => {
           let exits = [];
-          this.selectList.map(item => {
+          this.selectedList.map(item => {
             let index;
             index = this.dataList.findIndex(items => {
               return items.id = item;
@@ -360,7 +360,7 @@ export default {
             }
             exits.push(item);
           });
-          this.selectList = [];
+          this.selectedList = [];
         }).catch(() => {
         });
       }

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

@@ -92,8 +92,10 @@
           <el-table-column prop="planCloseTime" label="整改完成时间"/>
           <el-table-column prop="responsibleUnit" label="责任部门"/>
           <el-table-column prop="dutyEngineer" label="负责人"/>
-          <el-table-column label="佐证材料">
+          <el-table-column label="佐证材料" show-overflow-tooltip>
-            <div class="div-text">{{ 11 || '暂无数据' }}</div>
+            <template slot-scope="scope">
+              <el-button  type="text" @click="download" >{{scope.row.fileText}}</el-button>
+            </template>
           </el-table-column>
         </el-table>
         <!--        <pagination :page="pageNo" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"/>-->
@@ -263,6 +265,16 @@ export default {
       }
       this.getData()
     },
+    download(row) {
+      // window.open(process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + tPath)
+      var name = row.fileText;
+      var url = row.fileTextPath;
+      const a = document.createElement('a')
+      a.setAttribute('download', name)
+      a.setAttribute('target', '_blank')
+      a.setAttribute('href', process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + url)
+      a.click()
+    },
     // 分页事件
     pageChange (page) {
       this.pageNo = page

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

@@ -65,7 +65,7 @@
         <div class="tableTitle">
           <div class="tableButton">
             <el-button plain class="common-button-primary" size="mini" @click="addList">新增</el-button>
-            <el-button plain class="common-button-primary" size="mini" @click="addList">批量删除</el-button>
+            <el-button plain class="common-button-primary" size="mini" @click="deleteList">批量删除</el-button>
           </div>
         </div>
         <el-table
@@ -163,6 +163,51 @@
       <div class="demo-drawer-content">
         <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
           <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+            <div class="left">
+              <el-form :modal="standardSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+                <el-form-item label="类型" class="search-item search-item-last">
+                  <el-select
+                    @change="typeChange"
+                    v-model="standardSearch.standType"
+                    placeholder="请选择"
+                    filterable
+                  >
+                    <el-option
+                      v-for="item in standardTypeOptions"
+                      :value="item.value"
+                      :key="item.value"
+                      :label="item.label"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="标准号/标准名称" class="search-item search-item-last">
+                  <el-input
+                    v-model="standardSearch.standName"
+                    placeholder="请输入标准号或标准名称"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    :loading="searching"
+                    type="primary"
+                    class="common-button-primary"
+                    size="small"
+                    v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
+                    @click="getStandData">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
+                    @click="clearSearch">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
             <el-table
               :data="sarAccessListDatas"
               tooltip-effect="dark"
@@ -344,6 +389,24 @@ export default {
       standList: [], //新添加的标准
       modalshowflag: false, // drawer开关
       drawerTitle: "", //drawer标题
+      // 查询相关参数
+      searching: false,
+      standardSearch: {
+        standType:'',
+        standName:'',
+      },
+      standardTypeOptions: [
+        {
+          value: 'INLAND',
+          label: '国内标准法规',
+          item:'INLAND',
+        },
+        {
+          value: 'FOREIGN',
+          label: '海外标准法规',
+          item:'FOREIGN',
+        },
+      ],
       nodeList: [],
       defaultProps: {
         children: "children",
@@ -386,6 +449,7 @@ export default {
       },
       ListModel: false, //选择拆分标准抽屉状态
       treeData: [], // 人员数据
+      selectList: [], //选择标准的选择框
       isSubmit: false,
       saveLoading: false,
       selectedList: [],  //拆分标准的选择框
@@ -409,7 +473,8 @@ export default {
           id: "",
           itemsName: "",
           itemsNum: "",
-          responsibleUnit: "",
+          responsibleUnit: "",  //责任部门
+          responsibleEngineer: "", //责任工程师
           standId: "",
           svpps: ""
         }],
@@ -477,6 +542,9 @@ export default {
     handleTabs(name) {
       this.active = name;
     },
+    typeChange(type) {
+      this.standardSearch.standType = type
+    },
     choiceShow() {
       this.ListModel = true;
     },
@@ -497,6 +565,31 @@ export default {
     addList() {
       this.standModel = true;
     },
+    // 点击批量删除事件
+    deleteList() {
+       if(this.selectList.length < 1){
+         this.$message.warning('请选择一条数据进行删除')
+       }else {
+          this.$confirm('您确认删除这些数据？', '提示', {
+            confirmButtonText: "确认",
+            confirmButtonClass: "common-button-primary",
+            cancelButtonText: "取消",
+            type: "warning"
+          }). then(() => {
+            this.selectList.map(item => {
+              let index;
+            index =  this.dataList.findIndex(items => {
+                return items.productLine = item
+              })
+              if (index > -1) {
+                this.dataList.splice(index, 1);
+              }
+            });
+            this.selectList = [];
+          }).catch(() => {
+          })
+       }
+    },
     //取消添加事件
     cancelStand() {
       this.standModel = false;
@@ -540,8 +633,8 @@ export default {
       json.prcCreateUser = this.$store.getters.userInfo.userId;
       json.prcCreateUserName = this.$store.getters.userInfo.account;
       json.standId = this.listForm.standId;
-      json.XCXSSRQ =  this.sarAccessListDatas[0].attrInfoMap.XCXSSRQ
+      json.XCXSSRQ =  this.sarAccessListDatas[0].xcxssrqgj
-      json.ZCCSSRQ =  this.sarAccessListDatas[0].attrInfoMap.ZCCSSRQ
+      json.ZCCSSRQ =  this.sarAccessListDatas[0].zccssrqgj
       this.$refs['listForm'].validate((valid) => {
         if (valid) {
           this.$refs['roleForm'].validate((valid) => {
@@ -590,6 +683,7 @@ export default {
         }, {
           _this: this
         }, res => {
+          console.log(res)
           this.listForm.breakdownList = res.data;
           this.ListModel = false;
         }, e => {
@@ -609,7 +703,7 @@ export default {
     selectStandChange(data) {
       this.selectList = [];
       for (let i = 0; i < data.length; i++) {
-        this.selectList.push(data[i].id);
+        this.selectList.push(data[i].productLine);
       }
     },
     //添加产品线select的改变
@@ -655,28 +749,34 @@ export default {
       }, {
         _this: this
       }, res => {
-        this.productData = res.data;
+        this.productData = res.data.records;
         this.totalNo = res.data.total;
       }, e => {
 
       });
     },
     //获取标准数据
-    getStandData() {
+    getStandData(){
-      console.log(this.page);
+      this.$http.post('SarStandItems/sar-stand-items/findStand',{
-      console.log(this.pageSize);
-      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
         page: this.page,
-        pageSize: this.pageSize,
+        size: this.pageSize,
-      }, {
+        ...this.standardSearch,
-        _this: this
+      },{
+        _this: this,
       }, res => {
-        console.log(res.data);
+        this.sarAccessListDatas = res.records;
-        this.sarAccessListDatas = res.data.list;
+        this.total = res.total
-        this.total = res.data.count;
       }, e => {
-      });
+
-    }
+      })
+    },
+    clearSearch() {
+      this.standardSearch = {
+        standName: "",
+        standType:"",
+      };
+      this.getStandData();
+    },
   },
   computed: {},
   mounted() {

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

@@ -132,14 +132,12 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
@@ -243,7 +241,8 @@ export default {
           id: "",
           itemsName: "",
           itemsNum: "",
-          responsibleUnit: "",
+          responsibleUnit: "",  //责任部门
+          responsibleEngineer: "", //责任工程师
           standId: "",
           svpps: ""
         }],
@@ -318,6 +317,7 @@ export default {
      */
     getFormFieldList (item) {
       this.$nextTick(() => {
+        console.log(item.dataList)
         this.listForm = JSON.parse(JSON.stringify(item))
         this.listForm.prcNum = this.prcNum
         this.listForm.prcName = this.prcName
@@ -325,6 +325,7 @@ export default {
         this.listForm.dataList = item.dataList
         this.dataList = item.dataList
         this.dataList.distributePerson = item.dataList[0].distributePerson
+        this.listForm.breakdownList = item.breakdownList
       })
     },
 
@@ -344,6 +345,7 @@ export default {
       this.listForm.standId = this.listForm.standId;
       this.listForm.passFlag = '1';
       this.listForm.signFlag = "";
+      this.listForm.breakdownList = this.listForm.breakdownList
       const json = JSON.stringify(this.listForm);
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,

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

@@ -101,11 +101,17 @@
             prop="xCXSSRQ"
             align="center"
             label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="zCCSSRQ"
             align="center"
             label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             fixed="right"
@@ -177,14 +183,12 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
@@ -384,6 +388,8 @@ export default {
           this.listForm.breakdownList.push({
             itemsName: item.pepdtos[i].breakdownList[j].itemsName,
             itemNum: item.pepdtos[i].breakdownList[j].itemsNum,
+            responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer,
+            responsibleUnit: item.pepdtos[i].breakdownList[j].responsibleUnit,
             productLine: item.pepdtos[i].sarStandProjectLibraries.productLine,
             projectNumber: item.pepdtos[i].sarStandProjectLibraries.projectNumber,
             projectName: item.pepdtos[i].sarStandProjectLibraries.projectName,
@@ -400,6 +406,7 @@ export default {
             zCCSSRQ:  item.pepdtos[i].zCCSSRQ,
           });
         }
+        console.log(item.pepdtos);
       }
     },
     saveUserInfo() {
@@ -442,7 +449,6 @@ export default {
       this.listForm.zrUserId = this.$store.getters.userInfo.userId;
       this.listForm.commentText = this.commentText;
       this.listForm.approvalOpinion = "";
-      this.listForm.standId = this.listForm.standId;
       this.listForm.signFlag = "";
       const json = JSON.stringify(this.listForm.breakdownList);
       this.$http.post("lawss/activiti/completeTask", {

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

@@ -107,12 +107,18 @@
             width="200"
             align="center"
             label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="zCCSSRQ"
             width="200"
             align="center"
             label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="productType"
@@ -286,14 +292,12 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
@@ -496,6 +500,10 @@ export default {
         this.listForm.standNumber = item.step3DTOS[0].standNumber
         this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer
         this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer
+        this.listForm.itemsName = item.step3DTOS[0].itemsName
+        this.listForm.itemNum = item.step3DTOS[0].itemNum
+        this.listForm.responsibleUnit = item.step3DTOS[0].responsibleUnit
+        this.listForm.responsibleEngineer = item.step3DTOS[0].responsibleEngineer
       })
     },
 
@@ -506,12 +514,8 @@ export default {
     //提交事件
     handleSubmit() {
       this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
-      this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
-      this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
-      this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
       this.listForm.commentText = this.commentText;
       this.listForm.approvalOpinion = "";
-      this.listForm.standId = this.listForm.standId;
       this.listForm.signFlag = "";
       this.listForm.dataList = this.dataList
       const json = JSON.stringify(this.listForm);

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

@@ -107,12 +107,18 @@
             width="200"
             align="center"
             label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="zCCSSRQ"
             width="200"
             align="center"
             label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="productType"
@@ -243,14 +249,12 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
@@ -428,13 +432,19 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList (item) {
-      console.log(item.dataList);
+      console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item))
         this.listForm.prcNum = this.prcNum
         this.listForm.prcName = this.prcName
         this.listForm['id'] = item.id
         this.dataList = item.dataList
+        this.listForm.standName = item.standName
+        this.listForm.standNumber = item.standNumber
+        this.listForm.qualityEngineer = item.qualityEngineer
+        this.listForm.certifiedEngineer = item.certifiedEngineer
+        this.listForm.responsibleUnit = item.responsibleUnit
+        this.listForm.responsibleEngineer = item.responsibleEngineer
       })
     },
 
@@ -448,7 +458,6 @@ export default {
     handleSubmit() {
       this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
       this.listForm.commentText = this.commentText;
-      this.listForm.standId = this.listForm.standId;
       this.listForm.fenFlag = "1";
       this.listForm.dataList = this.dataList
       const json = JSON.stringify(this.listForm);

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

@@ -107,12 +107,18 @@
             width="200"
             align="center"
             label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="zCCSSRQ"
             width="200"
             align="center"
             label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="productType"
@@ -243,14 +249,12 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column

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

@@ -107,12 +107,18 @@
             width="200"
             align="center"
             label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="zCCSSRQ"
             width="200"
             align="center"
             label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="productType"
@@ -243,14 +249,12 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column

src/pages/processCenter/pages/newProcess/index.vue

@@ -7,8 +7,8 @@
         <div class="process-name" @click="handleCreateProcess('2')">标准调研流程</div>
         <div class="process-name" @click="handleCreateProcess('1')">标准入库流程</div>
         <div class="process-name" @click="handleCreateProcess('3')">标准征求意见流程</div>
-        <div class="process-name" @click="handleCreateProcess('4')">标准需求(翻译)申请流程</div>
+<!--        <div class="process-name" @click="handleCreateProcess('4')">标准需求(翻译)申请流程</div>-->
-        <div class="process-name" @click="handleCreateProcess('5')">标准发放申请流程</div>
+<!--        <div class="process-name" @click="handleCreateProcess('5')">标准发放申请流程</div>-->
         <div class="process-name" @click="handleCreateProcess('6')">标准清单发布/更新流程</div>
         <div class="process-name" @click="handleCreateProcess('7')">项目合规评估流程</div>
         <div class="process-name" @click="handleCreateProcess('8')">未符合项整改流程</div>

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue

@@ -117,7 +117,7 @@
               }}</span>
           </template>
         </el-table-column>
-        <el-table-column
+<!--        <el-table-column
           prop="applicationScope"
           label="适用领域"
           align="center">
@@ -126,7 +126,7 @@
               v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
               }}</span>
           </template>
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column
           prop="updateTime"
           label="更新时间"
@@ -188,6 +188,7 @@ export default {
       selectedList: [],
       // 新增、编辑 准入信息字段
       sarAccessEO: {
+        relateFile: '',
         country: "",
         applyArctic: "",
         energyKind: "",
@@ -261,11 +262,16 @@ export default {
     searchSarAccess() {
       this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
         sortKey: 1,
+        page: 1,
+        pageSize: 10,
         ...this.sarSarAccessEOSearch,
       }, {
         _this: this
       }, res => {
         this.sarAccessListDatas = res.data.records;
+        this.sarAccessListDatas.forEach(item => {
+          this.$set(item,'relateFile','')
+        })
         this.sarAccessListTotal = res.data.total
       }, e => {
 

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue

@@ -108,7 +108,7 @@
               }}</span>
           </template>
         </el-table-column>
-        <el-table-column
+<!--        <el-table-column
           prop="applicationScope"
           label="适用领域"
           align="center">
@@ -117,14 +117,14 @@
               v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
               }}</span>
           </template>
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column
           prop="updateTime"
           label="更新时间"
           sortable
           align="center">
           <template slot-scope="scope">
-            <div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD hh:mm:ss')  : scope.row.updateTime }}</div>
+            <div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD')  : scope.row.updateTime }}</div>
           </template>
         </el-table-column>
         <el-table-column
@@ -269,6 +269,8 @@ export default {
     searchSarAccess() {
       this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
         ...this.sarSarAccessEOSearch,
+        page: 1,
+        pageSize: 10,
         sortKey: 3
       }, {
         _this: this

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue

@@ -109,7 +109,7 @@
               }}</span>
           </template>
         </el-table-column>
-        <el-table-column
+<!--        <el-table-column
           prop="applicationScope"
           label="适用领域"
           align="center">
@@ -118,14 +118,14 @@
               v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
               }}</span>
           </template>
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column
           prop="updateTime"
           label="更新时间"
           sortable
           align="center">
           <template slot-scope="scope">
-            <div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD hh:mm:ss')  : scope.row.updateTime }}</div>
+            <div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD')  : scope.row.updateTime }}</div>
           </template>
         </el-table-column>
         <el-table-column
@@ -270,6 +270,8 @@ export default {
     searchSarAccess() {
       this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
         ...this.sarSarAccessEOSearch,
+        page: 1,
+        pageSize: 10,
         sortKey: 2
       }, {
         _this: this
@@ -294,7 +296,7 @@ export default {
         projectName: "",
         detailedListName: "",
       };
-      this.searchSarAccess();
+      this.searchSarAccess()
 
     },
     // 新增相关

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

@@ -28,7 +28,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="适用领域" prop="applicationScope" class="search-item">
+<!--            <el-form-item label="适用领域" prop="applicationScope" class="search-item">
               <el-select
                   v-model="sarAccessEO.applicationScope"
                   multiple
@@ -45,7 +45,7 @@
                 >
                 </el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item>-->
             <br/><br/>
             <el-form-item label="清单说明" prop="remark" class="search-item max-search-item2">
               <el-input
@@ -336,40 +336,93 @@
         >
         </el-table-column>
         <el-table-column
-            prop="issueTime"
+          prop="issueTime"
-            sortable
+          align="center"
-            label="发布日期">
+          width="180px"
+          label="英文名称">
         </el-table-column>
         <el-table-column
-            prop="xcxssrq"
+          prop="issueTime"
-            sortable
+          align="center"
-            label="新车型实施日期">
+          width="180px"
+          label="适用车型">
         </el-table-column>
         <el-table-column
-            show-overflow-tooltip
+          prop="issueTime"
-            prop="zccssrq"
+          align="center"
-            sortable
+          width="180px"
-            label="在产车实施日期">
+          label="能源类型">
         </el-table-column>
         <el-table-column
-            show-overflow-tooltip
+          prop="issueTime"
-            prop="textStatus"
+          sortable
-            width="120px"
+          align="center"
-            label="文本状态">
+          width="210px"
+          label="标准实施日期">
+        </el-table-column>
+        <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="新车型实施日期">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="zccssrq"
+          width="210px"
+          align="center"
+          label="责任部门">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="textStatus"
+          width="180px"
+          align="center"
+          label="适用产品线">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="textStatus"
+          width="210px"
+          align="center"
+          label="乘用车VPPS中文名称">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="textStatus"
+          align="center"
+          width="210px"
+          label="卡车VPPS编码">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="textStatus"
+          align="center"
+          width="210px"
+          label="卡车VPPS中文名称">
         </el-table-column>
         <el-table-column>
           <template slot-scope="scope">
             <el-button
-                class="common-button-default"
+              class="common-button-default"
-                type="primary"
+              type="primary"
-                size="small" @click="moveUp(scope.$index, scope.row)"
+              size="small" @click="moveUp(scope.$index, scope.row)"
-                v-if="!disabledFlag"
+              v-if="!disabledFlag"
             >上移</el-button>
             <el-button
-                class="common-button-default"
+              class="common-button-default"
-                type="danger"
+              type="danger"
-                size="small" @click="moveDown(scope.$index, scope.row)"
+              size="small" @click="moveDown(scope.$index, scope.row)"
-                v-if="!disabledFlag"
+              v-if="!disabledFlag"
             >下移</el-button>
           </template>
         </el-table-column>
@@ -484,7 +537,7 @@ export default {
         type: '',
         relateFile: '',
         remark: '', // 清单说明
-        applicationScope: '' //适用领域
+        // applicationScope: '' //适用领域
       },
       fileInfoList: [], // 上传的附件
       uploadFileListPath: 'api/att/attFile/upload', // 上传的地址
@@ -525,7 +578,7 @@ export default {
       sarAccessInfoSearch: {
         id: '',
         countryArea: '', // 国家
-        applicationScope: '', //适用区域
+        // applicationScope: '', //适用区域
         keywords: '', // 关键字
         detailedListName: '', //清单名称
         applyArctic: '', // 能源种类
@@ -790,6 +843,7 @@ export default {
     uploadBackSuccess (res, file, fileList) {
       if (res.ok) {
         this.fileInfoList = fileList
+        console.log(this.fileInfoList)
         this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
         this.$message.success('上传成功')
       } else {
@@ -1122,7 +1176,7 @@ export default {
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
           sarAccessEO.inforlist = JSON.stringify(rowlist)
           sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
-          sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
+          // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
           // 判断是否有附件
           if (this.fileInfoList.length > 0) {
             let relateFile = []
@@ -1130,6 +1184,7 @@ export default {
               relateFile.push(item.id)
             })
             sarAccessEO.relateFile = relateFile.join(',')
+            console.log(sarAccessEO.relateFile)
           }
           if (!sarAccessEO.id) {
             // 新增
@@ -1140,10 +1195,15 @@ export default {
               loading: 'loadData'
             }, res => {
               if (res.ok) {
+                this.$message.success('新增成功')
                 this.isNext = true
                 this.$router.push({
-                  name: 'AccessStandardsAndRegulations'
+                  name: 'AccessStandardsAndRegulations',
+                  query: {
+                    relateFile: sarAccessEO.relateFile
+                  }
                 })
+                console.log(sarAccessEO)
               }
             }, e => {
             })
@@ -1154,6 +1214,7 @@ export default {
               loading: 'loadData'
             }, res => {
               if (res.ok) {
+                this.$message.success('编辑成功')
                 this.isNext = true
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
@@ -1376,8 +1437,8 @@ export default {
                 this.sarAccessInfoList.push(nowstandinfo)
                 this.sarAccessInfoList[this.sarAccessInfoList.length - 1].uuid = this.number
                 this.number++
-                this.isSubmit = false
                 this.$message.success('添加成功')
+                this.isSubmit = false
               } else {
                 this.sarAccessInfoList.map((item, index) => {
                   if (item.uuid === nowstandinfo.uuid) {
@@ -1678,7 +1739,7 @@ export default {
       this.$nextTick(() => {
         this.sarAccessEO.type = accessRow.type
         this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
-        this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',')
+        // this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',')
         this.sarAccessEO.detailedListName = accessRow.detailedListName
         this.sarAccessEO.id = accessRow.id
         this.sarAccessEO.remark = accessRow.remark || ''
@@ -1768,4 +1829,4 @@ export default {
     margin: 2px;
   }
 }
-</style>
+</style>

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

@@ -26,13 +26,13 @@
                 title="下载"
                 @click="downloadFile(item.id)"
                 class="icon-download"
-                v-btn-permission="'E5QPKLR9CFVXTV64N32C'"
+                v-btn-permission="''"
               />
               <i
                 title="下载带水印"
                 @click="downloadFileByWater(item.id,item.name)"
                 class="icon-download2"
-                v-btn-permission="'43MBNPD59L2VYEQH4DSL'"
+                v-btn-permission="''"
               />
             </p>
           </div>
@@ -452,6 +452,7 @@ export default {
     },
     // 请求上传的文件信息
     getFileInfo() {
+      console.log(this.sarAccessEO)
       this.$http.get("att/attFile/getMultiFileInfos", {
         fileIds: this.sarAccessEO.relateFile
       }, {
@@ -564,6 +565,7 @@ export default {
   mounted() {
     this.$nextTick(() => {
       let accessRow = JSON.parse(sessionStorage.getItem("accessRow"));
+      console.log(accessRow)
       this.pageId = accessRow.id
       this.sarAccessEO = accessRow;
       this.selectInfobyAccid();

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

@@ -13,7 +13,7 @@
             <el-form-item label="清单类别" prop="detailedList" class="search-item">
               <el-input v-model="sarAccessEO.detailedList" :disabled="disabledFlag" placeholder="请输入"></el-input>
             </el-form-item>
-            <el-form-item label="适用领域" prop="applicationScope" class="search-item">
+<!--            <el-form-item label="适用领域" prop="applicationScope" class="search-item">
               <el-select
                 v-model="sarAccessEO.applicationScope"
                 multiple
@@ -30,7 +30,7 @@
                 >
                 </el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item>-->
             <br/><br/>
             <el-form-item label="清单说明" prop="remark" class="search-item max-search-item2">
               <el-input
@@ -322,25 +322,78 @@
         </el-table-column>
         <el-table-column
           prop="issueTime"
-          sortable
+          align="center"
-          label="发布日期">
+          width="180px"
+          label="英文名称">
         </el-table-column>
         <el-table-column
-          prop="xcxssrq"
+          prop="issueTime"
+          align="center"
+          width="180px"
+          label="适用车型">
+        </el-table-column>
+        <el-table-column
+          prop="issueTime"
+          align="center"
+          width="180px"
+          label="能源类型">
+        </el-table-column>
+        <el-table-column
+          prop="issueTime"
           sortable
-          label="新车型实施日期">
+          align="center"
+          width="210px"
+          label="标准实施日期">
         </el-table-column>
         <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="新车型实施日期">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="zccssrq"
+          width="210px"
+          align="center"
+          label="责任部门">
+        </el-table-column>
         <el-table-column
           show-overflow-tooltip
           prop="textStatus"
-          width="120px"
+          width="180px"
-          label="文本状态">
+          align="center"
+          label="适用产品线">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="textStatus"
+          width="210px"
+          align="center"
+          label="乘用车VPPS中文名称">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="textStatus"
+          align="center"
+          width="210px"
+          label="卡车VPPS编码">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="textStatus"
+          align="center"
+          width="210px"
+          label="卡车VPPS中文名称">
         </el-table-column>
         <el-table-column>
           <template slot-scope="scope">
@@ -462,14 +515,14 @@ export default {
       // 新增、编辑 基础信息字段
       sarAccessEO: {
         id: '',
-        sortKey: 1,
+        sortKey: 4,
         detailedList: '',
         detailedListName: '',
         energyKind: '',
         type: '',
         relateFile: '',
         remark: '', // 清单说明
-        applicationScope: '' //适用领域
+        // applicationScope: '' //适用领域
       },
       fileInfoList: [], // 上传的附件
       uploadFileListPath: 'api/att/attFile/upload', // 上传的地址
@@ -510,7 +563,7 @@ export default {
       sarAccessInfoSearch: {
         id: '',
         countryArea: '', // 国家
-        applicationScope: '', //适用区域
+        // applicationScope: '', //适用区域
         keywords: '', // 关键字
         detailedListName: '', //清单名称
         applyArctic: '', // 能源种类
@@ -1107,7 +1160,7 @@ export default {
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
           sarAccessEO.inforlist = JSON.stringify(rowlist)
           // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
-          sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
+          // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
           // 判断是否有附件
           if (this.fileInfoList.length > 0) {
             let relateFile = []
@@ -1125,6 +1178,7 @@ export default {
               loading: 'loadData'
             }, res => {
               if (res.ok) {
+                this.$message.success('新增成功')
                 this.isNext = true
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
@@ -1139,6 +1193,7 @@ export default {
               loading: 'loadData'
             }, res => {
               if (res.ok) {
+                this.$message.success('编辑成功')
                 this.isNext = true
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
@@ -1669,7 +1724,7 @@ export default {
       this.$nextTick(() => {
         this.sarAccessEO.type = accessRow.type
         this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
-        this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',')
+        // this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',')
         this.sarAccessEO.detailedListName = accessRow.detailedListName
         this.sarAccessEO.id = accessRow.id
         this.sarAccessEO.remark = accessRow.remark || ''

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

@@ -10,10 +10,10 @@
             <el-form-item label="清单名称" prop="detailedListName" class="search-item">
               <el-input v-model="sarAccessEO.detailedListName" :disabled="disabledFlag" placeholder="请输入"></el-input>
             </el-form-item>
-            <el-form-item label="项目名称" prop="detailedList" class="search-item">
+            <el-form-item label="项目名称" prop="projectName" class="search-item">
-              <el-input v-model="sarAccessEO.detailedList" :disabled="disabledFlag" placeholder="请输入"></el-input>
+              <el-input v-model="sarAccessEO.projectName" :disabled="disabledFlag" placeholder="请输入"></el-input>
             </el-form-item>
-            <el-form-item label="适用领域" prop="applicationScope" class="search-item">
+<!--            <el-form-item label="适用领域" prop="applicationScope" class="search-item">
               <el-select
                 v-model="sarAccessEO.applicationScope"
                 multiple
@@ -30,7 +30,7 @@
                 >
                 </el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item>-->
             <br/><br/>
             <el-form-item label="清单说明" prop="remark" class="search-item max-search-item2">
               <el-input
@@ -246,8 +246,8 @@
             align="center">
           </el-table-column>
           <el-table-column
-            prop="detailedList"
+            prop="projectName"
-            label="国家/地区"
+            label="项目名称"
             align="center">
           </el-table-column>
           <el-table-column
@@ -322,25 +322,78 @@
         </el-table-column>
         <el-table-column
           prop="issueTime"
-          sortable
+          align="center"
-          label="发布日期">
+          width="180px"
+          label="英文名称">
         </el-table-column>
         <el-table-column
-          prop="xcxssrq"
+          prop="issueTime"
+          align="center"
+          width="180px"
+          label="适用车型">
+        </el-table-column>
+        <el-table-column
+          prop="issueTime"
+          align="center"
+          width="180px"
+          label="能源类型">
+        </el-table-column>
+        <el-table-column
+          prop="issueTime"
           sortable
-          label="新车型实施日期">
+          align="center"
+          width="210px"
+          label="标准实施日期">
         </el-table-column>
         <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="新车型实施日期">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="zccssrq"
+          width="210px"
+          align="center"
+          label="责任部门">
+        </el-table-column>
         <el-table-column
           show-overflow-tooltip
           prop="textStatus"
-          width="120px"
+          width="180px"
-          label="文本状态">
+          align="center"
+          label="适用产品线">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="textStatus"
+          width="210px"
+          align="center"
+          label="乘用车VPPS中文名称">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="textStatus"
+          align="center"
+          width="210px"
+          label="卡车VPPS编码">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="textStatus"
+          align="center"
+          width="210px"
+          label="卡车VPPS中文名称">
         </el-table-column>
         <el-table-column>
           <template slot-scope="scope">
@@ -462,14 +515,14 @@ export default {
       // 新增、编辑 基础信息字段
       sarAccessEO: {
         id: '',
-        sortKey: 1,
+        sortKey: 2,
-        detailedList: '',
+        projectName: '',
         detailedListName: '',
         energyKind: '',
         type: '',
         relateFile: '',
         remark: '', // 清单说明
-        applicationScope: '' //适用领域
+        // applicationScope: '' //适用领域
       },
       fileInfoList: [], // 上传的附件
       uploadFileListPath: 'api/att/attFile/upload', // 上传的地址
@@ -478,8 +531,8 @@ export default {
         type: [
           {required: true, message: '国内/海外不能为空', trigger: 'change'}
         ],
-        detailedList: [
+        projectName: [
-          {required: true, message: '清单类别不能为空', trigger: 'change'}
+          {required: true, message: '项目名称不能为空', trigger: 'change'}
         ],
         detailedListName: [
           {required: true, message: '清单名称不能为空', trigger: 'blur'},
@@ -510,7 +563,7 @@ export default {
       sarAccessInfoSearch: {
         id: '',
         countryArea: '', // 国家
-        applicationScope: '', //适用区域
+        // applicationScope: '', //适用区域
         keywords: '', // 关键字
         detailedListName: '', //清单名称
         applyArctic: '', // 能源种类
@@ -1097,6 +1150,7 @@ export default {
     },
     // 提交按钮 事件
     saveSarAccess () {
+      alert()
       this.$refs['sarAccessForm'].validate((valid) => {
         if (valid) {
           let rowlist = []
@@ -1107,7 +1161,7 @@ export default {
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
           sarAccessEO.inforlist = JSON.stringify(rowlist)
           // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
-          sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
+          // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
           // 判断是否有附件
           if (this.fileInfoList.length > 0) {
             let relateFile = []
@@ -1125,6 +1179,7 @@ export default {
               loading: 'loadData'
             }, res => {
               if (res.ok) {
+                this.$message.success('新增成功')
                 this.isNext = true
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
@@ -1139,6 +1194,7 @@ export default {
               loading: 'loadData'
             }, res => {
               if (res.ok) {
+                this.$message.success('编辑成功')
                 this.isNext = true
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
@@ -1669,7 +1725,7 @@ export default {
       this.$nextTick(() => {
         this.sarAccessEO.type = accessRow.type
         this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
-        this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',')
+        // this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',')
         this.sarAccessEO.detailedListName = accessRow.detailedListName
         this.sarAccessEO.id = accessRow.id
         this.sarAccessEO.remark = accessRow.remark || ''

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -3730,11 +3730,12 @@ export default {
       this.formFieldList = data.map((item) => {
         if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') {
             if(item.attrField === 'WSSMR'){
-                const options = [
-                    {label:"署名人1",value:"1"},{label:"署名人2",value:"2"}
-                ]
                 return Object.assign({}, item, {
-                    options: options
+                    options: this.allSelectOptions["WSSMR"]
+                })
+            }else if(item.attrField === 'QCDW'){
+                return Object.assign({}, item, {
+                    options: this.allSelectOptions["QCDW"]
                 })
             }else if(item.attrField === 'CYSD'){
                 return Object.assign({}, item, {

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -3607,50 +3607,51 @@ export default {
           const data = this.formFieldListData
           this.formFieldList = data.map((item) => {
               if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') {
-                  if(item.attrField === 'WSSMR'){
+                if(item.attrField === 'WSSMR'){
-                      const options = [
+                  return Object.assign({}, item, {
-                          {label:"署名人1",value:"1"},{label:"署名人2",value:"2"}
+                    options: this.allSelectOptions["WSSMR"]
-                      ]
+                  })
-                      return Object.assign({}, item, {
+                }else if(item.attrField === 'QCDW'){
-                          options: options
+                  return Object.assign({}, item, {
-                      })
+                    options: this.allSelectOptions["QCDW"]
-                  }else if(item.attrField === 'CYSD'){
+                  })
+                }else if(item.attrField === 'CYSD'){
                       return Object.assign({}, item, {
                           options: this.allSelectOptions["WSCYSD"]
                       })
-                  }else if(item.attrField === 'CLLX'){
+                }else if(item.attrField === 'CLLX'){
-                      return Object.assign({}, item, {
+                    return Object.assign({}, item, {
-                          options: this.allSelectOptions["ENERGYTYPES"]
+                        options: this.allSelectOptions["ENERGYTYPES"]
-                      })
+                    })
-                  }else if(item.attrField === 'NYLX'){
+                }else if(item.attrField === 'NYLX'){
-                      return Object.assign({}, item, {
+                    return Object.assign({}, item, {
-                          options: this.allSelectOptions["NYLXCLASS"]
+                        options: this.allSelectOptions["NYLXCLASS"]
-                      })
+                    })
-                  }else if(item.attrField === 'SYCPX'){
+                }else if(item.attrField === 'SYCPX'){
-                      return Object.assign({}, item, {
+                    return Object.assign({}, item, {
-                          options: this.allSelectOptions["SYCPXCLASS"]
+                        options: this.allSelectOptions["SYCPXCLASS"]
-                      })
+                    })
-                  }else if(item.attrField === 'SYRZ'){
+                }else if(item.attrField === 'SYRZ'){
-                      return Object.assign({}, item, {
+                    return Object.assign({}, item, {
-                          options: this.allSelectOptions["SYRZCLASS"]
+                        options: this.allSelectOptions["SYRZCLASS"]
-                      })
+                    })
-                  }else if(item.attrField === 'ZRBM'){
+                }else if(item.attrField === 'ZRBM'){
-                      return Object.assign({}, item, {
+                    return Object.assign({}, item, {
-                          options: this.allSelectOptions["ZRBMCLASS"]
+                        options: this.allSelectOptions["ZRBMCLASS"]
-                      })
+                    })
-                  }else if(item.attrField === 'ZRGCS'){
+                }else if(item.attrField === 'ZRGCS'){
-                      return Object.assign({}, item, {
+                    return Object.assign({}, item, {
-                          options: this.allSelectOptions["ZRGCSCLASS"]
+                        options: this.allSelectOptions["ZRGCSCLASS"]
-                      })
+                    })
-                  }else if(item.attrField === 'TXLB'){
+                }else if(item.attrField === 'TXLB'){
-                      return Object.assign({}, item, {
+                    return Object.assign({}, item, {
-                          options: this.allSelectOptions["TXLBCLASS"]
+                        options: this.allSelectOptions["TXLBCLASS"]
-                      })
+                    })
-                  }else {
+                }else {
-                      return Object.assign({}, item, {
+                    return Object.assign({}, item, {
-                          options: this.allSelectOptions[item.selVal]
+                        options: this.allSelectOptions[item.selVal]
-                      })
+                    })
-                  }
+                }
               } else {
                   return item
               }

src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue

@@ -42,20 +42,24 @@
                   <el-table-column
                           prop="partCode"
                           label="章节编号"
+                          align="center"
                           width="180">
                   </el-table-column>
                   <el-table-column
                           prop="content"
+                          align="center"
                           label="修改意见内容(包括理由或依据)"
                   >
                   </el-table-column>
                   <el-table-column
                           prop="deptName"
+                          align="center"
                           label="提出部门"
                   >
                   </el-table-column>
                   <el-table-column
                           prop="userName"
+                          align="center"
                           label="提出人"
                   >
                   </el-table-column>

src/router/index.js

@@ -702,7 +702,7 @@ const routes = [
         meta: {
           requireAuth: false,
           // parentPath: '/standAutoSplit',
-          title: '标准分解单'
+          title: '拆分结果'
         }
       },
       // 标准编号申领

src/sysConfig/index.js

@@ -7,7 +7,7 @@
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
 // const devIp = '192.168.10.248'
-const devIp = '192.168.10.254'
+const devIp = '192.168.1.108'
 const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'