Merge branch 'develop' into 'test'

Develop

See merge request !77

src/components/navMenu/index.vue

@@ -88,11 +88,11 @@ export default {
               path: '/domesticStandardsAndRegulations',
               menuId: '3e3657498664beaa0dc1de1ecb3ae0da'
             },
-            // {
+            {
-            //   title: '零部件编号申请',
+              title: '零部件编号申请',
-            //   path: '/partCodeApply',
+              path: '/partCodeApply',
-            //   menuId: ''
+              menuId: 'ad9db496772c075f78495382b7581fe9'
-            // },
+            },
             // {
             //   title: '标准法规工作组数据统计',
             //   path: '/dataStatisComments',
@@ -310,11 +310,11 @@ export default {
         //       path: '/convertDocView',
         //       menuId: '3F52K25546'
         //     },
-            /*{
+        //     {
-              title: '菜单管理',
+        //       title: '菜单管理',
-              path: '/menuManage',
+        //       path: '/menuManage',
-              menuId: '87b8b4f5817a7829696e63185c744d52'
+        //       menuId: '87b8b4f5817a7829696e63185c744d52'
-            },*/
+        //     },
             {
               title: '链接管理',
               path: '/linkManage',

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

@@ -2,8 +2,8 @@
 <template>
   <div class="attribute-custom v-class">
     <div class="action-bar1">
-      <el-button class="common-button-primary add-button" size="mini" v-btn-permission="'7UARYUBX8J8BX3ELZDH2'" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
+      <el-button class="common-button-primary add-button" size="mini" v-btn-permission="''" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
-      <el-button class="common-button-default" size="mini" v-btn-permission="'8QSDDR8R7UMDS9S6M2HU'" @click="showDisplayLocationDialog" >展示区域管理</el-button>
+      <el-button class="common-button-default" size="mini" v-btn-permission="''" @click="showDisplayLocationDialog" >展示区域管理</el-button>
     </div>
     <loading :loading="attributeDataLoading">数据处理中</loading>
     <div class="content">

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -1302,11 +1302,10 @@
             </el-form-item>
             <!--            标准年份-->
             <el-form-item :label="$t('m.standardYear')"  class="serch-form-item">
-              <el-date-picker
+              <el-input
                   v-model="sarStandardsSearch.standYear"
-                  type="date"
                   placeholder="根据标准年份查找">
-              </el-date-picker>
+              </el-input>
             </el-form-item>
             <!--            标准发布日期-->
             <el-form-item label="标准发布日期"  class="serch-form-item">
@@ -1324,8 +1323,8 @@
               </el-select>
             </el-form-item>
             <!--            是否纳入标准清单-->
-            <el-form-item title="是否纳入标准清单" label="是否纳入标准清单">
+            <el-form-item  label="是否纳入标准清单" class="serch-form-item">
-              <el-select v-model="sarStandardsSearch.isRelateAccess" class="advanced-one" placeholder="根据是否纳入标准清单查找">
+              <el-select v-model="sarStandardsSearch.isRelateAccess"  placeholder="根据是否纳入标准清单查找">
                 <el-option value="yes" label="是"></el-option>
                 <el-option value="no" label="否"></el-option>
               </el-select>
@@ -1333,7 +1332,7 @@
             <!--            实施日期-->
             <el-form-item label="实施日期">
               <el-date-picker
-                  v-model="sarStandardsSearch.putTime"
+                  v-model="sarStandardsSearch.ssrq"
                   type="date"
                   placeholder="根据实施日期查找">
               </el-date-picker>
@@ -1341,7 +1340,7 @@
             <!--            新车型实施日期-->
             <el-form-item title="新车型实施日期" label="新车型实施日期">
               <el-date-picker
-                  v-model="sarStandardsSearch.XCXTime"
+                  v-model="sarStandardsSearch.xcxssrq"
                   type="date"
                   placeholder="根据新车型实施日期查找">
               </el-date-picker>
@@ -1349,15 +1348,17 @@
             <!--            在产车实施日期-->
             <el-form-item title="在产车实施日期" label="在产车实施日期">
               <el-date-picker
-                  v-model="sarStandardsSearch.ZCCTime"
+                  v-model="sarStandardsSearch.zccssrq"
                   type="date"
                   placeholder="根据在产车实施日期查找">
               </el-date-picker>
             </el-form-item>
             <!--            归口管理部门-->
             <el-form-item label="归口管理部门">
-              <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据归口管理部门查找"
+              <el-select v-model="sarStandardsSearch.gkglbm" placeholder="归口管理部门" clearable
-                        @keyup.enter.native="btnSearch"></el-input>
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
             </el-form-item>
             <!--            起草单位-->
             <el-form-item label="起草单位">
@@ -1368,7 +1369,7 @@
             </el-form-item>
             <!--            我司参与深度-->
             <el-form-item label="我司参与深度">
-              <el-select v-model="sarStandardsSearch.nameShow" placeholder="请选择我司参与深度" clearable
+              <el-select v-model="sarStandardsSearch.wscysd" placeholder="请选择我司参与深度" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
@@ -1376,14 +1377,14 @@
 
             <!--            能源类型-->
             <el-form-item label="能源类型">
-              <el-select v-model="sarStandardsSearch.energyKind" placeholder="请选择能源类型" clearable
+              <el-select v-model="sarStandardsSearch.nylx" placeholder="请选择能源类型" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
             </el-form-item>
             <!--            适用车型-->
             <el-form-item :label="$t('m.applicableModels')"  class="serch-form-item">
-              <el-select v-model="sarStandardsSearch.applyArctic" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
+              <el-select v-model="sarStandardsSearch.cllx" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
@@ -1397,9 +1398,9 @@
             </el-form-item>
             <!--            适用认证-->
             <el-form-item label="适用认证">
-              <el-select v-model="sarStandardsSearch.syzr" placeholder="根据适用认证查找" clearable
+              <el-select v-model="sarStandardsSearch.syrz" placeholder="根据适用认证查找" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in syzrOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in syrzOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
             </el-form-item>
             <!--            责任部门-->
@@ -1411,7 +1412,7 @@
             </el-form-item>
             <!--            责任工程师-->
             <el-form-item label="责任工程师">
-              <el-select v-model="sarStandardsSearch.dutyEngineer" placeholder="根据责任工程师查找" clearable
+              <el-select v-model="sarStandardsSearch.zrgcs" placeholder="根据责任工程师查找" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
@@ -1424,7 +1425,7 @@
             </el-form-item>
             <!--            代替标准号-->
             <el-form-item label="代替标准号">
-              <el-input v-model="sarStandardsSearch.replaceStandNum" clearable placeholder="根据代替标准号查找"
+              <el-input v-model="sarStandardsSearch.dtbjh" clearable placeholder="根据代替标准号查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
             <!--            关联模块-中文名称-->
@@ -1435,23 +1436,23 @@
             </el-form-item>
             <!--            采标编号-->
             <el-form-item label="采标编号" prop="nameShow">
-              <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据采标编号查找"
+              <el-input v-model="sarStandardsSearch.cbbh" clearable placeholder="根据采标编号查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
             <!--            采标程度-->
             <el-form-item label="采标程度" prop="standNumber">
-              <el-input v-model="sarStandardsSearch.standNumber" clearable
+              <el-input v-model="sarStandardsSearch.cbcd" clearable
                         placeholder="根据采标程度查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
             <!--            引用标准-->
             <el-form-item label="引用标准">
-              <el-input v-model="sarStandardsSearch.citeStand" clearable placeholder="根据引用标准查找"
+              <el-input v-model="sarStandardsSearch.yybj" clearable placeholder="根据引用标准查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
             <!--            被引用标准-->
             <el-form-item label="被引用标准">
-              <el-input v-model="sarStandardsSearch.citedStand" clearable
+              <el-input v-model="sarStandardsSearch.byybj" clearable
                         placeholder="根据被引用标准查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
@@ -1463,6 +1464,23 @@
                 </el-option>
               </el-select>
             </el-form-item>
+
+            <!--            标记-->
+            <!--            标签-->
+            <el-form-item label="标签">
+              <el-input v-model="sarStandardsSearch.gxhbq" clearable
+                        placeholder="根据被标签查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+
+
+            <!--            体系类别-->
+            <el-form-item label="体系类别">
+              <el-select v-model="sarStandardsSearch.txlb" placeholder="根据体系类别查找" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
           </el-form>
         </div>
         <div class="demo-drawer-footer">
@@ -1671,18 +1689,21 @@ export default {
       searching: false,
       stahndinfoList: [],
       tableFlag: '',
+      // sycpxOptions: [], // 适用产品线
+      syzrOptions: [], // 适用认证
+      // zrgcsOptions: [], // 责任工程师
+
       countryOptions: [],
-      cysdOptions: [], // 我司参与深度下拉框
+      regionOptions: [], // 区域
+      standSortOptions: [], // 标准类别下拉框
+      standSystemOptions: [], // 标准体系下拉框
       sycpxOptions: [], // 适用产品线下拉框
       zrbmOptions: [], // 责任部门下拉框
       zrgcsOptions: [], // 责任工程师下拉框
       txlbOptions: [], // 体系类别下拉框
-      regionOptions: [], // 区域
-      standSortOptions: [], // 标准类别下拉框
       standSortConfigOptions: [], // 标准类别下拉框
       applyArcticOptions: [], // 适用车型下拉框
-      standStateOptions: [], // 文本状态下拉框
+      standStateOptions: [], // 标准状态下拉框
-      standSystemOptions: [], // 标准体系下拉框
       standNatureOptions: [], // 标准性质下拉框
       adoptExtentOptions: [], // 采标程度下拉框
       emergyKindOptions: [], // 能源种类下拉框
@@ -1690,12 +1711,14 @@ export default {
       categoryOptions: [], // 所属类别下拉框
       categoryConfigOptions: [], // 所属类别下拉框
       assemClassOptions: [], // 总成分类下拉框
-      qcdwOptions: [], // 起草单位
+      qcdwOptions:[],//起草单位下拉框
-      nylxOptions: [], // 能源类型
+      cysdOptions:[], //我司参与深度下拉框
-      // sycpxOptions: [], // 适用产品线
+      nylxOptions:[],//能源类型下拉框
-      syzrOptions: [], // 适用认证
+      syrzOptions:[],//适用认证下拉框
-      // zrbmOptions: [], // 责任部门
+      gkglbmOptions:[],//归口管理部门下拉框
-      // zrgcsOptions: [], // 责任工程师
+
+
+
       standAttributeList: [],
       sarStandardsSearch: {
         page: 1,
@@ -1704,35 +1727,36 @@ export default {
         validFlag: '0',
         menuId: '',
         country: '',
-        standNumber: '', // 标准编号
+        standNumber: '',//标准编号
-        standName: '', // 标准名称
+        standName: '',//标准名称
-        standState: '', // 标准状态
+        standState: '',
-        issueTime: '', // 标准发布日期
+        standNature: '',//标准性质
-        svpps: '', // 关联模块-VPPS编码
+        issueTime: '',//标准发布时间
-        replaceStandNum: '', // 代替标准号
+        // applyArctic: '',
-        replacedStandNum: '',  // 	被代替标准号
+        dtbjh: '',//代替标准号
-        replacePartStandNum: '', // 代替标准号
+        // replaceStandNumCope: '',
-        replacedPartStandNum: '',  // 	被代替标准号
+        // replaceStandNumList: [],
-        citeStand: '',  // 	引用标准
+        replacedStandNum: '',
-        citedStand: '',  // 	被引用标准
         synopsis: '', // 内容摘要
-        applyArctic: '', // 适用车型
+        // category: '', // 所属类别
-        sycpx: '', // 适用产品线
-        syzr: '', // 适用认证
-        zrbm: '', // 责任部门
-        dutyEngineer: '', // 责任工程师
         standSort: '', // 标准类别
-        standYear: '', // 标准年份
+        txlbOption:'', //标准体系
-        standEnName: '', // 标准英文名称
+        gxhbq:'', //标签
-        standNature: '', // 标准性质
+        wscysd:'', //我司参与深度
-        putTime: '', // 实施日期
+        gkglbm:'', //归口管理部门
-        isRelateAccess: '', // 是否纳入标准清单
+        ssrq:'',//实施日期
-        // nameShow: '', // 我司参与深度
+        scxssrq:''//新车型实施日期
-        qcdw: '', // 起草单位
+        ,zccssrq:''//在产车实施日期
-        nameShow: '', // 归口管理部门
+        ,qcdw:''//起草单位
-        ZCCTime: '', // 在产车实施日期
+        ,nylx:''//能源类型
-        XCXTime: '', // 新车型实施日期
+        ,cllx:''//适用车型
-        energyKind: '', // 能源类型
+        ,syrz:''//适用认证
+        ,zrgcs:''//责任工程师
+        ,cbbh:''//采标编号
+        ,cbcd:''//采标程度
+        ,yybj:''//引用标准
+        ,byybj:''//被引用标准
+        ,txlb:''//体系类别
       }, // 分页查询过程中用到的对象
       // 树形结构
       // tree function
@@ -4720,12 +4744,11 @@ export default {
         this.standNatureOptions = res.data.SARPROPERTY // 标准性质
         this.standStateOptions = res.data.WBZTCLASS // 文本状态
         this.standSystemOptions = res.data.BZTXCLASS // 标准体系
-        this.applyArcticOptions = res.data.SYCXCLASS // 适用车型
+        this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
         this.categoryOptions = res.data.NYLXCLASS // 能源类型
         this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
         this.cysdOptions = res.data.WSCYSD // 我司参与深度
         this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
-        this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
         this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
         this.txlbOptions = res.data.TXLBCLASS // 体系类别
       this.qcdwOptions = res.data.QCDW // 起草单位
@@ -4733,7 +4756,8 @@ export default {
       this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
       this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
       this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
-      this.syzrOptions = res.data.SYRZCLASS // 适用认证
+      this.syrzOptions = res.data.SYRZCLASS // 适用认证
+      this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
       this.getGzzOption()
       this.setMap(this.standStateOptions)
     }, e => {

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

@@ -4,18 +4,25 @@
 <!--左侧树-->
     <div class="tree-content" :class="{ 'tree-closed': sideClose }" >
       <div class="tree">
+          <el-input
+                  placeholder="输入树状图体系"
+                  v-model="filterText">
+          </el-input>
           <el-tree
                   ref="tree"
                   node-key="id"
-                  class="filter-tree"
+                  class="tree-line"
+                  icon-class="icon-tree"
+                  :indent="0"
                   :props="props"
                   :data="treeList"
                   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> {{ node.label}} </span>
+                        <span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span> <span> {{ node.label}} </span>
                         <span>
                           <el-button
                                   type="text"
@@ -1021,6 +1028,7 @@ export default {
             // 唯一辨识
             dicId: ""
         },
+      filterText: '', // 企业标准库过滤
       treeList: [],
       standId: '',
       visibleOrgTable: false,
@@ -3434,7 +3442,11 @@ export default {
       }
     }
   },
-  watch: {},
+  watch: {
+      filterText(val) {
+          this.$refs.tree.filter(val);
+      }
+  },
   computed: {
     // 是否拥有拖拽权限
     hasPermissionDrag () {
@@ -3491,6 +3503,94 @@ export default {
 }
 </script>
 
+<style lang="less" scoped>
+    /deep/ .icon-tree {
+        margin:0  5px 0 10px;
+        position:relative;
+        background:url('~@/assets/images/shangqi/img/tree-add.png');
+        background-size:100% 100%;
+    }
+    /deep/ .expanded{
+        background:url('~@/assets/images/shangqi/img/tree-sub.png');
+        background-size:100% 100%;
+    }
+    /deep/ .is-leaf{
+        background-image:none;
+        background-size:100% 100%;
+    }
+    /deep/ .is-leaf-none{
+        position: relative;
+        display: inline-block;
+        width: 15px;
+        height: 15px;
+        background:url('~@/assets/images/shangqi/img/none-file.png');
+        background-size:100% 100%;
+    }
+    /deep/ .is-show{
+        position: relative;
+        display: inline-block;
+        width: 15px;
+        height: 15px;
+        background:url('~@/assets/images/shangqi/img/tree.png');
+        background-size:100% 100%;
+    }
+    /deep/.tree-line{
+        .el-tree-node {
+            position: relative;
+            padding-left: 0px; // 缩进量
+            line-height: 30px;
+        }
+        .el-tree-node__children {
+            padding-left: 16px; // 缩进量
+        }
+
+        // 竖线
+        .el-tree-node::before {
+            content: "";
+            height: 100%;
+            width: 1px;
+            position: absolute;
+            left: -3px;
+            top: -26px;
+            border-width: 1px;
+            border-left: 1px dashed #858990e0;
+        }
+        // 当前层最后一个节点的竖线高度固定
+        .el-tree-node:last-child::before {
+            height: 38px; // 可以自己调节到合适数值
+        }
+
+        // 横线
+        .el-tree-node::after {
+            content: "";
+            width: 11px;
+            height: 20px;
+            position: absolute;
+            left: -3px;
+            top: 12px;
+            border-width: 1px;
+            border-top: 1px dashed #858990e0;
+        }
+
+        // 去掉最顶层的虚线，放最下面样式才不会被上面的覆盖了
+        & > .el-tree-node::after {
+            border-top: none;
+        }
+        & > .el-tree-node::before {
+            border-left: none;
+        }
+
+        // 展开关闭的icon
+        .el-tree-node__expand-icon{
+            font-size: 16px;
+            // 叶子节点（无子节点）
+            &.is-leaf{
+                color: transparent;
+                // display: none; // 也可以去掉
+            }
+        }
+    }
+</style>
 <style  lang="less" scoped>
   @import '~@/assets/styles/mixins';
   @import '~@/assets/styles/style';

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -185,6 +185,17 @@
                 {{ formatIssueDate(scope.row.issueTime) }}
               </template>
             </el-table-column>
+            <el-table-column
+                prop="SSRQ"
+                sortable="custom"
+                width="150px"
+                label="实施日期">
+              <template slot-scope="scope">
+                <!--                {{ formatIssueDate(scope.row.putTime) }}-->
+                <span>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</span>
+
+              </template>
+            </el-table-column>
             <el-table-column
                 prop="XCXSSRQ"
                 sortable="custom"
@@ -369,11 +380,10 @@
             </el-form-item>
             <!--            标准年份-->
             <el-form-item :label="$t('m.standardYear')"  class="serch-form-item">
-              <el-date-picker
+              <el-input
                   v-model="sarStandardsSearch.standYear"
-                  type="date"
                   placeholder="根据标准年份查找">
-              </el-date-picker>
+              </el-input>
             </el-form-item>
             <!--            标准发布日期-->
             <el-form-item label="标准发布日期"  class="serch-form-item">
@@ -400,7 +410,7 @@
             <!--            实施日期-->
             <el-form-item label="实施日期">
               <el-date-picker
-                  v-model="sarStandardsSearch.putTime"
+                  v-model="sarStandardsSearch.ssrq"
                   type="date"
                   placeholder="根据实施日期查找">
               </el-date-picker>
@@ -408,7 +418,7 @@
             <!--            新车型实施日期-->
             <el-form-item title="新车型实施日期" label="新车型实施日期">
               <el-date-picker
-                  v-model="sarStandardsSearch.XCXTime"
+                  v-model="sarStandardsSearch.xcxssrq"
                   type="date"
                   placeholder="根据新车型实施日期查找">
               </el-date-picker>
@@ -416,15 +426,17 @@
             <!--            在产车实施日期-->
             <el-form-item title="在产车实施日期" label="在产车实施日期">
               <el-date-picker
-                  v-model="sarStandardsSearch.ZCCTime"
+                  v-model="sarStandardsSearch.zccssrq"
                   type="date"
                   placeholder="根据在产车实施日期查找">
               </el-date-picker>
             </el-form-item>
             <!--            归口管理部门-->
             <el-form-item label="归口管理部门">
-              <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据归口管理部门查找"
+              <el-select v-model="sarStandardsSearch.gkglbm" placeholder="归口管理部门" clearable
-                        @keyup.enter.native="btnSearch"></el-input>
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
             </el-form-item>
             <!--            起草单位-->
             <el-form-item label="起草单位">
@@ -435,22 +447,22 @@
             </el-form-item>
             <!--            我司参与深度-->
             <el-form-item label="我司参与深度">
-              <el-select v-model="sarStandardsSearch.nameShow" placeholder="请选择我司参与深度" clearable
+              <el-select v-model="sarStandardsSearch.wscysd" placeholder="请选择我司参与深度" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in wscysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
             </el-form-item>
 
             <!--            能源类型-->
             <el-form-item label="能源类型">
-              <el-select v-model="sarStandardsSearch.energyKind" placeholder="请选择能源类型" clearable
+              <el-select v-model="sarStandardsSearch.nylx" placeholder="请选择能源类型" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
             </el-form-item>
             <!--            适用车型-->
             <el-form-item :label="$t('m.applicableModels')"  class="serch-form-item">
-              <el-select v-model="sarStandardsSearch.applyArctic" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
+              <el-select v-model="sarStandardsSearch.cllx" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
@@ -464,9 +476,9 @@
             </el-form-item>
             <!--            适用认证-->
             <el-form-item label="适用认证">
-              <el-select v-model="sarStandardsSearch.syzr" placeholder="根据适用认证查找" clearable
+              <el-select v-model="sarStandardsSearch.syrz" placeholder="根据适用认证查找" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in syzrOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in syrzOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
             </el-form-item>
             <!--            责任部门-->
@@ -478,7 +490,7 @@
             </el-form-item>
             <!--            责任工程师-->
             <el-form-item label="责任工程师">
-              <el-select v-model="sarStandardsSearch.dutyEngineer" placeholder="根据责任工程师查找" clearable
+              <el-select v-model="sarStandardsSearch.zrgcs" placeholder="根据责任工程师查找" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
@@ -491,7 +503,7 @@
             </el-form-item>
             <!--            代替标准号-->
             <el-form-item label="代替标准号">
-              <el-input v-model="sarStandardsSearch.replaceStandNum" clearable placeholder="根据代替标准号查找"
+              <el-input v-model="sarStandardsSearch.dtbjh" clearable placeholder="根据代替标准号查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
             <!--            关联模块-中文名称-->
@@ -502,23 +514,23 @@
             </el-form-item>
             <!--            采标编号-->
             <el-form-item label="采标编号" prop="nameShow">
-              <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据采标编号查找"
+              <el-input v-model="sarStandardsSearch.cbbh" clearable placeholder="根据采标编号查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
             <!--            采标程度-->
             <el-form-item label="采标程度" prop="standNumber">
-              <el-input v-model="sarStandardsSearch.standNumber" clearable
+              <el-input v-model="sarStandardsSearch.cbcd" clearable
                         placeholder="根据采标程度查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
             <!--            引用标准-->
             <el-form-item label="引用标准">
-              <el-input v-model="sarStandardsSearch.citeStand" clearable placeholder="根据引用标准查找"
+              <el-input v-model="sarStandardsSearch.yybj" clearable placeholder="根据引用标准查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
             <!--            被引用标准-->
             <el-form-item label="被引用标准">
-              <el-input v-model="sarStandardsSearch.citedStand" clearable
+              <el-input v-model="sarStandardsSearch.byybj" clearable
                         placeholder="根据被引用标准查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
@@ -534,7 +546,7 @@
 <!--            标记-->
             <!--            标签-->
             <el-form-item label="标签">
-              <el-input v-model="sarStandardsSearch.tag" clearable
+              <el-input v-model="sarStandardsSearch.gxhbq" clearable
                         placeholder="根据被标签查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
@@ -542,7 +554,7 @@
 
             <!--            体系类别-->
             <el-form-item label="体系类别">
-              <el-select v-model="sarStandardsSearch.txlbOption" placeholder="根据体系类别查找" clearable
+              <el-select v-model="sarStandardsSearch.txlb" placeholder="根据体系类别查找" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
@@ -1433,13 +1445,13 @@ export default {
         validFlag: '0',
         menuId: '',
         country: '',
-        standNumber: '',
+        standNumber: '',//标准编号
-        standName: '',
+        standName: '',//标准名称
         standState: '',
-        standNature: '',
+        standNature: '',//标准性质
-        issueTime: '',
+        issueTime: '',//标准发布时间
         // applyArctic: '',
-        replaceStandNum: '',
+        dtbjh: '',//代替标准号
         // replaceStandNumCope: '',
         // replaceStandNumList: [],
         replacedStandNum: '',
@@ -1447,7 +1459,22 @@ export default {
         // category: '', // 所属类别
         standSort: '', // 标准类别
         txlbOption:'', //标准体系
-        tag:'' //标签
+        gxhbq:'', //标签
+        wscysd:'', //我司参与深度
+        gkglbm:'', //归口管理部门
+        ssrq:'',//实施日期
+        scxssrq:''//新车型实施日期
+        ,zccssrq:''//在产车实施日期
+        ,qcdw:''//起草单位
+        ,nylx:''//能源类型
+        ,cllx:''//适用车型
+        ,syrz:''//适用认证
+        ,zrgcs:''//责任工程师
+        ,cbbh:''//采标编号
+        ,cbcd:''//采标程度
+        ,yybj:''//引用标准
+        ,byybj:''//被引用标准
+        ,txlb:''//体系类别
 
       }, // 分页查询过程中用到的对象
       loading: false,
@@ -1504,8 +1531,11 @@ export default {
       categoryConfigOptions: [], // 所属类别下拉框
       assemClassOptions: [], // 总成分类下拉框
       standAttributeList: [],
-      qcdwOptions:[],//起草单位
+      qcdwOptions:[],//起草单位下拉框
-      wscysdOptions:[], //我司参与深度
+      cysdOptions:[], //我司参与深度下拉框
+      nylxOptions:[],//能源类型下拉框
+      syrzOptions:[],//适用认证下拉框
+      gkglbmOptions:[],//归口管理部门下拉框
       // 树形结构
       // tree function
       MoveTest: '',
@@ -3163,6 +3193,10 @@ export default {
             if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.ZCCSSRQ) {
               res.data.list[i].ZCCSSRQ = res.data.list[i].attrInfoMap.ZCCSSRQ.split(',')[0]
             }
+            if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.SSRQ) {
+              res.data.list[i].SSRQ = res.data.list[i].attrInfoMap.SSRQ
+              console.log(res.data.list[i].SSRQ);
+            }
           }
           this.stahndinfoList = res.data.list
           this.total = res.data.count
@@ -4298,14 +4332,18 @@ export default {
       this.txlbOptions = res.data.TXLBCLASS // 体系类别
       this.countryOptions = res.data.COUNTRY
       this.regionOptions = res.data.REGION // 区域
-      this.applyArcticOptions = res.data.PRODUCTTYPE // 根据需求文档，产品类别对应标准属性中的“适用车型”
+      this.applyArcticOptions = res.data.ENERGYTYPES // 根据需求文档，产品类别对应标准属性中的“适用车型”
       this.adoptExtentOptions = res.data.DEGREESTANDARD
       this.emergyKindOptions = res.data.ENERGYTYPES
       this.assemClassOptions = res.data.ASSEMCLASSIFY // 总成分类
       this.categoryConfigOptions = res.data.CATEGORY
       this.standAttributeList = res.data.RULETYPE
       this.qcdwOptions = res.data.QCDW
-      this.wscysdOptions=res.data.WSCYSD;
+      this.cysdOptions=res.data.WSCYSD;
+      this.nylxOptions=res.data.NYLXCLASS;//能源类型
+      this.syrzOptions=res.data.SYRZCLASS;//适用认证
+      this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
+
       this.getGzzOption()
       this.setMap(this.standStateOptions)
     }, e => {

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue

@@ -198,7 +198,7 @@
             <el-table-column
               width="150px"
               align="center"
-              prop="standardInfo"
+              prop="clauseName"
               label="条款名称">
             </el-table-column>
             <el-table-column
@@ -379,8 +379,12 @@ export default {
       this.standId = row.standId;
       this.querySarProStateZero();
     }, // 查看项目符合性
-    querySarProStateZero() {
+    querySarProStateZero(page) {
-      this.sarProStateTotalPage = 1;
+      if (page) {
+        this.sarProStateTotalPage = page
+      } else {
+        this.sarProStateTotalPage = 1;
+      }
       var form = this.sarProStateEO;
       // form.standId = this.standId
       form.current = this.sarProStateTotalPage;
@@ -416,12 +420,12 @@ export default {
     }, // 关闭查看事件
     pageProStateChange(page) {
       this.sarProStateTotalPage = page;
-      this.querySarProStateZero();
+      this.querySarProStateZero(page);
     },
     pageProStateSizeChange(pageSize) {
       this.sarProStatePageSize = pageSize;
       this.$store.getters.userInfo.configContent = pageSize;
-      this.querySarProStateZero();
+      this.querySarProStateZero(1);
     }
   },
   mounted() {

src/pages/regulatoryRepository/partCodeApply/index.vue

@@ -3,87 +3,287 @@
   <div class="partCodeApply" id="partCodeApply">
     <!--搜索区域-->
     <div class="search-area">
-      <div class="content-top">
+      <el-form inline class="label-input-form" v-model="searchFormData">
-        <el-form inline class="label-input-form">
+        <el-form-item label="子组号" class="search-item">
-          <el-form-item label="子组号" class="search-item">
+          <el-input placeholder="根据子组号查询" clearable :maxlength="100" v-model="searchFormData.subgroupNumber">
-            <el-input placeholder="根据子组号查询" clearable :maxlength="100">
 
-            </el-input>
+          </el-input>
-          </el-form-item>
+        </el-form-item>
-          <el-form-item label="分组号" class="search-item">
+        <el-form-item label="分组代号" class="search-item">
-            <el-input placeholder="根据分组号查询" clearable :maxlength="100">
+          <el-input placeholder="根据分组代号查询" clearable :maxlength="100" v-model="searchFormData.groupCode">
 
-            </el-input>
+          </el-input>
-          </el-form-item>
+        </el-form-item>
-          <el-form-item label="零件分类号" class="search-item">
+        <el-form-item label="零件分类号" class="search-item">
-            <el-input placeholder="根据零件分类号查询" clearable :maxlength="100">
+          <el-input placeholder="根据零件分类代号查询" clearable :maxlength="100" v-model="searchFormData.partCategoryCode">
 
-            </el-input>
+          </el-input>
-          </el-form-item>
+        </el-form-item>
-          <el-form-item>
+        <el-form-item>
-            <el-button type="primary" size="mini" class="common-button-primary">
+          <el-button type="primary" size="mini" v-btn-permission="'02424c2bc370ee846aa5a6d60c49a6a5'"
-              查询
+                     class="common-button-primary" @click="getTableByPage('')">
-            </el-button>
+            查询
-          </el-form-item>
+          </el-button>
-          <el-form-item>
+        </el-form-item>
-            <el-button size="mini" class="common-button-default">
+        <el-form-item>
-              清空
+          <el-button size="mini" v-btn-permission="'c5b873fcb659afb230db133e7e4706c8'" class="common-button-default"
-            </el-button>
+                     @click="clearAllSearch">
-          </el-form-item>
+            清空
-        </el-form>
+          </el-button>
-      </div>
+        </el-form-item>
+      </el-form>
     </div>
     <!--操作区域-->
     <div class="operation_area">
-      <div class="content-center">
+      <el-button type="primary" size="mini" class="common-button-primary" @click="exportPartInfo()"
-        <el-button type="primary" size="mini" class="common-button-primary">
+                 v-btn-permission="'2b196e3179b073436deb9c64251ddb3d'" title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项">
-          <i class="iconfont">&#xe6e9;</i>
+        <i class="iconfont">&#xe6e9;</i>
-          导出
+        导出
-        </el-button>
+      </el-button>
-        <el-button type="primary" size="mini" class="common-button-primary">
+      <el-button type="primary" size="mini" v-btn-permission="'9caea8a46be62a0ae0600de35bad6539'"
-          <i class="iconfont">&#xe611;</i>
+                 class="common-button-primary" @click="deletePartCode('demore',null)">
-          删除
+        <i class="iconfont">&#xe611;</i>
-        </el-button>
+        删除
-      </div>
+      </el-button>
     </div>
     <!--表格区域-->
     <div class="table_area">
       <div class="container">
-        <loading :loading="loading"></loading>
+        <loading :loading="loading">数据获取中...</loading>
         <!--表头-->
         <div class="table-wrap">
-          <div class="inner-wrap">
+          <el-table
-            <el-table>
+              :data="partCodeList"
-              <el-table-column type="selection" align="center"></el-table-column>
+              tooltip-effect="dark"
-              <el-table-column label="序号"></el-table-column>
+              height="100%"
-              <el-table-column label="子组号"></el-table-column>
+              border
-              <el-table-column label="子组结构号"></el-table-column>
+              style="width: 99%"
-              <el-table-column label="子组结构名称"></el-table-column>
+              class="table"
-              <el-table-column label="分组代号"></el-table-column>
+              v-loading="tableLoading.loadData"
-              <el-table-column label="零部件分类名称"></el-table-column>
+              :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-              <el-table-column label="零部件分类代号"></el-table-column>
+         fontWeight: 'bold', height: '48px'}"
-              <el-table-column label="备注"></el-table-column>
+              @selection-change="selectOne"
-              <el-table-column label="操作"></el-table-column>
+              ref="selection">
-            </el-table>
+            <el-table-column type="selection" align="center"></el-table-column>
-          </div>
+            <el-table-column label="子组号" prop="subgroupNumber" align="center"></el-table-column>
+            <el-table-column label="子组结构号" prop="subgroupStructureNumber" align="center"></el-table-column>
+            <el-table-column label="子组结构名称" prop="subgroupStructureName" align="center"></el-table-column>
+            <el-table-column label="分组代号" prop="groupCode" align="center"></el-table-column>
+            <el-table-column label="零部件分类名称" prop="partCategoryName" align="center"></el-table-column>
+            <el-table-column label="零部件分类代号" prop="partCategoryCode" align="center"></el-table-column>
+            <el-table-column label="备注" prop="remarks" align="center"></el-table-column>
+          </el-table>
         </div>
         <!--表头-->
       </div>
     </div>
+    <!--分页区域-->
+    <div class="page_area">
+      <pagination :page="pageNo" :total="total" @pageChange="pageChange"
+                  @pageSizeChange="pageSizeChange"></pagination>
+    </div>
+    <!--导出模态框区域-->
+    <el-dialog :visible.sync="exportModelFlag" title="导出文件" width="300px">
+      <el-form :inline="true" class="label-input-form search-area">
+        <el-form-item label="导出名称" class="search-item">
+          <el-input v-model="exportName" placeholder="请输入导出文件名称" :maxlength="30" clearable label="导出名称"/>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="demo-drawer-footer">
+          <el-button size="mini" class="common-button-default" icon="el-icon-close" @click="cancal">取消</el-button>
+          <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check"
+                     @click="exportTestItem">提交</el-button>
+        </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
+import {interfaceUrl} from "@/sysConfig";
+
 export default {
   name: "partCodeApply",
   data() {
     return {
-      loading: false
+      //零部件编号表格数据
+      partCodeList: [],
+      //当前页数
+      pageNo: 1,
+      //总数
+      total: 1,
+      //搜索区域输入框的数据
+      searchFormData: {
+        //子组号
+        subgroupNumber: "",
+        //分组代号
+        groupCode: "",
+        //零件分类号
+        partCategoryCode: ""
+      },
+      loading: false,
+      tableLoading: {
+        loadData: false
+      },
+      selectedList: [],//标准选中的数据
+      saveExportType: '',// 导出文件模态框控制，和文件名称
+      exportName: '',//导出文件的名称输入值
+      exportModelFlag: false, //导出模态窗
     }
+  },
+  mounted() {
+    this.getTableByPage();
+  },
+  methods: {
+    //导出
+    exportPartInfo() {
+      if (this.selectedList.length > 0) {
+        this.saveExportType = 'apart'
+      } else {
+        this.saveExportType = 'all'
+      }
+      this.exportName = ''
+      this.exportModelFlag = true
+      console.log(this.saveExportType);
+    },
+    //取消导出
+    cancal() {
+      this.exportModelFlag = false
+    },
+    //确认导出
+    exportTestItem() {
+      if (this.saveExportType === 'apart') {
+        if (this.selectedList != null && this.selectedList != '') {
+          console.log(this.selectedList);
+          const exportURL = interfaceUrl + 'sarStandPartCodeApply/exportPartInfoExcel?' +
+              'exportType' + this.saveExportType + '&ids=' + this.selectedList.join(',') + '&exportName=' + this.exportName
+          window.open(exportURL)
+          this.$message.success('导出信息成功')
+        }
+      } else if (this.saveExportType === 'all') {
+        console.log(this.selectedList);
+        const exportURL = interfaceUrl + 'sarStandPartCodeApply/exportPartInfoExcel?' +
+            'exportType' + this.saveExportType + '&ids=' + this.selectedList.join(',') + '&exportName=' + this.exportName
+        window.open(exportURL)
+        this.$message.success('导出信息成功')
+      }
+      this.exportModelFlag = false
+      this.selectedList = []
+    },
+    // 表格选择框
+    selectOne(data) {
+      this.selectedList = [];
+      for (let i = 0; i < data.length; i++) {
+        this.selectedList.push(data[i].id);
+      }
+    },
+    // 批量删除
+    deletePartCode(flag, id) {
+      if (flag === 'delOne') {
+        this.selectedList = [];
+        this.selectedList[0] = id;
+      }
+      if (this.selectedList.length === 0) {
+        this.$message.warning('请选择要删除的数据')
+      } else {
+        this.$confirm('确定删除这些数据？', '提示', {
+          confirmButtonText: '确定',
+          confirmButtonClass: 'common-button-primary',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          const URL = `sarStandPartCodeApply/deleteListAll?idList=${this.selectedList.join(',')}`
+          this.$http.postDelete(URL, {}, res => {
+            this.getTableByPage();
+            this.selectedList = [];
+            this.$message.success('删除成功')
+          }, e => {
+          });
+        }).catch(() => {
+
+        })
+      }
+    },
+    // 查询零部件table列表
+    getTableByPage() {
+      this.tableLoading.loadData = true
+      //后端的controller接口
+      this.$http.get('sarStandPartCodeApply', {
+        ...this.searchFormData,
+        current: this.pageNo,
+        size: this.$store.getters.userInfo.configContent
+      }, {
+        _this: this
+      }, res => {
+        this.tableLoading.loadData = false
+        this.total = res.data.total
+        this.partCodeList = res.data.records
+      }, e => {
+        this.tableLoading.loadData = false
+      })
+    },
+    // 清空 查询条件
+    clearAllSearch() {
+      this.searchFormData = {
+        //子组号
+        subgroupNumber: "",
+        //分组代号
+        groupCode: "",
+        //零件分类号
+        partCategoryCode: ""
+      }
+      this.getTableByPage()
+    },
+    // 分页事件
+    pageChange(page) {
+      this.pageNo = page
+      this.getTableByPage()
+    },
+    pageSizeChange(pageSize) {
+      console.log(pageSize);
+      this.getTableByPage()
+    },
   }
 }
 </script>
 
-<style scoped>
+<style lang="less" scoped>
+#partCodeApply {
+  height: 100%;
+  background-color: #ffffff;
+  padding-left: 10px;
 
+  .search-area {
+    /deep/ .el-input__inner {
+      width: 185px;
+    }
+  }
+
+  .table_area {
+    display: flex;
+    height: calc(100% - 115px);
+
+    .container {
+      flex: 1;
+      height: 100%;
+
+      .table-wrap {
+        flex: 1;
+        height: 100%;
+      }
+    }
+  }
+
+
+  .operation_area {
+    padding: 4px 0 14px 10px;
+  }
+
+  .page_area {
+    // /deep/只在当前页面修改elementui的默认样式
+    /deep/ .pagination-slot {
+      padding-left: 40px;
+    }
+  }
+
+}
 </style>