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

src/pages/localTool/standAutoSplit/index.vue

@@ -14,10 +14,12 @@
                  size="mini"
                   type="primary"
                   class="common-button-primary"
-                  @click="searchStandList">搜索</el-button>
+                 v-btn-permission="'bcf0d05723689ced8f49fae7794ff0db'"
+                  @click="searchStandList">查询</el-button>
               <el-button
                  size="mini"
                   class="common-button-default"
+                 v-btn-permission="'0af780936b77df9905c988db9e90bee8'"
                   @click="clearSearchStand">清空</el-button>
             </el-form-item>
           </el-form>
@@ -26,10 +28,10 @@
     </table-tools-bar>
     <div class="content">
       <div class="action-bar">
-        <el-button size="mini"  @click="spiltStandFile" v-btn-permission="'6ZQ7ZZH4PTUYTUE5YQG4'"><i class="iconfont"></i>拆分</el-button>
+        <el-button size="mini"  @click="spiltStandFile" v-btn-permission="'633d92e841ab4d49fb57b48b45fd0db8'"><i class="iconfont"></i>拆分</el-button>
-        <el-button size="mini"  @click="clickButtonToUpload" v-btn-permission="'NDQVR2GRE97JRF5A2VJ2'"><i class="iconfont">&#xe65d;</i>上传</el-button>
+        <el-button size="mini"  @click="clickButtonToUpload" v-btn-permission="'d7a62638bbbe81e375ea598acaf80593'"><i class="iconfont">&#xe65d;</i>上传</el-button>
-        <el-button size="mini"  @click="clickButtonToImport" v-btn-permission="'EH3ADP8PE9C3SGTS7S7T'"><i class="iconfont">&#xe6de;</i>导入拆分结果</el-button>
+        <el-button size="mini"  @click="clickButtonToImport" v-btn-permission="'b8aaf61ad3c88f4c73e5af88ac9689c0'"><i class="iconfont">&#xe6de;</i>导入拆分结果</el-button>
-        <el-button size="mini"  @click="batchDelete" v-btn-permission="'9AC5CEZETGQTY4L9YRBP'"><i class="iconfont">&#xe61b;</i>删除</el-button>
+        <el-button size="mini"  @click="batchDelete" v-btn-permission="'e214975dcab66d2e27bf2ed9897f521c'"><i class="iconfont">&#xe61b;</i>删除</el-button>
       </div>
       <div class="table-wrap">
         <div style="position: absolute;height: 100%;width: 100%;">
@@ -107,25 +109,24 @@
                 <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="'CXW6XPMXNZEYZFLQ4S59'">查看</el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'17ba4598eb411d6feed468a2e446a301'">查看</el-dropdown-item>
-                    <!--<el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'E39C6YHE7Q7CMWHSLHCS'">编辑</el-dropdown-item>-->
                     <el-dropdown-item
                         v-if="scope.row.collectBtn"
                         :command="[scope.row, '收藏']"
-                        v-btn-permission="'35889SJ4SDN2UDCKNJLA'"
+                        v-btn-permission="'0d316a6ffcbefddd9caad6b4e180a7d7'"
                     >
                       收藏
                     </el-dropdown-item>
                     <el-dropdown-item
                         v-else
                         :command="[scope.row, '取消收藏']"
-                        v-btn-permission="'35889SJ4SDN2UDCKNJLA'"
+                        v-btn-permission="'7a92c8e3476202429a71ff18112469bc'"
                     >
                       取消收藏
                     </el-dropdown-item>
-                    <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'YG9YLB3AWY353KHWA57C'">分享</el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'b96444e5e022acfac7ca7de12dec5e13'">分享</el-dropdown-item>
 <!--                    <el-dropdown-item :command="[scope.row, '关联']">关联</el-dropdown-item>-->
-                    <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'9AC5CEZETGQTY4L9YRBP'">删除</el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'10ba28487876990927f653a66e1eeb98'">删除</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </template>

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

@@ -0,0 +1,659 @@
+<!--标准清单发布/更新流程-->
+<template>
+  <div class="bzqdfb-step1">
+    <ProcessHeader toggle>
+      <template slot="proName">标准清单发布/更新流程</template>
+      <template slot="proNode">申请人发起流程</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
+    </div>
+    <div class="content" v-if="active == '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          :model="listForm"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="选择清单" prop="orgName" class="add-form-item form-item-disabled">
+                <el-radio-group v-model="radio" @change="selectionList">
+                  <el-radio label="country">国家/地区清单</el-radio>
+                  <el-radio label="project">项目清单</el-radio>
+                  <el-radio label="other">其他清单</el-radio>
+                </el-radio-group>
+                <el-button size="mini" type="primary" style="margin-left: 40px;" @click="choiceShow">带入</el-button>
+              </el-form-item>
+              <el-form-item label="清单名称" prop="orgName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.orgName"
+                  placeholder="请输入清单名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="适用区域" prop="account" class="add-form-item form-item-disabled">
+                <el-select v-model="listForm.country">
+                  <el-option v-for="opt in countryOptions" :value="opt.value === undefined ? '' :opt.value"
+                             :key="opt.value" :label="opt.label">{{ opt.label }}
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="清单说明" prop="mobilePhone" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.mobilePhone"
+                  placeholder="请输入清单说明"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="附件" prop="email" class="add-form-item form-item-disabled">
+                <el-button size="mini" type="primary">点击上传</el-button>
+              </el-form-item>
+              <el-form-item label="会签" prop="type" class="add-form-item form-item-disabled">
+                <el-radio-group v-model="listForm.type">
+                  <el-radio label="1">是</el-radio>
+                  <el-radio label="2">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title>
+          <template slot="title">填写信息</template>
+        </process-title>
+        <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="deleteList">批量删除</el-button>
+          </div>
+        </div>
+        <el-table
+          :data="data"
+          border
+          style="width: 100%"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="content"
+            label="标准号"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="deptName"
+            label="中文名称"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="deptName"
+            label="英文名称"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="deptName"
+            label="发布日期"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="deptName"
+            label="新车型实施日期"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="deptName"
+            label="在产车实施日期"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="deptName"
+            label="适用车型"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="deptName"
+            label="文本状态"
+          >
+          </el-table-column>
+        </el-table>
+      </div>
+      <ProcessFooter
+        show-save
+        show-submit
+        :submitLoading="isSubmit"
+        :saveLoading="saveLoading"
+        @save="handleSave"
+        @submit="handleSubmit"
+      >
+      </ProcessFooter>
+    </div>
+    <div class="content" v-if="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>
+    <!-- 选择标准抽屉-->
+    <el-drawer
+      title="选择清单"
+      :visible.sync="ListModel"
+      size="900px"
+      custom-class="demo-drawer"
+    >
+      <el-table
+        v-if="radio === 'country'"
+        :data="sarAccessListDatas"
+        tooltip-effect="dark"
+        style="width: 100%"
+        border
+        height="100%"
+        :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+        @selection-change="selectOne"
+        ref="selection"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="countryArea"
+          label="国家/地区"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="detailedListName"
+          label="清单名称"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="detailedListState"
+          label="清单状态"
+          align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.detailedListState === '1'">未发布</span>
+            <span v-if="scope.row.detailedListState === '2'">已发布</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="detailedListVision"
+          label="清单版本"
+          align="center">
+          <template slot-scope="scope">
+            <span
+              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
+              }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="applicationScope"
+          label="适用领域"
+          align="center">
+          <template slot-scope="scope">
+            <span
+              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
+              }}</span>
+          </template>
+        </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>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="updatePeople"
+          label="更新人"
+          align="center">
+        </el-table-column>
+      </el-table>
+      <el-table
+        v-if="radio === 'project'"
+        :data="sarAccessListDatas"
+        tooltip-effect="dark"
+        style="width: 100%"
+        border
+        height="100%"
+        :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+        @selection-change="selectOne"
+        ref="selection"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="projectName"
+          label="项目名称"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="detailedListName"
+          label="清单名称"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="detailedListState"
+          label="清单状态"
+          align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.detailedListState === '1'">未发布</span>
+            <span v-if="scope.row.detailedListState === '2'">已发布</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="detailedListVision"
+          label="清单版本"
+          align="center">
+          <template slot-scope="scope">
+            <span
+              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
+              }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="applicationScope"
+          label="适用领域"
+          align="center">
+          <template slot-scope="scope">
+            <span
+              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
+              }}</span>
+          </template>
+        </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>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="updatePeople"
+          label="更新人"
+          align="center">
+        </el-table-column>
+      </el-table>
+      <el-table
+        v-if="radio === 'other'"
+        :data="sarAccessListDatas"
+        tooltip-effect="dark"
+        style="width: 100%"
+        border
+        height="100%"
+        :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+        @selection-change="selectOne"
+        ref="selection"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="detailedList"
+          label="清单类别"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="detailedListName"
+          label="清单名称"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="detailedListState"
+          label="清单状态"
+          align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.detailedListState === '1'">未发布</span>
+            <span v-if="scope.row.detailedListState === '2'">已发布</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="detailedListVision"
+          label="清单版本"
+          align="center">
+          <template slot-scope="scope">
+            <span
+              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
+              }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="applicationScope"
+          label="适用领域"
+          align="center">
+          <template slot-scope="scope">
+            <span
+              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
+              }}</span>
+          </template>
+        </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>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="updatePeople"
+          label="更新人"
+          align="center">
+        </el-table-column>
+      </el-table>
+            <div class="demo-drawer-footer">
+              <el-button size="mini" @click="closeDrawer">取消</el-button>
+              <el-button type="primary" size="mini" @click="OkDrawer">确定</el-button>
+            </div>
+    </el-drawer>
+<!--    添加标准抽屉-->
+    <el-drawer
+      title="添加标准"
+      :visible.sync="standModel"
+      size="900px"
+      custom-class="demo-drawer"
+    >
+      <el-table
+        :data="standardData"
+        tooltip-effect="dark"
+        style="width: 100%"
+        border
+        height="100%"
+        :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+        @selection-change="selectOne"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="content"
+          label="标准号"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="deptName"
+          label="中文名称"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="deptName"
+          label="英文名称"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="deptName"
+          label="发布日期"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="deptName"
+          label="新车型实施日期"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="deptName"
+          label="在产车实施日期"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="deptName"
+          label="适用车型"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="deptName"
+          label="文本状态"
+        >
+        </el-table-column>
+      </el-table>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+
+export default {
+  name: "bzqdfbStep1",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      data: [],
+      sarAccessListDatas: [], //国家地区清单表格
+      standardData: [], //添加标准数据
+      ListModel: false, //选择清单抽屉状态
+      standModel: false, // 选择标准抽屉状态
+      active: "1",
+      isSubmit: false,
+      saveLoading: false,
+      radio: "country",
+      tabValue: "listOfCountries",
+      selectedList: [],
+      listForm: {},
+      choiceForm: {}, //选择标准清单列表
+      countryOptions: [], //适用区域下拉框数据
+      user1: "",
+      user2: "",
+      user3: "",
+      user4: "",
+      user5: ""
+    };
+  },
+  methods: {
+    //tab发生变化
+    handleTabs(name) {
+      this.active = name;
+    },
+    choiceShow() {
+      this.ListModel = true;
+    },
+    selectionList (type) {
+      console.log(type);
+    },
+    //点击新增事件
+    addList() {
+      this.standModel = true
+    },
+    // 点击批量删除事件
+    deleteList() {
+       this.$confirm('您确认删除这些数据?', '提示', {
+         confirmButtonText: '确认',
+         confirmButtonClass:'common-button-primary',
+         cancelButtonText: '取消',
+         type:'warning',
+       }).then (() => {
+
+       }).catch (() => {
+
+       })
+    },
+    //保存事件
+    handleSave() {
+
+    },
+    //提交事件
+    handleSubmit() {
+
+    },
+    //选择标准取消事件
+    closeDrawer() {
+
+    },
+    //选择标准确定事件
+    OkDrawer() {
+
+    },
+    selectOne(data) {
+      this.selectedList = [];
+      for (let i = 0; i < data.length; i++) {
+        this.selectedList.push(data[i].id);
+      }
+    }
+  },
+  mounted() {
+    //从数据查询下拉框数据
+    this.$http.get("sys/dictype/getDicTypeListCode", "", {
+      _this: this
+    }, res => {
+      this.countryOptions = res.data.COUNTRY;
+    });
+  }
+
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.bzqdfb-step1 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 55px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+}
+</style>

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

@@ -0,0 +1,13 @@
+<!--标准-->
+<template>
+</template>
+
+<script>
+export default {
+  name: "bzqdfbStep2"
+};
+</script>
+
+<style scoped>
+
+</style>

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

@@ -9,6 +9,7 @@
         <div class="process-name" @click="handleCreateProcess('3')">标准征求意见流程</div>
         <div class="process-name" @click="handleCreateProcess('4')">标准需求(翻译)申请流程</div>
         <div class="process-name" @click="handleCreateProcess('5')">标准发放申请流程</div>
+        <div class="process-name" @click="handleCreateProcess('6')">标准清单发布/更新流程</div>
       </div>
     </div>
     <div v-if="zcgllc">
@@ -77,6 +78,10 @@ export default {
           // 标准发放申请流程
           break
         case '6':
+          //标准清单发布流程
+          this.$router.push({
+            name:'bzqdfbStep1'
+          })
           break
         case '7':
           break

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

@@ -51,7 +51,7 @@
         class="common-button-primary add-button"
         size="mini"
         @click="openModal(null,'addOpt')"
-        v-btn-permission="'J2YEFN9MH4KWW5HMR2QH'"
+        v-btn-permission="'db44de86c8a30b037335bb35ded9f40e'"
       ><i class="iconfont">&#xe84e;</i>新增
       </el-button>
       <el-button
@@ -59,7 +59,7 @@
         :loading="delLoading"
         size="mini"
         @click="deleteSarAccess('demore',null)"
-        v-btn-permission="'WPNW79T3DNUZPJFNMHGP'"
+        v-btn-permission="'a43a8f88306ecf557ee243c013076bc4'"
       ><i class="iconfont">&#xe61b;</i>批量删除
       </el-button>
     </div>
@@ -144,11 +144,11 @@
               <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="'43UVH8AWGJLFDZT9WNTZ'">查看
+                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'f4bf556d10c3600390bec6e8447b92cc'">查看
                   </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'HYY8NGY2RYT3VEDRSK5V'">编辑
+                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'591151a039d0fb454578776cee513524'">编辑
                   </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'X9HP9YQL2BRKBFCDMZQT'">删除
+                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'e7719eb059163fc634a2109981bd1367'">删除
                   </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>

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

@@ -42,7 +42,7 @@
         class="common-button-primary add-button"
         size="mini"
         @click="openModal(null,'addOpt')"
-        v-btn-permission="'J2YEFN9MH4KWW5HMR2QH'"
+        v-btn-permission="'ae7419baca1564175bf96d94e827ef8b'"
       ><i class="iconfont">&#xe84e;</i>新增
       </el-button>
       <el-button
@@ -50,7 +50,7 @@
         :loading="delLoading"
         size="mini"
         @click="deleteSarAccess('demore',null)"
-        v-btn-permission="'WPNW79T3DNUZPJFNMHGP'"
+        v-btn-permission="'e8ce15aba7bf8108c41d8d06c75c58eb'"
       ><i class="iconfont">&#xe61b;</i>批量删除
       </el-button>
     </div>
@@ -135,11 +135,11 @@
               <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="'43UVH8AWGJLFDZT9WNTZ'">查看
+                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'9cf958c09b0cf3d14cc33807c2c18951'">查看
                   </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'HYY8NGY2RYT3VEDRSK5V'">编辑
+                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'8f57e60942d8c307a9c3d566df64e57b'">编辑
                   </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'X9HP9YQL2BRKBFCDMZQT'">删除
+                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'1bde7a8d30bfb0ffc0fc8aa506b55bd2'">删除
                   </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>

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

@@ -42,7 +42,7 @@
         class="common-button-primary add-button"
         size="mini"
         @click="openModal(null,'addOpt')"
-        v-btn-permission="'J2YEFN9MH4KWW5HMR2QH'"
+        v-btn-permission="'00139623434e23209d184eb8f753c980'"
       ><i class="iconfont">&#xe84e;</i>新增
       </el-button>
       <el-button
@@ -50,7 +50,7 @@
         :loading="delLoading"
         size="mini"
         @click="deleteSarAccess('demore',null)"
-        v-btn-permission="'WPNW79T3DNUZPJFNMHGP'"
+        v-btn-permission="'d9ba629448d5a48dee0b2a2659a719c7'"
       ><i class="iconfont">&#xe61b;</i>批量删除
       </el-button>
     </div>
@@ -135,11 +135,11 @@
               <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="'43UVH8AWGJLFDZT9WNTZ'">查看
+                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'2b2b6e7673d70b2e63ffd4dacacca7ce'">查看
                   </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'HYY8NGY2RYT3VEDRSK5V'">编辑
+                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'363482802f1b46d022057d117678ce75'">编辑
                   </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'X9HP9YQL2BRKBFCDMZQT'">删除
+                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'21f363e9a0907c09ba81b7f9fc406116'">删除
                   </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>

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

@@ -307,11 +307,13 @@
         <el-button
           class="common-button-default export-button"
           size="mini" @click="exportAccessInfo('apart')"
+          v-btn-permission="'2ff6a6bbf710e9cbb344e3694b28b1c7'"
         ><i class="iconfont">&#xe6e9;</i>导出</el-button>
         <el-button
           class="common-button-default delete-button"
           size="mini" @click="deleteSelectSarAccessInfo"
           v-if="!disabledFlag"
+          v-btn-permission="'9aa2a183b97c94f9bdec79a6885760ed'"
         ><i class="iconfont">&#xe61b;</i>删除</el-button>
       </div>
       <el-table
@@ -1512,7 +1514,6 @@ export default {
           _this: this,
           loading: 'dataLoading'
         }, res => {
-          console.log(res.data.list);
           res.data.list[0].list.map(item => {
             item.newPutTextTime = null
             item.prodPutTextTime = null

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

@@ -79,6 +79,7 @@
           </el-form-item>
 
           <el-button class="common-button-default export-button"
+                     v-btn-permission="'25859ea5afacb2ad49705f5daefe0d23'"
                      size="small" @click="exportStandard()"
                      title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
                      icon="export"

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

@@ -292,9 +292,11 @@
         <el-button
           class="common-button-default export-button"
           size="mini" @click="exportAccessInfo('apart')"
+          v-btn-permission="'98c9556f5ae1590b4c2eb7d8ae2526dd'"
         ><i class="iconfont">&#xe6e9;</i>导出</el-button>
         <el-button
           class="common-button-default delete-button"
+          v-btn-permission="'c998c341816ecade73493fca3051cb1e'"
           size="mini" @click="deleteSelectSarAccessInfo"
           v-if="!disabledFlag"
         ><i class="iconfont">&#xe61b;</i>删除</el-button>

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

@@ -292,9 +292,11 @@
         <el-button
           class="common-button-default export-button"
           size="mini" @click="exportAccessInfo('apart')"
+          v-btn-permission="'0108c65a5e4f7c950fb5f4b4efa2845f'"
         ><i class="iconfont">&#xe6e9;</i>导出</el-button>
         <el-button
           class="common-button-default delete-button"
+          v-btn-permission="'f8dd8627fdc479030a82ce9697de7d0f'"
           size="mini" @click="deleteSelectSarAccessInfo"
           v-if="!disabledFlag"
         ><i class="iconfont">&#xe61b;</i>删除</el-button>

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -86,36 +86,36 @@
                    class="common-button-primary add-button"
                    @click="addModal"
                    size="mini"
-                   v-btn-permission="'B6KGCGZWKM'"
+                   v-btn-permission="'57f40856850c95912be0760a082db0e0'"
                    :disabled="addBtnDisabled"><i class="iconfont">&#xe84e;</i>新增</el-button>
         <el-button class="common-button-default in-button"
                    :loading="searching"
                    size="mini"
                    @click="addImportModal(1)"
-                   v-btn-permission="'7Y7XX6PXNM'"><i class="iconfont">&#xe6de;</i>导入</el-button>
+                   v-btn-permission="'417c6562dd08f1c98c681a40fbf94e31'"><i class="iconfont">&#xe6de;</i>导入</el-button>
         <el-button class="common-button-default export-button"
                    @click="exportStandard()"
                    size="mini"
-                   v-btn-permission="'MP3Y2BAK5V'"
+                   v-btn-permission="'b17f1d035219c47344032e261342d87d'"
                    title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"><i class="iconfont">&#xe6e9;</i>导出</el-button>
         <el-button class="common-button-default delete-button"
                    :loading="delLoading"
                    size="mini"
                    @click="deleteStand(2)"
-                   v-btn-permission="'UH6NV867E7'"><i class="iconfont">&#xe61b;</i>批量删除</el-button>
+                   v-btn-permission="'c09dc12531085e30e39bbdc6cb6116ba'"><i class="iconfont">&#xe61b;</i>批量删除</el-button>
         <el-button class="common-button-default"
                    size="mini"
                    @click="deleteStandFromKind(2)"
-                   v-btn-permission="'DQSXS89BRN'"><i class="iconfont">&#xe611;</i>移除标准</el-button>
+                   v-btn-permission="'5aedea192a77b14c364f19bdcee3513a'"><i class="iconfont">&#xe611;</i>移除标准</el-button>
         <el-button class="common-button-default"
                    size="mini"
                    :loading="searching"
                    @click="uploadImportModal(1)"
-                   v-btn-permission="'nDZVPHAg4Y'"><i class="iconfont">&#xe825;</i>模板下载</el-button>
+                   v-btn-permission="'86a8f92390bb4dcd7f1c2176c183c943'"><i class="iconfont">&#xe825;</i>模板下载</el-button>
         <el-button class="common-button-default"
                    size="mini"
                    @click="configurationStandard"
-                   v-btn-permission="'4EN5WW694V'"><i class="iconfont">&#xe669;</i>配置标准</el-button>
+                   v-btn-permission="'8158aefd62cda676a6baf179532328c6'"><i class="iconfont">&#xe669;</i>配置标准</el-button>
       </div>
       <div class="content">
         <div class="table-wrap">
@@ -199,21 +199,21 @@
                   <el-dropdown trigger="click" @command="handleCommand">
                     <i class="iconfont">&#xe61e;</i>
                     <el-dropdown-menu slot="dropdown">
-                      <el-dropdown-item v-btn-permission="'C4I1726ZT1'"
+                      <el-dropdown-item v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
                         v-if="scope.row.collectBtn"
                         :command="[scope.row, '收藏']"
                       >
                         收藏
                       </el-dropdown-item>
-                      <el-dropdown-item  v-btn-permission="'C4I1726ZT1'"
+                      <el-dropdown-item  v-btn-permission="'abcf82476e9f7bf2469896b3b0cb84fa'"
                         v-else
                         :command="[scope.row, '取消收藏']"
                       >
                         取消收藏
                       </el-dropdown-item>
-                      <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'9K6ANCMBZ9'">编辑</el-dropdown-item>
+                      <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'247cebaefa7cf1683092af160af11502'">编辑</el-dropdown-item>
-                      <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'SNGDU9PF4J'">分享</el-dropdown-item>
+                      <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'ce4ec1bb233314d2ad8740d0aa98aca1'">分享</el-dropdown-item>
-                      <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'UH6NV867E7'">删除</el-dropdown-item>
+                      <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">删除</el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
                 </div>

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

@@ -71,13 +71,15 @@
         size="mini"
         @click="exportStandard()"
         title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
+        v-btn-permission="'496090d129d51cf2f3730eaf030c2728'"
       ><i class="iconfont">&#xe6e9;</i>导出</el-button>
       <el-button
         class="common-button-primary"
         type="primary"
         size="mini"
         @click="batchClose()"
-      ><i class="iconfont">&#xe6e9;</i>批量关闭</el-button>
+        v-btn-permission="'740b5b1fb6131517ebc273bfe18b7272'"
+      ><i class="iconfont">&#xe611;</i>批量关闭</el-button>
       <el-button
         class="common-button-primary"
         size="mini"
@@ -189,7 +191,7 @@
                   <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="'R4FTCUQSXFUZPUSN3W63'">查看</el-dropdown-item>
+                      <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'a2d3ea256630c9beb239ac22bf6771b8'">查看</el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
                 </div>

src/pages/searchCenter/pages/standardSearch.vue

@@ -192,7 +192,7 @@ export default {
       resultLoading: false,
       total: 0,
       page: 1,
-      zqazqazqa:[],
+      searchData: [],
       pageAll: 1,
       totalAll: 0,
       Allitems: [], // 选中全部返回数据
@@ -242,12 +242,11 @@ export default {
             ]
           }
         ];
-        res.data.forEach((info) => {
+        _this.searchData = res.data;
-          _this.searchOptions.push(info);
+        for (let i = 0; i < res.data.length; i++) {
-          let resdata = JSON.parse(JSON.stringify(_this.searchOptions));
+          if (_this.searchOptions.length >= 6) break;
-          let data = resdata.slice(0, 6);
+          _this.searchOptions.push(res.data[i]);
-          _this.searchOptions =data;
+        }
-        });
       }, e => {
       });
     },
@@ -268,13 +267,17 @@ export default {
           this.AllCheck = true;
           //点击全部显示分页
           this.AllPage = true;
-          this.searchOptions = [condition];
+          this.searchOptions = [condition]
           this.searchCondition.selectIndex = ["All"];
           this.searchSarByInputKey();
         } else {
           this.AllPage = false;
           this.Allitems = [];
           this.AllCheck = false;
+          for (let i = 0; i < this.searchData.length; i++) {
+            if (this.searchOptions.length >= 6) break;
+            this.searchOptions.push(this.searchData[i]);
+          }
         }
       } else {
         this.AllPage = false;
@@ -574,17 +577,10 @@ export default {
 
       .search-condition {
         width: 100%;
-        /*min-height: 200px;*/
-        min-height: 200px;
         position: relative;
-        //border: 1px solid @borderColor;
         border-bottom: 1px solid @borderColor;
-
         margin-top: 15px;
-        //background-color: hsla(0,0%,100%,.9);
-        //border-radius: 20px;
         padding: 10px;
-        //overflow: auto;
         max-height: 300px;
 
         .condition-btn {

src/router/index.js

@@ -240,6 +240,24 @@ const routes = [
           title: '标准发放申请流程'
         }
       },
+      {
+        path: '/bzqdfbStep1',
+        name: 'bzqdfbStep1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准清单发布/更新流程'
+        }
+      },
+      {
+        path: '/bzqdfbStep2',
+        name: 'bzqdfbStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准清单发布/更新流程'
+        }
+      },
       {
         path: '/bzrkStep1',
         name: 'bzrkStep1',

src/sysConfig/index.js

@@ -6,7 +6,7 @@
 // 服务器地址
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
-const devIp = '192.168.10.29'
+const devIp = '192.168.10.53'
 const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'