From b6cdda5d6a5750a4ba6614341a9bc883f597bbd8 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Thu, 12 Aug 2021 17:51:12 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=9B=B6=E9=83=A8=E4=BB=B6=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E7=94=B3=E8=AF=B7=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/navMenu/index.vue              |  14 +-
 .../details/otherStandardDetails/index.vue    |   8 +-
 .../partCodeApply/index.vue                   | 306 +++++++++++++++---
 3 files changed, 267 insertions(+), 61 deletions(-)

diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index c26c24ebd..c1a7bfcb4 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -88,11 +88,11 @@ export default {
               path: '/domesticStandardsAndRegulations',
               menuId: '3e3657498664beaa0dc1de1ecb3ae0da'
             },
-            // {
-            //   title: '零部件编号申请',
-            //   path: '/partCodeApply',
-            //   menuId: ''
-            // },
+            {
+              title: '零部件编号申请',
+              path: '/partCodeApply',
+              menuId: 'ad9db496772c075f78495382b7581fe9'
+            },
             // {
             //   title: '标准法规工作组数据统计',
             //   path: '/dataStatisComments',
@@ -310,11 +310,11 @@ export default {
         //       path: '/convertDocView',
         //       menuId: '3F52K25546'
         //     },
-            /*{
+            {
               title: '菜单管理',
               path: '/menuManage',
               menuId: '87b8b4f5817a7829696e63185c744d52'
-            },*/
+            },
             {
               title: '链接管理',
               path: '/linkManage',
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index b472b7646..362c13083 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -539,7 +539,7 @@
             prop="termsConditions"
             label="解读内容"
             show-overflow-tooltip
-            :resizable="false"
+
           >
             <template slot-scope="scope">
               <div class="table-jump" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">{{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}</div>
@@ -550,11 +550,17 @@
               :formatter="formatterTime"
               label="新车型实施日期(文本)"
               width="180">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
               prop="zccssrq"
               label="在产车实施日期(文本)"
               width="180">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
diff --git a/src/pages/regulatoryRepository/partCodeApply/index.vue b/src/pages/regulatoryRepository/partCodeApply/index.vue
index 191afc273..315258947 100644
--- a/src/pages/regulatoryRepository/partCodeApply/index.vue
+++ b/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">
-          <el-form-item label="子组号" class="search-item">
-            <el-input placeholder="根据子组号查询" clearable :maxlength="100">
+      <el-form inline class="label-input-form" v-model="searchFormData">
+        <el-form-item label="子组号" class="search-item">
+          <el-input placeholder="根据子组号查询" clearable :maxlength="100" v-model="searchFormData.subgroupNumber">
 
-            </el-input>
-          </el-form-item>
-          <el-form-item label="分组号" class="search-item">
-            <el-input placeholder="根据分组号查询" clearable :maxlength="100">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="分组代号" class="search-item">
+          <el-input placeholder="根据分组代号查询" clearable :maxlength="100" v-model="searchFormData.groupCode">
 
-            </el-input>
-          </el-form-item>
-          <el-form-item label="零件分类号" class="search-item">
-            <el-input placeholder="根据零件分类号查询" clearable :maxlength="100">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="零件分类号" class="search-item">
+          <el-input placeholder="根据零件分类代号查询" clearable :maxlength="100" v-model="searchFormData.partCategoryCode">
 
-            </el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" size="mini" class="common-button-primary">
-              查询
-            </el-button>
-          </el-form-item>
-          <el-form-item>
-            <el-button size="mini" class="common-button-default">
-              清空
-            </el-button>
-          </el-form-item>
-        </el-form>
-      </div>
+          </el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" size="mini" v-btn-permission="'02424c2bc370ee846aa5a6d60c49a6a5'"
+                     class="common-button-primary" @click="getTableByPage('')">
+            查询
+          </el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button size="mini" v-btn-permission="'c5b873fcb659afb230db133e7e4706c8'" class="common-button-default"
+                     @click="clearAllSearch">
+            清空
+          </el-button>
+        </el-form-item>
+      </el-form>
     </div>
     <!--操作区域-->
     <div class="operation_area">
-      <div class="content-center">
-        <el-button type="primary" size="mini" class="common-button-primary">
-          <i class="iconfont">&#xe6e9;</i>
-          导出
-        </el-button>
-        <el-button type="primary" size="mini" class="common-button-primary">
-          <i class="iconfont">&#xe611;</i>
-          删除
-        </el-button>
-      </div>
+      <el-button type="primary" size="mini" class="common-button-primary" @click="exportPartInfo()"
+                 v-btn-permission="'2b196e3179b073436deb9c64251ddb3d'" title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项">
+        <i class="iconfont">&#xe6e9;</i>
+        导出
+      </el-button>
+      <el-button type="primary" size="mini" v-btn-permission="'9caea8a46be62a0ae0600de35bad6539'"
+                 class="common-button-primary" @click="deletePartCode('demore',null)">
+        <i class="iconfont">&#xe611;</i>
+        删除
+      </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-column type="selection" align="center"></el-table-column>
-              <el-table-column label="序号"></el-table-column>
-              <el-table-column label="子组号"></el-table-column>
-              <el-table-column label="子组结构号"></el-table-column>
-              <el-table-column label="子组结构名称"></el-table-column>
-              <el-table-column label="分组代号"></el-table-column>
-              <el-table-column label="零部件分类名称"></el-table-column>
-              <el-table-column label="零部件分类代号"></el-table-column>
-              <el-table-column label="备注"></el-table-column>
-              <el-table-column label="操作"></el-table-column>
-            </el-table>
-          </div>
+          <el-table
+              :data="partCodeList"
+              tooltip-effect="dark"
+              height="100%"
+              border
+              style="width: 99%"
+              class="table"
+              v-loading="tableLoading.loadData"
+              :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+              @selection-change="selectOne"
+              ref="selection">
+            <el-table-column type="selection" align="center"></el-table-column>
+            <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>

From 36a514d3c83733ca5a927726402b1b762fddefc5 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 12 Aug 2021 17:54:08 +0800
Subject: [PATCH 2/4] commit

---
 .../pages/standInvolveProjectDetail.vue              | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
index a379be0c5..5c55a6950 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
@@ -379,8 +379,12 @@ export default {
       this.standId = row.standId;
       this.querySarProStateZero();
     }, // 查看项目符合性
-    querySarProStateZero() {
-      this.sarProStateTotalPage = 1;
+    querySarProStateZero(page) {
+      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() {

From 2f71741baf672ae58b468adfbb1d0784662ef00c Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Thu, 12 Aug 2021 17:55:41 +0800
Subject: [PATCH 3/4] commit

---
 src/components/navMenu/index.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index c1a7bfcb4..56cf10aca 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -310,11 +310,11 @@ export default {
         //       path: '/convertDocView',
         //       menuId: '3F52K25546'
         //     },
-            {
-              title: '菜单管理',
-              path: '/menuManage',
-              menuId: '87b8b4f5817a7829696e63185c744d52'
-            },
+        //     {
+        //       title: '菜单管理',
+        //       path: '/menuManage',
+        //       menuId: '87b8b4f5817a7829696e63185c744d52'
+        //     },
             {
               title: '链接管理',
               path: '/linkManage',

From de2f8c1fc3e7d811e72cc735e930137fa5e1910f Mon Sep 17 00:00:00 2001
From: "Mr.Z" <709235321@qq.com>
Date: Thu, 12 Aug 2021 18:31:05 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86--?=
 =?UTF-8?q?=E6=8B=86=E5=88=86=E9=A1=B5=E9=9D=A2=E5=92=8C=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=82=B9=E5=87=BB=E6=A0=87=E5=87=86=E5=8F=B7?=
 =?UTF-8?q?=E3=80=81=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=87=B3=E8=AF=A5=E6=A0=87=E5=87=86=E7=9A=84?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/standInvolveProjectDetail.vue                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
index 5c55a6950..9e53c7ad7 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+++ b/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