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

public/static/pdf/web/viewer.js

@@ -6649,13 +6649,13 @@ var PDFPageView = function () {
           watermark_txt: msg,
           watermark_x: 50,//水印起始位置x轴坐标
           watermark_y: 0,//水印起始位置Y轴坐标
-          watermark_rows: 10,//水印行数
+          watermark_rows: 7,//水印行数
-          watermark_cols: 3,//水印列数
+          watermark_cols: 5,//水印列数
-          watermark_x_space: 30,//水印x轴间隔
+          watermark_x_space: 80,//水印x轴间隔
-          watermark_y_space: 100,//水印y轴间隔
+          watermark_y_space: 120,//水印y轴间隔
           watermark_color: 'rgba(192, 192, 192)',//水印字体颜色
           watermark_alpha: 0.3,//水印透明度
-          watermark_fontsize: '50px',//水印字体大小
+          watermark_fontsize: '30px',//水印字体大小
           watermark_font: '微软雅黑',//水印字体
           watermark_width: 120,//水印宽度
           watermark_height: 80,//水印长度

public/static/ueditor/ADT/template/template.css

@@ -10,8 +10,8 @@
 .bottom{height:320px;width:100%;margin: 0 auto;}
 .transparent{ background: url("images/bg.gif") repeat;}
 .bottom table tr td{border:1px dashed #ccc;}
-#colorPicker{width: 17px;height: 17px;border: 1px solid #CCC;display: inline-block;3px;box-shadow: 2px 2px 5px #D3D6DA;}
+#colorPicker{width: 17px;height: 17px;border: 1px solid #CCC;display: inline-block;box-shadow: 2px 2px 5px #D3D6DA;}
-.border_style1{padding:2px;border: 1px solid #ccc;5px;box-shadow:2px 2px 5px #d3d6da;}
+.border_style1{padding:2px;border: 1px solid #ccc;box-shadow:2px 2px 5px #d3d6da;}
 p{margin: 5px 0}
 table{clear:both;margin-bottom:10px;border-collapse:collapse;word-break:break-all;}
 li{clear:both}

src/App.vue

@@ -1,58 +1,128 @@
 <template>
   <div id="app">
-    <router-view v-if="!isBoolean"/>
+<!--    <router-view v-if="!isBoolean"/>-->
-    <div class="content-box" v-if="isBoolean">
+    <span v-if="this.$route.name === 'Login'">
-      <nav-menu></nav-menu>
+      <router-view />
-      <div class="sub-container">
+    </span>
-        <div style="background-color: #0068B7; height: 65px; width: 100%">
+    <span v-else>
-          <span style="color: #fff; line-height: 65px; float: left; font-size: 20px; font-weight: 600;">
+      <div class="content-box" v-if="isCollapse">
-            标准法规管理系统  Standard and Regulation Management System
+        <el-container>
-          </span>
+          <el-header>
-          <!-- header头部 右侧内容 当前登录人和退出-->
+            <div>
-          <div class="header-right" style="display: inline-block; float: right; margin-right: 20px; color: #fff">
+              <img style="height: 50px;width: 100%" :src="require('@/assets/images/shangqi/home/top-logo.png')">
-            <div class="user-info">
+            </div>
-              <el-dropdown
+            <div style="float: right; margin-right: 20px;">
+              <div class="user-info">
+                <el-dropdown
                   trigger="click"
                   @command="handleCommand"
-              >
+                >
-                <div class="user-box" style="margin-top: 23px;">
+                  <div class="user-box">
-                  <img :src="userAvator" v-if="$store.getters.userInfo.avator">
+                    <img :src="userAvator" v-if="$store.getters.userInfo.avator">
-                  <span class="iconfont" v-else style="color: #FFFFFF;">&#xe69b;</span>
+                    <span class="iconfont" v-else style="color: #000;">&#xe69b;</span>
-                  <span style="color: #FFFFFF;">{{ $store.getters.userInfo.uName }}</span>
+                    <span style="color: #000;">{{ $store.getters.userInfo.uName }}</span>
-                  <i style="color: #FFFFFF;" class="el-icon-arrow-down"/>
+                    <i style="color: #000;" class="el-icon-arrow-down"/>
-                </div>
+                  </div>
-                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="loginOut">退出</el-dropdown-item>
+                    <el-dropdown-item command="loginOut">退出</el-dropdown-item>
-                </el-dropdown-menu>
+                  </el-dropdown-menu>
-              </el-dropdown>
+                </el-dropdown>
+              </div>
             </div>
-          </div>
+          </el-header>
-          <!--          <div class="logo">-->
+          <el-main>
-          <!--            <img :src="logo" />-->
+            <nav-menu></nav-menu>
-          <!--          </div>-->
+            <div class="sub-container" style="margin-left: 60px">
-        </div>
+              <div class="container-box">
-        <!--        <com-header></com-header>-->
+                <router-view/>
-        <div class="container-box">
+              </div>
-          <router-view />
+            </div>
-        </div>
+          </el-main>
+        </el-container>
+
       </div>
-    </div>
+      <div class="content-box" v-else>
+        <el-container>
+          <el-header>
+            <div>
+              <img style="height: 50px;width: 100%" :src="require('@/assets/images/shangqi/home/top-logo.png')">
+            </div>
+            <div style="float: right; margin-right: 20px;">
+              <div class="user-info">
+                <el-dropdown
+                  trigger="click"
+                  @command="handleCommand"
+                >
+                  <div class="user-box">
+                    <img :src="userAvator" v-if="$store.getters.userInfo.avator">
+                    <span class="iconfont" v-else style="color: #000;">&#xe69b;</span>
+                    <span style="color: #000;">{{ $store.getters.userInfo.uName }}</span>
+                    <i style="color: #000;" class="el-icon-arrow-down"/>
+                  </div>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item command="loginOut">退出</el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+              </div>
+            </div>
+          </el-header>
+          <el-main>
+            <nav-menu></nav-menu>
+            <div class="sub-container" style="margin-left: 200px">
+              <!--            <div style="background-color: #0068B7; height: 65px; width: 100%">
+                        <span style="color: #fff; line-height: 65px; float: left; font-size: 20px; font-weight: 600;">
+                          标准法规管理系统  Standard and Regulation Management System
+                        </span>
+                             header头部 右侧内容 当前登录人和退出
+                            <div class="header-right" style="display: inline-block; float: right; margin-right: 20px; color: #fff">
+                              <div class="user-info">
+                                <el-dropdown
+                                  trigger="click"
+                                  @command="handleCommand"
+                                >
+                                  <div class="user-box" style="margin-top: 23px;">
+                                    <img :src="userAvator" v-if="$store.getters.userInfo.avator">
+                                    <span class="iconfont" v-else style="color: #FFFFFF;">&#xe69b;</span>
+                                    <span style="color: #FFFFFF;">{{ $store.getters.userInfo.uName }}</span>
+                                    <i style="color: #FFFFFF;" class="el-icon-arrow-down"/>
+                                  </div>
+                                  <el-dropdown-menu slot="dropdown">
+                                    <el-dropdown-item command="loginOut">退出</el-dropdown-item>
+                                  </el-dropdown-menu>
+                                </el-dropdown>
+                              </div>
+                            </div>
+                                      <div class="logo">
+                                        <img :src="logo" />
+                                      </div>
+                          </div>
+                                  <com-header></com-header>-->
+              <div class="container-box">
+                <router-view/>
+              </div>
+            </div>
+          </el-main>
+        </el-container>
+
+      </div>
+    </span>
   </div>
 </template>
 
 <script>
 import {mapGetters, mapState} from 'vuex'
-import { webLoginType } from '@/sysConfig'
+import {webLoginType} from '@/sysConfig'
+
 export default {
   name: 'App',
-  data () {
+  data() {
     return {
       isBoolean: false
     }
   },
   methods: {
     // 点击下拉选项事件
-    handleCommand (command) {
+    handleCommand(command) {
       // 退出登录
       if (command === 'loginOut') {
         this.$confirm('您确认要退出吗?', '提示', {
@@ -62,19 +132,20 @@ export default {
           confirmButtonClass: 'common-button-primary',
           roundButton: false
         }).then(() => {
-          if(webLoginType != null && webLoginType === 'idm' ) {
+          if (webLoginType != null && webLoginType === 'idm') {
-            window.location.href= 'http://sso.foton.com.cn/logout?service='
+            window.location.href = 'http://sso.foton.com.cn/logout?service='
             // this.$http.post('logout', {}, res => {
             //   window.location.href= 'http://testsso1.foton.com.cn/logout?service='
             // })
-          }else if(webLoginType != null && webLoginType === 'dev'){
+          } else if (webLoginType != null && webLoginType === 'dev') {
             this.$store.commit('setTypeFlag', 'loginOut')
             this.$http.get('logout', {}, {
               _this: this
             }, res => {
               this.$store.dispatch('logout')
               this.$router.push('/login')
-            }, e => {})
+            }, e => {
+            })
           }
           // this.$http.post('/logout', {}, res => {
           //   window.location.href = 'http://testsso1.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&redirect_uri=http://127.0.0.1:9090&response_type=code'
@@ -96,7 +167,7 @@ export default {
      * @author: xx
      * @date: 2018-08-29 14:56:39
      */
-    setTheme (theme) {
+    setTheme(theme) {
       document.getElementById('app').className = theme
     },
 
@@ -108,32 +179,32 @@ export default {
     banBackSpace(e) {
       var ev = e || window.event;
       //各种浏览器下获取事件对象
-      var obj = ev.relatedTarget || ev.srcElement || ev.target ||ev.currentTarget;
+      var obj = ev.relatedTarget || ev.srcElement || ev.target || ev.currentTarget;
       //按下Backspace键
-      if(ev.keyCode == 8){
+      if (ev.keyCode == 8) {
         var tagName = obj.nodeName //标签名称
         //如果标签不是input或者textarea则阻止Backspace
-        if(tagName!='INPUT' && tagName!='TEXTAREA'){
+        if (tagName != 'INPUT' && tagName != 'TEXTAREA') {
           return this.stopIt(ev);
         }
         var tagType = obj.type.toUpperCase();//标签类型
         //input标签除了下面几种类型，全部阻止Backspace
-        if(tagName=='INPUT' && (tagType!='TEXT' && tagType!='TEXTAREA' && tagType!='PASSWORD')){
+        if (tagName == 'INPUT' && (tagType != 'TEXT' && tagType != 'TEXTAREA' && tagType != 'PASSWORD')) {
           return this.stopIt(ev);
         }
         //input或者textarea输入框如果不可编辑则阻止Backspace
-        if((tagName=='INPUT' || tagName=='TEXTAREA') && (obj.readOnly==true || obj.disabled ==true)){
+        if ((tagName == 'INPUT' || tagName == 'TEXTAREA') && (obj.readOnly == true || obj.disabled == true)) {
           return this.stopIt(ev);
         }
       }
     },
 
     stopIt(ev) {
-      if(ev.preventDefault){
+      if (ev.preventDefault) {
         //preventDefault()方法阻止元素发生默认的行为
         ev.preventDefault();
       }
-      if(ev.returnValue){
+      if (ev.returnValue) {
         //IE浏览器下用window.event.returnValue = false;实现阻止元素发生默认的行为
         ev.returnValue = false;
       }
@@ -148,25 +219,25 @@ export default {
   },
   computed: {
     // 获取用户头像
-    userAvator () {
+    userAvator() {
       return this.$store.getters.userInfo.avator || require('@/assets/images/avator_default.png')
     },
     ...mapGetters([
       'getWebSocketList', 'getTheme', 'getMenuList'
     ]),
-    ...mapState(['userInfoModifyTime','isCollapse'])
+    ...mapState(['userInfoModifyTime', 'isCollapse'])
   },
   watch: {
     // 'userInfoModifyTime'() {
     //   // console.log('watch global, userInfoModifyTime')
     //   this.refresh()
     // },
-    getTheme (val) {
+    getTheme(val) {
       // 主题修改
       this.setTheme(val)
     },
     // 监听路由 控制isBoolean
-    $route () {
+    $route() {
       if (this.$route.name !== 'Login' && this.$route.name !== 'Home' && !this.$route.meta.isBoolean && this.$route.name !== 'beeEChungLogin' && this.$route.name !== 'beeEnergyLogin' && this.$route.name !== 'mdLawLogin' && this.$route.name !== 'nuoBLogin' && this.$route.name !== 'sTLogin' && this.$route.name !== 'StandardSearch') {
         this.isBoolean = true
       } else {
@@ -174,7 +245,7 @@ export default {
       }
     }
   },
-  mounted () {
+  mounted() {
     this.setTheme(this.getTheme)
     //实现对字符码的截获，keypress中屏蔽了这些功能按键
     document.onkeypress = this.banBackSpace
@@ -195,7 +266,9 @@ export default {
           this.$store.dispatch('syncStorageData')
 
           const currentPage = this.$route.name
-          if (currentPage === 'Login') {return}
+          if (currentPage === 'Login') {
+            return
+          }
           this.currentMinute = 3
           this.loading && this.loading.close()
           this.loading = this.$loading({
@@ -285,35 +358,45 @@ export default {
   position: relative;
   width: 100%;
   height: 100%;
-  overflow-y: auto;
+  overflow-y: hidden;
   background-color: #F0F2F5;
   //background: url('~@/assets/images/shangqi/home/BG.png') no-repeat;
   background-size: 100% 100%;
-  font-family: MicrosoftYaHei,微软雅黑;
+  font-family: MicrosoftYaHei, 微软雅黑;
-  & > div{
+
+  & > div {
     position: absolute;
     top: 0;
     left: 0;
     width: 100%;
     min-height: 100%;
   }
+
+  .el-main {
+    padding: 10px 10px 0 10px;
+  }
   .content-box {
     display: flex;
     height: 100%;
+
+    .el-header {
+      padding: 0;
+    }
+
     .sub-container {
       height: 100%;
       flex: 1;
       overflow-x: auto;
       display: flex;
       flex-direction: column;
+
       .container-box {
         position: relative;
-        height: calc(~'100% - 65px');
+        height: calc(~'100% - 10px');
         //flex: 1;
         background: #F4F4F4;
         overflow-y: auto;
-        padding: 10px 0 10px 0;
+
-        //padding:  10px 10px 0;
         .pagination {
           border-top: 1px solid #f4f4f4;
           width: calc(~'100% - 20px');
@@ -322,7 +405,8 @@ export default {
       }
     }
   }
-  /deep/.el-menu--vertical {
+
+  /deep/ .el-menu--vertical {
     background: red;
   }
 }

src/api/statisticsApi.js

@@ -138,7 +138,7 @@ export function CgfyDetail(data) {
 export function CgfysEdit (data) {
   return axios({
     url: 'api/wgdCensusLeo/wgd-cgfy/modCgfy',
-    method: 'get',
+    method: 'post',
     params: data
   })
 }
@@ -146,15 +146,7 @@ export function CgfysEdit (data) {
 export function CgfysAdd (data) {
   return axios({
     url: 'api/wgdCensusLeo/wgd-cgfy/addCgfy',
-    method: 'get',
+    method: 'post',
-    params: data
-  })
-}
-// 单条删除
-export function CgfysDelOne (data) {
-  return axios({
-    url: 'api/wgdCensusLeo/wgd-cgfy/delCgfy',
-    method: 'get',
     params: data
   })
 }
@@ -162,8 +154,115 @@ export function CgfysDelOne (data) {
 export function CgfysDelMore (data) {
   return axios({
     url: 'api/wgdCensusLeo/wgd-cgfy/delCgfys',
+    method: 'post',
+    params: data
+  })
+}
+/** 翻译费用信息统计 */
+// 查询
+export function fyQuery (data) {
+  return axios({
+    url: 'api/wgdCensusLeo/wgd-fyfy/queryAllFyfys',
     method: 'get',
     params: data
   })
 }
-
+// 查看
+export function fyDetail (data) {
+  return axios({
+    url: 'api/wgdCensusLeo/wgd-fyfy/getFyfyById',
+    method: 'get',
+    params: data
+  })
+}
+// 编辑
+export function fyEdit (data) {
+  return axios({
+    url: 'api/wgdCensusLeo/wgd-fyfy/modFyfy',
+    method: 'post',
+    params: data
+  })
+}
+// 新增
+export function fyAdd (data) {
+  return axios({
+    url: 'api/wgdCensusLeo/wgd-fyfy/addFyfy',
+    method: 'post',
+    params: data
+  })
+}
+// 删除
+// 查看
+export function fyDel (data) {
+  return axios({
+    url: 'api/wgdCensusLeo/wgd-fyfy/delFyfys',
+    method: 'post',
+    params: data
+  })
+}
+/** 资金收支统计（收入） */
+// 查询
+export function inComeQuery (data) {
+  return axios({
+    url: 'api/wgdCensusLeo/wgd-srb/queryAllSrbs',
+    method: 'get',
+    params: data
+  })
+}
+// 编辑
+export function inComeEdit (data) {
+  return axios({
+    url: 'api/wgdCensusLeo/wgd-srb/modSrb',
+    method: 'post',
+    params: data
+  })
+}
+// 新增
+export function inComeAdd (data) {
+  return axios({
+    url: 'api/wgdCensusLeo/wgd-srb/addSrb',
+    method: 'post',
+    params: data
+  })
+}
+// 删除
+export function inComeDel (data) {
+  return axios({
+    url: 'api/wgdCensusLeo/wgd-srb/delSrbs',
+    method: 'post',
+    params: data
+  })
+}
+/** 资金收支统计（支出） */
+// 查询
+export function exportQuery (data) {
+  return axios({
+    url: 'api/wgdCensusLeo/wgd-zcb/queryAllZcbs',
+    method: 'get',
+    params: data
+  })
+}
+// 编辑
+export function exportEdit (data) {
+  return axios({
+    url: 'api/wgdCensusLeo/wgd-zcb/modZcb',
+    method: 'post',
+    params: data
+  })
+}
+// 新增
+export function exportAdd (data) {
+  return axios({
+    url: 'api/wgdCensusLeo/wgd-zcb/addZcb',
+    method: 'post',
+    params: data
+  })
+}
+// 删除
+export function exportDel (data) {
+  return axios({
+    url: 'api/wgdCensusLeo/wgd-zcb/delZcbs',
+    method: 'post',
+    params: data
+  })
+}

src/assets/styles/common.less

@@ -389,3 +389,8 @@
 .clearfix{
   *zoom: 1;/*ie6清除浮动的方式 *号只有IE6-IE7执行，其他浏览器不执行*/
 }
+.el-button--primary {
+  background-color: #4788c0 ;
+  border-color: #3986c9
+}
+

src/components/CustomFormComponents/Select.vue

@@ -12,6 +12,7 @@
         :placeholder="placeholder"
         :disabled="disabled"
         clearable
+        filterable
         @change="handleChange"
       >
         <el-option

src/components/navMenu/index.vue

@@ -1,13 +1,13 @@
 <!--左侧导航菜单 liuyan -->
 <template>
   <div class="nav-menu v-class" :class="{'is-collapse': isCollapse}">
-    <div class="nav-menu-header" style="height: 65px; background-color: #0068B7;">
+<!--    <div class="nav-menu-header" style="height: 65px; background-color: #4788c0;">
       <div class="header-left">
         <div class="logo">
           <img :src="logo" height="58" width="149" />
         </div>
       </div>
-    </div>
+    </div>-->
     <!--    <div class="toggle-btn el-icon-s-fold" v-if="isCollapse === false" style="margin: 10px 0; display: flex;justify-content: center; font-size: 30px; color: #333333;" @click="handleToggleSideBar">-->
     <!--      <div style="font-size: 14px; line-height: 30px;">{{ this.isCollapse ? '' : '' }}</div><i class=""></i></div>-->
     <!--    <div class="toggle-btn el-icon-s-unfold" v-else style="margin: 10px 0; display: flex;justify-content: center; font-size: 30px; color: #333333;" @click="handleToggleSideBar">-->
@@ -16,11 +16,12 @@
       <el-menu
           unique-opened
           :default-active="defaultActive"
-          background-color="#0068B7"
+          background-color="#4788c0"
           text-color="#fff"
           active-text-color="#000"
           router
           :collapse="isCollapse"
+          @select="handleSelect"
       >
         <template v-for="(item, index) in navMenuList">
           <el-submenu
@@ -39,6 +40,7 @@
                 v-for="(children, childrenIndex) in item.children"
                 :key="childrenIndex"
                 :index="children.path"
+                style="text-align: center;"
                 v-if="!children.menuId || $hasPermission(children.menuId)"itemSplitInfo
             >
               <el-badge :value="getDynamicTotal.msgCount" class="item" v-if="children.title === '我的消息' && getDynamicTotal.msgCount !== 0">
@@ -68,8 +70,8 @@
     </div>
     <div class="tree-collapse" @click="handleToggleSideBar" :class="{ 'tree-close': isCollapse }">
       <!--切换折叠样式-->
-      <i class="el-icon-arrow-left" style="font-weight: 600; font-size: 16px;" v-if="isCollapse === false"></i>
+      <i class="el-icon-arrow-left" style="font-weight: 600; font-size: 16px;margin-top: 300px;" v-if="isCollapse === false"></i>
-      <i class="el-icon-arrow-right" style="font-weight: 600; font-size: 16px;" v-if="isCollapse === true"></i>
+      <i class="el-icon-arrow-right" style="font-weight: 600; font-size: 16px;margin-top: 300px;" v-if="isCollapse === true"></i>
     </div>
   </div>
 </template>
@@ -115,7 +117,7 @@ export default {
             //   menuId: 'ad9db496772c075f78495382b7581fe9'
             // },
             {
-              title: '标准法规工作组数据统计',
+              title: '工作组数据统计',
               path: '/dataStatisComments',
               menuId: ''
             },
@@ -473,6 +475,11 @@ export default {
   mounted () {
   },
   methods: {
+    handleSelect (key, keyPath) {
+      if (this.$route.path === key) {
+        this.$router.go(0)
+      }
+    },
     handleToggleSideBar () {
       this.toggleSideBar(!this.isCollapse)
     },
@@ -511,11 +518,11 @@ export default {
 }
 .el-menu--collapse {
   .is-active {
-    background-color: #fff !important;
+    background-color: #697178 !important;
     .shangqi-icon {
-      color: #0068B7 !important;
+      color: #fff !important;
     }
-    color: #0068B7 !important;
+    color: #697178 !important;
   }
 }
 .nav-menu {
@@ -524,22 +531,18 @@ export default {
   overflow-y: auto;
   user-select: none;
   box-sizing: border-box;
-  position: relative;
+  position: absolute;
-  background: rgb(255, 255, 255);
+  background: #697178;
   background-size: 100% 100%;
   /deep/.el-tooltip {
     padding: 0px 16px !important;
   }
-  .left-tree {
-    height: calc(~'100% - 115px');
-    overflow-y: auto;
-  }
   .left-tree::-webkit-scrollbar {
     display: none;
   }
   &:not(.is-collapse) {
-    width: 180px;
+    width: 200px;
-    background: #0068B7;
+    background: #697178;
     background-size: 100% 100%;
     .logo {
       padding: 10px;
@@ -552,18 +555,18 @@ export default {
     }
   }
   .tree-collapse{
+    display: inline-block;
     position: absolute;
     right: 0;
-    top: 65px;
+    top: 0px;
-    display: flex;
     align-items: center;
     justify-content: center;
     width: 15px;
-    height: calc(100% - 65px);
+    min-height: 140%;
     background: #EEE;
     cursor: pointer;
     &:hover{
-      background-color: #3391CE;
+      background-color: #f0f2f5;
     }
   }
   .logo{
@@ -578,8 +581,8 @@ export default {
     /*background:url("../../assets/images/shangqi/home/logo3.png");*/
   }
   /deep/:not(.is-collapse) .el-menu-item.is-active{
-    background: #fff !important;
+    background: #4788c0 !important;
-    color: #0068B7 !important;
+    color: #fff !important;
   }
 }
 .has-no-read{
@@ -602,7 +605,7 @@ export default {
 /*  }*/
 /*}*/
 .is-active /deep/.shangqi-icon {
-  color: #0068B7;
+  color: #fff;
 }
 /deep/.el-submenu__title i {
   color: #fff;
@@ -611,7 +614,7 @@ export default {
   color: #fff;
 }
 .nav-menu{
-  background-color: #0068B7;
+  background-color: #697178;
   scrollbar-width: none;
   -ms-overflow-style: none; /* IE 10+ */
 }
@@ -623,19 +626,19 @@ export default {
 }
 .nav-menu-popper .el-menu .el-menu-item.is-active {
   background-color: #fff !important;
-  color: #0068B7 !important;
+  color: #4788c0 !important;
   font-weight: bold;
 }
 .nav-menu-popper .el-menu .el-menu-item:hover {
-  background-color: #fff !important;
+  background-color: #697178 !important;
-  color: #0068B7 !important;
+  color: #fff !important;
   font-weight: bold;
 }
 
 .el-menu-item {
-  padding: 0 16px !important;
   span {
     margin-left: 5px;
+    font-weight: normal;
   }
   .shangqi-icon {
     display: inline-block;
@@ -665,6 +668,9 @@ export default {
   }
 }
 .el-submenu {
+  .is-opened {
+    background-color: red;
+  }
   /deep/.el-submenu__title {
     padding: 0 16px !important;
     span {

src/components/roleTree/index.vue

@@ -11,6 +11,7 @@
                     ref="attributeEO"
                     class="label-input-form"
                     :inline="true"
+                    @submit.native.prevent
             >
                 <el-form-item class="form-item-disabled" style="margin: 10px;">
                     <el-input
@@ -25,6 +26,7 @@
                     style="height: 100%; overflow: auto;"
                     class="filter-tree tree-line"
                     :class="treeClass"
+                    @check-change="checkChange"
                     :data="treeData"
                     :props="defaultProps"
                     :default-checked-keys="nodeList"
@@ -115,16 +117,55 @@
             }
         },
         methods: {
+            checkChange (row, type, c) {
+                if (!type) {
+                    if (this.nodeList.length > 0) {
+                        for (let a = 0; a < this.nodeList.length; a ++) {
+                            if (row.id === this.nodeList[a]) {
+                                this.nodeList.splice(a, 1)
+                            }
+                        }
+                    }
+                }
+            },
             treeClass () {
-
             },
             handleTreeDrawerCancel () {
                 this.filterText = ''
                 this.isVisible2 = false
             },
             saveUserInfo () {
-                this.isVisible2 = false
+                if (this.nodeList.length > 0 && this.nodeList[0].length !== 0) {
-                this.$emit('checkedRole', this.roleList)
+                    let ids = ''
+                    this.nodeList.forEach(item => {
+                        if (ids.length > 0) {
+                            ids += ','
+                            ids += item
+                        } else {
+                            ids = item
+                        }
+                    })
+                    this.$http.get('SarInstitution/institution/getNextById', {
+                        ids: ids
+                    }, {
+                        _this: this
+                    }, res => {
+                        let oldList2 = res.concat(this.roleList)
+                        let result = []
+                        let obj = {}
+                        for(let i = 0; i < oldList2.length; i++){
+                            if(!obj[oldList2[i].id]){
+                                result.push(oldList2[i]);
+                                obj[oldList2[i].id] = true;
+                            }
+                        }
+                        this.isVisible2 = false
+                        this.$emit('checkedRole', result)
+                    })
+                } else {
+                    this.isVisible2 = false
+                    this.$emit('checkedRole', this.roleList)
+                }
             },
             drawerCheck (data) {
                 if (this.checkBox) {

src/pages/details/otherStandardDetails/index.vue

@@ -3024,7 +3024,13 @@
         this.$refs['relatedTermsSelect'].handleSubmit(() => {
           this.selectSarStandItems()
           this.btnLoading = false
+          this.$message({
+            message: '关联成功',
+            type: 'success'
+          });
         })
+
+
       },
       closeRelatedTermsDrawer() {
         this.$refs['relatedTermsDrawer'].closeDrawer()

src/pages/home/components/EnterCard.vue

@@ -1,8 +1,12 @@
 <template>
   <div @click="toPage">
     <div>
-      <div v-if="label">
+      <div v-if="label" class="icon-style">
-        <span class="card-font">{{ label }}</span>
+        <span v-for="item in icons" v-if="item.label === label" :class="item.icon" style="font-size: 20px;">
+          <span style="padding-left: 10px; font-size: 16px">
+            {{ label }}
+          </span>
+        </span>
       </div>
       <div v-else>
         <div class="labelNull">
@@ -17,7 +21,43 @@
   export default {
     name: 'EnterCard',
     props: ['icon', 'label', 'path'],
+    data () {
+      return {
+        icons: [],
+        iconList: ['el-icon-help','el-icon-s-order',
+          'el-icon-document-remove','el-icon-document-checked',
+          'el-icon-folder','el-icon-notebook-2',
+          'el-icon-bangzhu','el-icon-reading'],
+        iconInfo: [],
+      }
+    },
+    mounted() {
+      this.getData()
+    },
     methods: {
+      getData (){
+        this.$http.get('/sarPersonalCenter/sar-user-personal-menu/getList',
+          {
+            userId: this.$store.getters.userInfo.userId
+          }, {_this: this}, res => {
+            if (res.ok) {
+              res.data.records.forEach(item => {
+                this.icons.push({
+                  label: item.menuName,
+                  icon: ''
+                })
+              })
+            }
+            this.icons.forEach((item,index)=>{
+              if (index > this.iconList.length) {
+                let i = index % this.iconList.length
+                item.icon = this.iconList[i]
+              } else {
+                item.icon = this.iconList[index]
+              }
+            })
+        })
+      },
       toPage() {
         this.$router.push(this.path)
       }
@@ -40,13 +80,14 @@
       border-radius: 5px;
       width: 100%;
       height: 70px;
-      background-color: #99BEDB;
+      color: #fff;
+      background-color: #4788c0;
     }
   }
   .wx-card:hover {
     & > div {
       color: #fff;
-      background-color: #0068B7;
+      background-color: #3a8ee6;
     }
   }
   .wx-card1 {

src/pages/home2/components/empennage/index.vue

@@ -1,13 +1,91 @@
 <!-- 尾部链接 -->
 <template>
     <div class="link" id="link">
+      <!--  此部分暂时这样写，到后面做修改    -->
+      <div style="display: inline-block;width: 15%;">
+        <span class="title borderRight">友情链接</span>
+      </div>
+      <div style="display: inline-block;width: 80%;text-align: center">
         <div>
-            <span class="title borderRight">友情链接</span>
+          <el-row>
+            <el-col :span="4">
+              <a style="color: #0068B7;" href="http://www.sac.gov.cn/">国标委</a>
+            </el-col>
+            <el-col :span="1">
+              <span class="borderMiddle"></span>
+            </el-col>
+            <el-col :span="4">
+              <a style="color: #0068B7;" href="http://www.catarc.org.cn/">汽标委</a>
+            </el-col>
+            <el-col :span="1">
+              <span class="borderMiddle"></span>
+            </el-col>
+            <el-col :span="4">
+              <a style="color: #0068B7;" href="http://openstd.samr.gov.cn/bzgk/gb/index">国标全文公开</a>
+            </el-col>
+            <el-col :span="1">
+              <span class="borderMiddle"></span>
+            </el-col>
+            <el-col :span="4">
+              <a style="color: #0068B7;" href="http://std.samr.gov.cn/">全国标准信息公共服务</a>
+            </el-col>
+            <el-col :span="1">
+              <span class="borderMiddle"></span>
+            </el-col>
+            <el-col :span="4">
+              <a style="color: #0068B7;" href="http://jtst.mot.gov.cn/">交通部标准信息</a>
+            </el-col>
+          </el-row>
+        </div>
+        <div>
+          <el-row>
+            <el-col :span="4">
+              <a style="color: #0068B7;" href="https://www.un.org/zh/aboutun/structure/unece/">欧洲经济委员会</a>
+            </el-col>
+            <el-col :span="1">
+              <span class="borderMiddle"></span>
+            </el-col>
+            <el-col :span="4">
+              <a style="color: #0068B7;" href="https://eur-lex.europa.eu">欧盟</a>
+            </el-col>
+            <el-col :span="1">
+              <span class="borderMiddle"></span>
+            </el-col>
+            <el-col :span="4">
+              <a style="color: #0068B7;" href="https://www.interregs.com/">InterRegs </a>
+            </el-col>
+            <el-col :span="1">
+              <span class="borderMiddle"></span>
+            </el-col>
+            <el-col :span="4">
+              <a style="color: #0068B7;" href="https://tbt.sist.org.cn/cslm/wtotbttb/">WTO/TBT通报</a>
+            </el-col>
+            <el-col :span="1">
+              <span class="borderMiddle"></span>
+            </el-col>
+            <el-col :span="4">
+              <a style="color: #0068B7;" href="https://www.iso.org/home.html">ISO</a>
+            </el-col>
+          </el-row>
+        </div>
+      </div>
+      <div style="display: inline-block;width: 15%;">
+        <span class="borderLeft"></span>
+        <span class="myLi1" @click="$router.push('linkManage')">更多链接 ⋙</span></div>
+
+
+      <!--          <div>
             <span class="myLi1 borderRight" v-for="(link, index) in linkList" :key="index" @click="openLinkUrl(link.url)" :title="link.name" >
                 {{ link.name }}
             </span>
             <span class="myLi1" @click="$router.push('linkManage')">更多链接 ⋙</span>
-        </div>
+          </div>
+          <div v-show="false">
+            <span class="myLi1 borderRight" v-for="(link, index) in linkList" :key="index" @click="openLinkUrl(link.url)" :title="link.name" >
+                {{ link.name }}
+            </span>
+            <span class="myLi1" @click="$router.push('linkManage')">更多链接 ⋙</span>
+          </div>-->
     </div>
 </template>
 
@@ -70,6 +148,7 @@
                     }
                     let list
                     list = res.data.slice(0, c)
+                  console.log(list)
                     this.linkList = list
                 })
             }
@@ -85,16 +164,25 @@
         border-radius: 3px;
         height: 100%;
         align-items: center;
-        justify-content: space-around;
         box-shadow: 1px 1px 10px rgba(0,0,0,0.1);
         .borderRight {
-            padding-right: 30px;
+            //padding-right: 50px;
-            margin-right: 30px;
+            //margin-right: 50px;
             border-right: 2px dotted #aaa;
         }
+      .borderLeft {
+        margin-right: 50px;
+        //padding-left: 50px;
+        //margin-left: 50px;
+        border-left: 2px dotted #aaa;
+      }
+      .borderMiddle {
+        border-left: 2px dotted #aaa;
+      }
         .title {
+          padding-right: 50px;
             font-weight: bold;
-            padding-left: 10px;
+            padding-left: 40px;
             width: 80px;
         }
         .myLi1 {

src/pages/home2/components/searchGroup/index.vue

@@ -105,7 +105,7 @@ export default {
         width: 18vm;
         height: 40px;
         color: #333333;
-        font-size: 13px;
+        font-size: 14px;
         border: 0;
         border-radius: 3px;
        background-color: #FFFFFF;

src/pages/home2/components/todoList/index.vue

@@ -1289,10 +1289,10 @@ export default {
   }
   .more {
     float: right;
-    color: #5ea9f6;
+    color: #4788c0;
     margin: 15px 15px;
     &:hover {
-      color: #5ea9f6;
+      color: #3a8ee6;
       cursor: pointer;
     }
   }

src/pages/home2/index.vue

@@ -28,10 +28,10 @@
       <todo-list></todo-list>
     </div>
   </div>
-  <div calss="home_footer">
+  <div calss="home_footer" style="padding: 0">
-    <div class="footer">
+    <el-card class="footer">
       <Empennage></Empennage>
-    </div>
+    </el-card>
   </div>
 </div>
 </template>
@@ -182,9 +182,12 @@ export default {
       }
     }
   }
+  /deep/.el-card__body {
+    padding: 0;
+  }
   .footer {
-    height: 49px;
+    height: 90px;
-    line-height: 49px;
+    line-height: 44px;
     //margin-top: 0.3vh;
     //line-height: 5.2vh;
     background: #FFFFFF;

src/pages/localTool/standCalendar/index.vue

@@ -73,7 +73,7 @@
             </div>
             <div class="content_text">
                 <span>会议附件 :
-                 <span v-if="item.files.length === '0'">{{ '-' }}</span>
+                 <span v-if="item.files.length === 0">{{ '-' }}</span>
                   <span v-for="res in item.files" :key="res.id" style="color: #409EFF;" @click="previews(res.id)">
                     {{ res.name }} {{ ';'}}
                    </span>

src/pages/localTool/standardRecognition/index.vue

@@ -186,6 +186,7 @@
             v-model="uploadFilesdfEo.standNumber"
             :placeholder="$t('m.pleaseEnterTheStandardNumberAndPolicyNumber')"
           ></el-input>
+          <el-button type="primary" size="mini" @click="handleSelect">手动查找</el-button>
         </el-form-item>
         <el-form-item
           label="标准名称/政策名称"
@@ -226,6 +227,487 @@
         <!--<el-button  @click="uploadSave" type="primary">转换</Button>-->
       </div>
     </el-dialog>
+    <el-drawer
+        title="查询结果"
+        :wrapperClosable="false"
+        :visible.sync="selectModal"
+        size="1250px"
+        :styles="styles"
+        :close="cancelSelectModel">
+      <div class="demo-drawer-content">
+        <el-form
+            class="label-input-form"
+            style="margin-top: 15px;"
+            label-width="130px"
+            :modal="handleSelectForm"
+            :inline="true"
+        >
+          <el-form-item label="标准/政策来源" class="search-item">
+            <el-select
+                v-model="handleSelectForm.dataSource"
+                @change="dataSourceChange"
+                :popper-append-to-body="false"
+                placeholder="请选择标准/政策来源">
+              <el-option value="INLAND" label="国内标准库"></el-option>
+              <el-option value="FOREIGN" label="海外标准库"></el-option>
+              <el-option value="FOREIGN_LAWS" label="国内外政策库"></el-option>
+              <el-option value="BUSINESS_STAND" label="企业标准库"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="标准编号/政策编号" class="search-item">
+            <el-input
+                v-model="handleSelectForm.lawNumber"
+                @change="lawNumberSearch"
+                placeholder="根据标准编号/政策编号查找"
+                clearable
+                :maxlength="100"></el-input>
+          </el-form-item>
+          <el-form-item label="标准名称/政策名称" class="search-item">
+            <el-input
+                v-model="handleSelectForm.lawName"
+                @change="lawNameSearch"
+                placeholder="根据标准名称/政策名称查找"
+                clearable
+                :maxlength="100"></el-input>
+          </el-form-item>
+          <el-form-item class="search-item btn-box">
+            <el-button
+                icon="el-icon-search"
+                type="primary"
+                class="common-button-primary"
+                round
+                @click="searchLawBtn">
+            </el-button>
+          </el-form-item>
+          <el-form-item class="search-item btn-box">
+            <el-button
+                class="common-button-default"
+                icon="el-icon-refresh-left"
+                round
+                type="default"
+                @click="clearLawBtn"></el-button>
+          </el-form-item>
+        </el-form>
+        <loading :loading="lawInfoTableLoading">数据获取中</loading>
+        <el-table
+            ref="selections"
+            tooltip-effect="dark"
+            style="width: 100%;overflow-y: auto;overflow-x: hidden;"
+            border
+            :loading="lawInfoTableLoading"
+            :data="lawInfoTable"
+            :height="300"
+            :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          fontWeight: 'bold', height: '48px'}"
+            @selection-change="handleSelectTableChange"
+        >
+
+          <el-table-column
+              fixed="left"
+              type="selection"
+              width="55"
+              align="center">
+          </el-table-column>
+
+          <div v-if="handleSelectForm.dataSource === 'INLAND'">
+            <el-table-column
+                label="标准号"
+                width="150"
+            >
+              <template slot-scope="scope">
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
+                   @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                    scope.row.standNumber
+                  }}-{{ scope.row.standYear }}</a>
+                <a v-else-if="scope.row.standYear" class="table-jump" style="color: #333333"
+                   @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                    scope.row.standNumber
+                  }}-{{ scope.row.standYear }}</a>
+                <a v-else @click="handlePreview(scope.row)" class="table-jump" style="color: #333333">
+                  {{ scope.row.standSortShow }}
+                  {{ scope.row.standNumber }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+                show-overflow-tooltip
+                prop="standName"
+                label="标准名称"
+                min-width="300"
+            >
+              <template slot-scope="scope">
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
+                <a v-else @click="handlePreview(scope.row)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="issueTime"
+                sortable="custom"
+                width="120"
+                label="发布日期">
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
+                <span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="SSRQ"
+                sortable="custom"
+                width="120"
+                label="实施日期">
+              <template slot-scope="scope">
+                <!--                {{ formatIssueDate(scope.row.putTime) }}-->
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+
+              </template>
+            </el-table-column>
+
+            <el-table-column
+                prop="XCXSSRQ"
+                sortable="custom"
+                width="150"
+                label="新车型实施日期">
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="ZCCSSRQ"
+                sortable="custom"
+                width="150"
+                label="在产车实施日期">
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="textStatus"
+                sortable="custom"
+                width="110"
+                label="文本状态">
+              <!--              <template slot="header" slot-scope="scope">-->
+              <!--                <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
+              <!--                  <span>文本状态<i class="el-icon-warning-outline"></i></span>-->
+              <!--                </el-tooltip>-->
+              <!--              </template>-->
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    textStatusMap[scope.row.textStatus]
+                  }}</span>
+                <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
+              </template>
+            </el-table-column>
+          </div>
+          <div v-if="handleSelectForm.dataSource === 'FOREIGN'">
+            <el-table-column
+                label="标准号"
+                width="150"
+            >
+              <template slot-scope="scope">
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
+                    scope.row.standSortShow
+                  }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                <a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">{{
+                    scope.row.standSortShow
+                  }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                <a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">{{
+                    scope.row.standSortShow
+                  }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standSortShow
+                  }}
+                  {{ scope.row.standNumber }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+                show-overflow-tooltip
+                prop="standName"
+                label="标准名称"
+                min-width="300"
+            >
+              <template slot-scope="scope">
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standName
+                  }}</a>
+                <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standName
+                  }}</a>
+                <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standName
+                  }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="issueTime"
+                sortable="custom"
+                width="120"
+                label="发布日期">
+              <template slot-scope="scope">
+                <div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
+                  {{ formatIssueDate(scope.row.issueTime) }}
+                </div>
+                <div v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">
+                  {{ formatIssueDate(scope.row.issueTime) }}
+                </div>
+                <div v-else style="color: #333333">
+                  {{ formatIssueDate(scope.row.issueTime) }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="SSRQ"
+                sortable="custom"
+                width="120"
+                label="实施日期">
+              <template slot-scope="scope">
+                <!--                {{ formatIssueDate(scope.row.putTime) }}-->
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else style="color: #333333">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="XCXSSRQ"
+                sortable="custom"
+                width="150"
+                label="新车型实施日期">
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else style="color: #333333">{{
+                    scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+                  }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="ZCCSSRQ"
+                sortable="custom"
+                width="150"
+                label="在产车实施日期">
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else style="color: #333333">{{
+                    scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+                  }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="textStatus"
+                sortable="custom"
+                width="110"
+                label="文本状态">
+              <!--              <template slot="header" slot-scope="scope">-->
+              <!--                <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
+              <!--                  <span>文本状态 <i class="el-icon-warning-outline"></i></span>-->
+              <!--                </el-tooltip>-->
+              <!--              </template>-->
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    textStatusMap[scope.row.textStatus]
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    textStatusMap[scope.row.textStatus]
+                  }}</span>
+                <span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
+              </template>
+            </el-table-column>
+          </div>
+          <div v-if="handleSelectForm.dataSource === 'FOREIGN_LAWS'">
+            <el-table-column
+                show-overflow-tooltip
+                label="政策编号"
+                width="150"
+            >
+              <template slot-scope="scope">
+                <!--                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>-->
+                <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsNumber }}</a>
+                <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsNumber }}</a>
+                <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsNumber }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+                show-overflow-tooltip
+                prop="lawsName"
+                label="中文名称"
+                min-width="300"
+            >
+              <template slot-scope="scope">
+                <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsName }}</a>
+                <a v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsName }}</a>
+                <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsName }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+                show-overflow-tooltip
+                prop="lawsEnName"
+                label="英文名称"
+                min-width="300"
+            >
+              <template slot-scope="scope">
+                <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsEnName }}</a>
+                <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsEnName }}</a>
+                <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsEnName }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="issueTime"
+                label="发文日期"
+                sortable
+                width="120"
+            >
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="XCXSSRQLAWS"
+                label="新车实施日期"
+                sortable
+                width="150"
+            >
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.XCXSSRQLAWS ? scope.row.XCXSSRQLAWS.slice(0, 10) : ''}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+                show-overflow-tooltip
+                sortable
+                prop="standStatusShow"
+                label="文本状态"
+                width="110"
+            >
+
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">
+                  {{scope.row.standStatusShow}}
+                </span>
+                <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">
+                  {{scope.row.standStatusShow}}
+                </span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">
+                  {{scope.row.standStatusShow}}
+                </span>
+              </template>
+            </el-table-column>
+          </div>
+          <div v-if="handleSelectForm.dataSource === 'BUSINESS_STAND'">
+            <el-table-column
+                show-overflow-tooltip
+                label="企标编号"
+                width="150"
+            >
+              <template slot-scope="scope">
+                <!--                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>-->
+                <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+                <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+                <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+                show-overflow-tooltip
+                prop="standName"
+                label="中文名称"
+                min-width="300"
+            >
+              <template slot-scope="scope">
+                <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                <a v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+                show-overflow-tooltip
+                prop="standEnName"
+                label="英文名称"
+                min-width="300"
+            >
+              <template slot-scope="scope">
+                <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+                <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+                <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="issueTime"
+                label="发布日期"
+                sortable
+                width="120"
+            >
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="putTime"
+                label="实施日期"
+                sortable
+                width="120"
+            >
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+                show-overflow-tooltip
+                sortable
+                prop="standStatusShow"
+                label="文本状态"
+                width="110"
+            >
+
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">
+                  {{scope.row.standStatusShow}}
+                </span>
+                <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">
+                  {{scope.row.standStatusShow}}
+                </span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">
+                  {{scope.row.standStatusShow}}
+                </span>
+              </template>
+            </el-table-column>
+          </div>
+
+        </el-table>
+        <!--分页-->
+        <pagination
+            v-show="this.lawInfoTableLoading === false"
+            style="position: relative;"
+            :page="handleSelectForm.page"
+            :total="handleSelectForm.total"
+            @pageChange="handleSelectPageChange"
+            @pageSizeChange="handleSelectPageSizeChange"></pagination>
+        <div slot="footer" class="demo-drawer-footer">
+          <el-button class="common-button-default" round icon="el-icon-close" @click="selectModal = false">取消</el-button>
+          <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="handleSelectConfirm" v-show="lawInfoTableLoading === false">确定</el-button>
+        </div>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
@@ -235,6 +717,34 @@ export default {
   components: {},
   data() {
     return {
+      textStatusMap: {}, // 文本状态id与name对应
+      lawInfoTable:[],
+      lawInfoTableLoading: true,
+      //手动查找的模态框
+      selectModal: false,
+      styles: {
+        height: 'calc(100% - 55px)',
+        overflow: 'auto',
+        paddingBottom: '53px',
+        position: 'static'
+      },
+      handleSelectForm: {
+        standName: '', //标准名称
+        numberName: '', //政策名称
+        lawsNumber: '', //政策编号
+        standNumber: '', //标准编号
+        standCode: '', //企标编号
+        dataSource: 'INLAND',
+        lawNumber: '', // 标准编号/政策编号
+        lawName: '', // 标准名称/政策名称
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        total: 0,
+        standType: '',
+        quoteIdList: '',
+        validFlag: '0',
+        menuId: 'nomenu'
+      },
       tableHeight: null,
       loading: false,
       uploadModal: false,
@@ -468,6 +978,242 @@ export default {
   props: {},
   watch: {},
   methods: {
+    // 将文本状态的id与name对应
+    setMap(data) {
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label)
+      })
+    },
+    //手动查找的确定按钮
+    handleSelectConfirm(){
+      if (this.handleSelectTableList.length>1){
+        this.$message.warning('只能选择一条数据')
+      }else if (this.handleSelectTableList.length===0){
+        this.$message.warning('请选择一条数据')
+      }
+      else {
+        console.log('619',this.handleSelectForm.dataSource)
+        // this.attributeEO.dataSource = this.handleSelectForm.dataSource
+        // this.attributeEO.lawId = this.handleSelectTableList[0].id
+        this.uploadFilesdfEo.standNumber =this.handleSelectTableList[0].standCode || this.handleSelectTableList[0].lawsNumber || this.handleSelectTableList[0].standSort+" "+this.handleSelectTableList[0].standNumber+"-"+this.handleSelectTableList[0].standYear
+        this.uploadFilesdfEo.standName = this.handleSelectTableList[0].standName || this.handleSelectTableList[0].lawsName
+        //文本状态，下次一定
+        // this.uploadFilesdfEo.fileType = this.handleSelectTableList[0].textStatus || this.handleSelectTableList[0].standStatusShow
+        this.selectModal = false
+      }
+      console.log('确定',this.handleSelectTableList)
+    },
+    handleSelectPageChange(page){
+      this.lawInfoTableLoading = true
+      this.handleSelectForm.page = page
+      console.log(this.handleSelectForm.page)
+      this.searchLawBtn()
+    },
+    handleSelectPageSizeChange(pageSize){
+      this.lawInfoTableLoading = true
+      this.handleSelectForm.pageSize = pageSize
+      console.log(this.handleSelectForm.pageSize)
+      this.searchLawBtn()
+    },
+    formatIssueDate(str) {
+      const momentDate = this.$moment(str)
+      if (momentDate.isValid()) {
+        return this.$moment(str).format('YYYY-MM-DD')
+      } else {
+        return str
+      }
+    },
+    // 点击查看
+    handlePreview(item) {
+      console.log('539',item)
+      if (item.standType === "INLAND"){
+        let routeUrlINLAND = this.$router.resolve({
+          name: 'OtherStandardDetails',
+          params: {
+            id: item.id,
+            pageType: 'INLAND_STAND'
+          }
+        })
+        window.open(routeUrlINLAND.href, '_blank')
+      }else if (item.standType === "FOREIGN"){
+        let routeUrlFOREIGN = this.$router.resolve({
+          name: 'OtherStandardDetails',
+          params: {
+            id: item.id,
+            pageType: 'FOREIGN_STAND'
+          }
+        })
+        window.open(routeUrlFOREIGN.href, '_blank')
+      } else if (item.country !== undefined){
+        let routeUrlLAWS = this.$router.resolve({
+          name: 'OtherLawsStandDetails',
+          params: {
+            id: item.id,
+            pageType: 'LAWS_STAND'
+          }
+        })
+        window.open(routeUrlLAWS.href, '_blank')
+      }else {
+        let routeUrlBUSINESS = this.$router.resolve({
+          name: 'OtherBussStandardDetails',
+          params: {
+            id: item.id,
+            pageType: 'BUSINESS_STAND'
+          }
+        })
+        window.open(routeUrlBUSINESS.href, '_blank')
+      }
+
+    },
+    // 手动查找 table选择事件
+    handleSelectTableChange (row) {
+      this.handleSelectTableList = row
+      console.log('我选的',this.handleSelectTableList)
+    },
+    //手动查找的清空按钮
+    clearLawBtn(){
+      this.lawInfoTableLoading = true
+      //清空的时候还是不要把人家选的数据源清空吧
+      // this.handleSelectForm.dataSource = ''
+      //清空标准编号/政策编号的查询
+      this.handleSelectForm.lawNumber = ''
+      this.handleSelectForm.standNumber = ''
+      this.handleSelectForm.lawsNumber = ''
+      this.handleSelectForm.standCode = ''
+      //清空标准名称/政策名称的查询
+      this.handleSelectForm.lawName = ''
+      this.handleSelectForm.standName = ''
+      this.handleSelectForm.numberName = ''
+      this.searchLawBtn()
+    },
+    //手动查找的查询按钮
+    searchLawBtn(){
+      this.lawInfoTableLoading = true
+      console.log('533',this.handleSelectForm.dataSource)
+      if (this.handleSelectForm.dataSource === 'INLAND'){
+        this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{
+          _this: this
+        },res=>{
+          console.log('国内标准库数据',res)
+          if (res.ok){
+            this.lawInfoTable = res.data.list
+            this.handleSelectForm.total = res.data.count
+            if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+              this.lawInfoTableLoading = true
+              this.handleSelectPageChange(1)
+            }else {
+              this.lawInfoTableLoading = false
+              this.lawInfoTableLoading = false
+            }
+          }else {
+            this.$message.error(res.message)
+          }
+        },e=>{
+          this.lawInfoTable = []
+          this.handleSelectForm.total = 0
+        })
+        console.log('国内标准库')
+      }else if(this.handleSelectForm.dataSource === 'FOREIGN'){
+        this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{
+          _this: this
+        },res=>{
+          console.log('海外标准库数据',res)
+          if (res.ok){
+            this.lawInfoTable = res.data.list
+            this.handleSelectForm.total = res.data.count
+            if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+              this.lawInfoTableLoading = true
+              this.handleSelectPageChange(1)
+            }else {
+              this.lawInfoTableLoading = false
+            }
+          }else {
+            this.$message.error(res.message)
+            this.lawInfoTableLoading = false
+          }
+        },e=>{
+          this.lawInfoTable = []
+          this.handleSelectForm.total = 0
+        })
+        console.log('海外标准库')
+      }else if(this.handleSelectForm.dataSource === 'FOREIGN_LAWS'){
+        this.$http.get('lawss/sarLawsInfo/page',this.handleSelectForm,{
+          _this: this
+        },res=>{
+          console.log('国内外政策库数据',res)
+          if (res.ok){
+            this.lawInfoTable = res.data.list
+            this.handleSelectForm.total = res.data.count
+            if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+              this.lawInfoTableLoading = true
+              this.handleSelectPageChange(1)
+            }else {
+              this.lawInfoTableLoading = false
+            }
+          }else {
+            this.$message.error(res.message)
+            this.lawInfoTableLoading = false
+          }
+        },e=>{
+          this.lawInfoTable = []
+          this.handleSelectForm.total = 0
+        })
+        console.log('国内外政策库')
+      }else if(this.handleSelectForm.dataSource === 'BUSINESS_STAND'){
+        this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',this.handleSelectForm,{
+          _this: this
+        },res=>{
+          console.log('企业标准库数据',res)
+          if (res.ok){
+            this.lawInfoTable = res.data.list
+            this.handleSelectForm.total = res.data.count
+            if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+              this.lawInfoTableLoading = true
+              this.handleSelectPageChange(1)
+            }else {
+              this.lawInfoTableLoading = false
+            }
+          }else {
+            this.$message.error(res.message)
+            this.lawInfoTableLoading = false
+          }
+        },e=>{
+          this.lawInfoTable = []
+          this.handleSelectForm.total = 0
+        })
+        console.log('企业标准库')
+      }else {
+        this.$message.warning('请先选择标准/政策来源')
+      }
+    },
+    //根据标准编号/政策编号查询
+    lawNumberSearch() {
+      this.handleSelectForm.standNumber = this.handleSelectForm.lawNumber
+      this.handleSelectForm.lawsNumber = this.handleSelectForm.lawNumber
+      this.handleSelectForm.standCode = this.handleSelectForm.lawNumber
+    },
+    //根据标准名称/政策名称查询
+    lawNameSearch() {
+      this.handleSelectForm.standName = this.handleSelectForm.lawName
+      this.handleSelectForm.numberName = this.handleSelectForm.lawName
+    },
+    dataSourceChange() {
+      this.handleSelectForm.page = 1
+      this.lawInfoTableLoading = true
+      this.handleSelectForm.standType = this.handleSelectForm.dataSource
+      this.searchLawBtn()
+    },
+    cancelSelectModel () {
+      this.selectModal = false
+    },
+    //点击手动查找按钮
+    handleSelect() {
+      this.selectModal = true
+      this.lawInfoTableLoading = true
+      this.handleSelectForm.standType = this.handleSelectForm.dataSource
+      this.clearLawBtn()
+      this.searchLawBtn()
+    },
     handleCommand(command) {
       switch (command[1]) {
         case "获取文件":

src/pages/localTool/standardWarning.vue

@@ -12,66 +12,78 @@
             <h5>实施预警</h5>
           </div>
             <div class="more">
-              <el-form :inline="true" :model="dynamic" class="demo-form-inline">
+              <el-row :gutter="24">
-                <el-form-item label="标准编号">
+                <el-col span="24">
-                  <el-input clearable size="mini"
+                  <el-form :inline="true" :model="dynamic" class="demo-form-inline">
-                            v-model="dynamic.standCode"
+                    <el-form-item label="标准编号">
-                            placeholder="根据标准编号查找">
+                      <el-input clearable size="mini"
-                  </el-input>
+                                v-model="dynamic.standCode"
-                </el-form-item>
+                                placeholder="根据标准编号查找">
-                <el-form-item label="标准名称">
+                      </el-input>
-                  <el-input clearable size="mini"
+                    </el-form-item>
-                            v-model="dynamic.standName"
+                    <el-form-item label="标准名称">
-                            placeholder="根据标准名称查找">
+                      <el-input clearable size="mini"
-                  </el-input>
+                                v-model="dynamic.standName"
-                </el-form-item>
+                                placeholder="根据标准名称查找">
-                <el-form-item label="实施日期" style="margin-right: -40px" class="choose-time-area">
+                      </el-input>
-                  <el-datePicker
+                    </el-form-item>
-                    clearable size="mini"
+                    <el-form-item label="实施日期" style="margin-right: 10px" class="choose-time-area">
-                    v-model="dynamic.putTime"
+                      <el-date-picker
-                    value-format="yyyy-MM-dd"
+                        size="mini"
-                    placeholder="根据实施日期查找">
+                        clearable
-                  </el-datePicker>
+                        v-model="dynamic.putTime"
-                </el-form-item>
+                        value-format="yyyy-MM-dd"
-                <el-form-item label="适用车型">
+                        type="daterange"
-                  <el-input clearable size="mini"
+                        range-separator="-"
-                            v-model="dynamic.applyType"
+                        start-placeholder="开始日期"
-                            placeholder="根据适用车型查找">
+                        end-placeholder="结束日期">
-                  </el-input>
+                      </el-date-picker>
-                </el-form-item>
+                      <!--                  <el-datePicker-->
-                <div style="margin: 8px 0 0 0; float: right">
+                      <!--                    clearable size="mini"-->
-                  <el-button
+                      <!--                    v-model="dynamic.putTime"-->
-                    type="primary"
+                      <!--                    value-format="yyyy-MM-dd"-->
-                    size="mini"
+                      <!--                    placeholder="根据实施日期查找">-->
-                    v-btn-permission="'5dca375c3d8d57c45e4815acf3611b34'"
+                      <!--                  </el-datePicker>-->
-                    @click="searchBtnClick"
+                    </el-form-item>
-                    class="common-button-primary">
+                    <el-form-item label="适用车型">
-                    查询
+                      <el-input clearable size="mini"
-                  </el-button>
+                                v-model="dynamic.applyType"
-                  <el-button
+                                placeholder="根据适用车型查找">
-                    size="mini"
+                      </el-input>
-                    @click="clearBtnClick"
+                    </el-form-item>
-                    v-btn-permission="'8258ee44344e92365e7e5bd90f3c8d21'"
+                    <div style="margin: 8px 0 0 0; float: right">
-                    class="common-button-primary">
+                      <el-button
-                    清空
+                        type="primary"
-                  </el-button>
+                        size="mini"
-                </div>
+                        @click="searchBtnClick"
-<!--                <el-form-item>-->
+                        class="common-button-primary">
-<!--                  <el-button-->
+                        查询
-<!--                    type="primary"-->
+                      </el-button>
-<!--                    size="mini"-->
+                      <el-button
-<!--                    @click="searchBtnClick"-->
+                        size="mini"
-<!--                    class="common-button-primary">-->
+                        @click="clearBtnClick"
-<!--                    查询-->
+                        class="common-button-primary">
-<!--                  </el-button>-->
+                        清空
-<!--                  <el-button-->
+                      </el-button>
-<!--                    size="mini"-->
+                      <!--                  <el-button-->
-<!--                    @click="clearBtnClick"-->
+                      <!--                    type="primary"-->
-<!--                    class="common-button-primary">-->
+                      <!--                    size="mini"-->
-<!--                    清空-->
+                      <!--                    v-btn-permission="'5dca375c3d8d57c45e4815acf3611b34'"-->
-<!--                  </el-button>-->
+                      <!--                    @click="searchBtnClick"-->
-<!--                </el-form-item>-->
+                      <!--                    class="common-button-primary">-->
-              </el-form>
+                      <!--                    查询-->
+                      <!--                  </el-button>-->
+                      <!--                  <el-button-->
+                      <!--                    size="mini"-->
+                      <!--                    @click="clearBtnClick"-->
+                      <!--                    v-btn-permission="'8258ee44344e92365e7e5bd90f3c8d21'"-->
+                      <!--                    class="common-button-primary">-->
+                      <!--                    清空-->
+                      <!--                  </el-button>-->
+                    </div>
+                  </el-form>
+                </el-col>
+              </el-row>
             </div>
             <div class="content" style="height: 100%; padding-top: 50px; ">
               <el-divider content-position="left" class="dynamic-child-title">新车型实施日期预警</el-divider>
@@ -97,7 +109,7 @@
                     <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
                   </template>
                 </el-table-column>
-                <el-table-column prop="standName" label="标准名称" align="center">
+                <el-table-column prop="standName" width="320" label="标准名称" align="center">
                   <template slot-scope="scope">
                     <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
                   </template>
@@ -109,16 +121,6 @@
                 </el-table-column>
                 <el-table-column prop="applyType" label="适用车型" align="center">
                 </el-table-column>
-                <el-table-column label="标准类型" align="center">
-                  <template slot-scope="scope">
-                    <div>{{ scope.row.standCode.split(' ')[0] }}</div>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
-                  <template slot-scope="scope">
-                    <div>{{ scope.row.dutyEngineer }}</div>
-                  </template>
-                </el-table-column>
                 <el-table-column label="操作" align="center" v-if="isShowBtn">
                   <template slot-scope="scope">
                     <el-button
@@ -160,7 +162,7 @@
                     <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
                   </template>
                 </el-table-column>
-                <el-table-column prop="standName" label="标准名称" align="center">
+                <el-table-column prop="standName" width="320" label="标准名称" align="center">
                   <template slot-scope="scope">
                     <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
                   </template>
@@ -172,16 +174,6 @@
                 </el-table-column>
                 <el-table-column prop="applyType" label="适用车型" align="center">
                 </el-table-column>
-                <el-table-column label="标准类型" align="center">
-                  <template slot-scope="scope">
-                    <div>{{ scope.row.standCode.split(' ')[0] }}</div>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
-                  <template slot-scope="scope">
-                    <div>{{ scope.row.dutyEngineer }}</div>
-                  </template>
-                </el-table-column>
                 <el-table-column label="操作" align="center" v-if="isShowBtn">
                   <template slot-scope="scope">
                     <el-button
@@ -214,7 +206,7 @@
                     <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
                   </template>
                 </el-table-column>
-                <el-table-column prop="standName" label="标准名称" align="center">
+                <el-table-column prop="standName" width="320" label="标准名称" align="center">
                   <template slot-scope="scope">
                     <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
                   </template>
@@ -236,17 +228,6 @@
                 </el-table-column>
                 <el-table-column prop="applyType" label="适用车型" align="center">
                 </el-table-column>
-                <el-table-column prop="mark" label="标准分类" align="center">
-                  <template slot-scope="scope">
-                    <!--                        <a @click="showStandDetails(scope.row)">{{ scope.row.mark }}</a>-->
-                    <div>{{ scope.row.standCode.split(' ')[0] }}</div>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
-                  <template slot-scope="scope">
-                    <div>{{ scope.row.dutyEngineer }}</div>
-                  </template>
-                </el-table-column>
                 <el-table-column label="操作" align="center" v-if="isShowBtn">
                   <template slot-scope="scope">
                     <el-button
@@ -279,7 +260,7 @@
                     <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
                   </template>
                 </el-table-column>
-                <el-table-column prop="standName" label="标准名称" align="center">
+                <el-table-column prop="standName" width="320" label="标准名称" align="center">
                   <template slot-scope="scope">
                     <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
                   </template>
@@ -301,17 +282,6 @@
                 </el-table-column>
                 <el-table-column prop="applyType" label="适用车型" align="center">
                 </el-table-column>
-                <el-table-column prop="mark" label="标准分类" align="center">
-                  <template slot-scope="scope">
-                    <div>{{ scope.row.standCode.split(' ')[0] }}</div>
-                    <!--                        <a @click="showStandDetails(scope.row)">{{ scope.row.mark }}</a>-->
-                  </template>
-                </el-table-column>
-                <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
-                  <template slot-scope="scope">
-                    <div>{{ scope.row.dutyEngineer }}</div>
-                  </template>
-                </el-table-column>
                 <el-table-column label="操作" align="center" v-if="isShowBtn">
                   <template slot-scope="scope">
                     <el-button
@@ -659,7 +629,8 @@ export default {
         //标准名称
         standName: this.dynamic.standName,
         //实施日期
-        putTime: this.dynamic.putTime,
+        putTime: this.dynamic.putTime[0],
+        lastTime: this.dynamic.putTime[1],
         //适用车型
         applyType: this.dynamic.applyType
       }, {
@@ -1107,7 +1078,7 @@ export default {
 
           .choose-time-area {
             /deep/ .el-input__inner {
-              width: 170px;
+              width: 220px;
             }
           }
 
@@ -1207,6 +1178,10 @@ export default {
         .content {
           padding-bottom: 10px;
           height: calc(~'100% - 40px');
+            /deep/.el-button--mini{
+              padding: 5px 7px;
+              font-size: 8px;
+            }
         }
       }
 

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

@@ -128,7 +128,7 @@
                   <h4>责任部门对接人</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.dockUserList" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" placeholder="选择责任人" @click.native="choiceZRRS">
+                    <el-input v-model="roleForm.dockUserName" :title="roleForm.dockUserName" placeholder="选择责任人" readonly="readonly" @click.native="choiceZRRS">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -140,7 +140,7 @@
                   <h4>标准法规部部长</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.ministerUserName" placeholder="选择标准法规部部长" @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input>
+                    <el-input v-model="roleForm.ministerUserName" placeholder="选择标准法规部部长" readonly="readonly"  @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -151,7 +151,7 @@
                   <h4>技术管理中心主任</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.directorUserName" placeholder="选择技术管理中心主任" @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"></el-input>
+                    <el-input v-model="roleForm.directorUserName" placeholder="选择技术管理中心主任" readonly="readonly"  @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -162,7 +162,7 @@
                   <h4>工程研究总院院长</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.presidentUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.presidentUserName" placeholder="选择工程研究总院院长" @click.native="choiceZRR('presidentUser', '选择工程研究总院院长', roleForm.presidentUser)"></el-input>
+                    <el-input v-model="roleForm.presidentUserName" placeholder="选择工程研究总院院长" readonly="readonly"  @click.native="choiceZRR('presidentUser', '选择工程研究总院院长', roleForm.presidentUser)"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -275,9 +275,9 @@ export default {
         date: [
           { type: 'date', required: true, message: '请选择完成时间', trigger: 'change' }
         ],
-        modelNameList: [
+        // modelNameList: [
-          { required: true, message: '请上传调研结果', trigger: 'change' },
+        //   { required: true, message: '请上传调研结果', trigger: 'change' },
-        ]
+        // ]
       },
       roleForm: {
         startUserName: this.$store.getters.userInfo.userName,

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

@@ -356,10 +356,12 @@
             },
             handleSave() {
                 this.saveLoading = true
+                let json = this.form
+                json.responUserList = this.tableData
                 let _formData = new FormData()
                 _formData.append('taskIds', this.taskIds)
                 _formData.append('json', JSON.stringify({
-                    form: this.form,
+                    form: json,
                     commentText: this.commentText,
                 }))
                 saveTaskForPub(_formData).then(res => {

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

@@ -374,7 +374,7 @@
                     <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item"  v-if="!form.itemsNum1">
                         <el-input
                                 v-model="plForm.technicalRequir"
-                                placeholders="请输入核心技术要求"
+                                placeholder="请输入核心技术要求"
                                 maxlength="500"
                         ></el-input>
                     </el-form-item>

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

@@ -727,6 +727,7 @@ export default {
     uploadBackSuccess (res, file, fileList) {
       if (res.ok) {
         this.fileInfoList.push(res.data)
+        this.listForm.fileName = this.fileInfoList
         this.$message.success('上传成功')
       } else {
         this.$message.error(res.message)
@@ -784,7 +785,6 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList (item) {
-      console.log(item.commentText);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item))
         if(item.form === undefined){

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

@@ -29,6 +29,17 @@
                                         <el-radio label="1">海外标准入库</el-radio>
                                     </el-radio-group>
                                 </el-form-item>
+                              <el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled" v-show="form.standInData === '0'">
+                                <el-select :popper-append-to-body="false" filterable v-model="form.standSort" placeholder="请选择标准类别">
+                                  <el-option
+                                      v-for="item in standSortOptions"
+                                      placeholder="请选择"
+                                      :key="item.value"
+                                      :value="item.value"
+                                      :label="item.label"
+                                  ></el-option>
+                                </el-select>
+                              </el-form-item>
                                 <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
                                     <el-input
                                             v-model="form.standNumber"
@@ -36,6 +47,13 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
+                              <el-form-item v-if="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
+                                <el-input
+                                    v-model="form.standYear"
+                                    placeholder="请输入标准标准年份"
+                                    clearable
+                                ></el-input>
+                              </el-form-item>
                                 <el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
                                     <el-input
                                             v-model="form.standName"
@@ -43,30 +61,14 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled">
+                              <el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
-                                    <el-radio-group v-model="form.signFlag">
+                                <el-input
-                                        <el-radio label="1">是</el-radio>
+                                    v-model="form.standEnName"
-                                        <el-radio label="2">否</el-radio>
+                                    placeholder="请输入标准英文名称"
-                                    </el-radio-group>
+                                    clearable
-                                </el-form-item>
+                                ></el-input>
-                                <el-form-item v-if="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
+                              </el-form-item>
-                                    <el-input
+
-                                            v-model.number="form.standYear"
-                                            placeholder="请输入标准标准年份"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
-                                <el-form-item v-if="verifySarStandard" label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
-                                    <el-select :popper-append-to-body="false" v-model="form.textStatus" placeholder="请选择文本状态">
-                                        <el-option
-                                                v-for="item in standStateOptions"
-                                                placeholder="请选择"
-                                                :key="item.value"
-                                                :value="item.value"
-                                                :label="item.label"
-                                        ></el-option>
-                                    </el-select>
-                                </el-form-item>
                                 <el-form-item v-if="verifySarStandard" label="标准发布日期" prop="issueTime" class="add-form-item form-item-disabled">
                                     <el-date-picker
                                             v-model="form.issueTime"
@@ -88,18 +90,17 @@
                                   ></el-option>
                                 </el-select>
                               </el-form-item>
-                                <el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
+
-                                    <el-select :popper-append-to-body="false" filterable v-model="form.standSort" placeholder="请选择标准类别">
+                              <el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled">
-                                        <el-option
+                                <el-radio-group v-model="form.signFlag">
-                                                v-for="item in standSortOptions"
+                                  <el-radio label="1">是</el-radio>
-                                                placeholder="请选择"
+                                  <el-radio label="2">否</el-radio>
-                                                :key="item.value"
+                                </el-radio-group>
-                                                :value="item.value"
+                              </el-form-item>
-                                                :label="item.label"
+
-                                        ></el-option>
+
-                                    </el-select>
+
-                                </el-form-item>
+                                <el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled" v-show="form.standInData === '0'">
-                                <el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
                                     <el-select :popper-append-to-body="false" v-model="form.standNature" placeholder="请选择标准性质">
                                         <el-option
                                                 v-for="item in standNatureOptions"
@@ -110,13 +111,7 @@
                                         ></el-option>
                                     </el-select>
                                 </el-form-item>
-                                <el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
+
-                                    <el-input
-                                            v-model="form.standEnName"
-                                            placeholder="请输入标准英文名称"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
 
                                 <el-form-item class="add-form-item form-item-disabled" style="margin-left: -210px">
                                     <el-button
@@ -145,6 +140,17 @@
                                             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
                                             :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
                                 </el-form-item>
+                              <el-form-item v-if="verifySarStandard" label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
+                                <el-select :popper-append-to-body="false" v-model="form.textStatus" placeholder="请选择文本状态">
+                                  <el-option
+                                      v-for="item in standStateOptions"
+                                      placeholder="请选择"
+                                      :key="item.value"
+                                      :value="item.value"
+                                      :label="item.label"
+                                  ></el-option>
+                                </el-select>
+                              </el-form-item>
                                 <el-form-item v-if="verifySarStandard && form.standInData === '1'"  label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
                                     <el-input
                                             v-model="form.gxhbq"
@@ -503,17 +509,17 @@
                     <div class="prc-content-border" v-show="verifySarStandard">
                         <el-row :gutter="24">
                             <el-col :span="12">
-                                <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
+<!--                                <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">-->
-                                    <el-select :popper-append-to-body="false" v-model="form.zrbm" placeholder="请选择责任部门" multiple>
+<!--                                    <el-select :popper-append-to-body="false" v-model="form.zrbm" placeholder="请选择责任部门" multiple>-->
-                                        <el-option
+<!--                                        <el-option-->
-                                                v-for="item in zrbmOptions"
+<!--                                                v-for="item in zrbmOptions"-->
-                                                placeholder="请选择"
+<!--                                                placeholder="请选择"-->
-                                                :key="item.value"
+<!--                                                :key="item.value"-->
-                                                :value="item.value"
+<!--                                                :value="item.value"-->
-                                                :label="item.label"
+<!--                                                :label="item.label"-->
-                                        ></el-option>
+<!--                                        ></el-option>-->
-                                    </el-select>
+<!--                                    </el-select>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
                                 <el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled">
                                     <el-select :popper-append-to-body="false" v-model="form.cllx" placeholder="请选择适用车型" multiple>
                                         <el-option
@@ -590,7 +596,7 @@
                                   </el-select>
                                 </el-form-item>
                                 <el-form-item v-show="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
-                                    <el-select :popper-append-to-body="false" v-model="form.qcdw" placeholder="请选择起草单位" multiple>
+                                    <el-select :popper-append-to-body="false" v-model="form.qcdw" placeholder="请选择起草单位" multiple filterable>
                                         <el-option
                                                 v-for="item in qcdwOption"
                                                 placeholder="请选择"
@@ -635,17 +641,17 @@
                                         ></el-option>
                                     </el-select>
                                 </el-form-item>
-                                <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
+<!--                                <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">-->
-                                    <el-select :popper-append-to-body="false" v-model="form.zrgcs" placeholder="请选择责任工程师" multiple>
+<!--                                    <el-select :popper-append-to-body="false" v-model="form.zrgcs" placeholder="请选择责任工程师" multiple>-->
-                                        <el-option
+<!--                                        <el-option-->
-                                                v-for="item in zrgcsOptions"
+<!--                                                v-for="item in zrgcsOptions"-->
-                                                placeholder="请选择"
+<!--                                                placeholder="请选择"-->
-                                                :key="item.value"
+<!--                                                :key="item.value"-->
-                                                :value="item.value"
+<!--                                                :value="item.value"-->
-                                                :label="item.label"
+<!--                                                :label="item.label"-->
-                                        ></el-option>
+<!--                                        ></el-option>-->
-                                    </el-select>
+<!--                                    </el-select>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
                                 <el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled">
                                     <el-input
                                             v-model="form.cycvppscn"
@@ -914,7 +920,7 @@
                     :on-remove="removeOneFile"
                     :show-file-list="true"
             >
-                <div style="padding: 20px 0">
+                <div>
                     <i class="el-icon-upload" style="color: #3399ff"></i>
                     <p>点击或拖拽上传文件</p>
                 </div>
@@ -1203,7 +1209,7 @@
                 <el-button
                         round
                         class="common-button-primary"
-                        icon="el-icon-check"
+                        icon="el-icon-plus"
                         type="primary"
                         @click="handleProcessStandardNext(1)">新增</el-button>
                 <el-button
@@ -1211,7 +1217,7 @@
                         class="common-button-primary"
                         icon="el-icon-check"
                         type="primary"
-                        @click="handleProcessStandardNext(2)">带入</el-button>
+                        @click="handleProcessStandardNext(2)">确认</el-button>
                 <el-button
                         round
                         class="common-button-default"
@@ -1485,7 +1491,7 @@
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
                     ],
                   standEnName: [
-                    { required: true, message: '请输入标准英文名称', trigger: 'blur' },
+                    { required: false, message: '请输入标准英文名称', trigger: 'blur' },
                     { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
                   ],
                     standNature: [
@@ -1498,12 +1504,12 @@
                     issueTime: [
                         { required: false, message: '请选择标准发布日期', trigger: 'change' }
                     ],
-                    qcdw: [
+                    // qcdw: [
-                        { required: true, message: '请选择起草单位', validator: validateQcdw, trigger: 'change' }
+                    //     { required: true, message: '请选择起草单位', validator: validateQcdw, trigger: 'change' }
-                    ],
+                    // ],
-                    cysd: [
+                    // cysd: [
-                        { required: true, message: '请选择我司参与深度', validator: validateCysd, trigger: 'change' }
+                    //     { required: true, message: '请选择我司参与深度', validator: validateCysd, trigger: 'change' }
-                    ],
+                    // ],
                 },
                 zrUserIds: [], // 选择多个会签责任人
                 userType:'', // 选择用户ID判断
@@ -1553,6 +1559,14 @@
                 handler: function(val) {
                     this.verifySarStandard = false
                     this.standardSearchForm.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
+
+                  // 国内英文名称不必填 国外必填
+                    if(this.form.standInData === '1'){
+                        this.rules.standEnName[0].required=true;
+                    }else {
+                      this.rules.standEnName[0].required=false;
+                    }
+
                   //切换清空表单
                   this.form= {
                     // 基础信息
@@ -1718,9 +1732,10 @@
               this.verifySarStandard = this.$route.query.verifySarStandard
               let mes = JSON.parse(res.mes)
               mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
-              this.form = mes.form
               this.roleForm = mes.roleForm
               this.commentText = mes.commentText
+              //表单文件处理
+              this.getFormFieldList(mes.form)
             })
           },
           // 将文本状态的id与name对应
@@ -2597,6 +2612,8 @@
             },
             //保存
             handleSave() {
+              //文件处理
+              this.fileInfoHandle();
               this.form.country=this.countryArr;
               // if(item.country !== undefined && item.country !== null){
               //   this.sarStandardsInfoEO.country = item.country.split(",");
@@ -2768,6 +2785,29 @@
 <style lang="less" scoped>
     @import '~@/assets/styles/style';
     .bzrkStep1 {
+      /deep/ .el-upload-dragger {
+        background-color: #fff;
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        box-sizing: border-box;
+        width: 360px;
+        height: 90px;
+        text-align: center;
+        position: relative;
+        overflow: hidden;
+      }
+      /deep/ .el-dialog__body {
+        padding: 0 20px 10px;
+        color: #606266;
+        font-size: 14px;
+        word-break: break-all;
+      }
+      /deep/ .el-upload-list__item-name {
+        white-space: inherit;
+      }
+      /deep/ .el-upload-dragger .el-icon-upload {
+        margin: 10px 0 0 0;
+      }
         /deep/.el-drawer__container {
             .prc-content-border {
                 border: none;

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

@@ -1344,7 +1344,14 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew,saveTaskForPub,queryTaskFirst} from 'api/process'
+import {
+  inboundLiaisonDetail,
+  processCreateStand,
+  changeAssigneeNew,
+  saveTaskForPub,
+  queryTaskFirst,
+  saveTaskFirst
+} from 'api/process'
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
 import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
 
@@ -1476,12 +1483,12 @@ export default {
         issueTime: [
           { required: false, message: '请选择标准发布日期', trigger: 'change' }
         ],
-        qcdw: [
+        // qcdw: [
-          { required: true, message: '请选择起草单位', trigger: 'change' }
+        //   { required: true, message: '请选择起草单位', trigger: 'change' }
-        ],
+        // ],
-        cysd: [
+        // cysd: [
-          { required: true, message: '请选择我司参与深度', trigger: 'change' }
+        //   { required: true, message: '请选择我司参与深度', trigger: 'change' }
-        ],
+        // ],
       },
       form: {
         // 基础信息
@@ -1591,7 +1598,6 @@ export default {
       prcName : this.$route.query.prcName,
       // 调整处理人抽屉状态
       drawerModal: false,
-      drawerTitle: '',
       nodeList: [],
       selectPeople:'',
     }
@@ -1628,9 +1634,11 @@ export default {
       }).then(res => {
         let mes = JSON.parse(res.mes)
         mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
-        this.form = mes.form
         this.roleForm = mes.roleForm
         this.commentText = mes.commentText
+        this.taskIds=mes.taskIds
+        //表单文件处理
+        this.getFormFieldList(mes.form)
       })
     },
     choiceZRR1 (type, title, id) {
@@ -2001,7 +2009,7 @@ export default {
             break;
           default : ;
         }
-        console.log("caNmae",this.form.caName);
+        // console.log("caNmae",this.form.caName);
         this.$message({
           showClose: true,
           message: response.message,
@@ -2072,7 +2080,7 @@ export default {
       this.fileMadel = true
 
     },fileChange(fileList){
-      console.log("fileList",fileList);
+      // console.log("fileList",fileList);
     },
     // popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
     //   if(checkedData) {
@@ -2209,6 +2217,7 @@ export default {
             this.getFormFieldList(processForm)
           }
         }).catch(e => {
+          console.log("错误")
         })
       })
     },
@@ -2313,18 +2322,24 @@ export default {
       this.active = name
     },
     handleSave() {
+      //表单文件处理
+      this.fileInfoHandle();
       this.form.country=this.countryArr;
       this.saveLoading = true
       let _formData = new FormData()
       // _formData.append('id', this.bpnId)
+      _formData.append('createUser', this.$store.getters.userInfo.userId)
+      _formData.append('createUserName', this.$store.getters.userInfo.uName)
+      _formData.append('prcType', '1')
       _formData.append('taskIds', this.taskIds)
       _formData.append('json', JSON.stringify({
         form: this.form,
         roleForm: this.roleForm,
         commentText: this.commentText,
         taskInfo: '申请人修订',
+        taskIds:this.taskIds
       }))
-      saveTaskForPub(_formData).then(res => {
+      saveTaskFirst(_formData).then(res => {
         this.saveLoading = false
         this.$message.success('保存成功')
         // this.bpnId = res.result

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

@@ -46,8 +46,8 @@
                     style="display: none;"
                   ></el-input>
                   <div style="display: flex;">
-                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
+                    <div class="table-jump" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
-                      {{ item.fileName }}
+                        <span @click="updataFj(item)">{{ item.fileName }}</span>
                         <el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
                     </div>
                   </div>

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

@@ -375,7 +375,6 @@ export default {
       let _formData = new FormData();
       let json = this.form;
       json.data = this.data;
-      console.log(json);
       _formData.append("id", this.bpnId || "");
       _formData.append("prcType", "3");
       _formData.append("taskIds", this.taskIds);
@@ -426,6 +425,7 @@ export default {
           this.form.endTime = data.endTime || data.form.endTime;
           this.form.cname = data.cname || data.form.cname;
           this.oldData = JSON.parse(JSON.stringify(data.summaryList))
+          console.log(data);
           data.summaryList.forEach(item => {
             if (item.state) {
             } else {
@@ -433,6 +433,12 @@ export default {
             }
             item.type = false;
           });
+          data.info.forEach(item => {
+            if (item.state) {
+            } else {
+              item.state = "1";
+            }
+          });
           this.json = data;
           this.data = data.info
           if (data.introduce) {

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

@@ -347,12 +347,15 @@ export default {
     upload(row, title) {
       var params = {
         columnName: {
-          chapterNumber: '章条编号',
+          chapterNumber: "章条编号",
-          chapterName: '章节名称',
+          chapterName: "章节名称",
-          commentText: '修改意见内容（包括理由或依据）',
+          commentText: "修改意见内容（包括理由或依据）",
-          department: '提出部门',
+          oldText: "修改前",
-          responUserName: '提出人',
+          newText: "修改后",
-          stateText: '处理意见'
+          reason: "修改理由",
+          department: "提出部门",
+          responUserName: "提出人",
+          stateText: "处理意见"
         },
         dataList: []
       }

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

@@ -347,12 +347,15 @@ export default {
     upload(row, title) {
       var params = {
         columnName: {
-          chapterNumber: '章条编号',
+          chapterNumber: "章条编号",
-          chapterName: '章节名称',
+          chapterName: "章节名称",
-          commentText: '修改意见内容（包括理由或依据）',
+          commentText: "修改意见内容（包括理由或依据）",
-          department: '提出部门',
+          oldText: "修改前",
-          responUserName: '提出人',
+          newText: "修改后",
-          stateText: '处理意见'
+          reason: "修改理由",
+          department: "提出部门",
+          responUserName: "提出人",
+          stateText: "处理意见"
         },
         dataList: []
       }

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

@@ -350,6 +350,9 @@ export default {
           chapterNumber: "章条编号",
           chapterName: "章节名称",
           commentText: "修改意见内容（包括理由或依据）",
+          oldText: "修改前",
+          newText: "修改后",
+          reason: "修改理由",
           department: "提出部门",
           responUserName: "提出人",
           stateText: "处理意见"

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

@@ -459,9 +459,11 @@ export default {
       queryTaskFirst({
         bpnId: this.$route.query.bpnId
       }).then(res => {
+        console.log(res.mes);
         let mes = JSON.parse(res.mes)
         this.roleForm = mes.roleForm
-        this.standardSearch = mes.standardSearch
+        this.standardSearch = mes.qbfsForm
+        this.standShow = true
         this.commentText = mes.commentText
       });
     },
@@ -567,7 +569,7 @@ export default {
       _formData.append('id', this.bpnId || '')
       _formData.append('createUser', this.$store.getters.userInfo.userId)
       _formData.append('createUserName', this.$store.getters.userInfo.userName)
-      _formData.append('prcType', '23')
+      _formData.append('prcType', '24')
       _formData.append('json', JSON.stringify({
         roleForm: this.roleForm,
         qbfsForm: this.standardSearch,

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue

@@ -243,6 +243,7 @@ export default {
   components: {
     ProcessTitle
   },
+  props: ['message'],
   data(){
     return{
       formRules: {
@@ -276,6 +277,15 @@ export default {
 
     }
   },
+  watch:{
+    message: {
+      immediate: true,
+      deep: true,
+      handler(val) {
+        this.qbfsForm = val
+      }
+    }
+  },
   methods: {
     validateForm () {
       let flag = null

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue

@@ -259,6 +259,7 @@ export default {
   components: {
     ProcessTitle
   },
+  props: ['message'],
   data(){
     return{
       formRules: {
@@ -298,6 +299,15 @@ export default {
 
     }
   },
+  watch:{
+    message: {
+      immediate: true,
+      deep: true,
+      handler(val) {
+        this.qbfsForm = val
+      }
+    }
+  },
   methods: {
     validateForm () {
       let flag = null

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue

@@ -97,6 +97,7 @@ export default {
   components: {
     ProcessTitle
   },
+  props: ['message'],
   data(){
     return {
       qbfsForm: {
@@ -148,6 +149,15 @@ export default {
 
     }
   },
+  watch:{
+    message: {
+      immediate: true,
+      deep: true,
+      handler(val) {
+        this.qbfsForm = val
+      }
+    }
+  },
   methods: {
     validateForm () {
       let flag = null

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue

@@ -307,6 +307,7 @@ export default {
   components: {
     ProcessTitle
   },
+  props: ['message'],
   data(){
     return {
       standShow: false,
@@ -372,6 +373,16 @@ export default {
   },
   mounted() {
     this.getStandDataBtn()
+
+  },
+  watch:{
+    message: {
+      immediate: true,
+      deep: true,
+      handler(val) {
+        this.qbfsForm = val
+      }
+    }
   },
   methods: {
     validateForm () {

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue

@@ -250,6 +250,7 @@ export default {
   components: {
     ProcessTitle
   },
+  props: ['message'],
   data(){
     return{
       formRules: {
@@ -286,6 +287,15 @@ export default {
 
     }
   },
+  watch:{
+    message: {
+      immediate: true,
+      deep: true,
+      handler(val) {
+        this.qbfsForm = val
+      }
+    }
+  },
   methods: {
     validateForm () {
       let flag = null

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

@@ -6,7 +6,9 @@
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
+      <div class="headerTabsItem" v-if="approvalFlag"  :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+      <div class="headerTabsItem" v-else :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
+
     </div>
     <div class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto">
@@ -20,16 +22,21 @@
           <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="调整类型" class="add-form-item form-item-disabled">
-                <el-button size="small" type="primary" style="margin: 10px;"  @click="toggleComName('merge')">合并</el-button>
+                <el-button size="small" type="primary" style="margin: 10px;" @click="toggleComName('merge')">合并
-                <el-button size="small" type="primary" style="margin: 10px;"  @click="toggleComName('delay')">延期</el-button>
+                </el-button>
-                <el-button size="small" type="primary" style="margin: 10px;"  @click="toggleComName('cancel')">取消</el-button>
+                <el-button size="small" type="primary" style="margin: 10px;" @click="toggleComName('delay')">延期
-                <el-button size="small" type="primary" style="margin: 10px;"  @click="toggleComName('rename')">更名</el-button>
+                </el-button>
-                <el-button size="small" type="primary" style="margin: 10px;"  @click="toggleComName('establish')">立项</el-button>
+                <el-button size="small" type="primary" style="margin: 10px;" @click="toggleComName('cancel')">取消
+                </el-button>
+                <el-button size="small" type="primary" style="margin: 10px;" @click="toggleComName('rename')">更名
+                </el-button>
+                <el-button size="small" type="primary" style="margin: 10px;" @click="toggleComName('establish')">立项
+                </el-button>
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
-        <component ref="childForm" :is="comName" ></component>
+        <component ref="childForm" :message="qbfsForm" :is="comName"></component>
       </div>
       <div>
         <el-collapse accordion>
@@ -56,9 +63,9 @@
             :model="roleForm"
             :rules="roleFormRules"
             class="label-input-form">
-            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.prcCreateUser ? '#66b1ff' : ''">
               <el-card>
-                <el-form-item prop="startUserName" style="margin-bottom: 0">
+                <el-form-item prop="prcCreateUserName" style="margin-bottom: 0">
                   <h4>标准法规工程师</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.prcCreateUser" style="display: none;"></el-input>
@@ -69,7 +76,7 @@
               </el-card>
             </el-timeline-item>
             <el-timeline-item timestamp="选择申请部门高级经理审核" placement="top"
-                              :color="roleForm.dockUser ? '#66b1ff' : ''" >
+                              :color="roleForm.dockUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="dockUserName" style="margin-bottom: 0">
                   <h4>申请部门高级经理</h4>
@@ -83,7 +90,7 @@
               </el-card>
             </el-timeline-item>
             <el-timeline-item timestamp="选择申请部门中心主任会签" placement="top"
-                              :color="roleForm.countersigner ? '#66b1ff' : ''" >
+                              :color="roleForm.countersigner ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="countersignerName" style="margin-bottom: 0">
                   <h4>申请部门中心主任</h4>
@@ -97,7 +104,7 @@
               </el-card>
             </el-timeline-item>
             <el-timeline-item timestamp="选择标准法规工作组组长审定" placement="top"
-                              :color="roleForm.examine ? '#66b1ff' : ''" >
+                              :color="roleForm.examine ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="examineName" style="margin-bottom: 0">
                   <h4>标准法规工作组组长</h4>
@@ -111,7 +118,7 @@
               </el-card>
             </el-timeline-item>
             <el-timeline-item timestamp="选择标准法规部部长批准" placement="top"
-                              :color="roleForm.approver ? '#66b1ff' : ''" >
+                              :color="roleForm.approver ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="approverName" style="margin-bottom: 0">
                   <h4>标准法规部部长</h4>
@@ -125,7 +132,7 @@
               </el-card>
             </el-timeline-item>
             <el-timeline-item timestamp="选择标准法规部工程师抄送" placement="top"
-                              :color="roleForm.engineer ? '#66b1ff' : ''" >
+                              :color="roleForm.engineer ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="engineerName" style="margin-bottom: 0">
                   <h4>标准法规部工程师</h4>
@@ -142,6 +149,73 @@
         </el-timeline>
       </div>
     </div>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list" style="height: 100%">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="流程信息"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+
     <ProcessFooter
       show-save
       show-submit
@@ -178,11 +252,11 @@ import rename from "process/creatProcess/qbzxdjhgk/component/rename";
 import establish from "process/creatProcess/qbzxdjhgk/component/establish";
 import delay from "process/creatProcess/qbzxdjhgk/component/delay";
 import cancel from "process/creatProcess/qbzxdjhgk/component/cancel";
-import {saveTaskFirst,queryTaskFirst, inboundLiaisonDetail } from "api/process";
+import { saveTaskFirst, queryTaskFirst, inboundLiaisonDetail } from "api/process";
 
 export default {
   name: "qbzxdjhgkStep1",
-  components:{
+  components: {
     ProcessHeader,
     ProcessFooter,
     ProcessTitle,
@@ -190,88 +264,222 @@ export default {
     rename,
     establish,
     delay,
-    cancel,
+    cancel
   },
-  data(){
+  data() {
-    return{
+    return {
-       active: '1',
+      active: "1",
-      commentText: '',
+      commentText: "",
-      comName: 'merge',
+      comName: "merge",
-      drawerTitle: '',
+      qbfsForm: {},
+      approvalFlag: false,
+      taskId: '',
+      bpnId: '',
+      drawerTitle: "",
       nodeList: [],
       nodeList2: [],
+      detailData: [],
       isSubmit: false,
       saveLoading: false,
       modalshowflag: false,
       modalshowflag2: false,
+      loading: false,
       roleForm: {
         prcCreateUserName: this.$store.getters.userInfo.userName,
         prcCreateUser: this.$store.getters.userInfo.userId,
-        dockUser: '',
+        dockUser: "",
-        dockUserName: '',
+        dockUserName: "",
-        countersigner: '',
+        countersigner: "",
-        countersignerName: '',
+        countersignerName: "",
-        approver: '',
+        approver: "",
-        approverName: '',
+        approverName: "",
         engineer: "",
         engineerName: "",
-        examine: '',
+        examine: "",
-        examineName: '',
+        examineName: ""
       },
       //必填人员校验规则
       roleFormRules: {
         dockUserName: [
-          {required: true, message: "请选择工作组组长", trigger: "change"}
+          { required: true, message: "请选择工作组组长", trigger: "change" }
-        ],
+        ]
-      },
+      }
+    };
+  },
+  mounted() {
+   this.taskId = this.$route.query.taskIds
+    this.bpnId = this.$route.query.bpnId
+    if (this.bpnId !== undefined) {
+      this.getDatas()
     }
+    if(this.taskId){
+      this.approvalFlag = true
+      this.processTable()
+   }
+    this.getData();
   },
   methods: {
-    handleTabs(name){
+    processTable() {
-        this.active = name
+      this.$http.get("lawss/activiti/get_list_by_instance", {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : "",
+        shunxu: this.shunxu
+      }, {
+        loading: "loading",
+        _this: this
+      }, res => {
+        this.detailData = res
+      }, e => {
+      })
     },
-    toggleComName(name){
+    getDatas(){
-       this.comName = name
+      queryTaskFirst({
+        bpnId: this.$route.query.bpnId
+      }).then(res => {
+        let mes = JSON.parse(res.mes)
+        this.roleForm = mes.roleForm
+        this.qbfsForm = mes.qbfsForm
+        this.commentText = mes.commentText
+      });
     },
-    //流程保存
+    getData() {
-    handleSave(){
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.$route.query.taskIds,
+          pId: this.$route.query.prcId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.qbfsForm = item;
+        this.roleForm.dockUser = item.dockUser;
+        this.roleForm.dockUserName = item.dockUserName;
+        this.roleForm.countersigner = item.countersigner;
+        this.roleForm.countersignerName = item.countersignerName;
+        this.roleForm.approver = item.approver;
+        this.roleForm.approverName = item.approverName;
+        this.roleForm.engineer = item.engineer;
+        this.roleForm.engineerName = item.engineerName;
+        this.roleForm.examine = item.examine;
+        this.roleForm.examineName = item.examineName;
+      });
+    },
+    handleTabs(name) {
+      this.active = name;
+    },
+    toggleComName(name) {
+      this.comName = name;
+      if(this.comName === 'merge'){
+        this.$refs["childForm"].qbfsForm = '1'
+      }else if(this.comName === 'delay'){
+        this.$refs["childForm"].qbfsForm.type = '2'
+      }else if(this.comName === 'cancel'){
+        this.$refs["childForm"].qbfsForm.type = '3'
+      }else if(this.comName === 'rename'){
+        this.$refs["childForm"].qbfsForm.type = '4'
+      }else if(this.comName === 'establish'){
+        this.$refs["childForm"].qbfsForm.type = '5'
+      }
 
     },
+    //流程保存
+    handleSave() {
+      let qbzxdFrom = this.$refs["childForm"].qbfsForm;
+      this.saveLoading = true
+      let _formData = new FormData()
+      _formData.append('id', this.bpnId || '')
+      _formData.append('createUser', this.$store.getters.userInfo.userId)
+      _formData.append('createUserName', this.$store.getters.userInfo.userName)
+      _formData.append('prcType', '25')
+      _formData.append('json', JSON.stringify({
+        roleForm: this.roleForm,
+        qbfsForm: qbzxdFrom,
+        commentText: this.commentText
+      }))
+      saveTaskFirst(_formData).then(res => {
+        this.saveLoading = false
+        this.$message.success('保存成功')
+        this.bpnId = res.result
+      }).catch(e => {
+        this.saveLoading = false
+      })
+    },
     //流程提交
-    handleSubmit(){
+    handleSubmit() {
-      let flag = this.$refs['childForm'].validateForm()
+      if (this.$route.query.prcNum === undefined) {
-      let qbzxdFrom = this.$refs["childForm"].qbfsForm
+        let flag = this.$refs["childForm"].validateForm();
-       if(flag){
+        let qbzxdFrom = this.$refs["childForm"].qbfsForm;
-         this.$refs['roleForm'].validate((valid) => {
+        if (flag) {
-           if(valid){
+          this.$refs["roleForm"].validate((valid) => {
-             this.isSubmit = true
+            if (valid) {
-             var json = Object.assign(qbzxdFrom, this.roleForm)
+              this.isSubmit = true;
-             this.$http.get('lawss/activiti/startProcess', {type: '25'}, {
+              var json = Object.assign(qbzxdFrom, this.roleForm);
-               _this: this
+              this.$http.get("lawss/activiti/startProcess", { type: "25" }, {
-             }, res => {
+                _this: this
-               if (res.ok) {
+              }, res => {
-                 this.$http.post('lawss/activiti/completeTask', {
+                if (res.ok) {
-                   taskIds: res.data,
+                  this.$http.post("lawss/activiti/completeTask", {
-                   userId : this.$store.getters.userInfo.userId,
+                    taskIds: res.data,
-                   json: JSON.stringify(json)
+                    userId: this.$store.getters.userInfo.userId,
-                 }, {
+                    json: JSON.stringify(json)
-                   _this: this
+                  }, {
-                 }, res => {
+                    _this: this
-                   if (res.success) {
+                  }, res => {
-                     this.$message.success(res.message)
+                    if (res.success) {
-                     this.isSubmit = false
+                      this.$message.success(res.message);
-                     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                      this.isSubmit = false;
-                   }
+                      this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
-                 })
+                    }
-               }
+                  });
-             })
+                }
-           }else{
+              });
-             this.$message.warning('请完善人员信息')
+            } else {
-           }
+              this.$message.warning("请完善人员信息");
-         })
+            }
-       }else{
+          });
-         this.$message.warning('请完善基础信息')
+        } else {
-       }
+          this.$message.warning("请完善基础信息");
+        }
+      } else {
+        let flag = this.$refs["childForm"].validateForm();
+        let qbzxdFrom = this.$refs["childForm"].qbfsForm;
+        if (flag) {
+          this.$refs["roleForm"].validate((valid) => {
+            if (valid) {
+              this.isSubmit = true;
+              var json = Object.assign(qbzxdFrom, this.roleForm);
+              this.$http.post("lawss/activiti/completeTask", {
+                taskIds: this.$route.query.taskIds,
+                userId: this.$store.getters.userInfo.userId,
+                json: JSON.stringify(json)
+              }, {
+                _this: this
+              }, res => {
+                if (res.success) {
+                  this.$message.success(res.message);
+                  this.isSubmit = false;
+                  this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
+                }
+              });
+            } else {
+              this.$message.warning("请完善人员信息");
+            }
+          });
+        } else {
+          this.$message.warning("请完善基础信息");
+        }
+      }
+
 
     },
     // 流程阶段负责人选择
@@ -282,17 +490,17 @@ export default {
       this.drawerTitle = title;
       this.modalshowflag = true;
     },
-    checkedRole (data) {
+    checkedRole(data) {
       if (this.type === "dockUser") {
         this.roleForm.dockUser = data[0].id;
         this.roleForm.dockUserName = data[0].name;
-      }else if(this.type === 'examine'){
+      } else if (this.type === "examine") {
         this.roleForm.examine = data[0].id;
         this.roleForm.examineName = data[0].name;
-      }else if(this.type === 'approver'){
+      } else if (this.type === "approver") {
         this.roleForm.approver = data[0].id;
         this.roleForm.approverName = data[0].name;
-      }else if(this.type === 'engineer'){
+      } else if (this.type === "engineer") {
         this.roleForm.engineer = data[0].id;
         this.roleForm.engineerName = data[0].name;
       }
@@ -318,8 +526,8 @@ export default {
       });
       this.roleForm.countersigner = idList;
       this.roleForm.countersignerName = nameList;
-    },
+    }
-  },
+  }
 };
 </script>
 

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

@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step1">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">发起流程</template>
     </ProcessHeader>
     <div class="headerTabs">
@@ -395,6 +395,41 @@
       <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="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+                <el-form-item label="产品线" class="search-item search-item-last">
+                  <el-input
+                    v-model="projectSearch.productLine"
+                    placeholder="请输入产品线"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="产品线责任人" class="search-item search-item-last">
+                  <el-input
+                    v-model="projectSearch.uname"
+                    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=""
+                    @click="getProductData">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    v-btn-permission=""
+                    @click="clearProject">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
             <el-table
               :data="productData"
               tooltip-effect="dark"
@@ -490,6 +525,10 @@ export default {
         standType: "",
         standName: ""
       },
+      projectSearch: {
+        productLine: '',
+        uname: '',
+      },
       standardTypeOptions: [
         {
           value: "INLAND",
@@ -933,11 +972,20 @@ export default {
       this.pageSizeNo = this.$store.getters.userInfo.configContent;
       this.getProductData();
     },
+    //清空产品线数据
+    clearProject(){
+      this.projectSearch = {
+        productLine: '',
+        uname: '',
+      }
+      this.getProductData()
+    },
     //获取产品线数据
     getProductData() {
       this.$http.get("sarStandProjectLibrary/queryProjectManager", {
         current: this.pageNo,
-        pageSize: this.pageSizeNo
+        PageSize: this.pageSizeNo,
+        ...this.projectSearch
       }, {
         _this: this
       }, res => {

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

@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step2">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">业务经理审批流程</template>
     </ProcessHeader>
     <div class="headerTabs">

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

@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step7">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">标准法规部领导审批</template>
     </ProcessHeader>
     <div class="headerTabs">

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

@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step1">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">发起流程</template>
     </ProcessHeader>
     <div class="headerTabs">
@@ -397,6 +397,41 @@
       <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="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+                <el-form-item label="产品线" class="search-item search-item-last">
+                  <el-input
+                    v-model="projectSearch.productLine"
+                    placeholder="请输入产品线"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="产品线责任人" class="search-item search-item-last">
+                  <el-input
+                    v-model="projectSearch.uname"
+                    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=""
+                    @click="getProductData">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    v-btn-permission=""
+                    @click="clearProject">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
             <el-table
               :data="productData"
               tooltip-effect="dark"
@@ -488,6 +523,10 @@ export default {
       // 查询相关参数
       searching: false,
       fileType: "FBGBJBD",
+      projectSearch: {
+        productLine: '',
+        uname: '',
+      },
       standardSearch: {
         standType: "",
         standName: ""
@@ -869,7 +908,11 @@ export default {
         }, {
           _this: this
         }, res => {
-          this.listForm.breakdownList = res.data;
+          let breakdown = res.data
+          breakdown.forEach(item => {
+            delete item.termsConditions
+          })
+          this.listForm.breakdownList = breakdown;
           this.ListModel = false;
         }, e => {
           this.$message.error("添加失败");
@@ -926,11 +969,20 @@ export default {
       this.pageSizeNo = this.$store.getters.userInfo.configContent;
       this.getProductData();
     },
+    //清空产品线数据
+    clearProject(){
+      this.projectSearch = {
+        productLine: '',
+        uname: '',
+      }
+      this.getProductData()
+    },
     //获取产品线数据
     getProductData() {
       this.$http.get("sarStandProjectLibrary/queryProjectManager", {
         current: this.pageNo,
-        pageSize: this.pageSizeNo
+        PageSize: this.pageSizeNo,
+        ...this.projectSearch
       }, {
         _this: this
       }, res => {

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

@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step2">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">业务经理审批流程</template>
     </ProcessHeader>
     <div class="headerTabs">

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

@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step3">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">分发责任人分发任务</template>
     </ProcessHeader>
     <div class="headerTabs">

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

@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step4">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">落实人填写评估反馈</template>
     </ProcessHeader>
     <div class="headerTabs">

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

@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step5">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">分发责任人审批</template>
     </ProcessHeader>
     <div class="headerTabs">

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

@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step6">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">产品线责任人审批</template>
     </ProcessHeader>
     <div class="headerTabs">

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

@@ -2,7 +2,7 @@
 <template>
   <div class="xmpg-step7">
     <ProcessHeader toggle>
-      <template slot="proName">项目合规评估流程</template>
+      <template slot="proName">标准合规评估流程</template>
       <template slot="proNode">标准法规部领导审批</template>
     </ProcessHeader>
     <div class="headerTabs">

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

@@ -381,35 +381,34 @@
         <el-button type="primary" size="mini" @click="okStand">添加</el-button>
       </div>
     </el-drawer>
-    <ProcessFooter
-      show-save
-      show-transfer
-      show-affirm
-      :submitLoading="isSubmit"
-      :transfer-loading="isTransfer"
-      :saveLoading="saveLoading"
-      @submit="handleSubmit"
-      @transfer="handleTransfer"
-      @save="handleSave"
-      :approval="true"
-    >
-    </ProcessFooter>
 <!--    <ProcessFooter-->
-<!--      :show-save="submitShow"-->
+<!--      show-save-->
-<!--      :show-transfer="submitShow"-->
+<!--      show-transfer-->
-<!--      :show-affirm="submitShow"-->
+<!--      show-affirm-->
-<!--      :show-submit="submitShow"-->
-<!--      :show-confirm="acceptShow"-->
 <!--      :submitLoading="isSubmit"-->
 <!--      :transfer-loading="isTransfer"-->
 <!--      :saveLoading="saveLoading"-->
 <!--      @submit="handleSubmit"-->
 <!--      @transfer="handleTransfer"-->
 <!--      @save="handleSave"-->
-<!--      @accept="handleAccept"-->
 <!--      :approval="true"-->
 <!--    >-->
 <!--    </ProcessFooter>-->
+    <ProcessFooter
+      :show-save="submitShow"
+      :show-transfer="submitShow"
+      :show-affirm="submitShow"
+      show-confirm
+      :submitLoading="isSubmit"
+      :transfer-loading="isTransfer"
+      :saveLoading="saveLoading"
+      @submit="handleSubmit"
+      @transfer="handleTransfer"
+      @save="handleSave"
+      @accept="handleAccept"
+      :approval="true"
+    >
+    </ProcessFooter>
     <!-- 福田全公司选人解决方案 -->
     <Role-tree
         check-box

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

@@ -46,7 +46,7 @@
                 </el-table-column>
                 <el-table-column
                     label="标准编号/政策编号"
-                    prop="lawId"
+                    prop="lawCode"
                     align="center"
                     width="300"
                 >
@@ -221,7 +221,7 @@
             <el-form :model="standardSearchForm" inline class="label-input-form search-area">
               <el-form-item label="标准编号/政策编号" style="margin-right:10px" prop="lawsNumber" class="search-item">
                 <el-input
-                    v-model="standardSearchForm.lawId"
+                    v-model="standardSearchForm.lawCode"
                     clearable placeholder="根据编号查找"
                     :maxlength="100"
                     @keyup.enter.native="getDomesticStandardTable"/>
@@ -278,7 +278,7 @@
                   align="center">
               </el-table-column>
               <el-table-column
-                  prop="lawId"
+                  prop="lawCode"
                   width="200"
                   label="标准编号/政策编号"
                   align="center">
@@ -382,7 +382,7 @@ export default {
         taskTableData: []
       },
       standardSearchForm: {
-        lawId: '',
+        lawCode: '',
         lawName: '',
         productType: '',
         page: 1,
@@ -540,7 +540,22 @@ export default {
           // 带入
         case 2:
           if (this.standardCheckedList && this.standardCheckedList.length >= 1) {
-            this.infoTableDatas = this.standardCheckedList
+            let exits = [];
+            this.standardCheckedList.map(item =>{
+              let newStand = false;
+              for (let itemKey of this.infoTableDatas) {
+                if (item.id == itemKey.id){
+                  newStand = true;
+                  break;
+                }
+              }
+              if (newStand){
+                this.$message.warning("请勿重复添加数据");
+              }else {
+                this.infoTableDatas.push(item);
+                exits.push(item.id);
+              }
+            })
             this.standardDrawer = false
           } else {
             this.$message.warning('请选择要带入的数据')
@@ -583,7 +598,7 @@ export default {
     },
     //清空搜索条件
     handleResetSearch() {
-      this.standardSearchForm.lawId = ''
+      this.standardSearchForm.lawCode = ''
       this.standardSearchForm.lawName = ''
       this.standardSearchForm.productType = ''
       this.standardSearchForm.standType = 'INLAND'
@@ -693,50 +708,55 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      this.$refs['zdrzbzORzchgxxmscForm'].validate((valid) => {
+      if (this.infoTableDatas.length>0){
-        if (valid) {
+        this.$refs['zdrzbzORzchgxxmscForm'].validate((valid) => {
-          this.$refs['Form'].validate((valid) => {
+          if (valid) {
-            if (valid) {
+            this.$refs['Form'].validate((valid) => {
-              this.isSubmit = true
+              if (valid) {
-              let infoTableDatas = []
+                this.isSubmit = true
-              infoTableDatas = JSON.stringify(this.infoTableDatas)
+                let infoTableDatas = []
-              localStorage.setItem('infoTableDatas', JSON.stringify(this.infoTableDatas))
+                infoTableDatas = JSON.stringify(this.infoTableDatas)
-              this.$http.get('lawss/activiti/startProcess', {
+                localStorage.setItem('infoTableDatas', JSON.stringify(this.infoTableDatas))
-                type: 'laws3',
+                this.$http.get('lawss/activiti/startProcess', {
-              }, {_this: this}, res => {
+                  type: 'laws3',
-                if (res.ok) {
+                }, {_this: this}, res => {
-                  var json = Object.assign(this.form, this.roleForm)
+                  if (res.ok) {
-                  json.commentText = this.commentText
+                    var json = Object.assign(this.form, this.roleForm)
-                  // json.filesId = this.addFjList
+                    json.commentText = this.commentText
-                  // json.filesName = this.form.fjListName
+                    // json.filesId = this.addFjList
-                  json.infoTableDatas = infoTableDatas
+                    // json.filesName = this.form.fjListName
-                  this.$http.post('lawss/activiti/completeTask', {
+                    json.infoTableDatas = infoTableDatas
-                    json: JSON.stringify(json),
+                    this.$http.post('lawss/activiti/completeTask', {
-                    taskId: res.data,
+                      json: JSON.stringify(json),
-                    userId: this.$store.getters.userInfo.userId
+                      taskId: res.data,
-                  }, {_this: this}, res => {
+                      userId: this.$store.getters.userInfo.userId
-                    if (res.success) {
+                    }, {_this: this}, res => {
-                      this.$message.success('流程发起成功')
+                      if (res.success) {
-                      this.$router.push('/processCenter')
+                        this.$message.success('流程发起成功')
-                      this.isSubmit = false
+                        this.$router.push('/processCenter')
-                    } else {
+                        this.isSubmit = false
-                      this.$message.warning('流程启动失败')
+                      } else {
-                      this.isSubmit = false
+                        this.$message.warning('流程启动失败')
-                    }
+                        this.isSubmit = false
-                  })
+                      }
-                } else {
+                    })
-                  this.$message.warning('流程启动失败')
+                  } else {
-                  this.isSubmit = false
+                    this.$message.warning('流程启动失败')
-                }
+                    this.isSubmit = false
-              })
+                  }
-            } else {
+                })
-              return this.$message.warning('请完善人员信息')
+              } else {
-            }
+                return this.$message.warning('请完善人员信息')
-          })
+              }
-        } else {
+            })
-          return this.$message.warning('请完善基础信息')
+          } else {
-        }
+            return this.$message.warning('请完善基础信息')
-      })
+          }
+        })
+      }else {
+        this.$message.warning('请完善基础信息')
+      }
+
     },
   }
 }

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

@@ -40,7 +40,7 @@
                 <el-table-column
                     label="标准编号/政策编号"
                     align="center"
-                    prop="lawId"
+                    prop="lawCode"
                     width="300"
                 >
                 </el-table-column>

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

@@ -39,7 +39,7 @@
                 </el-table-column>
                 <el-table-column
                     label="标准编号/政策编号"
-                    prop="lawId"
+                    prop="lawCode"
                     align="center"
                     width="300"
                 >

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

@@ -53,7 +53,7 @@
             </el-table-column>
             <el-table-column
                 label="标准编号/政策编号"
-                prop="lawId"
+                prop="lawCode"
                 align="center"
                 width="300"
             >

src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5-2.vue

@@ -1,475 +0,0 @@
-<template>
-  <div class="zdrzbzORzchgxxmsc-step5-2">
-    <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-show="active === '1'">
-      <div style="flex: auto; overflow: auto;">
-        <el-form
-            ref="bzzqyjForm"
-            :model="form"
-            :rules="formRules"
-            class="label-input-form"
-            label-width="210px"
-        >
-          <ProcessTitle>
-            <template slot="title">基础信息</template>
-          </ProcessTitle>
-          <div style="height: 450px">
-              <el-table
-                  ref="multipleTable"
-                  tooltip-effect="dark"
-                  border
-                  style="width: 100%;"
-                  height="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
-                    type="index"
-                    label="序号"
-                    width="55"
-                    align="center">
-                </el-table-column>
-                <el-table-column
-                    label="业务"
-                    align="center"
-                    width="150"
-                >
-                </el-table-column>
-                <el-table-column
-                    show-overflow-tooltip
-                    prop="standName"
-                    label="平台"
-                    min-width="150"
-                    align="center"
-                >
-                </el-table-column>
-                <el-table-column
-                    show-overflow-tooltip
-                    prop="standName"
-                    label="项目"
-                    min-width="150"
-                    align="center"
-                >
-                </el-table-column>
-                <el-table-column
-                    show-overflow-tooltip
-                    prop="standName"
-                    label="项目描述"
-                    min-width="150"
-                    align="center"
-                >
-                </el-table-column>
-                <el-table-column
-                    show-overflow-tooltip
-                    prop="standName"
-                    label="当前节点"
-                    min-width="150"
-                    align="center"
-                >
-                </el-table-column>
-                <el-table-column
-                    show-overflow-tooltip
-                    prop="standName"
-                    label="概念状态"
-                    min-width="150"
-                    align="center"
-                >
-                </el-table-column>
-                <el-table-column
-                    prop="SSRQ"
-                    align="center"
-                    width="150"
-                    label="概念计划下发时间">
-                </el-table-column>
-                <el-table-column
-                    prop="SSRQ"
-                    align="center"
-                    width="120"
-                    label="概念修订计划">
-                </el-table-column>
-                <el-table-column
-                    prop="SSRQ"
-                    align="center"
-                    width="400"
-                    label="其他说明">
-                </el-table-column>
-              </el-table>
-          </div>
-        </el-form>
-      </div>
-      <el-collapse accordion>
-        <el-collapse-item title="审批意见">
-          <div style="margin: 10px 0;">
-            <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入意见"
-                v-model="commentText">
-            </el-input>
-          </div>
-        </el-collapse-item>
-      </el-collapse>
-    </div>
-    <div class="content" v-show="active === '2'">
-      <el-table
-          height="100%"
-          ref="selection"
-          :data="histortData"
-          tooltip-effect="dark"
-          style="width: 100%"
-          border
-          row-key="id"
-          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-        <el-table-column
-            prop="name"
-            label="任务步骤"
-            align="center"
-            sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-            prop="assignee"
-            label="任务受理人"
-            align="center"
-            sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-            prop="createTime"
-            label="创建时间"
-            sortable="custom"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="endTime"
-            label="完成时间"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="comment"
-            label="流程信息"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.commentText }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="completeFlag"
-            label="状态"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <ProcessFooter
-        show-submit
-        show-save
-        :submitLoading="isSubmit"
-        :saveLoading="saveLoading"
-        show-transfer
-        @transfer="handleTransfer"
-        @save="handleSave"
-        @submit="handleSubmit"
-    >
-    </ProcessFooter>
-    <Role-tree
-        check-box
-        is-title="转办处理人"
-        :is-visible.sync="drawerModal"
-        @checkedRole="checkedRole"
-    ></Role-tree>
-  </div>
-</template>
-
-<script>
-import ProcessHeader from "../../components/ProcessHeader";
-import ProcessFooter from "../../components/ProcessFooter";
-import ProcessTitle from "../../components/ProcessTitle";
-import {inboundLiaisonDetail, processCreateStand, saveTaskForPub, changeAssigneeNew} from "api/process";
-import axios from "axios";
-
-export default {
-  name: "zdrzbzORzchgxxmscStep5-2",
-  data() {
-    return {
-      drawerModal: false,
-      histortData: [],
-      commentText: "",
-      taskIds: this.$route.query.taskIds,
-      pId: this.$route.query.prcId,
-      nodeList: [],
-      type: "",
-      modalshowflag: false, // drawer开关
-      drawerTitle: "", //drawer标题
-      textarea: "", // 意见
-      ListModel: false, // 新增编辑抽屉开关
-      active: "1", // 默认显示
-      isSubmit: false,
-      saveLoading: false,
-      form: {
-        cid: "", // 政策编号
-        endTime: "", // 责任部门领导审批 截止时间
-        cname: "", // 名称
-        fjList: [],
-        fjListId: '',
-        responUserList: "",
-        responUserListName: ""
-      },
-      formRules: {
-        responUserList: [
-          {required: true, message: "请选择责任人", trigger: "change"}
-        ]
-      },
-      json: {}
-    };
-  },
-  components: {
-    ProcessHeader,
-    ProcessFooter,
-    ProcessTitle
-  },
-  methods: {
-    handleTransfer() {
-      this.drawerModal = true
-    },
-    checkedRole(data) {
-      changeAssigneeNew({
-        taskId: this.$route.query.taskIds, // 任务id
-        userId: this.$store.getters.userInfo.userId, // 委托人
-        assignee: data[0].id, // 被委托人
-        pId: this.$route.query.prcId, // 流程实例
-      }).then(res => {
-        if (res.success) {
-          this.drawerModal = false
-          this.$message.success('调整成功')
-          this.processNum()
-          this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
-        } else {
-          this.$message.warning(res.message)
-        }
-      })
-    },
-    // 请求转换流程图
-    processNum(row) {
-      axios.request({
-        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
-        responseType: 'blob',
-        method: 'get',
-        params: {
-          prcNum: this.$route.query.prcNum
-        }
-      }).then(res => {
-        this.processStep = window.URL.createObjectURL(res.data)
-      })
-    },
-    getHistoryData() {
-      this.$http.get("lawss/activiti/get_list_by_instance", {
-        prcNum: this.$route.query.prcNum
-      }, {}, res => {
-        this.histortData = res;
-      }, e => {
-      });
-    },
-    checkedRole2(data) {
-      var idList = "";
-      var nameList = "";
-      data.forEach(item => {
-        if (nameList.length > 0) {
-          nameList += ",";
-          idList += ",";
-        }
-        idList += item.id;
-        nameList += item.name;
-      });
-      this.form.responUserList = idList;
-      this.form.responUserListName = nameList;
-
-    },
-    choiceZRR() {
-      this.nodeList = [];
-      if (this.form.responUserList.length > 0) {
-        this.nodeList = this.form.responUserList.split(",");
-      }
-      this.modalshowflag = true;
-    },
-    handleTabs(name) {
-      this.active = name;
-    },
-    //保存事件
-    handleSave() {
-      this.saveLoading = true;
-      let _formData = new FormData();
-      _formData.append("id", this.bpnId || "");
-      _formData.append("prcType", "3");
-      _formData.append("taskIds", this.taskIds);
-      _formData.append("json", JSON.stringify({
-        form: this.form,
-        commentText: this.commentText
-      }));
-      saveTaskForPub(_formData).then(res => {
-        this.saveLoading = false;
-        this.$message.success("保存成功");
-        this.bpnId = res.result;
-      }).catch(e => {
-        this.saveLoading = false;
-      });
-    },
-    handleSubmit() {
-      this.$refs["bzzqyjForm"].validate((valid) => {
-        if (valid) {
-          this.isSubmit = true;
-          var json = this.json;
-          json.commentText = this.commentText;
-          json.responUserList = this.form.responUserList;
-          json.responUserListName = this.form.responUserListName;
-          json.introduce = false;
-          this.$http.post("lawss/activiti/completeTask", {
-            json: JSON.stringify(json),
-            taskId: this.taskIds,
-            userId: this.$store.getters.userInfo.userId
-          }, {}, res => {
-            if (res.success) {
-              this.$message.success("提交成功");
-              this.$router.push("/processCenter");
-            }
-            this.isSubmit = false;
-          });
-        } else {
-          return this.$message.warning("请完善基础信息");
-        }
-      });
-    },
-    handleSubmitNo() {
-      if (this.commentText) {
-        var json = this.json
-        json.actionFlag = 1
-        json.commentText = this.commentText
-        this.$http.post('lawss/activiti/completeTask', {
-          json: JSON.stringify(json),
-          taskId: this.taskIds,
-          userId: this.$store.getters.userInfo.userId
-        }, {}, res => {
-          if (res.success) {
-            this.$message.success('提交成功')
-            this.$router.push('/processCenter')
-          }
-        })
-      } else {
-        this.$message.warning('请输入反馈意见')
-      }
-
-    },
-    getData() {
-      return new Promise((resolve, reject) => {
-        inboundLiaisonDetail({
-          taskIds: this.taskIds,
-          pId: this.pId
-        }).then(res => {
-          let data = JSON.parse(res.mesg)
-          this.form.cid = data.cid
-          this.form.endTime = data.endTime
-          this.form.cname = data.cname
-          this.form.fjList = data.fjList
-          this.form.fjListId = data.fjListId
-          this.json = data
-        }).catch(e => {
-        });
-      });
-    }
-  },
-  mounted() {
-    this.getHistoryData();
-    this.getData();
-  }
-};
-</script>
-
-<style lang="less" scoped>
-@import '~@/assets/styles/style';
-
-.zdrzbzORzchgxxmsc-step5-2 {
-  /deep/ .el-drawer__container {
-    .prc-content-border {
-      border: none;
-      padding: 0 20px 0;
-    }
-  }
-
-  .fileClass {
-    cursor: pointer;
-  }
-
-  .fileClass:hover {
-    color: #0c91e5;
-  }
-
-  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% - 103px');
-    overflow: auto;
-
-    .tableTitle {
-      margin-bottom: 10px;
-      height: 30px;
-      line-height: 30px;
-      position: relative;
-      font-size: 13px;
-      font-weight: bold;
-
-      .tableButton {
-        position: absolute;
-        right: 0;
-        top: 0;
-      }
-    }
-  }
-}
-</style>

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

@@ -37,13 +37,13 @@
                   align="center">
               </el-table-column>
               <el-table-column
-                  prop="lawId"
+                  prop="lawCode"
                   label="标准编号/政策编号"
                   align="center"
                   width="150"
               >
                 <template slot-scope="scope">
-                  <el-input style="margin: 10px 0;" v-model="scope.row.lawId"></el-input>
+                  <el-input style="margin: 10px 0;" v-model="scope.row.lawCode"></el-input>
                 </template>
               </el-table-column>
               <el-table-column

src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step6-1.vue

@@ -1,594 +0,0 @@
-<template>
-  <div class="zdrzbzORzchgxxmsc-step6-1">
-    <ProcessHeader toggle>
-      <template slot="proName">重点认证标准/政策合规性项目审查流程</template>
-      <template slot="proNode">{{ feedbackDept === '1' ? '事业部' : '产品规划部' }}责任部门领导批准</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-show="active === '1'">
-      <div style="flex: auto; overflow: auto;">
-        <el-form
-            ref="zdrzbzORzchgxxmscForm"
-            :model="form"
-            :rules="formRules"
-            class="label-input-form"
-            label-width="210px"
-        >
-          <ProcessTitle>
-            <template slot="title">基础信息</template>
-          </ProcessTitle>
-          <!--这个div是事业部信息-->
-          <div style="height: 450px" v-if="feedbackDept === '1'">
-            <el-table
-                ref="multipleTable"
-                :data="data"
-                tooltip-effect="dark"
-                border
-                style="width: 100%; flex: auto;"
-                height="100%"
-                class="drag-table"
-                :default-sort="{prop: 'chapterNumber', order: 'ascending'}"
-                :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
-         fontWeight: 'bold', height: '48px'}">
-              <el-table-column
-                  label="标准编号/政策编号"
-                  align="center"
-                  width="150"
-              >
-              </el-table-column>
-              <el-table-column
-                  show-overflow-tooltip
-                  prop="standName"
-                  label="标准名称/政策名称"
-                  min-width="150"
-                  align="center"
-              >
-              </el-table-column>
-              <el-table-column
-                  prop="issueTime"
-                  sortable="custom"
-                  width="120"
-                  align="center"
-                  label="产品类型">
-              </el-table-column>
-              <el-table-column
-                  prop="SSRQ"
-                  sortable="custom"
-                  align="center"
-                  width="120"
-                  label="实施日期">
-              </el-table-column>
-              <el-table-column
-                  prop="SSRQ"
-                  sortable="custom"
-                  align="center"
-                  width="120"
-                  label="实施要求">
-              </el-table-column>
-              <el-table-column
-                  prop="SSRQ"
-                  sortable="custom"
-                  align="center"
-                  width="130"
-                  label="资源符合情况">
-              </el-table-column>
-              <el-table-column
-                  prop="SSRQ"
-                  sortable="custom"
-                  align="center"
-                  width="120"
-                  label="开发计划">
-              </el-table-column>
-              <el-table-column
-                  prop="SSRQ"
-                  sortable="custom"
-                  align="center"
-                  width="120"
-                  label="SOP时间">
-              </el-table-column>
-              <el-table-column
-                  prop="SSRQ"
-                  sortable="custom"
-                  align="center"
-                  width="120"
-                  label="完成情况">
-              </el-table-column>
-              <el-table-column
-                  prop="SSRQ"
-                  sortable="custom"
-                  align="center"
-                  width="400"
-                  label="SOP时间超过法规时限的空档期的业务应对方案">
-              </el-table-column>
-            </el-table>
-          </div>
-          <!--这个div是产品规划部信息-->
-          <div style="height: 450px" v-else-if="feedbackDept === '2'">
-            <el-table
-                ref="multipleTable"
-                :data="data"
-                tooltip-effect="dark"
-                border
-                style="width: 100%; flex: auto;"
-                height="100%"
-                class="drag-table"
-                :default-sort="{prop: 'chapterNumber', order: 'ascending'}"
-                :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
-                  type="index"
-                  label="序号"
-                  width="55"
-                  align="center">
-              </el-table-column>
-              <el-table-column
-                  label="业务"
-                  align="center"
-                  width="150"
-              >
-              </el-table-column>
-              <el-table-column
-                  show-overflow-tooltip
-                  prop="standName"
-                  label="平台"
-                  min-width="150"
-                  align="center"
-              >
-              </el-table-column>
-              <el-table-column
-                  show-overflow-tooltip
-                  prop="standName"
-                  label="项目"
-                  min-width="150"
-                  align="center"
-              >
-              </el-table-column>
-              <el-table-column
-                  show-overflow-tooltip
-                  prop="standName"
-                  label="项目描述"
-                  min-width="150"
-                  align="center"
-              >
-              </el-table-column>
-              <el-table-column
-                  show-overflow-tooltip
-                  prop="standName"
-                  label="当前节点"
-                  min-width="150"
-                  align="center"
-              >
-              </el-table-column>
-              <el-table-column
-                  show-overflow-tooltip
-                  prop="standName"
-                  label="概念状态"
-                  min-width="150"
-                  align="center"
-              >
-              </el-table-column>
-              <el-table-column
-                  prop="SSRQ"
-                  align="center"
-                  width="150"
-                  label="概念计划下发时间">
-              </el-table-column>
-              <el-table-column
-                  prop="SSRQ"
-                  align="center"
-                  width="120"
-                  label="概念修订计划">
-              </el-table-column>
-              <el-table-column
-                  prop="SSRQ"
-                  align="center"
-                  width="400"
-                  label="其他说明">
-              </el-table-column>
-            </el-table>
-          </div>
-        </el-form>
-      </div>
-      <el-collapse accordion>
-        <el-collapse-item title="审批意见">
-          <div style="margin: 10px 0;">
-            <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入意见"
-                v-model="commentText">
-            </el-input>
-          </div>
-        </el-collapse-item>
-      </el-collapse>
-    </div>
-    <div class="content" v-show="active === '2'">
-      <el-table
-          height="100%"
-          ref="selection"
-          :data="histortData"
-          tooltip-effect="dark"
-          style="width: 100%"
-          border
-          row-key="id"
-          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-        <el-table-column
-            prop="name"
-            label="任务步骤"
-            align="center"
-            sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-            prop="assignee"
-            label="任务受理人"
-            align="center"
-            sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-            prop="createTime"
-            label="创建时间"
-            sortable="custom"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="endTime"
-            label="完成时间"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="comment"
-            label="流程信息"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.commentText }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="completeFlag"
-            label="状态"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? '已完成' : '未完成' }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <ProcessFooter
-        show-submit
-        :submitLoading="isSubmit"
-        :saveLoading="saveLoading"
-        show-transfer
-        @transfer="handleTransfer"
-        @save="handleSave"
-        @submit="handleSubmit"
-        show-back
-        @back="handleSubmitNo"
-        approval
-        submitBTNText="同意"
-    >
-    </ProcessFooter>
-    <Role-tree
-        check-box
-        is-title="转办处理人"
-        :is-visible.sync="drawerModal"
-        @checkedRole="checkedRole"
-    ></Role-tree>
-  </div>
-</template>
-
-<script>
-import ProcessHeader from '../../components/ProcessHeader'
-import ProcessFooter from '../../components/ProcessFooter'
-import ProcessTitle from '../../components/ProcessTitle'
-import {inboundLiaisonDetail, processCreateStand, changeAssigneeNew, saveTaskForPub} from 'api/process'
-import axios from "axios";
-
-export default {
-  name: "zdrzbzORzchgxxmscStep6-1",
-  data() {
-    return {
-      //用来判断反馈情况的是哪个部门，1代表各事业部，2代表产品规划部，0代表其他部门
-      feedbackDept: "",
-      drawerModal: false,
-      histortData: [],
-      data: [],
-      commentText: '',
-      taskIds: this.$route.query.taskIds,
-      pId: this.$route.query.prcId,
-      roleRow: {},
-      nodeList: [],
-      type: '',
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      treeData: [], // 人员数据
-      modalshowflag: false, // drawer开关
-      drawerTitle: '', //drawer标题
-      textarea: '', // 意见
-      ListModel: false, // 新增编辑抽屉开关
-      active: '1', // 默认显示
-      isSubmit: false,
-      saveLoading: false,
-      form: {
-        cid: '', // 编号
-        endTime: '', // 结束日期
-        cname: '', // 名称
-        fjList: [],
-        fjListId: '',
-        responUserList: "",
-        responUserListName: ""
-      },
-      formRules: {
-        responUserList: [
-          {required: true, message: '请选择责任人', trigger: 'change'},
-        ]
-      },
-      json: {}
-    }
-  },
-  components: {
-    ProcessHeader,
-    ProcessFooter,
-    ProcessTitle
-  },
-  methods: {
-    handleTransfer() {
-      this.drawerModal = true
-    },
-    checkedRole(data) {
-      changeAssigneeNew({
-        taskId: this.$route.query.taskIds, // 任务id
-        userId: this.$store.getters.userInfo.userId, // 委托人
-        assignee: data[0].id, // 被委托人
-        pId: this.$route.query.prcId, // 流程实例
-      }).then(res => {
-        if (res.success) {
-          this.drawerModal = false
-          this.$message.success('调整成功')
-          this.processNum()
-          this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
-        } else {
-          this.$message.warning(res.message)
-        }
-      })
-    },
-    // 请求转换流程图
-    processNum(row) {
-      axios.request({
-        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
-        responseType: 'blob',
-        method: 'get',
-        params: {
-          prcNum: this.$route.query.prcNum
-        }
-      }).then(res => {
-        this.processStep = window.URL.createObjectURL(res.data)
-      })
-    },
-    getHistoryData() {
-      this.$http.get('lawss/activiti/get_list_by_instance', {
-        prcNum: this.$route.query.prcNum,
-      }, {}, res => {
-        this.histortData = res
-      }, e => {
-      })
-    },
-    checkedRole2(data) {
-      console.log('395', data)
-      var idList = "";
-      var nameList = "";
-      data.forEach(item => {
-        if (nameList.length > 0) {
-          nameList += ",";
-          idList += ",";
-        }
-        idList += item.id;
-        nameList += item.name;
-      });
-      this.form.responUserList = idList;
-      this.form.responUserListName = nameList;
-
-    },
-    choiceZRR() {
-      this.nodeList = [];
-      if (this.form.responUserList.length > 0) {
-        this.nodeList = this.form.responUserList.split(",");
-      }
-      this.modalshowflag = true;
-    },
-    handleTabs(name) {
-      this.active = name
-    },
-    handleSave() {
-      this.saveLoading = true;
-      let _formData = new FormData();
-      _formData.append("id", this.bpnId || "");
-      _formData.append("prcType", "3");
-      _formData.append("taskIds", this.taskIds);
-      _formData.append("json", JSON.stringify({
-        form: this.form,
-        commentText: this.commentText
-      }));
-      saveTaskForPub(_formData).then(res => {
-        this.saveLoading = false;
-        this.$message.success("保存成功");
-        this.bpnId = res.result;
-      }).catch(e => {
-        this.saveLoading = false;
-      });
-    },
-    handleSubmit() {
-      this.$refs["zdrzbzORzchgxxmscForm"].validate((valid) => {
-        if (valid) {
-          this.isSubmit = true
-          var json = this.json
-          //这个就是原来的actionFlag，用来表示流程是驳回还是同意
-          json.actionFlag = 0
-          json.commentText = this.commentText
-          json.responUserList = this.form.responUserList;
-          json.responUserListName = this.form.responUserListName;
-          json.introduce = false;
-          this.$http.post('lawss/activiti/completeTask', {
-            json: JSON.stringify(json),
-            taskId: this.taskIds,
-            userId: this.$store.getters.userInfo.userId
-          }, {}, res => {
-            if (res.success) {
-              this.$message.success('提交成功')
-              this.$router.push('/processCenter')
-            }
-            this.isSubmit = false
-          })
-        } else {
-          return this.$message.warning("请完善基础信息");
-        }
-      });
-    },
-    handleSubmitNo() {
-      if (this.commentText) {
-        var json = this.json
-        //这个就是原来的actionFlag，用来表示流程是驳回还是同意
-        json.actionFlag = 1
-        json.commentText = this.commentText
-        this.$http.post('lawss/activiti/completeTask', {
-          json: JSON.stringify(json),
-          taskId: this.taskIds,
-          userId: this.$store.getters.userInfo.userId
-        }, {}, res => {
-          if (res.success) {
-            this.$message.success('提交成功')
-            this.$router.push('/processCenter')
-          }
-        })
-      } else {
-        this.$message.warning('请输入反馈意见')
-      }
-
-    },
-    getData() {
-      return new Promise((resolve, reject) => {
-        inboundLiaisonDetail({
-          taskIds: this.taskIds,
-          pId: this.pId
-        }).then(res => {
-          if (res) {
-            const processForm = JSON.parse(res.mesg)
-            this.getFormFieldList(processForm)
-          }
-          let data = JSON.parse(res.mesg)
-          this.feedbackDept = data.feedbackDept
-          this.form.fjList = data.fjList || data.form.fjList
-          this.form.fjListId = data.fjListId || data.form.fjListId
-          this.form.cid = data.cid || data.form.cid
-          this.form.endTime = data.endTime || data.form.endTime
-          this.form.cname = data.cname || data.form.cname
-          this.json = data
-          this.data = data.info || data.data
-        }).catch(e => {
-        })
-      })
-    },
-    /**
-     * @description: 动态表单读取
-     */
-    getFormFieldList(item) {
-      this.$nextTick(() => {
-        this.form = JSON.parse(JSON.stringify(item));
-        this.form.cid = item.form.cid
-      });
-    },
-  },
-  mounted() {
-    this.getHistoryData()
-    this.getData()
-  }
-}
-</script>
-
-<style lang="less" scoped>
-@import '~@/assets/styles/style';
-
-.zdrzbzORzchgxxmsc-step6-1 {
-  /deep/ .el-drawer__container {
-    .prc-content-border {
-      border: none;
-      padding: 0 20px 0;
-    }
-  }
-
-  .fileClass {
-    cursor: pointer;
-  }
-
-  .fileClass:hover {
-    color: #0c91e5;
-  }
-
-  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% - 103px');
-    overflow: auto;
-
-    .tableTitle {
-      margin-bottom: 10px;
-      height: 30px;
-      line-height: 30px;
-      position: relative;
-      font-size: 13px;
-      font-weight: bold;
-
-      .tableButton {
-        position: absolute;
-        right: 0;
-        top: 0;
-      }
-    }
-  }
-}
-</style>

src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step6-2.vue

@@ -1,455 +0,0 @@
-<template>
-  <div class="zdrzbzORzchgxxmsc-step6-2">
-    <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-show="active === '1'">
-      <div style="flex: auto; overflow: auto;">
-        <el-form
-            ref="bzzqyjForm"
-            :model="form"
-            :rules="formRules"
-            class="label-input-form"
-            label-width="210px"
-        >
-          <ProcessTitle>
-            <template slot="title">基础信息</template>
-          </ProcessTitle>
-          <el-table
-              ref="multipleTable"
-              :data="data"
-              tooltip-effect="dark"
-              border
-              style="width: 100%; flex: auto;"
-              height="450px"
-              class="drag-table"
-              :default-sort="{prop: 'chapterNumber', order: 'ascending'}"
-              :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
-                type="index"
-                label="序号"
-                width="55"
-                align="center">
-            </el-table-column>
-            <el-table-column
-                label="业务"
-                align="center"
-                width="150"
-            >
-            </el-table-column>
-            <el-table-column
-                show-overflow-tooltip
-                prop="standName"
-                label="平台"
-                min-width="150"
-                align="center"
-            >
-            </el-table-column>
-            <el-table-column
-                show-overflow-tooltip
-                prop="standName"
-                label="项目"
-                min-width="150"
-                align="center"
-            >
-            </el-table-column>
-            <el-table-column
-                show-overflow-tooltip
-                prop="standName"
-                label="项目描述"
-                min-width="150"
-                align="center"
-            >
-            </el-table-column>
-            <el-table-column
-                show-overflow-tooltip
-                prop="standName"
-                label="当前节点"
-                min-width="150"
-                align="center"
-            >
-            </el-table-column>
-            <el-table-column
-                show-overflow-tooltip
-                prop="standName"
-                label="概念状态"
-                min-width="150"
-                align="center"
-            >
-            </el-table-column>
-            <el-table-column
-                prop="SSRQ"
-                align="center"
-                width="150"
-                label="概念计划下发时间">
-            </el-table-column>
-            <el-table-column
-                prop="SSRQ"
-                align="center"
-                width="120"
-                label="概念修订计划">
-            </el-table-column>
-            <el-table-column
-                prop="SSRQ"
-                align="center"
-                width="400"
-                label="其他说明">
-            </el-table-column>
-          </el-table>
-        </el-form>
-      </div>
-      <el-collapse accordion>
-        <el-collapse-item title="审批意见">
-          <div style="margin: 10px 0;">
-            <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入意见"
-                v-model="commentText">
-            </el-input>
-          </div>
-        </el-collapse-item>
-      </el-collapse>
-    </div>
-    <div class="content" v-show="active === '2'">
-      <el-table
-          height="100%"
-          ref="selection"
-          :data="histortData"
-          tooltip-effect="dark"
-          style="width: 100%"
-          border
-          row-key="id"
-          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-        <el-table-column
-            prop="name"
-            label="任务步骤"
-            align="center"
-            sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-            prop="assignee"
-            label="任务受理人"
-            align="center"
-            sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-            prop="createTime"
-            label="创建时间"
-            sortable="custom"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="endTime"
-            label="完成时间"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="comment"
-            label="流程信息"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.commentText }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="completeFlag"
-            label="状态"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? '已完成' : '未完成' }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <ProcessFooter
-        show-submit
-        :submitLoading="isSubmit"
-        :saveLoading="saveLoading"
-        show-transfer
-        @transfer="handleTransfer"
-        @save="handleSave"
-        @submit="handleSubmit"
-        show-back
-        @back="handleSubmitNo"
-        approval
-        submitBTNText="同意"
-    >
-    </ProcessFooter>
-    <Role-tree
-        check-box
-        is-title="转办处理人"
-        :is-visible.sync="drawerModal"
-        @checkedRole="checkedRole"
-    ></Role-tree>
-  </div>
-</template>
-
-<script>
-import ProcessHeader from '../../components/ProcessHeader'
-import ProcessFooter from '../../components/ProcessFooter'
-import ProcessTitle from '../../components/ProcessTitle'
-import {inboundLiaisonDetail, processCreateStand, changeAssigneeNew} from 'api/process'
-import axios from "axios";
-
-export default {
-  name: "zdrzbzORzchgxxmscStep6-2",
-  data() {
-    return {
-      drawerModal: false,
-      histortData: [],
-      data: [],
-      commentText: '',
-      taskIds: this.$route.query.taskIds,
-      pId: this.$route.query.prcId,
-      roleRow: {},
-      nodeList: [],
-      type: '',
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      treeData: [], // 人员数据
-      modalshowflag: false, // drawer开关
-      drawerTitle: '', //drawer标题
-      textarea: '', // 意见
-      ListModel: false, // 新增编辑抽屉开关
-      active: '1', // 默认显示
-      isSubmit: false,
-      saveLoading: false,
-      form: {
-        cid: '', // 编号
-        endTime: '', // 结束日期
-        cname: '', // 名称
-        fjList: [],
-        fjListId: '',
-      },
-      formRules: {
-        responUserList: [
-          {required: true, message: '请选择责任人', trigger: 'change'},
-        ]
-      },
-      json: {}
-    }
-  },
-  components: {
-    ProcessHeader,
-    ProcessFooter,
-    ProcessTitle
-  },
-  methods: {
-    handleTransfer() {
-      this.drawerModal = true
-    },
-    checkedRole(data) {
-      changeAssigneeNew({
-        taskId: this.$route.query.taskIds, // 任务id
-        userId: this.$store.getters.userInfo.userId, // 委托人
-        assignee: data[0].id, // 被委托人
-        pId: this.$route.query.prcId, // 流程实例
-      }).then(res => {
-        if (res.success) {
-          this.drawerModal = false
-          this.$message.success('调整成功')
-          this.processNum()
-          this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
-        } else {
-          this.$message.warning(res.message)
-        }
-      })
-    },
-    // 请求转换流程图
-    processNum(row) {
-      axios.request({
-        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
-        responseType: 'blob',
-        method: 'get',
-        params: {
-          prcNum: this.$route.query.prcNum
-        }
-      }).then(res => {
-        this.processStep = window.URL.createObjectURL(res.data)
-      })
-    },
-    getHistoryData() {
-      this.$http.get('lawss/activiti/get_list_by_instance', {
-        prcNum: this.$route.query.prcNum,
-      }, {}, res => {
-        this.histortData = res
-      }, e => {
-      })
-    },
-    handleTabs(name) {
-      this.active = name
-    },
-    handleSave() {
-    },
-    handleSubmit() {
-      this.isSubmit = true
-      var json = this.json
-      //这个就是原来的actionFlag，用来表示流程是驳回还是同意
-      json.actionFlag = 0
-      json.commentText = this.commentText
-      this.$http.post('lawss/activiti/completeTask', {
-        json: JSON.stringify(json),
-        taskId: this.taskIds,
-        userId: this.$store.getters.userInfo.userId
-      }, {}, res => {
-        if (res.success) {
-          this.$message.success('提交成功')
-          this.$router.push('/processCenter')
-        }
-        this.isSubmit = false
-      })
-    },
-    handleSubmitNo() {
-      if (this.commentText) {
-        var json = this.json
-        //这个就是原来的actionFlag，用来表示流程是驳回还是同意
-        json.actionFlag = 1
-        json.commentText = this.commentText
-        this.$http.post('lawss/activiti/completeTask', {
-          json: JSON.stringify(json),
-          taskId: this.taskIds,
-          userId: this.$store.getters.userInfo.userId
-        }, {}, res => {
-          if (res.success) {
-            this.$message.success('提交成功')
-            this.$router.push('/processCenter')
-          }
-        })
-      } else {
-        this.$message.warning('请输入反馈意见')
-      }
-
-    },
-    getData() {
-      return new Promise((resolve, reject) => {
-        inboundLiaisonDetail({
-          taskIds: this.taskIds,
-          pId: this.pId
-        }).then(res => {
-          if (res) {
-            const processForm = JSON.parse(res.mesg)
-            this.getFormFieldList(processForm)
-          }
-          let data = JSON.parse(res.mesg)
-          console.log('355', data.form.cid);
-          this.form.fjList = data.fjList || data.form.fjList
-          this.form.fjListId = data.fjListId || data.form.fjListId
-          this.form.cid = data.cid || data.form.cid
-          this.form.endTime = data.endTime || data.form.endTime
-          this.form.cname = data.cname || data.form.cname
-          this.json = data
-          this.data = data.info || data.data
-          console.log('364', this.form.cid);
-        }).catch(e => {
-        })
-      })
-    },
-    /**
-     * @description: 动态表单读取
-     */
-    getFormFieldList(item) {
-      this.$nextTick(() => {
-        this.form = JSON.parse(JSON.stringify(item));
-        this.form.cid = item.form.cid
-      });
-    },
-  },
-  mounted() {
-    this.getHistoryData()
-    this.getData()
-  }
-}
-</script>
-
-<style lang="less" scoped>
-@import '~@/assets/styles/style';
-
-.zdrzbzORzchgxxmsc-step6-2 {
-  /deep/ .el-drawer__container {
-    .prc-content-border {
-      border: none;
-      padding: 0 20px 0;
-    }
-  }
-
-  .fileClass {
-    cursor: pointer;
-  }
-
-  .fileClass:hover {
-    color: #0c91e5;
-  }
-
-  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% - 103px');
-    overflow: auto;
-
-    .tableTitle {
-      margin-bottom: 10px;
-      height: 30px;
-      line-height: 30px;
-      position: relative;
-      font-size: 13px;
-      font-weight: bold;
-
-      .tableButton {
-        position: absolute;
-        right: 0;
-        top: 0;
-      }
-    }
-  }
-}
-</style>

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

@@ -37,7 +37,7 @@
                   align="center">
               </el-table-column>
               <el-table-column
-                  prop="lawId"
+                  prop="lawCode"
                   label="标准编号/政策编号"
                   align="center"
                   width="150"

src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step7-2.vue

@@ -1,485 +0,0 @@
-<template>
-  <div class="zdrzbzORzchgxxmsc-step7-2">
-    <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-show="active === '1'">
-      <div style="flex: auto; overflow: auto;">
-        <el-form
-            ref="bzzqyjForm"
-            :model="form"
-            :rules="formRules"
-            class="label-input-form"
-            label-width="210px"
-        >
-          <ProcessTitle>
-            <template slot="title">基础信息</template>
-          </ProcessTitle>
-          <div style="height: 450px">
-              <el-table
-                  ref="multipleTable"
-                  tooltip-effect="dark"
-                  border
-                  style="width: 100%;"
-                  height="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
-                    type="index"
-                    label="序号"
-                    width="55"
-                    align="center">
-                </el-table-column>
-                <el-table-column
-                    label="业务"
-                    align="center"
-                    width="150"
-                >
-                </el-table-column>
-                <el-table-column
-                    show-overflow-tooltip
-                    prop="standName"
-                    label="平台"
-                    min-width="150"
-                    align="center"
-                >
-                </el-table-column>
-                <el-table-column
-                    show-overflow-tooltip
-                    prop="standName"
-                    label="项目"
-                    min-width="150"
-                    align="center"
-                >
-                </el-table-column>
-                <el-table-column
-                    show-overflow-tooltip
-                    prop="standName"
-                    label="项目描述"
-                    min-width="150"
-                    align="center"
-                >
-                </el-table-column>
-                <el-table-column
-                    show-overflow-tooltip
-                    prop="standName"
-                    label="当前节点"
-                    min-width="150"
-                    align="center"
-                >
-                </el-table-column>
-                <el-table-column
-                    show-overflow-tooltip
-                    prop="standName"
-                    label="概念状态"
-                    min-width="150"
-                    align="center"
-                >
-                </el-table-column>
-                <el-table-column
-                    prop="SSRQ"
-                    align="center"
-                    width="150"
-                    label="概念计划下发时间">
-                </el-table-column>
-                <el-table-column
-                    prop="SSRQ"
-                    align="center"
-                    width="120"
-                    label="概念修订计划">
-                </el-table-column>
-                <el-table-column
-                    prop="SSRQ"
-                    align="center"
-                    width="400"
-                    label="其他说明">
-                </el-table-column>
-                <el-table-column
-                    prop="SSRQ"
-                    fixed="right"
-                    align="center"
-                    width="200"
-                    label="是否风险项">
-                </el-table-column>
-              </el-table>
-          </div>
-        </el-form>
-      </div>
-      <el-collapse accordion>
-        <el-collapse-item title="审批意见">
-          <div style="margin: 10px 0;">
-            <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入意见"
-                v-model="commentText">
-            </el-input>
-          </div>
-        </el-collapse-item>
-      </el-collapse>
-    </div>
-    <div class="content" v-show="active === '2'">
-      <el-table
-          height="100%"
-          ref="selection"
-          :data="histortData"
-          tooltip-effect="dark"
-          style="width: 100%"
-          border
-          row-key="id"
-          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-        <el-table-column
-            prop="name"
-            label="任务步骤"
-            align="center"
-            sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-            prop="assignee"
-            label="任务受理人"
-            align="center"
-            sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-            prop="createTime"
-            label="创建时间"
-            sortable="custom"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="endTime"
-            label="完成时间"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="comment"
-            label="流程信息"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.commentText }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="completeFlag"
-            label="状态"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <ProcessFooter
-        show-submit
-        :submitLoading="isSubmit"
-        :saveLoading="saveLoading"
-        show-transfer
-        @transfer="handleTransfer"
-        @save="handleSave"
-        @submit="handleSubmit"
-        show-back
-        @back="handleSubmitNo"
-        approval
-        submitBTNText="同意"
-    >
-    </ProcessFooter>
-    <Role-tree
-        check-box
-        is-title="转办处理人"
-        :is-visible.sync="drawerModal"
-        @checkedRole="checkedRole"
-    ></Role-tree>
-  </div>
-</template>
-
-<script>
-import ProcessHeader from "../../components/ProcessHeader";
-import ProcessFooter from "../../components/ProcessFooter";
-import ProcessTitle from "../../components/ProcessTitle";
-import {inboundLiaisonDetail, processCreateStand, saveTaskForPub, changeAssigneeNew} from "api/process";
-import axios from "axios";
-
-export default {
-  name: "zdrzbzORzchgxxmscStep7-2",
-  data() {
-    return {
-      drawerModal: false,
-      histortData: [],
-      commentText: "",
-      taskIds: this.$route.query.taskIds,
-      pId: this.$route.query.prcId,
-      nodeList: [],
-      type: "",
-      modalshowflag: false, // drawer开关
-      drawerTitle: "", //drawer标题
-      textarea: "", // 意见
-      ListModel: false, // 新增编辑抽屉开关
-      active: "1", // 默认显示
-      isSubmit: false,
-      saveLoading: false,
-      form: {
-        cid: "", // 政策编号
-        endTime: "", // 责任部门领导审批 截止时间
-        cname: "", // 名称
-        fjList: [],
-        fjListId: '',
-        responUserList: "",
-        responUserListName: ""
-      },
-      formRules: {
-        responUserList: [
-          {required: true, message: "请选择责任人", trigger: "change"}
-        ]
-      },
-      json: {}
-    };
-  },
-  components: {
-    ProcessHeader,
-    ProcessFooter,
-    ProcessTitle
-  },
-  methods: {
-    handleTransfer() {
-      this.drawerModal = true
-    },
-    checkedRole(data) {
-      changeAssigneeNew({
-        taskId: this.$route.query.taskIds, // 任务id
-        userId: this.$store.getters.userInfo.userId, // 委托人
-        assignee: data[0].id, // 被委托人
-        pId: this.$route.query.prcId, // 流程实例
-      }).then(res => {
-        if (res.success) {
-          this.drawerModal = false
-          this.$message.success('调整成功')
-          this.processNum()
-          this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
-        } else {
-          this.$message.warning(res.message)
-        }
-      })
-    },
-    // 请求转换流程图
-    processNum(row) {
-      axios.request({
-        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
-        responseType: 'blob',
-        method: 'get',
-        params: {
-          prcNum: this.$route.query.prcNum
-        }
-      }).then(res => {
-        this.processStep = window.URL.createObjectURL(res.data)
-      })
-    },
-    getHistoryData() {
-      this.$http.get("lawss/activiti/get_list_by_instance", {
-        prcNum: this.$route.query.prcNum
-      }, {}, res => {
-        this.histortData = res;
-      }, e => {
-      });
-    },
-    checkedRole2(data) {
-      var idList = "";
-      var nameList = "";
-      data.forEach(item => {
-        if (nameList.length > 0) {
-          nameList += ",";
-          idList += ",";
-        }
-        idList += item.id;
-        nameList += item.name;
-      });
-      this.form.responUserList = idList;
-      this.form.responUserListName = nameList;
-
-    },
-    choiceZRR() {
-      this.nodeList = [];
-      if (this.form.responUserList.length > 0) {
-        this.nodeList = this.form.responUserList.split(",");
-      }
-      this.modalshowflag = true;
-    },
-    handleTabs(name) {
-      this.active = name;
-    },
-    //保存事件
-    handleSave() {
-      this.saveLoading = true;
-      let _formData = new FormData();
-      _formData.append("id", this.bpnId || "");
-      _formData.append("prcType", "3");
-      _formData.append("taskIds", this.taskIds);
-      _formData.append("json", JSON.stringify({
-        form: this.form,
-        commentText: this.commentText
-      }));
-      saveTaskForPub(_formData).then(res => {
-        this.saveLoading = false;
-        this.$message.success("保存成功");
-        this.bpnId = res.result;
-      }).catch(e => {
-        this.saveLoading = false;
-      });
-    },
-    handleSubmit() {
-      this.$refs["bzzqyjForm"].validate((valid) => {
-        if (valid) {
-          this.isSubmit = true;
-          var json = this.json;
-          json.commentText = this.commentText;
-          json.responUserList = this.form.responUserList;
-          json.responUserListName = this.form.responUserListName;
-          json.introduce = false;
-          this.$http.post("lawss/activiti/completeTask", {
-            json: JSON.stringify(json),
-            taskId: this.taskIds,
-            userId: this.$store.getters.userInfo.userId
-          }, {}, res => {
-            if (res.success) {
-              this.$message.success("提交成功");
-              this.$router.push("/processCenter");
-            }
-            this.isSubmit = false;
-          });
-        } else {
-          return this.$message.warning("请完善基础信息");
-        }
-      });
-    },
-    handleSubmitNo() {
-      if (this.commentText) {
-        var json = this.json
-        json.actionFlag = 1
-        json.commentText = this.commentText
-        this.$http.post('lawss/activiti/completeTask', {
-          json: JSON.stringify(json),
-          taskId: this.taskIds,
-          userId: this.$store.getters.userInfo.userId
-        }, {}, res => {
-          if (res.success) {
-            this.$message.success('提交成功')
-            this.$router.push('/processCenter')
-          }
-        })
-      } else {
-        this.$message.warning('请输入反馈意见')
-      }
-
-    },
-    getData() {
-      return new Promise((resolve, reject) => {
-        inboundLiaisonDetail({
-          taskIds: this.taskIds,
-          pId: this.pId
-        }).then(res => {
-          let data = JSON.parse(res.mesg)
-          this.form.cid = data.cid
-          this.form.endTime = data.endTime
-          this.form.cname = data.cname
-          this.form.fjList = data.fjList
-          this.form.fjListId = data.fjListId
-          this.json = data
-        }).catch(e => {
-        });
-      });
-    }
-  },
-  mounted() {
-    this.getHistoryData();
-    this.getData();
-  }
-};
-</script>
-
-<style lang="less" scoped>
-@import '~@/assets/styles/style';
-
-.zdrzbzORzchgxxmsc-step7-2 {
-  /deep/ .el-drawer__container {
-    .prc-content-border {
-      border: none;
-      padding: 0 20px 0;
-    }
-  }
-
-  .fileClass {
-    cursor: pointer;
-  }
-
-  .fileClass:hover {
-    color: #0c91e5;
-  }
-
-  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% - 103px');
-    overflow: auto;
-
-    .tableTitle {
-      margin-bottom: 10px;
-      height: 30px;
-      line-height: 30px;
-      position: relative;
-      font-size: 13px;
-      font-weight: bold;
-
-      .tableButton {
-        position: absolute;
-        right: 0;
-        top: 0;
-      }
-    }
-  }
-}
-</style>

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

@@ -37,7 +37,7 @@
                   align="center">
               </el-table-column>
               <el-table-column
-                  prop="lawId"
+                  prop="lawCode"
                   label="标准编号/政策编号"
                   align="center"
                   width="150"

src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step8-1.vue

@@ -1,460 +0,0 @@
-<template>
-  <div class="zdrzbzORzchgxxmsc-step8-1">
-    <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-show="active === '1'">
-      <div style="flex: auto; overflow: auto;">
-        <el-form
-            ref="bzzqyjForm"
-            :model="form"
-            :rules="formRules"
-            class="label-input-form"
-            label-width="210px"
-        >
-          <ProcessTitle>
-            <template slot="title">基础信息</template>
-          </ProcessTitle>
-          <el-table
-              ref="multipleTable"
-              :data="data"
-              tooltip-effect="dark"
-              border
-              style="width: 100%; flex: auto;"
-              height="450px"
-              class="drag-table"
-              :default-sort="{prop: 'chapterNumber', order: 'ascending'}"
-              :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
-         fontWeight: 'bold', height: '48px'}">
-            <el-table-column
-                label="标准编号/政策编号"
-                align="center"
-                width="150"
-            >
-            </el-table-column>
-            <el-table-column
-                show-overflow-tooltip
-                prop="standName"
-                label="标准名称/政策名称"
-                min-width="150"
-                align="center"
-            >
-            </el-table-column>
-            <el-table-column
-                prop="issueTime"
-                sortable="custom"
-                width="120"
-                align="center"
-                label="产品类型">
-            </el-table-column>
-            <el-table-column
-                prop="SSRQ"
-                sortable="custom"
-                align="center"
-                width="120"
-                label="实施日期">
-            </el-table-column>
-            <el-table-column
-                prop="SSRQ"
-                sortable="custom"
-                align="center"
-                width="120"
-                label="实施要求">
-            </el-table-column>
-            <el-table-column
-                prop="SSRQ"
-                sortable="custom"
-                align="center"
-                width="130"
-                label="资源符合情况">
-            </el-table-column>
-            <el-table-column
-                prop="SSRQ"
-                sortable="custom"
-                align="center"
-                width="120"
-                label="开发计划">
-            </el-table-column>
-            <el-table-column
-                prop="SSRQ"
-                sortable="custom"
-                align="center"
-                width="120"
-                label="SOP时间">
-            </el-table-column>
-            <el-table-column
-                prop="SSRQ"
-                sortable="custom"
-                align="center"
-                width="120"
-                label="完成情况">
-            </el-table-column>
-            <el-table-column
-                prop="SSRQ"
-                sortable="custom"
-                align="center"
-                width="400"
-                label="SOP时间超过法规时限的空档期的业务应对方案">
-            </el-table-column>
-            <el-table-column
-                prop="SSRQ"
-                fixed="right"
-                align="center"
-                width="200"
-                label="是否风险项">
-            </el-table-column>
-          </el-table>
-        </el-form>
-      </div>
-      <el-collapse accordion>
-        <el-collapse-item title="审批意见">
-          <div style="margin: 10px 0;">
-            <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入意见"
-                v-model="commentText">
-            </el-input>
-          </div>
-        </el-collapse-item>
-      </el-collapse>
-    </div>
-    <div class="content" v-show="active === '2'">
-      <el-table
-          height="100%"
-          ref="selection"
-          :data="histortData"
-          tooltip-effect="dark"
-          style="width: 100%"
-          border
-          row-key="id"
-          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-        <el-table-column
-            prop="name"
-            label="任务步骤"
-            align="center"
-            sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-            prop="assignee"
-            label="任务受理人"
-            align="center"
-            sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-            prop="createTime"
-            label="创建时间"
-            sortable="custom"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="endTime"
-            label="完成时间"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="comment"
-            label="流程信息"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.commentText }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="completeFlag"
-            label="状态"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? '已完成' : '未完成' }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <ProcessFooter
-        show-submit
-        :submitLoading="isSubmit"
-        :saveLoading="saveLoading"
-        show-transfer
-        @transfer="handleTransfer"
-        @save="handleSave"
-        @submit="handleSubmit"
-        show-back
-        @back="handleSubmitNo"
-        approval
-        submitBTNText="同意"
-    >
-    </ProcessFooter>
-    <Role-tree
-        check-box
-        is-title="转办处理人"
-        :is-visible.sync="drawerModal"
-        @checkedRole="checkedRole"
-    ></Role-tree>
-  </div>
-</template>
-
-<script>
-import ProcessHeader from '../../components/ProcessHeader'
-import ProcessFooter from '../../components/ProcessFooter'
-import ProcessTitle from '../../components/ProcessTitle'
-import {inboundLiaisonDetail, processCreateStand, changeAssigneeNew} from 'api/process'
-import axios from "axios";
-
-export default {
-  name: "zdrzbzORzchgxxmscStep8-1",
-  data() {
-    return {
-      drawerModal: false,
-      histortData: [],
-      data: [],
-      commentText: '',
-      taskIds: this.$route.query.taskIds,
-      pId: this.$route.query.prcId,
-      roleRow: {},
-      nodeList: [],
-      type: '',
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      treeData: [], // 人员数据
-      modalshowflag: false, // drawer开关
-      drawerTitle: '', //drawer标题
-      textarea: '', // 意见
-      ListModel: false, // 新增编辑抽屉开关
-      active: '1', // 默认显示
-      isSubmit: false,
-      saveLoading: false,
-      form: {
-        cid: '', // 编号
-        endTime: '', // 结束日期
-        cname: '', // 名称
-        fjList: [],
-        fjListId: '',
-      },
-      formRules: {
-        responUserList: [
-          {required: true, message: '请选择责任人', trigger: 'change'},
-        ]
-      },
-      json: {}
-    }
-  },
-  components: {
-    ProcessHeader,
-    ProcessFooter,
-    ProcessTitle
-  },
-  methods: {
-    handleTransfer() {
-      this.drawerModal = true
-    },
-    checkedRole(data) {
-      changeAssigneeNew({
-        taskId: this.$route.query.taskIds, // 任务id
-        userId: this.$store.getters.userInfo.userId, // 委托人
-        assignee: data[0].id, // 被委托人
-        pId: this.$route.query.prcId, // 流程实例
-      }).then(res => {
-        if (res.success) {
-          this.drawerModal = false
-          this.$message.success('调整成功')
-          this.processNum()
-          this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
-        } else {
-          this.$message.warning(res.message)
-        }
-      })
-    },
-    // 请求转换流程图
-    processNum(row) {
-      axios.request({
-        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
-        responseType: 'blob',
-        method: 'get',
-        params: {
-          prcNum: this.$route.query.prcNum
-        }
-      }).then(res => {
-        this.processStep = window.URL.createObjectURL(res.data)
-      })
-    },
-    getHistoryData() {
-      this.$http.get('lawss/activiti/get_list_by_instance', {
-        prcNum: this.$route.query.prcNum,
-      }, {}, res => {
-        this.histortData = res
-      }, e => {
-      })
-    },
-    handleTabs(name) {
-      this.active = name
-    },
-    handleSave() {
-    },
-    handleSubmit() {
-      this.isSubmit = true
-      var json = this.json
-      //这个就是原来的actionFlag，用来表示流程是驳回还是同意
-      json.actionFlag = 0
-      json.commentText = this.commentText
-      json.responUserList = this.form.responUserList;
-      json.responUserListName = this.form.responUserListName;
-      json.introduce = false;
-      this.$http.post('lawss/activiti/completeTask', {
-        json: JSON.stringify(json),
-        taskId: this.taskIds,
-        userId: this.$store.getters.userInfo.userId
-      }, {}, res => {
-        if (res.success) {
-          this.$message.success('提交成功')
-          this.$router.push('/processCenter')
-        }
-        this.isSubmit = false
-      })
-    },
-    handleSubmitNo() {
-      if (this.commentText) {
-        var json = this.json
-        //这个就是原来的actionFlag，用来表示流程是驳回还是同意
-        json.actionFlag = 1
-        json.commentText = this.commentText
-        this.$http.post('lawss/activiti/completeTask', {
-          json: JSON.stringify(json),
-          taskId: this.taskIds,
-          userId: this.$store.getters.userInfo.userId
-        }, {}, res => {
-          if (res.success) {
-            this.$message.success('提交成功')
-            this.$router.push('/processCenter')
-          }
-        })
-      } else {
-        this.$message.warning('请输入反馈意见')
-      }
-
-    },
-    getData() {
-      return new Promise((resolve, reject) => {
-        inboundLiaisonDetail({
-          taskIds: this.taskIds,
-          pId: this.pId
-        }).then(res => {
-          if (res) {
-            const processForm = JSON.parse(res.mesg)
-            this.getFormFieldList(processForm)
-          }
-          let data = JSON.parse(res.mesg)
-          console.log('355', data.form.cid);
-          this.form.fjList = data.fjList || data.form.fjList
-          this.form.fjListId = data.fjListId || data.form.fjListId
-          this.form.cid = data.cid || data.form.cid
-          this.form.endTime = data.endTime || data.form.endTime
-          this.form.cname = data.cname || data.form.cname
-          this.json = data
-          this.data = data.info || data.data
-          console.log('364', this.form.cid);
-        }).catch(e => {
-        })
-      })
-    },
-    /**
-     * @description: 动态表单读取
-     */
-    getFormFieldList(item) {
-      this.$nextTick(() => {
-        this.form = JSON.parse(JSON.stringify(item));
-        this.form.cid = item.form.cid
-      });
-    },
-  },
-  mounted() {
-    this.getHistoryData()
-    this.getData()
-  }
-}
-</script>
-
-<style lang="less" scoped>
-@import '~@/assets/styles/style';
-
-.zdrzbzORzchgxxmsc-step8-1 {
-  /deep/ .el-drawer__container {
-    .prc-content-border {
-      border: none;
-      padding: 0 20px 0;
-    }
-  }
-
-  .fileClass {
-    cursor: pointer;
-  }
-
-  .fileClass:hover {
-    color: #0c91e5;
-  }
-
-  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% - 103px');
-    overflow: auto;
-
-    .tableTitle {
-      margin-bottom: 10px;
-      height: 30px;
-      line-height: 30px;
-      position: relative;
-      font-size: 13px;
-      font-weight: bold;
-
-      .tableButton {
-        position: absolute;
-        right: 0;
-        top: 0;
-      }
-    }
-  }
-}
-</style>

src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step8-2.vue

@@ -1,462 +0,0 @@
-<template>
-  <div class="zdrzbzORzchgxxmsc-step8-2">
-    <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-show="active === '1'">
-      <div style="flex: auto; overflow: auto;">
-        <el-form
-            ref="bzzqyjForm"
-            :model="form"
-            :rules="formRules"
-            class="label-input-form"
-            label-width="210px"
-        >
-          <ProcessTitle>
-            <template slot="title">基础信息</template>
-          </ProcessTitle>
-          <el-table
-              ref="multipleTable"
-              :data="data"
-              tooltip-effect="dark"
-              border
-              style="width: 100%; flex: auto;"
-              height="450px"
-              class="drag-table"
-              :default-sort="{prop: 'chapterNumber', order: 'ascending'}"
-              :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
-                type="index"
-                label="序号"
-                width="55"
-                align="center">
-            </el-table-column>
-            <el-table-column
-                label="业务"
-                align="center"
-                width="150"
-            >
-            </el-table-column>
-            <el-table-column
-                show-overflow-tooltip
-                prop="standName"
-                label="平台"
-                min-width="150"
-                align="center"
-            >
-            </el-table-column>
-            <el-table-column
-                show-overflow-tooltip
-                prop="standName"
-                label="项目"
-                min-width="150"
-                align="center"
-            >
-            </el-table-column>
-            <el-table-column
-                show-overflow-tooltip
-                prop="standName"
-                label="项目描述"
-                min-width="150"
-                align="center"
-            >
-            </el-table-column>
-            <el-table-column
-                show-overflow-tooltip
-                prop="standName"
-                label="当前节点"
-                min-width="150"
-                align="center"
-            >
-            </el-table-column>
-            <el-table-column
-                show-overflow-tooltip
-                prop="standName"
-                label="概念状态"
-                min-width="150"
-                align="center"
-            >
-            </el-table-column>
-            <el-table-column
-                prop="SSRQ"
-                align="center"
-                width="150"
-                label="概念计划下发时间">
-            </el-table-column>
-            <el-table-column
-                prop="SSRQ"
-                align="center"
-                width="120"
-                label="概念修订计划">
-            </el-table-column>
-            <el-table-column
-                prop="SSRQ"
-                align="center"
-                width="400"
-                label="其他说明">
-            </el-table-column>
-            <el-table-column
-                prop="SSRQ"
-                fixed="right"
-                align="center"
-                width="200"
-                label="是否风险项">
-            </el-table-column>
-          </el-table>
-        </el-form>
-      </div>
-      <el-collapse accordion>
-        <el-collapse-item title="审批意见">
-          <div style="margin: 10px 0;">
-            <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入意见"
-                v-model="commentText">
-            </el-input>
-          </div>
-        </el-collapse-item>
-      </el-collapse>
-    </div>
-    <div class="content" v-show="active === '2'">
-      <el-table
-          height="100%"
-          ref="selection"
-          :data="histortData"
-          tooltip-effect="dark"
-          style="width: 100%"
-          border
-          row-key="id"
-          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-        <el-table-column
-            prop="name"
-            label="任务步骤"
-            align="center"
-            sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-            prop="assignee"
-            label="任务受理人"
-            align="center"
-            sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-            prop="createTime"
-            label="创建时间"
-            sortable="custom"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="endTime"
-            label="完成时间"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="comment"
-            label="流程信息"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.commentText }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="completeFlag"
-            label="状态"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? '已完成' : '未完成' }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <ProcessFooter
-        show-submit
-        :submitLoading="isSubmit"
-        :saveLoading="saveLoading"
-        show-transfer
-        @transfer="handleTransfer"
-        @save="handleSave"
-        @submit="handleSubmit"
-        show-back
-        @back="handleSubmitNo"
-        approval
-        submitBTNText="同意"
-    >
-    </ProcessFooter>
-    <Role-tree
-        check-box
-        is-title="转办处理人"
-        :is-visible.sync="drawerModal"
-        @checkedRole="checkedRole"
-    ></Role-tree>
-  </div>
-</template>
-
-<script>
-import ProcessHeader from '../../components/ProcessHeader'
-import ProcessFooter from '../../components/ProcessFooter'
-import ProcessTitle from '../../components/ProcessTitle'
-import {inboundLiaisonDetail, processCreateStand, changeAssigneeNew} from 'api/process'
-import axios from "axios";
-
-export default {
-  name: "zdrzbzORzchgxxmscStep8-2",
-  data() {
-    return {
-      drawerModal: false,
-      histortData: [],
-      data: [],
-      commentText: '',
-      taskIds: this.$route.query.taskIds,
-      pId: this.$route.query.prcId,
-      roleRow: {},
-      nodeList: [],
-      type: '',
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      treeData: [], // 人员数据
-      modalshowflag: false, // drawer开关
-      drawerTitle: '', //drawer标题
-      textarea: '', // 意见
-      ListModel: false, // 新增编辑抽屉开关
-      active: '1', // 默认显示
-      isSubmit: false,
-      saveLoading: false,
-      form: {
-        cid: '', // 编号
-        endTime: '', // 结束日期
-        cname: '', // 名称
-        fjList: [],
-        fjListId: '',
-      },
-      formRules: {
-        responUserList: [
-          {required: true, message: '请选择责任人', trigger: 'change'},
-        ]
-      },
-      json: {}
-    }
-  },
-  components: {
-    ProcessHeader,
-    ProcessFooter,
-    ProcessTitle
-  },
-  methods: {
-    handleTransfer() {
-      this.drawerModal = true
-    },
-    checkedRole(data) {
-      changeAssigneeNew({
-        taskId: this.$route.query.taskIds, // 任务id
-        userId: this.$store.getters.userInfo.userId, // 委托人
-        assignee: data[0].id, // 被委托人
-        pId: this.$route.query.prcId, // 流程实例
-      }).then(res => {
-        if (res.success) {
-          this.drawerModal = false
-          this.$message.success('调整成功')
-          this.processNum()
-          this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
-        } else {
-          this.$message.warning(res.message)
-        }
-      })
-    },
-    // 请求转换流程图
-    processNum(row) {
-      axios.request({
-        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
-        responseType: 'blob',
-        method: 'get',
-        params: {
-          prcNum: this.$route.query.prcNum
-        }
-      }).then(res => {
-        this.processStep = window.URL.createObjectURL(res.data)
-      })
-    },
-    getHistoryData() {
-      this.$http.get('lawss/activiti/get_list_by_instance', {
-        prcNum: this.$route.query.prcNum,
-      }, {}, res => {
-        this.histortData = res
-      }, e => {
-      })
-    },
-    handleTabs(name) {
-      this.active = name
-    },
-    handleSave() {
-    },
-    handleSubmit() {
-      this.isSubmit = true
-      var json = this.json
-      //这个就是原来的actionFlag，用来表示流程是驳回还是同意
-      json.actionFlag = 0
-      json.commentText = this.commentText
-      this.$http.post('lawss/activiti/completeTask', {
-        json: JSON.stringify(json),
-        taskId: this.taskIds,
-        userId: this.$store.getters.userInfo.userId
-      }, {}, res => {
-        if (res.success) {
-          this.$message.success('提交成功')
-          this.$router.push('/processCenter')
-        }
-        this.isSubmit = false
-      })
-    },
-    handleSubmitNo() {
-      if (this.commentText) {
-        var json = this.json
-        //这个就是原来的actionFlag，用来表示流程是驳回还是同意
-        json.actionFlag = 1
-        json.commentText = this.commentText
-        this.$http.post('lawss/activiti/completeTask', {
-          json: JSON.stringify(json),
-          taskId: this.taskIds,
-          userId: this.$store.getters.userInfo.userId
-        }, {}, res => {
-          if (res.success) {
-            this.$message.success('提交成功')
-            this.$router.push('/processCenter')
-          }
-        })
-      } else {
-        this.$message.warning('请输入反馈意见')
-      }
-
-    },
-    getData() {
-      return new Promise((resolve, reject) => {
-        inboundLiaisonDetail({
-          taskIds: this.taskIds,
-          pId: this.pId
-        }).then(res => {
-          if (res) {
-            const processForm = JSON.parse(res.mesg)
-            this.getFormFieldList(processForm)
-          }
-          let data = JSON.parse(res.mesg)
-          console.log('355', data.form.cid);
-          this.form.fjList = data.fjList || data.form.fjList
-          this.form.fjListId = data.fjListId || data.form.fjListId
-          this.form.cid = data.cid || data.form.cid
-          this.form.endTime = data.endTime || data.form.endTime
-          this.form.cname = data.cname || data.form.cname
-          this.json = data
-          this.data = data.info || data.data
-          console.log('364', this.form.cid);
-        }).catch(e => {
-        })
-      })
-    },
-    /**
-     * @description: 动态表单读取
-     */
-    getFormFieldList(item) {
-      this.$nextTick(() => {
-        this.form = JSON.parse(JSON.stringify(item));
-        this.form.cid = item.form.cid
-      });
-    },
-  },
-  mounted() {
-    this.getHistoryData()
-    this.getData()
-  }
-}
-</script>
-
-<style lang="less" scoped>
-@import '~@/assets/styles/style';
-
-.zdrzbzORzchgxxmsc-step8-2 {
-  /deep/ .el-drawer__container {
-    .prc-content-border {
-      border: none;
-      padding: 0 20px 0;
-    }
-  }
-
-  .fileClass {
-    cursor: pointer;
-  }
-
-  .fileClass:hover {
-    color: #0c91e5;
-  }
-
-  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% - 103px');
-    overflow: auto;
-
-    .tableTitle {
-      margin-bottom: 10px;
-      height: 30px;
-      line-height: 30px;
-      position: relative;
-      font-size: 13px;
-      font-weight: bold;
-
-      .tableButton {
-        position: absolute;
-        right: 0;
-        top: 0;
-      }
-    }
-  }
-}
-</style>

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

@@ -37,7 +37,7 @@
                   align="center">
               </el-table-column>
               <el-table-column
-                  prop="lawId"
+                  prop="lawCode"
                   label="标准编号/政策编号"
                   align="center"
                   width="150"

src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step9-1.vue

@@ -1,460 +0,0 @@
-<template>
-  <div class="zdrzbzORzchgxxmsc-step9-1">
-    <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-show="active === '1'">
-      <div style="flex: auto; overflow: auto;">
-        <el-form
-            ref="bzzqyjForm"
-            :model="form"
-            :rules="formRules"
-            class="label-input-form"
-            label-width="210px"
-        >
-          <ProcessTitle>
-            <template slot="title">基础信息</template>
-          </ProcessTitle>
-          <el-table
-              ref="multipleTable"
-              :data="data"
-              tooltip-effect="dark"
-              border
-              style="width: 100%; flex: auto;"
-              height="450px"
-              class="drag-table"
-              :default-sort="{prop: 'chapterNumber', order: 'ascending'}"
-              :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
-         fontWeight: 'bold', height: '48px'}">
-            <el-table-column
-                label="标准编号/政策编号"
-                align="center"
-                width="150"
-            >
-            </el-table-column>
-            <el-table-column
-                show-overflow-tooltip
-                prop="standName"
-                label="标准名称/政策名称"
-                min-width="150"
-                align="center"
-            >
-            </el-table-column>
-            <el-table-column
-                prop="issueTime"
-                sortable="custom"
-                width="120"
-                align="center"
-                label="产品类型">
-            </el-table-column>
-            <el-table-column
-                prop="SSRQ"
-                sortable="custom"
-                align="center"
-                width="120"
-                label="实施日期">
-            </el-table-column>
-            <el-table-column
-                prop="SSRQ"
-                sortable="custom"
-                align="center"
-                width="120"
-                label="实施要求">
-            </el-table-column>
-            <el-table-column
-                prop="SSRQ"
-                sortable="custom"
-                align="center"
-                width="130"
-                label="资源符合情况">
-            </el-table-column>
-            <el-table-column
-                prop="SSRQ"
-                sortable="custom"
-                align="center"
-                width="120"
-                label="开发计划">
-            </el-table-column>
-            <el-table-column
-                prop="SSRQ"
-                sortable="custom"
-                align="center"
-                width="120"
-                label="SOP时间">
-            </el-table-column>
-            <el-table-column
-                prop="SSRQ"
-                sortable="custom"
-                align="center"
-                width="120"
-                label="完成情况">
-            </el-table-column>
-            <el-table-column
-                prop="SSRQ"
-                sortable="custom"
-                align="center"
-                width="400"
-                label="SOP时间超过法规时限的空档期的业务应对方案">
-            </el-table-column>
-            <el-table-column
-                prop="SSRQ"
-                fixed="right"
-                align="center"
-                width="200"
-                label="是否风险项">
-            </el-table-column>
-          </el-table>
-        </el-form>
-      </div>
-      <el-collapse accordion>
-        <el-collapse-item title="审批意见">
-          <div style="margin: 10px 0;">
-            <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入意见"
-                v-model="commentText">
-            </el-input>
-          </div>
-        </el-collapse-item>
-      </el-collapse>
-    </div>
-    <div class="content" v-show="active === '2'">
-      <el-table
-          height="100%"
-          ref="selection"
-          :data="histortData"
-          tooltip-effect="dark"
-          style="width: 100%"
-          border
-          row-key="id"
-          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-        <el-table-column
-            prop="name"
-            label="任务步骤"
-            align="center"
-            sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-            prop="assignee"
-            label="任务受理人"
-            align="center"
-            sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-            prop="createTime"
-            label="创建时间"
-            sortable="custom"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="endTime"
-            label="完成时间"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="comment"
-            label="流程信息"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.commentText }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="completeFlag"
-            label="状态"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? '已完成' : '未完成' }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <ProcessFooter
-        show-submit
-        :submitLoading="isSubmit"
-        :saveLoading="saveLoading"
-        show-transfer
-        @transfer="handleTransfer"
-        @save="handleSave"
-        @submit="handleSubmit"
-        show-back
-        @back="handleSubmitNo"
-        approval
-        submitBTNText="同意"
-    >
-    </ProcessFooter>
-    <Role-tree
-        check-box
-        is-title="转办处理人"
-        :is-visible.sync="drawerModal"
-        @checkedRole="checkedRole"
-    ></Role-tree>
-  </div>
-</template>
-
-<script>
-import ProcessHeader from '../../components/ProcessHeader'
-import ProcessFooter from '../../components/ProcessFooter'
-import ProcessTitle from '../../components/ProcessTitle'
-import {inboundLiaisonDetail, processCreateStand, changeAssigneeNew} from 'api/process'
-import axios from "axios";
-
-export default {
-  name: "zdrzbzORzchgxxmscStep9-1",
-  data() {
-    return {
-      drawerModal: false,
-      histortData: [],
-      data: [],
-      commentText: '',
-      taskIds: this.$route.query.taskIds,
-      pId: this.$route.query.prcId,
-      roleRow: {},
-      nodeList: [],
-      type: '',
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      treeData: [], // 人员数据
-      modalshowflag: false, // drawer开关
-      drawerTitle: '', //drawer标题
-      textarea: '', // 意见
-      ListModel: false, // 新增编辑抽屉开关
-      active: '1', // 默认显示
-      isSubmit: false,
-      saveLoading: false,
-      form: {
-        cid: '', // 编号
-        endTime: '', // 结束日期
-        cname: '', // 名称
-        fjList: [],
-        fjListId: '',
-      },
-      formRules: {
-        responUserList: [
-          {required: true, message: '请选择责任人', trigger: 'change'},
-        ]
-      },
-      json: {}
-    }
-  },
-  components: {
-    ProcessHeader,
-    ProcessFooter,
-    ProcessTitle
-  },
-  methods: {
-    handleTransfer() {
-      this.drawerModal = true
-    },
-    checkedRole(data) {
-      changeAssigneeNew({
-        taskId: this.$route.query.taskIds, // 任务id
-        userId: this.$store.getters.userInfo.userId, // 委托人
-        assignee: data[0].id, // 被委托人
-        pId: this.$route.query.prcId, // 流程实例
-      }).then(res => {
-        if (res.success) {
-          this.drawerModal = false
-          this.$message.success('调整成功')
-          this.processNum()
-          this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
-        } else {
-          this.$message.warning(res.message)
-        }
-      })
-    },
-    // 请求转换流程图
-    processNum(row) {
-      axios.request({
-        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
-        responseType: 'blob',
-        method: 'get',
-        params: {
-          prcNum: this.$route.query.prcNum
-        }
-      }).then(res => {
-        this.processStep = window.URL.createObjectURL(res.data)
-      })
-    },
-    getHistoryData() {
-      this.$http.get('lawss/activiti/get_list_by_instance', {
-        prcNum: this.$route.query.prcNum,
-      }, {}, res => {
-        this.histortData = res
-      }, e => {
-      })
-    },
-    handleTabs(name) {
-      this.active = name
-    },
-    handleSave() {
-    },
-    handleSubmit() {
-      this.isSubmit = true
-      var json = this.json
-      //这个就是原来的actionFlag，用来表示流程是驳回还是同意
-      json.actionFlag = 0
-      json.commentText = this.commentText
-      json.responUserList = this.form.responUserList;
-      json.responUserListName = this.form.responUserListName;
-      json.introduce = false;
-      this.$http.post('lawss/activiti/completeTask', {
-        json: JSON.stringify(json),
-        taskId: this.taskIds,
-        userId: this.$store.getters.userInfo.userId
-      }, {}, res => {
-        if (res.success) {
-          this.$message.success('提交成功')
-          this.$router.push('/processCenter')
-        }
-        this.isSubmit = false
-      })
-    },
-    handleSubmitNo() {
-      if (this.commentText) {
-        var json = this.json
-        //这个就是原来的actionFlag，用来表示流程是驳回还是同意
-        json.actionFlag = 1
-        json.commentText = this.commentText
-        this.$http.post('lawss/activiti/completeTask', {
-          json: JSON.stringify(json),
-          taskId: this.taskIds,
-          userId: this.$store.getters.userInfo.userId
-        }, {}, res => {
-          if (res.success) {
-            this.$message.success('提交成功')
-            this.$router.push('/processCenter')
-          }
-        })
-      } else {
-        this.$message.warning('请输入反馈意见')
-      }
-
-    },
-    getData() {
-      return new Promise((resolve, reject) => {
-        inboundLiaisonDetail({
-          taskIds: this.taskIds,
-          pId: this.pId
-        }).then(res => {
-          if (res) {
-            const processForm = JSON.parse(res.mesg)
-            this.getFormFieldList(processForm)
-          }
-          let data = JSON.parse(res.mesg)
-          console.log('355', data.form.cid);
-          this.form.fjList = data.fjList || data.form.fjList
-          this.form.fjListId = data.fjListId || data.form.fjListId
-          this.form.cid = data.cid || data.form.cid
-          this.form.endTime = data.endTime || data.form.endTime
-          this.form.cname = data.cname || data.form.cname
-          this.json = data
-          this.data = data.info || data.data
-          console.log('364', this.form.cid);
-        }).catch(e => {
-        })
-      })
-    },
-    /**
-     * @description: 动态表单读取
-     */
-    getFormFieldList(item) {
-      this.$nextTick(() => {
-        this.form = JSON.parse(JSON.stringify(item));
-        this.form.cid = item.form.cid
-      });
-    },
-  },
-  mounted() {
-    this.getHistoryData()
-    this.getData()
-  }
-}
-</script>
-
-<style lang="less" scoped>
-@import '~@/assets/styles/style';
-
-.zdrzbzORzchgxxmsc-step9-1 {
-  /deep/ .el-drawer__container {
-    .prc-content-border {
-      border: none;
-      padding: 0 20px 0;
-    }
-  }
-
-  .fileClass {
-    cursor: pointer;
-  }
-
-  .fileClass:hover {
-    color: #0c91e5;
-  }
-
-  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% - 103px');
-    overflow: auto;
-
-    .tableTitle {
-      margin-bottom: 10px;
-      height: 30px;
-      line-height: 30px;
-      position: relative;
-      font-size: 13px;
-      font-weight: bold;
-
-      .tableButton {
-        position: absolute;
-        right: 0;
-        top: 0;
-      }
-    }
-  }
-}
-</style>

src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step9-2.vue

@@ -1,462 +0,0 @@
-<template>
-  <div class="zdrzbzORzchgxxmsc-step9-2">
-    <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-show="active === '1'">
-      <div style="flex: auto; overflow: auto;">
-        <el-form
-            ref="bzzqyjForm"
-            :model="form"
-            :rules="formRules"
-            class="label-input-form"
-            label-width="210px"
-        >
-          <ProcessTitle>
-            <template slot="title">基础信息</template>
-          </ProcessTitle>
-          <el-table
-              ref="multipleTable"
-              :data="data"
-              tooltip-effect="dark"
-              border
-              style="width: 100%; flex: auto;"
-              height="450px"
-              class="drag-table"
-              :default-sort="{prop: 'chapterNumber', order: 'ascending'}"
-              :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
-                type="index"
-                label="序号"
-                width="55"
-                align="center">
-            </el-table-column>
-            <el-table-column
-                label="业务"
-                align="center"
-                width="150"
-            >
-            </el-table-column>
-            <el-table-column
-                show-overflow-tooltip
-                prop="standName"
-                label="平台"
-                min-width="150"
-                align="center"
-            >
-            </el-table-column>
-            <el-table-column
-                show-overflow-tooltip
-                prop="standName"
-                label="项目"
-                min-width="150"
-                align="center"
-            >
-            </el-table-column>
-            <el-table-column
-                show-overflow-tooltip
-                prop="standName"
-                label="项目描述"
-                min-width="150"
-                align="center"
-            >
-            </el-table-column>
-            <el-table-column
-                show-overflow-tooltip
-                prop="standName"
-                label="当前节点"
-                min-width="150"
-                align="center"
-            >
-            </el-table-column>
-            <el-table-column
-                show-overflow-tooltip
-                prop="standName"
-                label="概念状态"
-                min-width="150"
-                align="center"
-            >
-            </el-table-column>
-            <el-table-column
-                prop="SSRQ"
-                align="center"
-                width="150"
-                label="概念计划下发时间">
-            </el-table-column>
-            <el-table-column
-                prop="SSRQ"
-                align="center"
-                width="120"
-                label="概念修订计划">
-            </el-table-column>
-            <el-table-column
-                prop="SSRQ"
-                align="center"
-                width="400"
-                label="其他说明">
-            </el-table-column>
-            <el-table-column
-                prop="SSRQ"
-                fixed="right"
-                align="center"
-                width="200"
-                label="是否风险项">
-            </el-table-column>
-          </el-table>
-        </el-form>
-      </div>
-      <el-collapse accordion>
-        <el-collapse-item title="审批意见">
-          <div style="margin: 10px 0;">
-            <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入意见"
-                v-model="commentText">
-            </el-input>
-          </div>
-        </el-collapse-item>
-      </el-collapse>
-    </div>
-    <div class="content" v-show="active === '2'">
-      <el-table
-          height="100%"
-          ref="selection"
-          :data="histortData"
-          tooltip-effect="dark"
-          style="width: 100%"
-          border
-          row-key="id"
-          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-        <el-table-column
-            prop="name"
-            label="任务步骤"
-            align="center"
-            sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-            prop="assignee"
-            label="任务受理人"
-            align="center"
-            sortable="custom"
-        >
-        </el-table-column>
-        <el-table-column
-            prop="createTime"
-            label="创建时间"
-            sortable="custom"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="endTime"
-            label="完成时间"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="comment"
-            label="流程信息"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.commentText }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="completeFlag"
-            label="状态"
-            align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? '已完成' : '未完成' }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <ProcessFooter
-        show-submit
-        :submitLoading="isSubmit"
-        :saveLoading="saveLoading"
-        show-transfer
-        @transfer="handleTransfer"
-        @save="handleSave"
-        @submit="handleSubmit"
-        show-back
-        @back="handleSubmitNo"
-        approval
-        submitBTNText="同意"
-    >
-    </ProcessFooter>
-    <Role-tree
-        check-box
-        is-title="转办处理人"
-        :is-visible.sync="drawerModal"
-        @checkedRole="checkedRole"
-    ></Role-tree>
-  </div>
-</template>
-
-<script>
-import ProcessHeader from '../../components/ProcessHeader'
-import ProcessFooter from '../../components/ProcessFooter'
-import ProcessTitle from '../../components/ProcessTitle'
-import {inboundLiaisonDetail, processCreateStand, changeAssigneeNew} from 'api/process'
-import axios from "axios";
-
-export default {
-  name: "zdrzbzORzchgxxmscStep9-2",
-  data() {
-    return {
-      drawerModal: false,
-      histortData: [],
-      data: [],
-      commentText: '',
-      taskIds: this.$route.query.taskIds,
-      pId: this.$route.query.prcId,
-      roleRow: {},
-      nodeList: [],
-      type: '',
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      treeData: [], // 人员数据
-      modalshowflag: false, // drawer开关
-      drawerTitle: '', //drawer标题
-      textarea: '', // 意见
-      ListModel: false, // 新增编辑抽屉开关
-      active: '1', // 默认显示
-      isSubmit: false,
-      saveLoading: false,
-      form: {
-        cid: '', // 编号
-        endTime: '', // 结束日期
-        cname: '', // 名称
-        fjList: [],
-        fjListId: '',
-      },
-      formRules: {
-        responUserList: [
-          {required: true, message: '请选择责任人', trigger: 'change'},
-        ]
-      },
-      json: {}
-    }
-  },
-  components: {
-    ProcessHeader,
-    ProcessFooter,
-    ProcessTitle
-  },
-  methods: {
-    handleTransfer() {
-      this.drawerModal = true
-    },
-    checkedRole(data) {
-      changeAssigneeNew({
-        taskId: this.$route.query.taskIds, // 任务id
-        userId: this.$store.getters.userInfo.userId, // 委托人
-        assignee: data[0].id, // 被委托人
-        pId: this.$route.query.prcId, // 流程实例
-      }).then(res => {
-        if (res.success) {
-          this.drawerModal = false
-          this.$message.success('调整成功')
-          this.processNum()
-          this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
-        } else {
-          this.$message.warning(res.message)
-        }
-      })
-    },
-    // 请求转换流程图
-    processNum(row) {
-      axios.request({
-        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
-        responseType: 'blob',
-        method: 'get',
-        params: {
-          prcNum: this.$route.query.prcNum
-        }
-      }).then(res => {
-        this.processStep = window.URL.createObjectURL(res.data)
-      })
-    },
-    getHistoryData() {
-      this.$http.get('lawss/activiti/get_list_by_instance', {
-        prcNum: this.$route.query.prcNum,
-      }, {}, res => {
-        this.histortData = res
-      }, e => {
-      })
-    },
-    handleTabs(name) {
-      this.active = name
-    },
-    handleSave() {
-    },
-    handleSubmit() {
-      this.isSubmit = true
-      var json = this.json
-      //这个就是原来的actionFlag，用来表示流程是驳回还是同意
-      json.actionFlag = 0
-      json.commentText = this.commentText
-      this.$http.post('lawss/activiti/completeTask', {
-        json: JSON.stringify(json),
-        taskId: this.taskIds,
-        userId: this.$store.getters.userInfo.userId
-      }, {}, res => {
-        if (res.success) {
-          this.$message.success('提交成功')
-          this.$router.push('/processCenter')
-        }
-        this.isSubmit = false
-      })
-    },
-    handleSubmitNo() {
-      if (this.commentText) {
-        var json = this.json
-        //这个就是原来的actionFlag，用来表示流程是驳回还是同意
-        json.actionFlag = 1
-        json.commentText = this.commentText
-        this.$http.post('lawss/activiti/completeTask', {
-          json: JSON.stringify(json),
-          taskId: this.taskIds,
-          userId: this.$store.getters.userInfo.userId
-        }, {}, res => {
-          if (res.success) {
-            this.$message.success('提交成功')
-            this.$router.push('/processCenter')
-          }
-        })
-      } else {
-        this.$message.warning('请输入反馈意见')
-      }
-
-    },
-    getData() {
-      return new Promise((resolve, reject) => {
-        inboundLiaisonDetail({
-          taskIds: this.taskIds,
-          pId: this.pId
-        }).then(res => {
-          if (res) {
-            const processForm = JSON.parse(res.mesg)
-            this.getFormFieldList(processForm)
-          }
-          let data = JSON.parse(res.mesg)
-          console.log('355', data.form.cid);
-          this.form.fjList = data.fjList || data.form.fjList
-          this.form.fjListId = data.fjListId || data.form.fjListId
-          this.form.cid = data.cid || data.form.cid
-          this.form.endTime = data.endTime || data.form.endTime
-          this.form.cname = data.cname || data.form.cname
-          this.json = data
-          this.data = data.info || data.data
-          console.log('364', this.form.cid);
-        }).catch(e => {
-        })
-      })
-    },
-    /**
-     * @description: 动态表单读取
-     */
-    getFormFieldList(item) {
-      this.$nextTick(() => {
-        this.form = JSON.parse(JSON.stringify(item));
-        this.form.cid = item.form.cid
-      });
-    },
-  },
-  mounted() {
-    this.getHistoryData()
-    this.getData()
-  }
-}
-</script>
-
-<style lang="less" scoped>
-@import '~@/assets/styles/style';
-
-.zdrzbzORzchgxxmsc-step9-2 {
-  /deep/ .el-drawer__container {
-    .prc-content-border {
-      border: none;
-      padding: 0 20px 0;
-    }
-  }
-
-  .fileClass {
-    cursor: pointer;
-  }
-
-  .fileClass:hover {
-    color: #0c91e5;
-  }
-
-  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% - 103px');
-    overflow: auto;
-
-    .tableTitle {
-      margin-bottom: 10px;
-      height: 30px;
-      line-height: 30px;
-      position: relative;
-      font-size: 13px;
-      font-weight: bold;
-
-      .tableButton {
-        position: absolute;
-        right: 0;
-        top: 0;
-      }
-    }
-  }
-}
-</style>

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

@@ -75,7 +75,7 @@
                 <img :src="getImg(Math.floor(Math.random() * 6))">
               </div>
               <div class="card-top-right">
-                <div class="card-top-right-text">项目合规评估流程-标准</div>
+                <div class="card-top-right-text">标准合规评估流程</div>
                 <div class="card-top-right-line"></div>
               </div>
             </div>

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

@@ -1685,6 +1685,17 @@ export default {
                 prcType: row.prcType
               }
             })
+          }else if(row.taskInfo === '企标制修订计划整改') {
+            this.$router.push({
+              name: 'qbzxdjhgkStep1',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }
           break
       }

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

@@ -82,7 +82,7 @@
                   align="center"
           >
             <template slot-scope="scope">
-              {{ scope.row.prcName || getPrcName(scope.row.prcType) }}
+              <a @click="dealWith(scope.row)" class="table-jump">{{ scope.row.prcName|| getPrcName(scope.row.prcType)  }}</a>
             </template>
           </el-table-column>
 <!--          <el-table-column-->
@@ -539,6 +539,28 @@ export default {
             }
           })
           break
+        //企标废止
+        case '24':
+          this.$router.push({
+            name: 'qbfzStep1',
+            query: {
+              type: '24',
+              processName: '企标废止流程',
+              bpnId: id
+            }
+          })
+          break
+        //企标制修订计划管控
+        case '25':
+          this.$router.push({
+            name: 'qbzxdjhgkStep1',
+            query: {
+              type: '25',
+              processName: '企标制修订计划管控',
+              bpnId: id
+            }
+          })
+          break
       }
     },
     ...mapMutations(['setProcess', 'setHandleInfo']),

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

@@ -6,7 +6,7 @@
         <el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form" >
           <el-form-item label="标准编号/政策编号:" class="search-item search-item-last">
             <el-input
-                v-model="sarSarAccessEOSearch.lawId"
+                v-model="sarSarAccessEOSearch.lawCode"
                 placeholder="请输入"
             ></el-input>
           </el-form-item>
@@ -74,7 +74,7 @@
           align="center">
         </el-table-column>
         <el-table-column
-          prop="lawId"
+          prop="lawCode"
           width="250"
           label="标准编号/政策编号"
           align="center">
@@ -139,14 +139,23 @@
         >
           <el-form-item
               label="标准编号/政策编号"
-              prop="lawId"
+              prop="lawCode"
               class="add-form-item"
           >
             <el-input
-                style="width: 45%"
+                v-show="false"
+                v-model.trim="attributeEO.dataSource"
+            />
+            <el-input
+                v-show="false"
                 v-model.trim="attributeEO.lawId"
-                placeholder="请输入标准编号/政策编号"
+            />
+            <el-input
+                style="width: 45%"
+                v-model.trim="attributeEO.lawCode"
+                placeholder="请手动查找带入标准编号/政策编号"
                 clearable
+                readonly
             />
 <!--            :disabled="this.addOrEdit !== 'add'"-->
             <el-button type="primary" size="mini" @click="handleSelect">手动查找</el-button>
@@ -157,8 +166,9 @@
               class="add-form-item"
           >
             <el-input
+                readonly
                 v-model.trim="attributeEO.lawName"
-                placeholder="请输入标准名称/政策名称"
+                placeholder="请手动查找带入标准名称/政策名称"
                 clearable
             />
           </el-form-item>
@@ -304,76 +314,410 @@
           fontWeight: 'bold', height: '48px'}"
             @selection-change="handleSelectTableChange"
         >
+
           <el-table-column
+              fixed="left"
               type="selection"
               width="55"
               align="center">
           </el-table-column>
-          <el-table-column
+
-              width="350"
+          <div v-if="handleSelectForm.dataSource === 'INLAND'">
-              align="center"
+            <el-table-column
-              label="标准编号/政策编号">
+                label="标准号"
-            <template slot-scope="scope">
+                width="150"
-              <!--企标-->
+            >
-              <a v-if="scope.row.standStatusShow === '作废' && handleSelectForm.dataSource === 'BUSINESS_STAND'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+              <template slot-scope="scope">
-              <a v-if="scope.row.standStatusShow === '参考' && handleSelectForm.dataSource === 'BUSINESS_STAND'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
-              <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考' && handleSelectForm.dataSource === 'BUSINESS_STAND'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+                   @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
-              <!--国内外标准-->
+                    scope.row.standNumber
-              <a v-if="textStatusMap[scope.row.textStatus] !== '废止' && textStatusMap[scope.row.textStatus] !== '被代替' && scope.row.standYear && (handleSelectForm.dataSource === 'INLAND'||handleSelectForm.dataSource === 'FOREIGN')" @click="handlePreview(scope.row)" style="color: #333333" class="table-jump">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                  }}-{{ scope.row.standYear }}</a>
-              <a v-if="textStatusMap[scope.row.textStatus] !== '废止' && textStatusMap[scope.row.textStatus] !== '被代替' && (scope.row.standYear === ''||scope.row.standYear === undefined) && (handleSelectForm.dataSource === 'INLAND'||handleSelectForm.dataSource === 'FOREIGN')" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
+                <a v-else-if="scope.row.standYear" class="table-jump" style="color: #333333"
-              <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替' && scope.row.standYear && (handleSelectForm.dataSource === 'INLAND'||handleSelectForm.dataSource === 'FOREIGN')" @click="handlePreview(scope.row)" style="color: #F56C6C" class="table-jump">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                   @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
-              <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替' && (scope.row.standYear === ''||scope.row.standYear === undefined) && (handleSelectForm.dataSource === 'INLAND'||handleSelectForm.dataSource === 'FOREIGN')" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
+                    scope.row.standNumber
-              <!--国内外政策-->
+                  }}-{{ scope.row.standYear }}</a>
-              <a v-if="scope.row.standStatusShow === '作废' && handleSelectForm.dataSource === 'FOREIGN_LAWS'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsNumber }}</a>
+                <a v-else @click="handlePreview(scope.row)" class="table-jump" style="color: #333333">
-              <a v-if="scope.row.standStatusShow === '参考' && handleSelectForm.dataSource === 'FOREIGN_LAWS'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsNumber }}</a>
+                  {{ scope.row.standSortShow }}
-              <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考' && handleSelectForm.dataSource === 'FOREIGN_LAWS'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsNumber }}</a>
+                  {{ scope.row.standNumber }}</a>
-            </template>
+              </template>
-          </el-table-column>
+            </el-table-column>
-          <el-table-column
+            <el-table-column
-              prop="lawName"
+                show-overflow-tooltip
-              align="center"
+                prop="standName"
-              label="标准名称/政策名称">
+                label="标准名称"
-            <template slot-scope="scope">
+                min-width="300"
-              <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'&& (handleSelectForm.dataSource === 'INLAND'||handleSelectForm.dataSource === 'FOREIGN'||handleSelectForm.dataSource === 'BUSINESS_STAND')" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
+            >
-              <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              <template slot-scope="scope">
-              <a v-if="scope.row.standStatusShow === '作废' && handleSelectForm.dataSource === 'FOREIGN_LAWS'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsName }}</a>
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
-              <a v-if="scope.row.standStatusShow === '参考' && handleSelectForm.dataSource === 'FOREIGN_LAWS'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsName }}</a>
+                <a v-else @click="handlePreview(scope.row)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
-              <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考' && handleSelectForm.dataSource === 'FOREIGN_LAWS'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsName }}</a>
+              </template>
-            </template>
+            </el-table-column>
-          </el-table-column>
+            <el-table-column
-          <el-table-column
+                prop="issueTime"
-              prop="textStatus"
+                sortable="custom"
-              align="center"
+                width="120"
-              label="标准状态"
+                label="发布日期">
-              width="350">
+              <template slot-scope="scope">
-            <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替' && (handleSelectForm.dataSource === 'INLAND'||handleSelectForm.dataSource === 'FOREIGN'||handleSelectForm.dataSource === 'BUSINESS_STAND')" style="color: #F56C6C">{{
+                <span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="SSRQ"
+                sortable="custom"
+                width="120"
+                label="实施日期">
+              <template slot-scope="scope">
+                <!--                {{ formatIssueDate(scope.row.putTime) }}-->
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+
+              </template>
+            </el-table-column>
+
+            <el-table-column
+                prop="XCXSSRQ"
+                sortable="custom"
+                width="150"
+                label="新车型实施日期">
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="ZCCSSRQ"
+                sortable="custom"
+                width="150"
+                label="在产车实施日期">
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="textStatus"
+                sortable="custom"
+                width="110"
+                label="文本状态">
+              <!--              <template slot="header" slot-scope="scope">-->
+              <!--                <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
+              <!--                  <span>文本状态<i class="el-icon-warning-outline"></i></span>-->
+              <!--                </el-tooltip>-->
+              <!--              </template>-->
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
                     textStatusMap[scope.row.textStatus]
                   }}</span>
-              <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
+                <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
-              <span v-if="scope.row.standStatusShow === '作废' && handleSelectForm.dataSource === 'FOREIGN_LAWS'" style="color: #F56C6C">
+              </template>
+            </el-table-column>
+          </div>
+          <div v-if="handleSelectForm.dataSource === 'FOREIGN'">
+            <el-table-column
+                label="标准号"
+                width="150"
+            >
+              <template slot-scope="scope">
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
+                    scope.row.standSortShow
+                  }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                <a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">{{
+                    scope.row.standSortShow
+                  }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                <a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">{{
+                    scope.row.standSortShow
+                  }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standSortShow
+                  }}
+                  {{ scope.row.standNumber }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+                show-overflow-tooltip
+                prop="standName"
+                label="标准名称"
+                min-width="300"
+            >
+              <template slot-scope="scope">
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standName
+                  }}</a>
+                <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standName
+                  }}</a>
+                <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standName
+                  }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="issueTime"
+                sortable="custom"
+                width="120"
+                label="发布日期">
+              <template slot-scope="scope">
+                <div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
+                  {{ formatIssueDate(scope.row.issueTime) }}
+                </div>
+                <div v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">
+                  {{ formatIssueDate(scope.row.issueTime) }}
+                </div>
+                <div v-else style="color: #333333">
+                  {{ formatIssueDate(scope.row.issueTime) }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="SSRQ"
+                sortable="custom"
+                width="120"
+                label="实施日期">
+              <template slot-scope="scope">
+                <!--                {{ formatIssueDate(scope.row.putTime) }}-->
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else style="color: #333333">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="XCXSSRQ"
+                sortable="custom"
+                width="150"
+                label="新车型实施日期">
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else style="color: #333333">{{
+                    scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+                  }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="ZCCSSRQ"
+                sortable="custom"
+                width="150"
+                label="在产车实施日期">
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else style="color: #333333">{{
+                    scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+                  }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="textStatus"
+                sortable="custom"
+                width="110"
+                label="文本状态">
+              <!--              <template slot="header" slot-scope="scope">-->
+              <!--                <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
+              <!--                  <span>文本状态 <i class="el-icon-warning-outline"></i></span>-->
+              <!--                </el-tooltip>-->
+              <!--              </template>-->
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    textStatusMap[scope.row.textStatus]
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    textStatusMap[scope.row.textStatus]
+                  }}</span>
+                <span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
+              </template>
+            </el-table-column>
+          </div>
+          <div v-if="handleSelectForm.dataSource === 'FOREIGN_LAWS'">
+            <el-table-column
+                show-overflow-tooltip
+                label="政策编号"
+                width="150"
+            >
+              <template slot-scope="scope">
+                <!--                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>-->
+                <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsNumber }}</a>
+                <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsNumber }}</a>
+                <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsNumber }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+                show-overflow-tooltip
+                prop="lawsName"
+                label="中文名称"
+                min-width="300"
+            >
+              <template slot-scope="scope">
+                <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsName }}</a>
+                <a v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsName }}</a>
+                <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsName }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+                show-overflow-tooltip
+                prop="lawsEnName"
+                label="英文名称"
+                min-width="300"
+            >
+              <template slot-scope="scope">
+                <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsEnName }}</a>
+                <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsEnName }}</a>
+                <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsEnName }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="issueTime"
+                label="发文日期"
+                sortable
+                width="120"
+            >
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="XCXSSRQLAWS"
+                label="新车实施日期"
+                sortable
+                width="150"
+            >
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.XCXSSRQLAWS ? scope.row.XCXSSRQLAWS.slice(0, 10) : ''}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+                show-overflow-tooltip
+                sortable
+                prop="standStatusShow"
+                label="文本状态"
+                width="110"
+            >
+
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">
                   {{scope.row.standStatusShow}}
                 </span>
-              <span v-if="scope.row.standStatusShow === '参考' && handleSelectForm.dataSource === 'FOREIGN_LAWS'" style="color: #E6A23C">
+                <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">
                   {{scope.row.standStatusShow}}
                 </span>
-              <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考' && handleSelectForm.dataSource === 'FOREIGN_LAWS'">
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">
                   {{scope.row.standStatusShow}}
                 </span>
-            </template>
+              </template>
-          </el-table-column>
+            </el-table-column>
+          </div>
+          <div v-if="handleSelectForm.dataSource === 'BUSINESS_STAND'">
+            <el-table-column
+                show-overflow-tooltip
+                label="企标编号"
+                width="150"
+            >
+              <template slot-scope="scope">
+                <!--                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>-->
+                <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+                <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+                <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+                show-overflow-tooltip
+                prop="standName"
+                label="中文名称"
+                min-width="300"
+            >
+              <template slot-scope="scope">
+                <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                <a v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+                show-overflow-tooltip
+                prop="standEnName"
+                label="英文名称"
+                min-width="300"
+            >
+              <template slot-scope="scope">
+                <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+                <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+                <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="issueTime"
+                label="发布日期"
+                sortable
+                width="120"
+            >
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="putTime"
+                label="实施日期"
+                sortable
+                width="120"
+            >
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+                show-overflow-tooltip
+                sortable
+                prop="standStatusShow"
+                label="文本状态"
+                width="110"
+            >
+
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">
+                  {{scope.row.standStatusShow}}
+                </span>
+                <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">
+                  {{scope.row.standStatusShow}}
+                </span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">
+                  {{scope.row.standStatusShow}}
+                </span>
+              </template>
+            </el-table-column>
+          </div>
+
         </el-table>
         <!--分页-->
         <pagination
             v-show="this.lawInfoTableLoading === false"
             style="position: relative;"
-            :page="handleSelectPage"
+            :page="handleSelectForm.page"
-            :total="handleSelectTotal"
+            :total="handleSelectForm.total"
             @pageChange="handleSelectPageChange"
             @pageSizeChange="handleSelectPageSizeChange"></pagination>
         <div slot="footer" class="demo-drawer-footer">
           <el-button class="common-button-default" round icon="el-icon-close" @click="selectModal = false">取消</el-button>
-          <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="handleSelectConfirm">确定</el-button>
+          <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="handleSelectConfirm" v-show="lawInfoTableLoading === false">确定</el-button>
         </div>
       </div>
     </el-drawer>
@@ -420,7 +764,7 @@ export default {
       ],
       addOrEdit: '',
       attributeEOFormRules: {
-        lawId: [
+        lawCode: [
           { required: true, message: '标准编号/政策编号不能为空', trigger: 'blur' },
         ],
         lawName: [
@@ -437,8 +781,11 @@ export default {
         ],
       },
       attributeEO: {
-        id: '',
         lawId: '',
+        //数据来源
+        dataSource: '',
+        id: '',
+        lawCode: '',
         lawName: '',
         productType: '',
         implTime: '',
@@ -458,7 +805,7 @@ export default {
       rows: 10,
       // 查询相关参数
       sarSarAccessEOSearch: {
-        lawId: '',
+        lawCode: '',
         lawName: '',
         productType: '',
         accessContent: '',
@@ -516,12 +863,6 @@ export default {
         deadLine: '', // 截止时间
         applyAuth: '' // 认证类型
       },
-      dataSourceOptions: [
-        {value: 'INLAND', label: '国内标准法规'},
-        {value: 'FOREIGN', label: '海外标准法规'},
-        {value: 'FOREIGN_LAWS', label: '国内外政策'},
-        {value: 'BUSINESS', label: '企业标准 '}
-      ],
       sarAccessInfoSearchList: [],
       selectedAccInfoSearchList: [],
       sarAccessInfoListArry: [],
@@ -536,6 +877,14 @@ export default {
     }
   },
   methods: {
+    formatIssueDate(str) {
+      const momentDate = this.$moment(str)
+      if (momentDate.isValid()) {
+        return this.$moment(str).format('YYYY-MM-DD')
+      } else {
+        return str
+      }
+    },
     // 点击查看
     handlePreview(item) {
       console.log('539',item)
@@ -585,6 +934,7 @@ export default {
       })
     },
     dataSourceChange() {
+      this.handleSelectForm.page = 1
       this.lawInfoTableLoading = true
       this.handleSelectForm.standType = this.handleSelectForm.dataSource
       this.searchLawBtn()
@@ -608,13 +958,10 @@ export default {
         this.$message.warning('请选择一条数据')
       }
       else {
-        // dataSourceOptions: [
+        console.log('619',this.handleSelectForm.dataSource)
-        //   {value: 'INLAND', label: '国内标准法规'},
+        this.attributeEO.dataSource = this.handleSelectForm.dataSource
-        //   {value: 'FOREIGN', label: '海外标准法规'},
+        this.attributeEO.lawId = this.handleSelectTableList[0].id
-        //   {value: 'FOREIGN_LAWS', label: '国内外政策'},
+        this.attributeEO.lawCode =this.handleSelectTableList[0].standCode || this.handleSelectTableList[0].lawsNumber || this.handleSelectTableList[0].standSort+" "+this.handleSelectTableList[0].standNumber+"-"+this.handleSelectTableList[0].standYear
-        //   {value: 'BUSINESS', label: '企业标准 '}
-        // ],
-        this.attributeEO.lawId =this.handleSelectTableList[0].standCode || this.handleSelectTableList[0].lawsNumber || this.handleSelectTableList[0].standSort+" "+this.handleSelectTableList[0].standNumber+"-"+this.handleSelectTableList[0].standYear
         this.attributeEO.lawName = this.handleSelectTableList[0].standName || this.handleSelectTableList[0].lawsName
         this.selectModal = false
       }
@@ -647,7 +994,7 @@ export default {
           console.log('国内标准库数据',res)
           if (res.ok){
             this.lawInfoTable = res.data.list
-            this.handleSelectTotal = res.data.count
+            this.handleSelectForm.total = res.data.count
             if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
               this.lawInfoTableLoading = true
               this.handleSelectPageChange(1)
@@ -660,7 +1007,7 @@ export default {
           }
         },e=>{
           this.lawInfoTable = []
-          this.total = 0
+          this.handleSelectForm.total = 0
         })
         console.log('国内标准库')
       }else if(this.handleSelectForm.dataSource === 'FOREIGN'){
@@ -670,7 +1017,7 @@ export default {
           console.log('海外标准库数据',res)
           if (res.ok){
             this.lawInfoTable = res.data.list
-            this.handleSelectTotal = res.data.count
+            this.handleSelectForm.total = res.data.count
             if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
               this.lawInfoTableLoading = true
               this.handleSelectPageChange(1)
@@ -683,7 +1030,7 @@ export default {
           }
         },e=>{
           this.lawInfoTable = []
-          this.total = 0
+          this.handleSelectForm.total = 0
         })
         console.log('海外标准库')
       }else if(this.handleSelectForm.dataSource === 'FOREIGN_LAWS'){
@@ -693,7 +1040,7 @@ export default {
           console.log('国内外政策库数据',res)
           if (res.ok){
             this.lawInfoTable = res.data.list
-            this.handleSelectTotal = res.data.count
+            this.handleSelectForm.total = res.data.count
             if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
               this.lawInfoTableLoading = true
               this.handleSelectPageChange(1)
@@ -706,7 +1053,7 @@ export default {
           }
         },e=>{
           this.lawInfoTable = []
-          this.total = 0
+          this.handleSelectForm.total = 0
         })
         console.log('国内外政策库')
       }else if(this.handleSelectForm.dataSource === 'BUSINESS_STAND'){
@@ -716,7 +1063,7 @@ export default {
           console.log('企业标准库数据',res)
           if (res.ok){
             this.lawInfoTable = res.data.list
-            this.handleSelectTotal = res.data.count
+            this.handleSelectForm.total = res.data.count
             if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
               this.lawInfoTableLoading = true
               this.handleSelectPageChange(1)
@@ -729,7 +1076,7 @@ export default {
           }
         },e=>{
           this.lawInfoTable = []
-          this.total = 0
+          this.handleSelectForm.total = 0
         })
         console.log('企业标准库')
       }else {
@@ -744,7 +1091,7 @@ export default {
     },
     handleSelectPageSizeChange(pageSize){
       this.lawInfoTableLoading = true
-      this.handleSelectForm.pageSize = this.$store.getters.userInfo.configContent
+      this.handleSelectForm.pageSize = pageSize
       console.log(this.handleSelectForm.pageSize)
       this.searchLawBtn()
     },
@@ -816,7 +1163,7 @@ export default {
       //   this.$refs['attributeEO'].resetFields()
       //   this.attributeEO = {
       //     id: '',
-      //     lawId: '',
+      //     lawCode: '',
       //     lawName: '',
       //     productType: '',
       //     implTime: '',
@@ -830,7 +1177,7 @@ export default {
         this.$refs['attributeEO'].resetFields()
         this.attributeEO = {
           id: '',
-          lawId: '',
+          lawCode: '',
           lawName: '',
           productType: '',
           implTime: '',
@@ -848,7 +1195,7 @@ export default {
         this.$nextTick(() => {
           this.attributeEO = {
             id: '',
-            lawId: '',
+            lawCode: '',
             lawName: '',
             productType: '',
             implTime: '',
@@ -960,12 +1307,12 @@ export default {
     },
     pageSizeChange (pageSize) {
       this.sarSarAccessEOSearch.page = 1
-      this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent
+      this.sarSarAccessEOSearch.pageSize = pageSize
       this.searchSarAccess()
     },
     clearSearch (search = true) {
       // search 字段是为了处理高级查询时清空字段用的
-      this.sarSarAccessEOSearch.lawId = ''
+      this.sarSarAccessEOSearch.lawCode = ''
       this.sarSarAccessEOSearch.lawName = ''
       this.sarSarAccessEOSearch.productType = ''
       this.sarSarAccessEOSearch.accessContent = ''

src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue

@@ -14,12 +14,12 @@
         </el-input>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" size="small" onclick="">查询</el-button>
+        <el-button type="primary" size="small" @click="queryData">查询</el-button>
         <el-button type="" size="small" onclick="">清空</el-button>
       </el-form-item>
       <el-divider/>
       <div style="float: left">
-        <el-button type="primary" size="small" @click="drawer1 = true">新增</el-button>
+        <el-button type="primary" size="small" @click="dataAdd">新增</el-button>
         <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>
         <el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>
         <el-button type="danger" size="small" @click="deleteDetail" icon="el-icon-delete">批量删除</el-button>
@@ -61,7 +61,7 @@
         </el-table-column>
         <el-table-column
           align="center"
-          prop="payMoney"
+          prop="money"
           label="支出金额">
         </el-table-column>
         <el-table-column
@@ -71,8 +71,16 @@
         </el-table-column>
         <el-table-column
           align="center"
-          prop="detailAnnex"
+          prop="annex"
+          show-overflow-tooltip
           label="详细附件">
+          <template slot-scope="scope">
+            <span v-if="scope.row.annex.length === 0">{{ '-' }}</span>
+            <span v-for="res in scope.row.annex" :key="res.id" style="color: #409EFF;">
+              {{ res.name }} {{ ';'}}
+            </span>
+          <!--<el-button size="mini" type="primary" @click="fileDetail(scope.row)"></el-button>-->
+          </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="50" fixed="right">
           <template slot-scope="scope">
@@ -111,26 +119,53 @@
             </el-input>
           </el-form-item>
           <el-form-item label="支出金额">
-            <el-input v-model="formShowData.payMoney" type="text" placeholder="请填写"></el-input>
+            <el-input v-model="formShowData.money" type="text" placeholder="请填写"></el-input>
           </el-form-item>
           <el-form-item label="用途">
             <el-input v-model="formShowData.use" type="text" placeholder="请填写">
             </el-input>
           </el-form-item>
           <el-form-item label="详细附件">
-            <el-input v-model="formShowData.detailAnnex" type="text">
+            <el-input v-model="formShowData.annex" type="text">
             </el-input>
+            <el-upload
+              :disabled="acceptShow"
+              multiple
+              ref="uploadFile"
+              :action="actionPath"
+              name="file"
+              :file-list="annexList"
+              accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+              :before-upload="handleBeforeUpload"
+              :before-remove="handleBeforeRemove"
+              :on-success="handleOnsuccess"
+            >
+             <el-button size="small" type="primary">点击上传</el-button>
+            </el-upload>
           </el-form-item>
         </el-form>
       </div>
 
       <div class="demo-drawer-footer">
-        <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
+        <el-button size="small" @click="drawerTable = false">取消</el-button>
-        <el-button size="small" type="primary" @click="submit()">提交</el-button>
+        <el-button size="small" type="primary" :loading="submitLoading" @click="submit()">提交</el-button>
       </div>
 
     </el-drawer>
 
+    <el-dialog
+      :visible.sync="annexDialog"
+      width="30%"
+      :before-close="handleClose">
+      <el-upload
+        :action="''"
+        name="file"
+        :file-list="annexList"
+        :on-preview="handleOnPreview"
+      >
+      </el-upload>
+    </el-dialog>
+
     <!--    <div>
           &lt;!&ndash; 导入弹框 &ndash;&gt;
           <el-dialog
@@ -149,6 +184,7 @@
 </template>
 
 <script>
+import { exportQuery, exportEdit, exportAdd, exportDel } from '@/api/statisticsApi'
 export default {
   name: "child2",
   data() {
@@ -166,15 +202,24 @@ export default {
       tableData: [],
       multipleSelection: [],
       formShowData: {
+        id: '',
         name: '',
-        payMoney: '',
+        money: '',
         use: '',
-        detailAnnex: ''
+        annex: ''
       },
 
       drawerTable: false,
       drawerTitle: '',
       formRules: {},
+      submitLoading: false,
+
+      // 上传路径
+      actionPath: 'api/att/attFile/upload',
+      acceptShow: false,
+      annexDialog: false,
+      annexList: [],
+
     }
   },
 
@@ -183,14 +228,102 @@ export default {
   },
 
   methods: {
+    getTableData() {
+      exportQuery(this.formQuery).then(res=>{
+        this.tableData = res.data.list
+        this.tableTotal = res.data.count
+      })
+    },
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
     //新增方法
+    dataAdd() {
+      this.drawerTitle = '新增'
+      this.formShowData = {}
+      this.drawerTable = true
+    },
+    // 查询按钮
+    queryData() {
+      this.getTableData()
+    },
+    //清空
+    resetForm() {
+      this.formQuery = {}
+      this.getTableData()
+    },
+    // 提交按钮
     submit() {
+      this.$refs['formShowData'].validate((valid) => {
+        if (valid) {
+          this.submitLoading = true
+          if (this.drawerTitle === '新增') {
+            exportAdd(this.formShowData).then(res=>{
+              if (res.ok) {
+                this.$message.success('新增成功')
+                this.submitLoading = false
+                this.getTableData()
+              } else {
+                this.$message.warning('新增失败')
+                this.submitLoading = false
+              }
+              this.drawerTable = false
+            }, e => {
+            })
+          } else {
+            exportEdit(this.formShowData).then(res => {
+              if (res.ok) {
+                this.$message.success('编辑成功')
+                this.submitLoading = false
+                this.getTableData()
+              } else {
+                this.$message.warning('编辑失败')
+                this.submitLoading = false
+              }
+              this.drawerTable = false
+            },e => {
+            })
+          }
+        }
+      })
     },
     //删除方法
     deleteDetail() {
+      if (this.multipleSelection.length > 0) {
+        let msgIds = []
+        for (let i = 0; i < this.multipleSelection.length; i++) {
+          let msgId = this.multipleSelection[i].id
+          msgIds.push(msgId)
+        }
+        let delId = {
+          ids: msgIds.join(',')
+        }
+        this.$confirm('确定删除这些数据?', '提示', {
+          confirmButtonText: this.$t('m.determine'),
+          cancelButtonText: this.$t('m.cancel'),
+          type: 'warning',
+          confirmButtonClass: 'common-button-primary',
+          roundButton: true
+        }).then(() => {
+          exportDel(delId).then(res => {
+            if (res.ok) {
+              this.$message.success('删除成功')
+              this.pageNo = 1
+              this.multipleSelection = ''
+              this.getTableData()
+            } else {
+              this.$message.warning('删除失败')
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          })
+        })
+      } else {
+        this.$message.warning('请选择一条数据进行删除')
+      }
     },
     // 列表更多按钮
     handleCommand(command) {
@@ -199,13 +332,48 @@ export default {
           this.editRowOne(command[0]);
           break;
         case "删除":
-          this.deleteRowOne("delOne", command[0].id);
+          this.deleteRowOne(command[0].id);
           break;
       }
     },
-    editRowOne() {
+    editRowOne(item) {
+      this.drawerTitle = '编辑'
+      this.formShowData = {
+        id: item.id,
+        name: item.name,
+        money: item.money,
+        use: item.use,
+        annex: item.annex
+      }
+      this.drawerTable = true
     },
-    deleteRowOne() {
+    deleteRowOne(val) {
+      let delId = {
+        ids: val
+      }
+      this.$confirm('确定删除这些数据?', '提示', {
+        confirmButtonText: this.$t('m.determine'),
+        cancelButtonText: this.$t('m.cancel'),
+        type: 'warning',
+        confirmButtonClass: 'common-button-primary',
+        roundButton: true
+      }).then(() => {
+        exportDel(delId).then(res => {
+          if (res.ok) {
+            this.$message.success('删除成功')
+            this.pageNo = 1
+            this.multipleSelection = []
+            this.getTableData()
+          } else {
+            this.$message.warning('删除失败')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
     },
     /** 分页  */
     pageChange(page) {
@@ -216,6 +384,81 @@ export default {
       this.formQuery.pageSize = pageSize
       this.getTableData()
     },
+    /** 附件详情 */
+    fileDetail(val) {
+      this.tableFile = val
+      this.annexList = this.tableFile.annex
+      this.annexDialog = true
+      this.acceptShow = true
+
+    },
+    // 文件上传成功
+    handleOnsuccess(res, file, fileList) {
+      if (res.ok) {
+        if (this.annexList !== undefined) {
+          this.newDataList = this.annexList
+          this.newDataList.push({
+            id: res.data.attId,
+            name: res.data.standName
+          })
+        } else {
+          this.newDataList.push({
+            id: res.data.attId,
+            name: res.data.standName
+          })
+        }
+
+        this.tableFile.annex = this.newDataList
+        this.$message({
+          showClose: true,
+          message: res.message,
+          type: 'success'
+        })
+        this.newDataList = []
+        this.fileMadel = false
+      }
+    },
+    // 移除上传的文件
+    handleBeforeRemove(file, fileList) {
+      this.annexList.forEach((item, index) => {
+        if (item.name === file.name || item.id === file.id ) {
+          this.annexList.splice(index,1)
+        }
+      })
+      this.tableFile.annex = this.annexList
+    },
+    // 文件上传限制条件
+    handleBeforeUpload(file) {
+      var filename = file.name
+      var index1 = filename.lastIndexOf('.')
+      var index2 = filename.length
+      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') {
+        return true
+      } else {
+        this.spinShow = false
+        this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+        return false
+      }
+      // 判断文件上传大小
+      // eslint-disable-next-line no-unreachable
+      if (file.size / 1024 / 1024 <= 200) {
+        return true
+      } else {
+        this.$message.error('文件' + file.name + '大小不超过200M')
+        return false
+      }
+      return true
+    },
+    // 点击上传的文件进行下载
+    handleOnPreview(file) {
+      let attId = file.id
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
+    },
   }
 }
 </script>

src/pages/regulatoryRepository/dataStatis/miniPages/inComeSubsidy.vue

@@ -7,18 +7,18 @@
         <el-input v-model="formQuery.name" size="small" placeholder="请输入标准名称"></el-input>
       </el-form-item>
       <el-form-item label="标准编号">
-        <el-input v-model="formQuery.num" size="small" placeholder="请输入标准编号"></el-input>
+        <el-input v-model="formQuery.number" size="small" placeholder="请输入标准编号"></el-input>
       </el-form-item>
       <el-form-item label="补助来源">
         <el-input v-model="formQuery.source" size="small" placeholder="请输入补助来源"></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" size="small" @click="">查询</el-button>
+        <el-button type="primary" size="small" @click="queryData">查询</el-button>
         <el-button type="" size="small" @click="resetForm('formQuery')">清空</el-button>
       </el-form-item>
       <el-divider/>
       <div style="float: left">
-        <el-button type="primary" size="small" @click="drawer1 = true">新增</el-button>
+        <el-button type="primary" size="small" @click="dataAdd">新增</el-button>
         <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>
         <el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>
         <el-button type="danger" size="small" @click="deleteDetail" icon="el-icon-delete">批量删除</el-button>
@@ -56,7 +56,7 @@
         </el-table-column>
         <el-table-column
           align="center"
-          prop="num"
+          prop="number"
           label="标准编号">
         </el-table-column>
         <el-table-column
@@ -66,13 +66,16 @@
         </el-table-column>
         <el-table-column
           align="center"
-          prop="money"
+          prop="cost"
           label="补助金额">
         </el-table-column>
         <el-table-column
           align="center"
           prop="time"
           label="入账时间">
+          <template slot-scope="scope">
+            {{ scope.row.time ? $moment(scope.row.time).format("YYYY-MM-DD HH:mm:ss") : '' }}
+          </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="50" fixed="right">
           <template slot-scope="scope">
@@ -111,25 +114,30 @@
             </el-input>
           </el-form-item>
           <el-form-item label="标准编号">
-            <el-input v-model="formShowData.num" type="text" placeholder="请填写"></el-input>
+            <el-input v-model="formShowData.number" type="text" placeholder="请填写"></el-input>
           </el-form-item>
           <el-form-item label="补助来源">
             <el-input v-model="formShowData.source" type="text" placeholder="请填写">
             </el-input>
           </el-form-item>
           <el-form-item label="补助金额">
-            <el-input v-model="formShowData.money" type="text" placeholder="请填写">
+            <el-input v-model="formShowData.cost" type="text" placeholder="请填写">
             </el-input>
           </el-form-item>
           <el-form-item label="入账时间">
-            <el-input v-model="formShowData.time" type="text" placeholder="请填写">
+            <el-date-picker
-            </el-input>
+              v-model="formShowData.time"
+              type="datetime"
+              format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择日期时间">
+            </el-date-picker>
           </el-form-item>
         </el-form>
       </div>
       <div class="demo-drawer-footer">
-        <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
+        <el-button size="small" @click="drawerTable = false">取消</el-button>
-        <el-button size="small" type="primary" @click="submit()">提交</el-button>
+        <el-button size="small" type="primary" :loading="submitLoading" @click="submit()">提交</el-button>
       </div>
 
     </el-drawer>
@@ -171,6 +179,7 @@
 </template>
 
 <script>
+import { inComeQuery, inComeEdit, inComeAdd, inComeDel } from '@/api/statisticsApi'
 export default {
   name: "child1",
   data() {
@@ -178,7 +187,7 @@ export default {
       loading: false,
       formQuery: {
         name: '',
-        num: '',
+        number: '',
         source: '',
         current: 1,
         page: 1,
@@ -188,33 +197,120 @@ export default {
       tableData: [],
       multipleSelection: [],
       formShowData: {
+        id: '',
         name: '',
-        num: '',
+        number: '',
         source: '',
-        money: '',
+        cost: '',
         time: ''
       },
       drawerTable: false,
       drawerTitle: '',
       formRules: {},
+      submitLoading: false
     }
   },
 
   created() {
-
+    this.getTableData()
   },
   methods: {
+    getTableData() {
+      inComeQuery(this.formQuery).then(res=>{
+        this.tableData = res.data.list
+        this.tableTotal = res.data.count
+      })
+    },
     //新增方法
+    dataAdd() {
+      this.drawerTitle = '新增'
+      this.formShowData = {}
+      this.drawerTable = true
+    },
+    // 提交按钮
     submit() {
+      this.$refs['formShowData'].validate((valid) => {
+        if (valid) {
+          this.submitLoading = true
+          if (this.drawerTitle === '新增') {
+            inComeAdd(this.formShowData).then(res=>{
+              if (res.ok) {
+                this.$message.success('新增成功')
+                this.submitLoading = false
+                this.getTableData()
+              } else {
+                this.$message.warning('新增失败')
+                this.submitLoading = false
+              }
+              this.drawerTable = false
+            }, e => {
+            })
+          } else {
+            inComeEdit(this.formShowData).then(res => {
+              if (res.ok) {
+                this.$message.success('编辑成功')
+                this.submitLoading = false
+                this.getTableData()
+              } else {
+                this.$message.warning('编辑失败')
+                this.submitLoading = false
+              }
+              this.drawerTable = false
+            },e => {
+            })
+          }
+        }
+      })
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val
     },
     //删除方法
     deleteDetail() {
+      if (this.multipleSelection.length > 0) {
+        let msgIds = []
+        for (let i = 0; i < this.multipleSelection.length; i++) {
+          let msgId = this.multipleSelection[i].id
+          msgIds.push(msgId)
+        }
+        let delId = {
+          ids: msgIds.join(',')
+        }
+        this.$confirm('确定删除这些数据?', '提示', {
+          confirmButtonText: this.$t('m.determine'),
+          cancelButtonText: this.$t('m.cancel'),
+          type: 'warning',
+          confirmButtonClass: 'common-button-primary',
+          roundButton: true
+        }).then(() => {
+          inComeDel(delId).then(res => {
+            if (res.ok) {
+              this.$message.success('删除成功')
+              this.pageNo = 1
+              this.multipleSelection = ''
+              this.getTableData()
+            } else {
+              this.$message.warning('删除失败')
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          })
+        })
+      } else {
+        this.$message.warning('请选择一条数据进行删除')
+      }
     },
-    //点击确定（编辑）(没出)
+    // 查询按钮
-    handleSelectionChange() {
+    queryData() {
+      this.getTableData()
     },
     //清空
-    resetForm(formName) {
+    resetForm() {
+      this.formQuery = {}
+      this.getTableData()
     },
     // 列表更多按钮
     handleCommand(command) {
@@ -223,13 +319,50 @@ export default {
           this.editRowOne(command[0]);
           break;
         case "删除":
-          this.deleteRowOne("delOne", command[0].id);
+          this.deleteRowOne(command[0].id);
           break;
       }
     },
-    editRowOne() {
+    editRowOne(item) {
+      this.drawerTitle = '编辑'
+      this.formShowData = {
+        id: item.id,
+        type: item.type,
+        number: item.number,
+        name: item.name,
+        source: item.source,
+        cost: item.cost,
+        time: this.$moment(item.time).format('YYYY-MM-DD HH:mm:ss'),
+      }
+      this.drawerTable = true
     },
-    deleteRowOne() {
+    deleteRowOne(val) {
+      let delId = {
+        ids: val
+      }
+      this.$confirm('确定删除这些数据?', '提示', {
+        confirmButtonText: this.$t('m.determine'),
+        cancelButtonText: this.$t('m.cancel'),
+        type: 'warning',
+        confirmButtonClass: 'common-button-primary',
+        roundButton: true
+      }).then(() => {
+        inComeDel(delId).then(res => {
+          if (res.ok) {
+            this.$message.success('删除成功')
+            this.pageNo = 1
+            this.multipleSelection = []
+            this.getTableData()
+          } else {
+            this.$message.warning('删除失败')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
     },
     /** 分页  */
     pageChange(page) {

src/pages/regulatoryRepository/dataStatis/page/listOfMeeting.vue

@@ -2,37 +2,38 @@
 <template>
   <div id="listOfMeeting" class="child3">
     <!-- 第一第二行表单 -->
-    <el-form :inline="true" :model="formQuery" class="demo-form-inline">
+    <el-form :inline="true" :model="form" class="demo-form-inline">
       <el-form-item label="会议名称">
-        <el-input v-model="formQuery.name" size="small" placeholder="请输入会议名称"></el-input>
+        <el-input v-model="form.meeting" size="small" placeholder="请输入会议名称"></el-input>
       </el-form-item>
       <el-form-item label="会议时间">
-        <el-select v-model="formQuery.time" size="small" placeholder="请选择会议时间">
+        <el-date-picker
-          <el-option label="1" value="one"></el-option>
+                v-model="form.time"
-          <el-option label="2" value="two"></el-option>
+                size="small"
-        </el-select>
+                value-format="yyyy-MM-dd HH:mm:ss"
+                type="datetime"
+                placeholder="请选择会议时间">
+        </el-date-picker>
       </el-form-item>
       <el-form-item label="参加单位">
-        <el-select v-model="formQuery.part" size="small" placeholder="请选择参加单位">
+        <el-input v-model="form.participants" size="small" placeholder="请输入主要议题">
-          <el-option label="1" value="one"></el-option>
+        </el-input>
-          <el-option label="2" value="two"></el-option>
-        </el-select>
       </el-form-item>
       <el-form-item label="主要议题">
-        <el-input v-model="formQuery.theme" size="small" placeholder="请输入主要议题">
+        <el-input v-model="form.issues" size="small" placeholder="请输入主要议题">
         </el-input>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" size="small" @click="">查询</el-button>
+        <el-button type="primary" size="small" @click="queryForm">查询</el-button>
-        <el-button type="" size="small" @click="resetForm('formQuery')">清空</el-button>
+        <el-button type="" size="small" @click="resetForm">清空</el-button>
       </el-form-item>
       <el-divider/>
       <div style="float: left">
-        <el-button type="primary" size="small" @click="drawer = true">新增</el-button>
+        <el-button type="primary" size="small" @click="formDataAdd">新增</el-button>
-        <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>
+<!--        <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>-->
-        <el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>
+<!--        <el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>-->
         <el-button type="danger" size="small" @click="deleteDetail" icon="el-icon-delete">批量删除</el-button>
-        <el-button type="primary" size="small" onclick="">模板下载</el-button>
+<!--        <el-button type="primary" size="small" onclick="">模板下载</el-button>-->
       </div>
     </el-form>
     <el-divider/>
@@ -53,99 +54,91 @@
         </el-table-column>
         <el-table-column
           align="center"
-          type="index"
+          prop="host"
-          label="序号"
-          width="100"
-        >
-        </el-table-column>
-        <el-table-column
-          align="center"
-          prop="holdUnit"
           label="主办单位"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="meetingName"
+          prop="meeting"
           label="会议名称"
           width="150"
         >
         </el-table-column>
-
         <el-table-column
           align="center"
-          prop="meetingTime"
+          prop="time"
           label="会议时间"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="meetingArea"
+          prop="place"
           label="会议地点"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="costStandard"
+          prop="contributions"
           label="会费标准"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="reality"
+          prop="occurs"
           label="会费实际发生"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="costList"
+          prop="expenses"
           label="费用列支"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="partner"
+          prop="user"
           label="参会人员"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="leader"
+          prop="leadership"
           label="主管领导"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="unit"
+          prop="participants"
-          label="参与单位"
+          label="参会单位"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="meetingMeans"
+          prop="information"
           label="会议资料"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="meetingSound"
+          prop="recording"
           label="会议录音"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="meetingTheme"
+          prop="issues"
           label="主要议题"
           width="150"
         >
@@ -156,6 +149,9 @@
               <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="''">
+                    查看
+                  </el-dropdown-item>
                   <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="''">
                     编辑
                   </el-dropdown-item>
@@ -170,114 +166,139 @@
       </el-table>
       <loading :loading="loading">加载中...</loading>
       <pagination
-        :page="formQuery.page"
+        :page="form.page"
         :total="tableTotal"
         @pageChange="pageChange"
         @pageSizeChange="pageSizeChange"/>
     </div>
     <!-- 新增抽屉 -->
     <el-drawer
-      size="50%"
+      size="1000px"
+      :before-close="addDrawerClose"
       :title="drawerTitle"
       :visible.sync="drawerTable">
-      <div style="margin: 10px;">
+      <div class="demo-drawer-content" v-if="drawerTable">
-        <el-form label-width="150px" style="overflow-y: scroll" ref="formShowData" :model="formShowData" :rules="formRules">
+        <div class="content">
-          <el-form-item label="主办单位">
+          <div class="standard-table-search">
-            <el-input v-model="formShowData.holdUnit" type="text" placeholder="请填写"></el-input>
+            <el-row :gutter="24">
-          </el-form-item>
+              <el-col :span="24">
-          <el-form-item label="会议名称">
+                <el-form :model="addForm"  inline class="label-input-form" label-width="180px" :rules="formRules" ref="addForm">
-            <el-input v-model="formShowData.meetingName" type="text" placeholder="请填写"></el-input>
+                  <el-form-item prop="host" label="主办单位" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          </el-form-item>
+                    <el-input
-          <el-form-item label="会议时间">
+                            :disabled="DrawerType === 'see'"
-            <el-select v-model="formShowData.meetingTime" type="text" placeholder="请选择">
+                            v-model="addForm.host"
-              <el-option label="1" value="one"></el-option>
+                            placeholder="请输入主办单位"
-              <el-option label="2" value="two"></el-option>
+                            :maxlength="500"/>
-            </el-select>
+                  </el-form-item>
-          </el-form-item>
+                  <el-form-item prop="meeting" label="会议名称" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-form-item label="会议地点">
+                    <el-input
-            <el-select v-model="formShowData.meetingArea" type="text" placeholder="请填写">
+                            :disabled="DrawerType === 'see'"
-              <el-option label="1" value="one"></el-option>
+                            v-model="addForm.meeting"
-              <el-option label="2" value="two"></el-option>
+                            placeholder="请输入会议名称"
-            </el-select>
+                            :maxlength="500"/>
-          </el-form-item>
+                  </el-form-item>
-          <el-form-item label="会费标准">
+                  <el-form-item label="会议时间" style="width: 100%; margin-right:10px" prop="time" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-select v-model="formShowData.costStandard" placeholder="请选择" type="text">
+                    <el-date-picker
-              <el-option label="1" value="one"></el-option>
+                            v-model="addForm.time"
-              <el-option label="2" value="two"></el-option>
+                            :disabled="DrawerType === 'see'"
-            </el-select>
+                            value-format="yyyy-MM-dd HH:mm:ss"
-          </el-form-item>
+                            type="datetime"
-          <el-form-item label="会费实际发生">
+                            placeholder="请选择会议时间">
-            <el-select v-model="formShowData.reality" placeholder="请选择">
+                    </el-date-picker>
-              <el-option label="1" value="one"></el-option>
+                  </el-form-item>
-              <el-option label="2" value="two"></el-option>
+                  <el-form-item prop="place" label="会议地点" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            </el-select>
+                    <el-input
-          </el-form-item>
+                            :disabled="DrawerType === 'see'"
-          <el-form-item label="费用列支">
+                            v-model="addForm.place"
-            <el-select v-model="formShowData.costList" placeholder="请选择">
+                            placeholder="请输入会议地点"
-              <el-option label="1" value="one"></el-option>
+                            :maxlength="500"/>
-              <el-option label="2" value="two"></el-option>
+                  </el-form-item>
-            </el-select>
+                  <el-form-item prop="contributions" label="会费标准" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          </el-form-item>
+                    <el-input
-          <el-form-item label="参会人员">
+                            :disabled="DrawerType === 'see'"
-            <el-input v-model="formShowData.partner" type="text" placeholder="请填写"></el-input>
+                            v-model="addForm.contributions"
-          </el-form-item>
+                            placeholder="请输入会费标准"
-          <el-form-item label="主管领导">
+                            :maxlength="500"/>
-            <el-input v-model="formShowData.leader" placeholder="请填写">
+                  </el-form-item>
-            </el-input>
+                  <el-form-item prop="occurs" label="会费实际发生" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          </el-form-item>
+                    <el-input
-          <el-form-item label="参与单位">
+                            :disabled="DrawerType === 'see'"
-            <el-input v-model="formShowData.unit" type="text" placeholder="请填写"></el-input>
+                            v-model="addForm.occurs"
-          </el-form-item>
+                            placeholder="请输入会费实际发生"
-          <el-form-item label="会议录音">
+                            :maxlength="500"/>
-            <el-input v-model="formShowData.meetingSound" type="text" placeholder="请填写"></el-input>
+                  </el-form-item>
-          </el-form-item>
+                  <el-form-item prop="expenses" label="费用列支" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-form-item label="主要议题">
+                    <el-input
-            <el-input v-model="formShowData.meetingTheme" type="text" placeholder="请填写"></el-input>
+                            :disabled="DrawerType === 'see'"
-          </el-form-item>
+                            v-model="addForm.expenses"
-        </el-form>
+                            placeholder="请输入费用列支"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="user" label="参会人员" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.user"
+                            placeholder="请输入参会人员"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="leadership" label="主管领导" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.leadership"
+                            placeholder="请输入主管领导"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="participants" label="参会单位" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.participants"
+                            placeholder="请输入参会单位"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="information" label="会议资料" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.information"
+                            placeholder="请输入会议资料"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="recording" label="会议录音" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.recording"
+                            placeholder="请输入会议录音"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="issues" label="主要议题" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.issues"
+                            placeholder="请输入主要议题"
+                            :maxlength="500"/>
+                  </el-form-item>
+                </el-form>
+              </el-col>
+            </el-row>
+          </div>
+        </div>
       </div>
-      <div class="demo-drawer-footer">
+      <div class="demo-drawer-footer" v-if="DrawerType !== 'see'">
-        <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
+        <el-button
-        <el-button size="small" type="primary" @click="submit()">提交</el-button>
+                size="mini"
+                class="common-button-primary"
+                icon="el-icon-check"
+                type="primary"
+                :loading="subLoading"
+                @click="submit">提交
+        </el-button>
+        <el-button
+                size="mini"
+                class="common-button-default"
+                icon="el-icon-close"
+                @click="addDrawerClose">取消</el-button>
       </div>
-
     </el-drawer>
-
-    <!--    <div>
-          &lt;!&ndash; 导入弹框 &ndash;&gt;
-          <el-dialog
-              title="导入文件"
-              :visible.sync="dialogVisible1"
-              width="30%"
-          >
-            <el-button  class="leading-in">点击或拖拽上传文件</el-button>
-          </el-dialog>
-          &lt;!&ndash;   导出弹框 &ndash;&gt;
-          <el-dialog
-              title="导出文件"
-              :visible.sync="dialogVisible2"
-              width="30%"
-          >
-            <el-form :model="formInlineOut">
-              <el-form-item label="名称" >
-                <el-input v-model="formInlineOut.name" style="width:350px"></el-input>
-              </el-form-item>
-              <el-form-item label="序号" >
-                <el-input v-model="formInlineOut.num" style="width:350px"></el-input>
-              </el-form-item>
-              <el-form-item label="备注" >
-                <el-input v-model="formInlineOut.remarks" style="width:350px"></el-input>
-              </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-            <el-button @click="dialogVisible2 = false">取 消</el-button>
-            <el-button type="primary" @click="dialogVisible2 = false">确 定</el-button>
-          </span>
-          </el-dialog>
-        </div>-->
   </div>
-
-
 </template>
 
 <script>
@@ -285,79 +306,249 @@ export default {
   name: "child3",
   data() {
     return {
+      subLoading: false,
       loading: false,
-      formQuery: {
+      form: {
-        name: '',
+        meeting: '',
         time: '',
-        part: '',
+        participants: '',
-        theme: '',
+        issues: '',
-        current: 1,
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
       },
       tableTotal: 0,
       tableData: [],
       multipleSelection: [],
-      formShowData: {
+      addForm: {
-        holdUnit: '',
+        host: '',
-        mneetingName: '',
+        meeting: '',
-        meetingTime: '',
+        time: '',
-        meetingArea: '',
+        place: '',
-        costStandard: '',
+        contributions: '',
-        reality: '',
+        occurs: '',
-        costList: '',
+        expenses: '',
-        partner: '',
+        user: '',
-        leader: '',
+        leadership: '',
-        unit: '',
+        participants: '',
-        meetingMeans: '',
+        information: '',
-        meetingSound: '',
+        recording: '',
-        meetingTheme: ''
+        issues: '',
+      },
+      formRules: {
+        host: [
+          {required: true, message: '请输入主办单位', trigger: 'blur'},
+        ],
+        meeting: [
+          {required: true, message: '请输入会议名称', trigger: 'blur'},
+        ],
+        time: [
+          {required: true, message: '请选择会议时间', trigger: 'change'},
+        ],
+        place: [
+          {required: true, message: '请输入会议地点', trigger: 'blur'},
+        ],
+        contributions: [
+          {required: true, message: '请输入会费标准', trigger: 'blur'},
+        ],
+        occurs: [
+          {required: true, message: '请输入会费实际发生', trigger: 'blur'},
+        ],
+        expenses: [
+          {required: true, message: '请输入费用列支', trigger: 'blur'},
+        ],
+        user: [
+          {required: true, message: '请输入参会人员', trigger: 'blur'},
+        ],
+        leadership: [
+          {required: true, message: '请输入主管领导', trigger: 'blur'},
+        ],
+        participants: [
+          {required: true, message: '请输入参会单位', trigger: 'blur'},
+        ],
+        information: [
+          {required: true, message: '请输入会议资料', trigger: 'blur'},
+        ],
+        recording: [
+          {required: true, message: '请输入会议录音', trigger: 'blur'},
+        ],
+        issues: [
+          {required: true, message: '请输入主要议题', trigger: 'blur'},
+        ],
       },
-      formRules: {},
-
       drawerTitle: '',
       drawerTable: false,
-
+      DrawerType: '',
     }
   },
-
+  mounted () {
-  created() {
+    this.getData()
-    console.log(4)
   },
-
   methods: {
+    formDataAdd () {
+      this.DrawerType = 'add'
+      this.drawerTitle = '新增'
+      this.drawerTable = true
+    }, // 新增
+    queryForm () {
+      this.form.page = 1
+      this.getData()
+    }, // 查询
+    getData () {
+      this.loading = true
+      this.$http.get('wgdCensusLeo/wgd-wbtj/queryAllWbtjs', this.form, {
+        _this: this
+      }, res => {
+        this.loading = false
+        if (res.ok) {
+          this.tableData = res.data.list
+          this.tableTotal = res.data.count
+        }
+      })
+    }, // 获取数据
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
-    //新增方法
     submit() {
-    },
+      this.$refs['addForm'].validate((valid) => {
-    //删除方法
+        if (valid) {
-    deleteDetail() {},
+          this.subLoading = true
-    //清空
+          let url = ''
-    resetForm() {},
+          let tips = ''
-
+          if (this.DrawerType === 'edit') {
+            url = 'wgdCensusLeo/wgd-wbtj/modWbtj'
+            tips = '编辑'
+          }else if (this.DrawerType === 'add') {
+            url = 'wgdCensusLeo/wgd-wbtj/addWbtj'
+            tips = '添加'
+          }
+          this.$http.post(url, this.addForm, {
+            _this: this
+          }, res => {
+            this.subLoading = false
+            if (res.ok) {
+              this.drawerTable = false
+              this.$message.success(tips + '成功')
+              this.getData()
+            } else {
+              this.$message.warning(tips + '失败')
+            }
+          })
+        } else {
+          this.$message.warning('请检查表单是否填写正确')
+        }
+      })
+    }, // 提交
+    addDrawerClose () {
+      this.addForm = {}
+      this.drawerTable = false
+    },// 关闭
+    deleteDetail() {
+      if (this.multipleSelection.length) {
+        this.$confirm('您是否确认删除选中数据?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+          confirmButtonClass: 'common-button-primary',
+          roundButton: true
+        }).then(() => {
+          let ids = ''
+          this.multipleSelection.forEach(item => {
+            if (ids.length > 0) {
+              ids += ','
+              ids += item.id
+            } else {
+              ids = item.id
+            }
+          })
+          this.$http.post('wgdCensusLeo/wgd-wbtj/delWbtjs', {
+            ids: ids
+          }, {
+            _this: this
+          }, res => {
+            if (res.ok) {
+              this.$message.success('删除成功')
+              this.form.page = 1
+              this.getData()
+            } else {
+              this.$message.warning('删除失败')
+            }
+          })
+        }).catch(() => {})
+      } else {
+        this.$message.warning('请选择要删除的数据')
+      }
+    }, //删除方法
+    resetForm() {
+      this.form.meeting = ''
+      this.form.time = ''
+      this.form.participants = ''
+      this.form.issues = ''
+      this.form.page = 1
+      this.getData()
+    }, //清空
     // 列表更多按钮
     handleCommand(command) {
       switch (command[1]) {
+        case "查看":
+          this.drawerTitle = '查看'
+          this.DrawerType = 'see'
+          this.drawerTable = true
+          this.addForm = command[0]
+          break
         case "编辑":
-          this.editRowOne(command[0]);
+          this.DrawerType = 'edit'
+          this.drawerTitle = '编辑'
+          this.drawerTable = true
+          this.addForm = {
+            id: command[0].id,
+            host: command[0].host,
+            meeting: command[0].meeting,
+            time: this.$moment(command[0].time).format("YYYY-MM-DD HH:mm:ss"),
+            place: command[0].place,
+            contributions: command[0].contributions,
+            occurs: command[0].occurs,
+            expenses: command[0].expenses,
+            user: command[0].user,
+            leadership: command[0].leadership,
+            participants: command[0].participants,
+            information: command[0].information,
+            recording: command[0].recording,
+            issues: command[0].issues,
+          }
           break;
         case "删除":
-          this.deleteRowOne("delOne", command[0].id);
+          this.$confirm('您是否确认删除选中数据?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+            confirmButtonClass: 'common-button-primary',
+            roundButton: true
+          }).then(() => {
+            this.$http.post('wgdCensusLeo/wgd-wbtj/delWbtjs', {
+              ids: command[0].id
+            }, {
+              _this: this
+            }, res => {
+              if (res.ok) {
+                this.$message.success('删除成功')
+                this.form.page = 1
+                this.getData()
+              } else {
+                this.$message.warning('删除失败')
+              }
+            })
+          }).catch(() => {})
           break;
       }
     },
-    editRowOne() {},
-    deleteRowOne() {},
     /** 分页  */
     pageChange(page) {
-      this.formQuery.page = page
+      this.form.page = page
-      this.getTableData()
+      this.getData()
     },
     pageSizeChange(pageSize) {
-      this.formQuery.pageSize = pageSize
+      this.form.pageSize = pageSize
-      this.getTableData()
+      this.getData()
     },
   }
 }
@@ -368,7 +559,11 @@ export default {
   height: 100%;
   display: flex;
   flex-direction: column;
-
+  .add-form-item {
+    /deep/.el-form-item__content {
+      width: calc(~'100% - 180px');
+    }
+  }
   .pagination {
     position: inherit!important;
   }

src/pages/regulatoryRepository/dataStatis/page/listOfStandard.vue

@@ -2,36 +2,30 @@
 <template>
   <div id="listOfStandard" class="child4">
     <!-- 第一第二行表单 -->
-    <el-form :inline="true" :model="formQuery" class="demo-form-inline">
+    <el-form :inline="true" :model="form" class="demo-form-inline">
       <el-form-item label="标准编号">
-        <el-input v-model="formQuery.num" size="small" placeholder="请输入标准编号"></el-input>
+        <el-input v-model="form.number" size="small" placeholder="请输入标准编号"></el-input>
       </el-form-item>
       <el-form-item label="标准名称">
-        <el-select v-model="formQuery.name" size="small" placeholder="请选择标准名称"></el-select>
+        <el-input v-model="form.name" size="small" placeholder="请输入标准名称"></el-input>
-        <el-option label="1" value="one"></el-option>
-        <el-option label="2" value="two"></el-option>
       </el-form-item>
       <el-form-item label="标准制/修订">
-        <el-select v-model="formQuery.revise" size="small" placeholder="请选择标准制/修订">
+        <el-input v-model="form.revised" size="small" placeholder="请输入标准制/修订"></el-input>
-          <el-option label="1" value="one"></el-option>
-          <el-option label="2" value="two"></el-option>
-        </el-select>
       </el-form-item>
       <el-form-item label="主持/参与">
-        <el-input v-model="formQuery.directPartner" size="small" placeholder="请选择主持/参与">
+        <el-input v-model="form.preside" size="small" placeholder="请输入标主持/参与"></el-input>
-        </el-input>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" size="small" @click="">查询</el-button>
+        <el-button type="primary" size="small" @click="queryForm">查询</el-button>
-        <el-button type="" size="small" @click="resetForm('formQuery')">清空</el-button>
+        <el-button type="" size="small" @click="resetForm">清空</el-button>
       </el-form-item>
       <el-divider/>
       <div style="float: left">
-        <el-button type="primary" size="small" @click="drawer = true">新增</el-button>
+        <el-button type="primary" size="small" @click="formDataAdd">新增</el-button>
-        <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>
+<!--        <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>-->
-        <el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>
+<!--        <el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>-->
         <el-button type="danger" size="small" @click="deleteDetail" icon="el-icon-delete">批量删除</el-button>
-        <el-button type="primary" size="small" onclick="">模板下载</el-button>
+<!--        <el-button type="primary" size="small" onclick="">模板下载</el-button>-->
       </div>
     </el-form>
     <el-divider/>
@@ -51,14 +45,6 @@
           align="center"
           type="selection"
           width="50">
-        </el-table-column>
-        <el-table-column
-          align="center"
-          type="index"
-          label="序号"
-          width="50"
-        >
-
         </el-table-column>
         <el-table-column
           align="center"
@@ -69,145 +55,140 @@
         </el-table-column>
         <el-table-column
           align="center"
-          prop="standardNum"
+          prop="number"
           label="标准号"
           width="150"
         >
         </el-table-column>
-
         <el-table-column
           align="center"
-          prop="standardName"
+          prop="name"
           label="标准名称"
           width="150"
         >
-
         </el-table-column>
         <el-table-column
           align="center"
-          prop="codeNum"
+          prop="projectId"
           label="项目代号"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="codeName"
+          prop="projectName"
           label="项目名称"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="standardType"
+          prop="type"
           label="标准类型"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="directPartner"
+          prop="preside"
           label="主持或参与"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="startTime"
+          prop="dataStart"
           label="发布日期"
           width="150"
         >
-          <template slot-scope="scope">{{ scope.row.date }}</template>
         </el-table-column>
         <el-table-column
           align="center"
-          prop="putTime"
+          prop="dataImplement"
           label="实施日期"
           width="150"
         >
-          <template slot-scope="scope">{{ scope.row.date }}</template>
         </el-table-column>
         <el-table-column
           align="center"
-          prop="organ"
+          prop="body"
           label="颁布机构"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="headDraft"
+          prop="drafting"
           label="牵头起草单位"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="recordTime"
+          prop="dataRecord"
           label="备案时间"
           width="150"
         >
-          <template slot-scope="scope">{{ scope.row.date }}</template>
         </el-table-column>
         <el-table-column
           align="center"
-          prop="putUnit"
+          prop="report"
           label="提报单位名称"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="partner"
+          prop="participants"
           label="参与人"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="writer"
+          prop="celebrity"
           label="署名人"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="standardCost"
+          prop="costMarking"
           label="制标费用"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="elseCost"
+          prop="costOther"
           label="其他费用"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="revise"
+          prop="revised"
           label="标准制/修订"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="prize"
+          prop="status"
           label="获奖情况"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="writerSort"
+          prop="signature"
           label="署名排序"
           width="150"
         >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="remarks"
+          prop="remark"
           label="备注"
           width="150"
         >
@@ -218,6 +199,9 @@
               <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="''">
+                    查看
+                  </el-dropdown-item>
                   <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="''">
                     编辑
                   </el-dropdown-item>
@@ -232,153 +216,199 @@
       </el-table>
       <loading :loading="loading">加载中...</loading>
       <pagination
-        :page="formQuery.page"
+        :page="form.page"
         :total="tableTotal"
         @pageChange="pageChange"
         @pageSizeChange="pageSizeChange"/>
     </div>
     <!-- 新增抽屉 -->
     <el-drawer
-      size="50%"
+            size="1000px"
-      :title="drawerTitle"
+            :before-close="addDrawerClose"
-      :visible.sync="drawerTable">
+            :title="drawerTitle"
-      <div style="margin: 10px;">
+            :visible.sync="drawerTable">
-        <el-form label-width="150px" style="overflow-y: scroll" ref="formShowData" :model="formShowData" :rules="formRules">
+      <div class="demo-drawer-content" v-if="drawerTable">
-          <el-form-item label="所处阶段">
+        <div class="content">
-            <el-select v-model="formShowData.stage" type="text" placeholder="请填写">
+          <div class="standard-table-search">
-              <el-option label="1" value="one"></el-option>
+            <el-row :gutter="24">
-              <el-option label="2" value="two"></el-option>
+              <el-col :span="24">
-            </el-select>
+                <el-form :model="addForm"  inline class="label-input-form" label-width="180px" :rules="formRules" ref="addForm">
-          </el-form-item>
+                  <el-form-item prop="stage" label="所处阶段" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-form-item label="标准号">
+                    <el-input
-            <el-input v-model="formShowData.standardNum" type="text" placeholder="请填写"></el-input>
+                            :disabled="DrawerType === 'see'"
-          </el-form-item>
+                            v-model="addForm.stage"
-          <el-form-item label="标准名称">
+                            placeholder="请输入所处阶段"
-            <el-input v-model="formShowData.standardName" type="text" placeholder="请填写">
+                            :maxlength="500"/>
-            </el-input>
+                  </el-form-item>
-          </el-form-item>
+                  <el-form-item prop="number" label="标准号" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          <el-form-item label="标准类型">
+                    <el-input
-            <el-select v-model="formShowData.standardType" type="text" placeholder="请选择">
+                            :disabled="DrawerType === 'see'"
-              <el-option label="1" value="one"></el-option>
+                            v-model="addForm.number"
-              <el-option label="2" value="two"></el-option>
+                            placeholder="请输入标准号"
-            </el-select>
+                            :maxlength="500"/>
-          </el-form-item>
+                  </el-form-item>
-          <el-form-item label="主持或参与">
+                  <el-form-item prop="name" label="标准名称" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-select v-model="formShowData.directPartner" placeholder="请选择" type="text">
+                    <el-input
-              <el-option label="1" value="one"></el-option>
+                            :disabled="DrawerType === 'see'"
-              <el-option label="2" value="two"></el-option>
+                            v-model="addForm.name"
-            </el-select>
+                            placeholder="请输入标准名称"
-          </el-form-item>
+                            :maxlength="500"/>
-          <el-form-item label="发布日期">
+                  </el-form-item>
-            <el-select v-model="formShowData.startTime" placeholder="请选择">
+                  <el-form-item prop="projectId" label="项目代号" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-              <el-option label="1" value="one"></el-option>
+                    <el-input
-              <el-option label="2" value="two"></el-option>
+                            :disabled="DrawerType === 'see'"
-            </el-select>
+                            v-model="addForm.projectId"
-          </el-form-item>
+                            placeholder="请输入项目代号"
-          <el-form-item label="实施日期">
+                            :maxlength="500"/>
-            <el-select v-model="formShowData.putTime" placeholder="请选择">
+                  </el-form-item>
-              <el-option label="1" value="one"></el-option>
+                  <el-form-item prop="projectName" label="项目名称" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-              <el-option label="2" value="two"></el-option>
+                    <el-input
-            </el-select>
+                            :disabled="DrawerType === 'see'"
-          </el-form-item>
+                            v-model="addForm.projectName"
-          <el-form-item label="颁布机构">
+                            placeholder="请输入项目名称"
-            <el-input v-model="formShowData.organ" type="text" placeholder="请填写"></el-input>
+                            :maxlength="500"/>
-          </el-form-item>
+                  </el-form-item>
-          <el-form-item label="牵头起草单位">
+                  <el-form-item prop="type" label="标准类型" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-input v-model="formShowData.headDraft" placeholder="请填写">
+                    <el-input
-            </el-input>
+                            :disabled="DrawerType === 'see'"
-          </el-form-item>
+                            v-model="addForm.type"
-          <el-form-item label="备案时间">
+                            placeholder="请输入标准类型"
-            <el-input v-model="formShowData.recordTime" type="text" placeholder="请填写"></el-input>
+                            :maxlength="500"/>
-          </el-form-item>
+                  </el-form-item>
-          <el-form-item label="提报单位名称">
+                  <el-form-item prop="preside" label="主持或参与" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-            <el-input v-model="formShowData.putUnit" type="text" placeholder="请填写"></el-input>
+                    <el-input
-          </el-form-item>
+                            :disabled="DrawerType === 'see'"
-          <el-form-item label="参与人">
+                            v-model="addForm.preside"
-            <el-select v-model="formShowData.partner" type="text" placeholder="请填写">
+                            placeholder="请输入主持或参与"
-              <el-option label="1" value="one"></el-option>
+                            :maxlength="500"/>
-              <el-option label="2" value="two"></el-option>
+                  </el-form-item>
-            </el-select>
+                  <el-form-item prop="dataStart" label="发布日期" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          </el-form-item>
+                    <el-date-picker
-          <el-form-item label="标准制/修订">
+                            v-model="addForm.dataStart"
-            <el-select v-model="formShowData.revise" type="text" placeholder="请填写">
+                            :disabled="DrawerType === 'see'"
-              <el-option label="1" value="one"></el-option>
+                            value-format="yyyy-MM-dd"
-              <el-option label="2" value="two"></el-option>
+                            type="date"
-            </el-select>
+                            placeholder="请选择发布日期">
-          </el-form-item>
+                    </el-date-picker>
-          <el-form-item label="获奖情况">
+                  </el-form-item>
-            <el-input v-model="formShowData.prize" type="text" placeholder="请填写"></el-input>
+                  <el-form-item prop="dataImplement" label="实施日期" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-          </el-form-item>
+                    <el-date-picker
-          <el-form-item label="署名排序">
+                            v-model="addForm.dataImplement"
-            <el-input v-model="formShowData.writerSort" type="text" placeholder="请填写"></el-input>
+                            :disabled="DrawerType === 'see'"
-          </el-form-item>
+                            value-format="yyyy-MM-dd"
-          <el-form-item label="备注">
+                            type="date"
-            <el-input v-model="formShowData.remarks" type="text" placeholder="请填写"></el-input>
+                            placeholder="请选择实施日期">
-          </el-form-item>
+                    </el-date-picker>
-        </el-form>
+                  </el-form-item>
-      </div>
+                  <el-form-item prop="body" label="颁布机构" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-      <div class="demo-drawer-footer">
+                    <el-input
-        <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
+                            :disabled="DrawerType === 'see'"
-        <el-button size="small" type="primary" @click="submit()">提交</el-button>
+                            v-model="addForm.body"
+                            placeholder="请输入颁布机构"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="drafting" label="牵头起草单位" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.drafting"
+                            placeholder="请输入牵头起草单位"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="dataRecord" label="备案时间" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-date-picker
+                            v-model="addForm.dataRecord"
+                            :disabled="DrawerType === 'see'"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            type="datetime"
+                            placeholder="请选择备案时间">
+                    </el-date-picker>
+                  </el-form-item>
+                  <el-form-item prop="report" label="提报单位名称" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.report"
+                            placeholder="请输入提报单位名称"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="participants" label="参与人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.participants"
+                            placeholder="请输入参与人"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="celebrity" label="署名人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.celebrity"
+                            placeholder="请输入署名人"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="costMarking" label="制标费用" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.costMarking"
+                            placeholder="请输入制标费用"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="costOther" label="其他费用" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.costOther"
+                            placeholder="请输入其他费用"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="revised" label="标准制/修订" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.revised"
+                            placeholder="请输入标准制/修订"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="status" label="获奖情况" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.status"
+                            placeholder="请输入获奖情况"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="signature" label="署名排序" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.signature"
+                            placeholder="请输入署名排序"
+                            :maxlength="500"/>
+                  </el-form-item>
+                  <el-form-item prop="remark" label="备注" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                    <el-input
+                            :disabled="DrawerType === 'see'"
+                            v-model="addForm.remark"
+                            placeholder="请输入备注"
+                            :maxlength="500"/>
+                  </el-form-item>
+                </el-form>
+              </el-col>
+            </el-row>
+          </div>
+        </div>
       </div>
+      <div class="demo-drawer-footer" v-if="DrawerType !== 'see'">
+          <el-button
+                  size="mini"
+                  class="common-button-primary"
+                  icon="el-icon-check"
+                  type="primary"
+                  :loading="subLoading"
+                  @click="submit">提交
+          </el-button>
+          <el-button
+                  size="mini"
+                  class="common-button-default"
+                  icon="el-icon-close"
+                  @click="addDrawerClose">取消</el-button>
+        </div>
     </el-drawer>
-
-
-    <!--    <div>
-          &lt;!&ndash; 导入弹框 &ndash;&gt;
-          <el-dialog
-              title="导入文件"
-              :visible.sync="dialogVisible1"
-              width="30%"
-          >
-            <el-button  class="leading-in">点击或拖拽上传文件</el-button>
-          </el-dialog>
-          &lt;!&ndash;   导出弹框 &ndash;&gt;
-          <el-dialog
-              title="导出文件"
-              :visible.sync="dialogVisible2"
-              width="30%"
-          >
-            <el-form :model="formInlineOut">
-              <el-form-item label="名称" >
-                <el-input v-model="formInlineOut.name" style="width:350px"></el-input>
-              </el-form-item>
-              <el-form-item label="序号" >
-                <el-input v-model="formInlineOut.num" style="width:350px"></el-input>
-              </el-form-item>
-              <el-form-item label="备注" >
-                <el-input v-model="formInlineOut.remarks" style="width:350px"></el-input>
-              </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-            <el-button @click="dialogVisible2 = false">取 消</el-button>
-            <el-button type="primary" @click="dialogVisible2 = false">确 定</el-button>
-          </span>
-          </el-dialog>
-          &lt;!&ndash;  删除提示弹框  &ndash;&gt;
-          <el-dialog
-              :visible.sync="dialogVisible3"
-              width="30%"
-              title="提 示："
-              height="100px"
-          >
-          <span >
-            <div class="icon">
-            <svg t="1628502929427" class="icon" viewBox="0 0 1024 1024" version="1.1"
-                 xmlns="http://www.w3.org/2000/svg" p-id="1418" width="200" height="200">
-              <path d="M512 1024A512 512 0 1 1 512 0a512 512 0 0 1 0 1024z m48-784a48 48 0 0 0-96 0v352a48 48 0 0 0 96 0v-352zM512 736A48 48 0 1 0 512 832a48 48 0 0 0 0-96z" p-id="1419" fill="#d81e06">
-              </path>
-            </svg></div>
-            确认删除这些数据？</span>
-            <span slot="footer" class="dialog-footer">
-            <el-button @click="dialogVisible3 = false">不用了</el-button>
-            <el-button type="primary" @click="dialogVisible3 = false">好  的</el-button>
-          </span>
-          </el-dialog>
-        </div>-->
   </div>
-
-
 </template>
 
 <script>
@@ -386,89 +416,289 @@ export default {
   name: "child4",
   data() {
     return {
+      subLoading: false,
       loading: false,
-      formQuery: {
+      form: {
-        num: '',
+        number: '',
         name: '',
-        revise: '',
+        revised: '',
-        directPartner: '',
+        preside: '',
-        current: 1,
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
-
       },
       tableTotal: 0,
       tableData: [],
       multipleSelection: [],
-
+      addForm: {
-      formShowData: {
         stage: '',
-        standardNum: '',
+        number: '',
-        standardName: '',
+        name: '',
-        codeNum: '',
+        projectId: '',
-        codeName: '',
+        projectName: '',
-        standardType: '',
+        type: '',
-        directPartner: '',
+        preside: '',
-        startTime: '',
+        dataStart: '',
-        putTime: '',
+        dataImplement: '',
-        organ: '',
+        body: '',
-        headDraft: '',
+        drafting: '',
-        recordTime: '',
+        dataRecord: '',
-        putUnit: '',
+        report: '',
-        partner: '',
+        participants: '',
-        writer: '',
+        celebrity: '',
-        standardCost: '',
+        costMarking: '',
-        elseCost: '',
+        costOther: '',
-        revise: '',
+        revised: '',
-        prize: '',
+        status: '',
-        writerSort: '',
+        signature: '',
-        remarks: ''
+        remark: '',
       },
-
       drawerTitle: '',
       drawerTable: false,
-      formRules: {}
+      formRules: {
+        stage:  [
+          {required: true, message: '请输入所处阶段', trigger: 'blur'},
+        ],
+        number: [
+          {required: true, message: '请输入标准号', trigger: 'blur'},
+        ],
+        name: [
+          {required: true, message: '请输入标准名称', trigger: 'blur'},
+        ],
+        projectId: [
+          {required: true, message: '请输入项目代号', trigger: 'blur'},
+        ],
+        projectName: [
+          {required: true, message: '请输入项目名称', trigger: 'blur'},
+        ],
+        type: [
+          {required: true, message: '请输入标准类型', trigger: 'blur'},
+        ],
+        preside: [
+          {required: true, message: '请输入主持或参与', trigger: 'blur'},
+        ],
+        dataStart: [
+          {required: true, message: '请选择发布日期', trigger: 'change'},
+        ],
+        dataImplement: [
+          {required: true, message: '请选择实施日期', trigger: 'change'},
+        ],
+        body: [
+          {required: true, message: '请输入颁布机构', trigger: 'blur'},
+        ],
+        drafting: [
+          {required: true, message: '请输入牵头起草单位', trigger: 'blur'},
+        ],
+        dataRecord: [
+          {required: true, message: '请选择备案时间', trigger: 'change'},
+        ],
+        report: [
+          {required: true, message: '请输入提报单位名称', trigger: 'blur'},
+        ],
+        participants: [
+          {required: true, message: '请输入参与人', trigger: 'blur'},
+        ],
+        celebrity: [
+          {required: true, message: '请输入署名人', trigger: 'blur'},
+        ],
+        costMarking: [
+          {required: true, message: '请输入制标费用', trigger: 'blur'},
+        ],
+        costOther: [
+          {required: true, message: '请输入其他费用', trigger: 'blur'},
+        ],
+        revised: [
+          {required: true, message: '请输入标准制/修订', trigger: 'blur'},
+        ],
+        status: [
+          {required: true, message: '请输入获奖情况', trigger: 'blur'},
+        ],
+        signature: [
+          {required: true, message: '请输入署名排序', trigger: 'blur'},
+        ],
+        remark: [
+          {required: true, message: '请输入备注', trigger: 'blur'},
+        ],
+      },
+      DrawerType: '',
     }
   },
-
+  mounted () {
-  created() {
+    this.getData()
-    console.log(3)
   },
-
   methods: {
+    formDataAdd () {
+      this.DrawerType = 'add'
+      this.drawerTitle = '新增'
+      this.drawerTable = true
+    }, // 新增
+    getData () {
+      this.loading = true
+      this.$http.get('wgdCensusLeo/wgd-wbxd/queryAllWbxds', this.form, {
+        _this: this
+      }, res => {
+        this.loading = false
+        if (res.ok) {
+          this.tableData = res.data.list
+          this.tableTotal = res.data.count
+        }
+      })
+    }, // 获取数据
+    queryForm () {
+      this.form.page = 1
+      this.getData()
+    }, // 查询
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
-    //新增方法
+    submit () {
-    submit: function () {},
+      this.$refs['addForm'].validate((valid) => {
-    //删除方法
+        if (valid) {
-    deleteDetail: function (index, rows) {},
+          this.subLoading = true
-
+          let url = ''
-    //清空
+          let tips = ''
-    resetForm(formName) {},
+          if (this.DrawerType === 'edit') {
-
+            url = 'wgdCensusLeo/wgd-wbxd/modWbxd'
-
+            tips = '编辑'
+          }else if (this.DrawerType === 'add') {
+            url = 'wgdCensusLeo/wgd-wbxd/addWbxd'
+            tips = '添加'
+          }
+          this.$http.post(url, this.addForm, {
+            _this: this
+          }, res => {
+            this.subLoading = false
+            if (res.ok) {
+              this.drawerTable = false
+              this.$message.success(tips + '成功')
+              this.getData()
+            } else {
+              this.$message.warning(tips + '失败')
+            }
+          })
+        } else {
+          this.$message.warning('请检查表单是否填写正确')
+        }
+      })
+    }, // 提交
+    addDrawerClose () {
+      this.addForm = {}
+      this.drawerTable = false
+    }, // 关闭
+    deleteDetail () {
+      if (this.multipleSelection.length) {
+        this.$confirm('您是否确认删除选中数据?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+          confirmButtonClass: 'common-button-primary',
+          roundButton: true
+        }).then(() => {
+          let ids = ''
+          this.multipleSelection.forEach(item => {
+            if (ids.length > 0) {
+              ids += ','
+              ids += item.id
+            } else {
+              ids = item.id
+            }
+          })
+          this.$http.post('wgdCensusLeo/wgd-wbxd/delWbxds', {
+            ids: ids
+          }, {
+            _this: this
+          }, res => {
+            if (res.ok) {
+              this.$message.success('删除成功')
+              this.form.page = 1
+              this.getData()
+            } else {
+              this.$message.warning('删除失败')
+            }
+          })
+        }).catch(() => {})
+      } else {
+        this.$message.warning('请选择要删除的数据')
+      }
+    }, //删除方法
+    resetForm () {
+      this.form.number = ''
+      this.form.name = ''
+      this.form.revised = ''
+      this.form.preside = ''
+      this.form.page = 1
+      this.getData()
+    }, //清空
     // 列表更多按钮
     handleCommand(command) {
       switch (command[1]) {
+        case "查看":
+          this.drawerTitle = '查看'
+          this.DrawerType = 'see'
+          this.drawerTable = true
+          this.addForm = command[0]
+          break
         case "编辑":
-          this.editRowOne(command[0]);
+          this.DrawerType = 'edit'
+          this.drawerTitle = '编辑'
+          this.drawerTable = true
+          this.addForm = {
+            id: command[0].id,
+            stage: command[0].stage,
+            number: command[0].number,
+            name: command[0].name,
+            projectId: command[0].projectId,
+            projectName: command[0].projectName,
+            type: command[0].type,
+            preside: command[0].preside,
+            dataStart: this.$moment(command[0].dataStart).format("YYYY-MM-DD HH:mm:ss"),
+            dataImplement: this.$moment(command[0].dataImplement).format("YYYY-MM-DD HH:mm:ss"),
+            body: command[0].body,
+            drafting: command[0].drafting,
+            dataRecord: this.$moment(command[0].dataRecord).format("YYYY-MM-DD HH:mm:ss"),
+            report: command[0].report,
+            participants: command[0].participants,
+            celebrity: command[0].celebrity,
+            costMarking: command[0].costMarking,
+            costOther: command[0].costOther,
+            revised: command[0].revised,
+            status: command[0].status,
+            signature: command[0].signature,
+            remark: command[0].remark,
+          }
           break;
         case "删除":
-          this.deleteRowOne("delOne", command[0].id);
+          this.$confirm('您是否确认删除选中数据?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+            confirmButtonClass: 'common-button-primary',
+            roundButton: true
+          }).then(() => {
+            this.$http.post('wgdCensusLeo/wgd-wbxd/delWbxds', {
+              ids: command[0].id
+            }, {
+              _this: this
+            }, res => {
+              if (res.ok) {
+                this.$message.success('删除成功')
+                this.form.page = 1
+                this.getData()
+              } else {
+                this.$message.warning('删除失败')
+              }
+            })
+          }).catch(() => {})
           break;
       }
     },
-    editRowOne() {},
-    deleteRowOne() {},
     /** 分页  */
     pageChange(page) {
-      this.formQuery.page = page
+      this.form.page = page
-      this.getTableData()
+      this.getData()
     },
     pageSizeChange(pageSize) {
-      this.formQuery.pageSize = pageSize
+      this.form.pageSize = pageSize
-      this.getTableData()
+      this.getData()
     },
   }
 }
@@ -479,7 +709,11 @@ export default {
   height: 100%;
   display: flex;
   flex-direction: column;
-
+  .add-form-item {
+    /deep/.el-form-item__content {
+      width: calc(~'100% - 180px');
+    }
+  }
   .pagination {
     position: inherit!important;
   }

src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue

@@ -116,7 +116,7 @@
       :visible.sync="drawerTable">
       <div style="margin: 10px;height: inherit">
         <el-form label-width="100px" ref="formShowData" :model="formShowData" :rules="formRules">
-          <el-form-item label="类型">
+          <el-form-item label="类型" prop="type">
             <el-select v-model="formShowData.type" type="text" placeholder="请填写">
               <el-option
                 v-for="item in typeOptions"
@@ -126,18 +126,18 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="项目编号">
+          <el-form-item label="项目编号" prop="proId">
             <el-input v-model="formShowData.proId" type="text" placeholder="请填写"></el-input>
           </el-form-item>
-          <el-form-item label="项目名称">
+          <el-form-item label="项目名称" prop="proName">
             <el-input v-model="formShowData.proName" type="text" placeholder="请填写">
             </el-input>
           </el-form-item>
-          <el-form-item label="费用列支项">
+          <el-form-item label="费用列支项" prop="costOutlay">
             <el-input v-model="formShowData.costOutlay" placeholder="请选择">
             </el-input>
           </el-form-item>
-          <el-form-item label="费用支出">
+          <el-form-item label="费用支出" prop="cost">
             <el-input v-model="formShowData.cost" placeholder="请选择">
             </el-input>
           </el-form-item>
@@ -193,7 +193,13 @@ export default {
       },
       drawerTable: false,
       drawerTitle: '',
-      formRules: {},
+      formRules: {
+        type: [{ required: true, message: '请选择类型', trigger: 'blur' }],
+        proId: [{ required: true, message: '请填写项目编号', trigger: 'blur' }],
+        proName: [{ required: true, message: '请填写项目名称', trigger: 'blur' }],
+        costOutlay: [{ required: true, message: '请填写费用列支项', trigger: 'blur' }],
+        cost: [{ required: true, message: '请填写费用支出', trigger: 'blur' }],
+      },
 
       submitLoading: false,
       typeOptions: [
@@ -381,7 +387,7 @@ export default {
     position: inherit!important;
   }
   .el-form-item {
-    margin-bottom: 10px;
+    margin-bottom: 20px;
   }
 
   .el-divider--horizontal {

src/pages/regulatoryRepository/dataStatis/pages/purchaseCost.vue

@@ -7,19 +7,19 @@
         <el-input v-model="formQuery.type" size="small" placeholder="请输入标准类型"></el-input>
       </el-form-item>
       <el-form-item label="标准代号">
-        <el-input v-model="formQuery.num" size="small" placeholder="请输入标准代号"></el-input>
+        <el-input v-model="formQuery.number" size="small" placeholder="请输入标准代号"></el-input>
       </el-form-item>
       <el-form-item label="标准名称">
         <el-input v-model="formQuery.name" size="small" placeholder="请输入标准名称">
         </el-input>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" size="small" onclick="">查询</el-button>
+        <el-button type="primary" size="small" @click="queryData">查询</el-button>
         <el-button type="" size="small" @click="resetForm('formQuery')">清空</el-button>
       </el-form-item>
       <el-divider/>
       <div style="float: left">
-        <el-button type="primary" size="small" @click="drawer1 = true">新增</el-button>
+        <el-button type="primary" size="small" @click="formDataAdd">新增</el-button>
         <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>
         <el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>
         <el-button type="danger" size="small" @click="deleteDetail" icon="el-icon-delete">批量删除</el-button>
@@ -47,44 +47,33 @@
           align="center"
           type="index"
           label="序号"
-          width="50"
+          width="50">
-        >
         </el-table-column>
         <el-table-column
           align="center"
           prop="type"
-          label="标准类型"
+          label="标准类型">
-
-        >
         </el-table-column>
         <el-table-column
           align="center"
-          prop="num"
+          prop="number"
-          label="标准代号"
+          label="标准代号">
-
-        >
         </el-table-column>
 
         <el-table-column
           align="center"
           prop="name"
-          label="标准名称"
+          label="标准名称">
-
-        >
         </el-table-column>
         <el-table-column
           align="center"
           prop="pages"
-          label="页数"
+          label="页数">
-
-        >
         </el-table-column>
         <el-table-column
           align="center"
           prop="cost"
-          label="费用"
+          label="费用">
-
-        >
         </el-table-column>
         <el-table-column label="操作" align="center" width="50" fixed="right">
           <template slot-scope="scope">
@@ -107,7 +96,7 @@
       <loading :loading="loading">加载中...</loading>
       <pagination
         :page="formQuery.page"
-        :total="formQuery.tableTotal"
+        :total="tableTotal"
         @pageChange="pageChange"
         @pageSizeChange="pageSizeChange"/>
     </div>
@@ -116,26 +105,26 @@
       size="50%"
       :title="drawerTitle"
       :visible.sync="drawerTable">
-      <div style="margin: 10px;height: inherit">
+      <div style="margin: 10px 50px 10px 20px;height: inherit">
         <el-form label-width="150px" ref="formShowData" :model="formShowData" :rules="formRules">
-          <el-form-item label="标准类型">
+          <el-form-item label="标准类型" prop="type">
             <el-select v-model="formShowData.type" type="text" placeholder="请填写">
               <el-option label="1" value="one"></el-option>
               <el-option label="2" value="two"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="标准代号">
+          <el-form-item label="标准代号" prop="number">
-            <el-input v-model="formShowData.num" type="text" placeholder="请填写"></el-input>
+            <el-input v-model="formShowData.number" type="text" placeholder="请填写"></el-input>
           </el-form-item>
-          <el-form-item label="标准名称">
+          <el-form-item label="标准名称" prop="name">
             <el-input v-model="formShowData.name" type="text" placeholder="请填写">
             </el-input>
           </el-form-item>
-          <el-form-item label="页数">
+          <el-form-item label="页数" prop="pages">
             <el-input v-model="formShowData.pages" type="text" placeholder="请填写">
             </el-input>
           </el-form-item>
-          <el-form-item label="费用">
+          <el-form-item label="费用" prop="cost">
             <el-input v-model="formShowData.cost" placeholder="请选择">
             </el-input>
           </el-form-item>
@@ -143,7 +132,7 @@
       </div>
       <div class="demo-drawer-footer">
         <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
-        <el-button size="small" type="primary" @click="submit()">提交</el-button>
+        <el-button size="small" type="primary" :loading="submitLoading" @click="submit()">提交</el-button>
       </div>
     </el-drawer>
 
@@ -186,6 +175,7 @@
 </template>
 
 <script>
+import { CgfysAll, CgfysEdit, CgfysAdd, CgfysDelMore } from '@/api/statisticsApi'
 export default {
   name: "child4",
   data() {
@@ -193,20 +183,34 @@ export default {
       loading: false,
       formQuery: {
         type: '',
-        num: '',
+        number: '',
         name: '',
         current: 1,
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
-        tableTotal: 0
       },
+      tableTotal: 0,
       tableData: [],
       multipleSelection: [],
 
-      formShowData: {},
+      formShowData: {
+        id: '',
+        type: '',
+        number: '',
+        name: '',
+        pages: '',
+        cost: ''
+      },
       drawerTable: false,
       drawerTitle: '',
-      formRules: {}
+      formRules: {
+        type: [{ required: true, message: '请选择标准类型', trigger: 'blur' }],
+        number: [{ required: true, message: '请填写标准代号', trigger: 'blur' }],
+        name: [{ required: true, message: '请填写标准代号', trigger: 'blur' }],
+        pages: [{ required: true, message: '请填写页数', trigger: 'blur' }],
+        cost: [{ required: true, message: '请填写费用', trigger: 'blur' }],
+      },
+      submitLoading: false,
     }
   },
 
@@ -215,17 +219,104 @@ export default {
   },
 
   methods: {
+    getTableData() {
+      CgfysAll(this.formQuery).then(res=>{
+        this.tableData = res.data.list
+        this.tableTotal = res.data.count
+      })
+    },
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
     //新增方法
+    formDataAdd() {
+      this.drawerTitle = '新增'
+      this.formShowData = {}
+      this.drawerTable = true
+    },
+
+    // 提交方法
     submit() {
+      this.$refs['formShowData'].validate((valid) => {
+        if (valid) {
+          this.submitLoading = true
+          if (this.drawerTitle === '新增') {
+            CgfysAdd(this.formShowData).then(res=>{
+              if (res.ok) {
+                this.$message.success('新增成功')
+                this.submitLoading = false
+                this.getTableData()
+              } else {
+                this.$message.warning('新增失败')
+                this.submitLoading = false
+              }
+              this.drawerTable = false
+            }, e => {
+            })
+          } else {
+            CgfysEdit(this.formShowData).then(res => {
+              if (res.ok) {
+                this.$message.success('编辑成功')
+                this.submitLoading = false
+                this.getTableData()
+              } else {
+                this.$message.warning('编辑失败')
+                this.submitLoading = false
+              }
+              this.drawerTable = false
+            },e => {
+            })
+          }
+        }
+      })
     },
     //删除方法
     deleteDetail() {
+      if (this.multipleSelection.length > 0) {
+        let msgIds = []
+        for (let i = 0; i < this.multipleSelection.length; i++) {
+          let msgId = this.multipleSelection[i].id
+          msgIds.push(msgId)
+        }
+        let delId = {
+          ids: msgIds.join(',')
+        }
+        this.$confirm('确定删除这些数据?', '提示', {
+          confirmButtonText: this.$t('m.determine'),
+          cancelButtonText: this.$t('m.cancel'),
+          type: 'warning',
+          confirmButtonClass: 'common-button-primary',
+          roundButton: true
+        }).then(() => {
+          CgfysDelMore(delId).then(res => {
+            if (res.ok) {
+              this.$message.success('删除成功')
+              this.pageNo = 1
+              this.multipleSelection = ''
+              this.getTableData()
+            } else {
+              this.$message.warning('删除失败')
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          })
+        })
+      } else {
+        this.$message.warning('请选择一条数据进行删除')
+      }
+    },
+
+    // 查询
+    queryData() {
+      this.getTableData()
     },
     //清空
     resetForm() {
+      this.formQuery = {}
+      this.getTableData()
     },
     // 列表更多按钮
     handleCommand(command) {
@@ -234,13 +325,49 @@ export default {
           this.editRowOne(command[0]);
           break;
         case "删除":
-          this.deleteRowOne("delOne", command[0].id);
+          this.deleteRowOne(command[0].id);
           break;
       }
     },
-    editRowOne() {
+    editRowOne(item) {
+      this.drawerTitle = '编辑'
+      this.formShowData = {
+        id: item.id,
+        type: item.type,
+        number: item.number,
+        name: item.name,
+        pages: item.pages,
+        cost: item.cost
+      }
+      this.drawerTable = true
     },
-    deleteRowOne() {
+    deleteRowOne(val) {
+      let delId = {
+        ids: val
+      }
+      this.$confirm('确定删除这些数据?', '提示', {
+        confirmButtonText: this.$t('m.determine'),
+        cancelButtonText: this.$t('m.cancel'),
+        type: 'warning',
+        confirmButtonClass: 'common-button-primary',
+        roundButton: true
+      }).then(() => {
+        CgfysDelMore(delId).then(res => {
+          if (res.ok) {
+            this.$message.success('删除成功')
+            this.pageNo = 1
+            this.multipleSelection = []
+            this.getTableData()
+          } else {
+            this.$message.warning('删除失败')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
     },
     /** 分页  */
     pageChange(page) {
@@ -264,10 +391,10 @@ export default {
   .pagination {
     position: inherit!important;
   }
-  .el-form-item {
-    margin-bottom: 0px;
-  }
 
+  .el-form-item {
+    margin-bottom: 20px;
+  }
   .el-divider--horizontal {
     height: 0.5px;
     margin: 10px 0;

src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue

@@ -131,16 +131,13 @@
       :visible.sync="drawerTable">
       <div style="margin: 10px;height: inherit">
         <el-form label-width="100px" ref="formShowData" :model="formShowData" :rules="formRules">
-          <el-form-item label="主办单位">
+          <el-form-item label="主办单位" prop="unit">
-            <el-select v-model="formShowData.unit" type="text" placeholder="请填写">
+            <el-input v-model="formShowData.unit" placeholder="请填写"></el-input>
-              <el-option label="1" value="one"></el-option>
-              <el-option label="2" value="two"></el-option>
-            </el-select>
           </el-form-item>
-          <el-form-item label="会议名称">
+          <el-form-item label="会议名称" prop="meetName">
             <el-input v-model="formShowData.meetName" type="text" placeholder="请填写"></el-input>
           </el-form-item>
-          <el-form-item label="会议时间">
+          <el-form-item label="会议时间" prop="meetTime">
             <el-date-picker
               v-model="formShowData.meetTime"
               type="datetime"
@@ -149,17 +146,23 @@
               placeholder="选择日期时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="会费标准">
+          <el-form-item label="会费标准" prop="payStandard">
             <el-input v-model="formShowData.payStandard" type="text" placeholder="请填写">
             </el-input>
           </el-form-item>
-          <el-form-item label="实际发生">
+          <el-form-item label="实际发生" prop="payReality">
             <el-input v-model="formShowData.payReality" placeholder="请选择">
             </el-input>
           </el-form-item>
-          <el-form-item label="费用列支">
+          <el-form-item label="费用列支" prop="costOutlay">
-            <el-input v-model="formShowData.costOutlay" placeholder="请选择">
+            <el-select size="small" v-model="formShowData.costOutlay">
-            </el-input>
+              <el-option
+                v-for="item in costOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.label">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-form>
       </div>
@@ -229,7 +232,14 @@ export default {
 
       drawerTable: false,
       drawerTitle: '',
-      formRules: {},
+      formRules: {
+        unit: [{ required: true,  message: '请填写主办单位', trigger: 'blur' }],
+        meetName: [{ required: true, message: '请填写会议名称', trigger: 'blur' }],
+        meetTime: [{ required: true, message: '请选择会议时间', trigger: 'blur' }],
+        payStandard: [{ required: true, message: '请填写会费标准', trigger: 'blur' }],
+        payReality: [{ required: true, message: '请填写实际发生', trigger: 'blur' }],
+        costOutlay: [{ required: true, message: '请选择费用列支', trigger: 'blur' }],
+      },
       formShowData: {
         id: '',
         unit: '',
@@ -425,7 +435,7 @@ export default {
     position: inherit!important;
   }
   .el-form-item {
-    margin-bottom: 10px;
+    margin-bottom: 20px;
   }
 
   .el-divider--horizontal {

src/pages/regulatoryRepository/dataStatis/pages/societyCost.vue

@@ -112,34 +112,41 @@
       :title="drawerTitle"
       :visible.sync="drawerTable">
       <div style="margin: 10px 50px 10px 20px;height: inherit">
-        <el-form  label-width="120px" ref="formShowData" :model="formShowData" :rules="formRules">
+        <el-form  label-width="150px" ref="formShowData" :model="formShowData" :rules="formRules">
-          <el-form-item label="协会名称-标委会">
+          <el-form-item label="协会名称-标委会" prop="scName">
             <el-select v-model="formShowData.scName" type="text" placeholder="请填写">
               <el-option label="1" value="one"></el-option>
               <el-option label="2" value="two"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="协会名称-分委会">
+          <el-form-item label="协会名称-分委会" prop="sscName">
             <el-input v-model="formShowData.sscName" type="text" placeholder="请填写"></el-input>
           </el-form-item>
-          <el-form-item label="协会名称-工作组">
+          <el-form-item label="协会名称-工作组" prop="wgName">
             <el-input v-model="formShowData.wgName" type="text" placeholder="请填写">
             </el-input>
           </el-form-item>
-          <el-form-item label="会费标准">
+          <el-form-item label="会费标准" prop="payStandard">
             <el-input v-model="formShowData.payStandard" type="text" placeholder="请填写">
             </el-input>
           </el-form-item>
-          <el-form-item label="实际发生">
+          <el-form-item label="实际发生" prop="payReality">
             <el-input v-model="formShowData.payReality" placeholder="请选择">
             </el-input>
           </el-form-item>
-          <el-form-item label="费用列支">
+          <el-form-item label="费用列支" prop="costOutlay">
             <el-input v-model="formShowData.costOutlay" placeholder="请选择">
             </el-input>
           </el-form-item>
-          <el-form-item label="每年缴费情况">
+          <el-form-item label="每年缴费情况" prop="annualPayment">
-            <el-input v-model="formShowData.annualPayment" type="text" placeholder="请填写"></el-input>
+            <el-select v-model="formShowData.annualPayment" size="small" placeholder="请选择缴费情况">
+              <el-option
+                v-for="item in payOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.label">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-form>
       </div>
@@ -190,7 +197,15 @@ export default {
       drawerTable: false,
       // 提交按钮loading
       submitLoading: false,
-      formRules: {},
+      formRules: {
+        scName: [{ required: true, message: '请填写协会名称-标委会', trigger: 'blur' }],
+        sscName: [{ required: true, message: '请填写协会名称-分委会', trigger: 'blur' }],
+        wgName: [{ required: true, message: '请填写协会名称-工作组', trigger: 'blur' }],
+        payStandard: [{ required: true, message: '请填写会费标准', trigger: 'blur' }],
+        payReality: [{ required: true, message: '请填写实际发生', trigger: 'blur' }],
+        costOutlay: [{ required: true, message: '请填写费用列支', trigger: 'blur' }],
+        annualPayment: [{ required: true, message: '请选择每年缴费情况', trigger: 'blur' }],
+      },
       // 新增、编辑数组
       formShowData: {
         id: '',
@@ -400,7 +415,7 @@ export default {
     position: inherit!important;
   }
   .el-form-item {
-    margin-bottom: 10px;
+    margin-bottom: 20px;
   }
 
   .el-divider--horizontal {

src/pages/regulatoryRepository/dataStatis/pages/translateCost.vue

@@ -7,18 +7,18 @@
         <el-input v-model="formQuery.type" size="small" placeholder="根据标准类型搜索"></el-input>
       </el-form-item>
       <el-form-item label="标准代号">
-        <el-input v-model="formQuery.num" size="small" placeholder="根据标准代号搜索"></el-input>
+        <el-input v-model="formQuery.number" size="small" placeholder="根据标准代号搜索"></el-input>
       </el-form-item>
       <el-form-item label="标准名称">
         <el-input v-model="formQuery.name" size="small" placeholder="根据标准名称搜索"></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" size="small" onclick="">查询</el-button>
+        <el-button type="primary" size="small" @click="queryData">查询</el-button>
         <el-button type="" size="small" @click="resetForm('formQuery')">清空</el-button>
       </el-form-item>
       <el-divider/>
       <div style="float: left">
-        <el-button type="primary" size="small" @click="drawer1 = true">新增</el-button>
+        <el-button type="primary" size="small" @click="dataAdd">新增</el-button>
         <el-button type="primary" size="small" @click="dialogVisible1 = true">导入</el-button>
         <el-button type="primary" size="small" @click="dialogVisible2 = true">导出</el-button>
         <el-button type="danger" size="small" @click="deleteDetail" icon="el-icon-delete">批量删除</el-button>
@@ -56,7 +56,7 @@
         </el-table-column>
         <el-table-column
           align="center"
-          prop="num"
+          prop="number"
           label="标准代号">
         </el-table-column>
 
@@ -67,7 +67,7 @@
         </el-table-column>
         <el-table-column
           align="center"
-          prop="translateType"
+          prop="translation"
           label="翻译类型">
         </el-table-column>
         <el-table-column
@@ -82,7 +82,7 @@
         </el-table-column>
         <el-table-column
           align="center"
-          prop="completeTime"
+          prop="time"
           label="翻译完成时间">
         </el-table-column>
         <el-table-column label="操作" align="center" width="50" fixed="right">
@@ -124,14 +124,14 @@
             </el-select>
           </el-form-item>
           <el-form-item label="标准代号">
-            <el-input v-model="formShowData.num" type="text" placeholder="请填写"></el-input>
+            <el-input v-model="formShowData.number" type="text" placeholder="请填写"></el-input>
           </el-form-item>
           <el-form-item label="标准名称">
             <el-input v-model="formShowData.name" type="text" placeholder="请填写">
             </el-input>
           </el-form-item>
           <el-form-item label="翻译类型">
-            <el-input v-model="formShowData.translateType" type="text" placeholder="请填写">
+            <el-input v-model="formShowData.translation" type="text" placeholder="请填写">
             </el-input>
           </el-form-item>
 
@@ -144,14 +144,14 @@
             </el-input>
           </el-form-item>
           <el-form-item label="翻译完成时间">
-            <el-input v-model="formShowData.completeTime" placeholder="请填写">
+            <el-input v-model="formShowData.time" placeholder="请填写">
             </el-input>
           </el-form-item>
         </el-form>
       </div>
       <div class="demo-drawer-footer">
-        <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
+        <el-button size="small" @click="drawerTable = false">取消</el-button>
-        <el-button size="small" type="primary" @click="submit()">提交</el-button>
+        <el-button size="small" type="primary" :loading="submitLoading" @click="submit()">提交</el-button>
       </div>
     </el-drawer>
 
@@ -193,6 +193,7 @@
 </template>
 
 <script>
+import { fyQuery, fyDetail, fyEdit, fyAdd, fyDel } from '@/api/statisticsApi'
 export default {
   name: "children",
   data() {
@@ -200,7 +201,7 @@ export default {
       loading: false,
       formQuery: {
         type: '',
-        num: '',
+        number: '',
         name: '',
         current: 1,
         page: 1,
@@ -210,17 +211,19 @@ export default {
       tableData: [],
       multipleSelection: [],
       formShowData: {
+        id: '',
         type: '',
-        num: '',
+        number: '',
         name: '',
-        translateType: '',
+        translation: '',
         pages: '',
         cost: '',
-        completeTime: ''
+        time: ''
       },
       drawerTable: false,
       drawerTitle: '',
       formRules: {},
+      submitLoading: false,
     }
   },
 
@@ -229,19 +232,102 @@ export default {
   },
 
   methods: {
+    getTableData() {
+      fyQuery(this.formQuery).then(res=>{
+        this.tableData = res.data.list
+        this.tableTotal = res.data.count
+      })
+    },
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
     //新增方法
+    dataAdd() {
+      this.drawerTitle = '新增'
+      this.formShowData = {}
+      this.drawerTable = true
+    },
     submit() {
+      this.$refs['formShowData'].validate((valid) => {
+        if (valid) {
+          this.submitLoading = true
+          if (this.drawerTitle === '新增') {
+            fyAdd(this.formShowData).then(res=>{
+              if (res.ok) {
+                this.$message.success('新增成功')
+                this.submitLoading = false
+                this.getTableData()
+              } else {
+                this.$message.warning('新增失败')
+                this.submitLoading = false
+              }
+              this.drawerTable = false
+            }, e => {
+            })
+          } else {
+           fyEdit(this.formShowData).then(res => {
+              if (res.ok) {
+                this.$message.success('编辑成功')
+                this.submitLoading = false
+                this.getTableData()
+              } else {
+                this.$message.warning('编辑失败')
+                this.submitLoading = false
+              }
+              this.drawerTable = false
+            },e => {
+            })
+          }
+        }
+      })
     },
     //删除方法
     deleteDetail() {
+      if (this.multipleSelection.length > 0) {
+        let msgIds = []
+        for (let i = 0; i < this.multipleSelection.length; i++) {
+          let msgId = this.multipleSelection[i].id
+          msgIds.push(msgId)
+        }
+        let delId = {
+          ids: msgIds.join(',')
+        }
+        this.$confirm('确定删除这些数据?', '提示', {
+          confirmButtonText: this.$t('m.determine'),
+          cancelButtonText: this.$t('m.cancel'),
+          type: 'warning',
+          confirmButtonClass: 'common-button-primary',
+          roundButton: true
+        }).then(() => {
+          fyDel(delId).then(res => {
+            if (res.ok) {
+              this.$message.success('删除成功')
+              this.pageNo = 1
+              this.multipleSelection = ''
+              this.getTableData()
+            } else {
+              this.$message.warning('删除失败')
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          })
+        })
+      } else {
+        this.$message.warning('请选择一条数据进行删除')
+      }
+    },
+    // 查询按钮
+    queryData() {
+      this.getTableData()
     },
     //清空
     resetForm() {
+      this.formQuery = {}
+      this.getTableData()
     },
-
     // 列表更多按钮
     handleCommand(command) {
       switch (command[1]) {
@@ -249,13 +335,51 @@ export default {
           this.editRowOne(command[0]);
           break;
         case "删除":
-          this.deleteRowOne("delOne", command[0].id);
+          this.deleteRowOne(command[0].id);
           break;
       }
     },
-    editRowOne() {
+    editRowOne(item) {
+      this.drawerTitle = '编辑'
+      this.formShowData = {
+        id: item.id,
+        type: item.type,
+        number: item.number,
+        name: item.name,
+        translation: item.translation,
+        pages: item.pages,
+        cost: item.cost,
+        time: item.time,
+      }
+      this.drawerTable = true
     },
-    deleteRowOne() {
+    deleteRowOne(val) {
+      let delId = {
+        ids: val
+      }
+      this.$confirm('确定删除这些数据?', '提示', {
+        confirmButtonText: this.$t('m.determine'),
+        cancelButtonText: this.$t('m.cancel'),
+        type: 'warning',
+        confirmButtonClass: 'common-button-primary',
+        roundButton: true
+      }).then(() => {
+        fyDel(delId).then(res => {
+          if (res.ok) {
+            this.$message.success('删除成功')
+            this.pageNo = 1
+            this.multipleSelection = []
+            this.getTableData()
+          } else {
+            this.$message.warning('删除失败')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
     },
     /** 分页  */
     pageChange(page) {

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -20,7 +20,6 @@
               highlight-current
               @node-click="treeClick"
               :filter-node-method="filterNode"
-              default-expand-all
               :expand-on-click-node="false">
                   <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)"
                         @mouseleave="mouseleave(data)">
@@ -659,7 +658,8 @@
                     :disabled="formdisableflag"
                   ></custom-textarea>
                 </template>
-                <template v-else-if="field.attrType === 'SEL_OPTION'">
+<!--                起草单位-->
+                <template v-else-if="field.attrType === 'SEL_OPTION' || field.attrType === 'SEL_OPTS' ">
                   <template>
                     <custom-select
                       :key="field.attrField"
@@ -4809,21 +4809,21 @@ export default {
       const rules = {...this.defaultAddFormFieldRules}
       formFieldList.forEach((item) => {
         const rule = []
-        if (item.isMust === '0' && isEdit !== '0') {
+        // if (item.isMust === '0' && isEdit !== '0') {
-          if (item.attrType === 'DATE_PICKER') {
+        //   if (item.attrType === 'DATE_PICKER') {
-            rule.push({required: true, type: 'date', message: `${item.attrName}不能为空`, trigger: 'blur'})
+        //     rule.push({required: true, type: 'date', message: `${item.attrName}不能为空`, trigger: 'blur'})
-          } else if (item.attrType === 'SEL_OPTION') {
+        //   } else if (item.attrType === 'SEL_OPTION') {
-            rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'change'})
+        //     rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'change'})
-          } else if (item.attrType === 'DATE_PIC_OPTS') {
+        //   } else if (item.attrType === 'DATE_PIC_OPTS') {
-            rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'change'})
+        //     rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'change'})
-          } else if (item.attrType === 'INPUT_NUM') {
+        //   } else if (item.attrType === 'INPUT_NUM') {
-            rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'blur'})
+        //     rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'blur'})
-          } else if (item.attrType === 'SEL_OPTS') {
+        //   } else if (item.attrType === 'SEL_OPTS') {
-            rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'change'})
+        //     rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'change'})
-          } else if (item.attrType === 'INPUT_STR') {
+        //   } else if (item.attrType === 'INPUT_STR') {
-            rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'change'})
+        //     rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'change'})
-          }
+        //   }
-        }
+        // }
         // isEdit 为0 标准状态不是必填
         if (isEdit === '0') {
           rules.standState = [{required: false, message: '文本状态不能为空', trigger: 'change'}]
@@ -4842,7 +4842,7 @@ export default {
           }
         }
         if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ' || item.attrField === 'BYYBJ' || item.attrField === 'CBBH') {
-          rule.push({validator: this.verify.validateStandardItem, trigger: 'blur'})
+          // rule.push({validator: this.verify.validateStandardItem, trigger: 'blur'})
         }
         if (rule.length > 0) {
           rules[item.attrField] = rule

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

@@ -23,7 +23,6 @@
                   highlight-current
                   @node-click="treeClick"
                   :filter-node-method="filterNode"
-                  default-expand-all
                   :expand-on-click-node="false">
                 <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
                         <span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>

src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue

@@ -21,7 +21,6 @@
                     highlight-current
                     @node-click="treeClick"
                     :filter-node-method="filterNode"
-                    default-expand-all
                     :expand-on-click-node="false">
                 <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
                         <span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -21,7 +21,6 @@
               highlight-current
               @node-click="treeClick"
               :filter-node-method="filterNode"
-              default-expand-all
               :expand-on-click-node="false">
                 <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
                         <span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>

src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue

@@ -93,11 +93,6 @@
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px',
              fontWeight: 'normal', height: '48px'}"
         @selection-change="handleSelectionChange">
-        <el-table-column
-          type="selection"
-          width="55"
-          align="center">
-        </el-table-column>
         <el-table-column
           show-overflow-tooltip
           prop="projectPlatfor"

src/pages/regulatoryRepository/nonConfomity/index.vue

@@ -7,7 +7,7 @@
            <rectification-database></rectification-database>
          </el-tab-pane>
          <el-tab-pane label="重点问题项管控" name="keynote">
-           <key-issues></key-issues>
+           <key-issues :keynoteActiveName="keynoteActiveName"></key-issues>
          </el-tab-pane>
        </el-tabs>
      </div>
@@ -24,13 +24,26 @@ export default {
   },
   data () {
     return {
-      activeName: 'database'
+      activeName: 'database',
+      keynoteActiveName: 'cause'
     }
   },
   methods: {
     handleClick(tab, event) {
+    },
+    getActiveName(){
+      if (this.$route.query.activeName){
+        this.activeName = this.$route.query.activeName
+      }
+      if (this.$route.query.keynoteActiveName){
+        this.keynoteActiveName = this.$route.query.keynoteActiveName
+      }
+      console.log('35',this.keynoteActiveName)
     }
   },
+  created() {
+    this.getActiveName()
+  },
   watch: {},
   mounted () {}
 }

src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue

@@ -373,7 +373,10 @@ export default {
     },
     back() {
       this.$router.push({
-        name: 'NonConfomity'
+        name: 'NonConfomity',
+        query:{
+          activeName:'keynote'
+        }
       })
     },
 // 清空 查询条件

src/pages/regulatoryRepository/nonConfomity/pages/keyIssues.vue

@@ -2,7 +2,7 @@
 <template>
 <div id="key-issues">
   <div class="non-content">
-    <el-tabs v-model="activeName" @tab-click="handleClick">
+    <el-tabs v-model="keynoteActiveName" @tab-click="handleClick">
       <el-tab-pane label="事业部" name="cause">
         <business-division></business-division>
       </el-tab-pane>
@@ -20,6 +20,7 @@ import productDepartment from "@/pages/regulatoryRepository/nonConfomity/pages/p
 
 export default {
   name: "keyIssues",
+  props:['keynoteActiveName'],
  components: {
    businessDivision,
    productDepartment,

src/pages/regulatoryRepository/nonConfomity/pages/productDetails.vue

@@ -556,7 +556,11 @@ export default {
     },
     back () {
       this.$router.push({
-        name: 'NonConfomity'
+        name: 'NonConfomity',
+        query:{
+          activeName:'keynote',
+          keynoteActiveName:'product'
+        }
       })
     },
     // 未符合项table selected事件