未符合项整改

src/components/navMenu/index.vue

@@ -144,7 +144,7 @@ export default {
               menuId: 'PCZKM8TQJAH5UP5EAXTJ'
             },
             {
-              title: '未符合项跟踪',
+              title: '未符合项整改',
               path: '/nonConfomity',
               menuId: 'HQSK8WWPDJG7R5F53LTK'
             },

src/pages/localTool/standardWarning.vue

@@ -542,13 +542,15 @@ export default {
            _this: this,
         }, res=> {
           const result = res.data[0]
-          // Object.keys(result).forEach((tableName,index) => {
-          //   const tableRes = result[tableName]
-          //   const count = `count${index + 1}`
-          //   this.pageConfig[count] = tableRes.total
-          //   this[tableName] = tableRes.records
-          //   console.log(tableRes)
-          // })
+          for(const type in result) {
+            this[type] = result[type].records
+          }
+          this.newItemsPage = 1
+          this.oldItemsPage = 1
+          this.newStandPage = 1
+          this.oldStandPage = 1
+          this.newPolicyPage = 1
+          this.oldPolicypage = 1
         }, e => {
           console.log(e)
         })

src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue

@@ -0,0 +1,14 @@
+<!--事业部-->
+<template>
+<div>事业部</div>
+</template>
+
+<script>
+export default {
+  name: "businessDivision"
+};
+</script>
+
+<style scoped>
+
+</style>

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

@@ -0,0 +1,44 @@
+<!--重点问题项管控-->
+<template>
+<div id="key-issues">
+  <div class="non-content">
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="事业部" name="cause">
+        <business-division></business-division>
+      </el-tab-pane>
+      <el-tab-pane label="产品规划部" name="product">
+       <product-department></product-department>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</div>
+</template>
+
+<script>
+import businessDivision from "@/pages/regulatoryRepository/nonConfomity/pages/businessDivision";
+import productDepartment from "@/pages/regulatoryRepository/nonConfomity/pages/productDepartment";
+
+export default {
+  name: "keyIssues",
+ components: {
+   businessDivision,
+   productDepartment,
+ },
+  data() {
+    return {
+      activeName:'cause',
+    }
+  },
+  methods: {
+    handleClick(tab, event) {
+      console.log(tab, event);
+    }
+  },
+};
+</script>
+
+<style lang="less" scoped>
+#key-issues {
+
+}
+</style>

src/pages/regulatoryRepository/nonConfomity/pages/productDepartment.vue

@@ -0,0 +1,16 @@
+<!--产品规划部-->
+<template>
+<div>
+  产品规划部
+</div>
+</template>
+
+<script>
+export default {
+  name: "productDepartment"
+};
+</script>
+
+<style scoped>
+
+</style>

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

@@ -0,0 +1,283 @@
+<!--未符合项整改数据库-->
+<template>
+  <div id="rectification-dataBase">
+    <div class="search-area">
+      <div class="content-top">
+        <el-form :modal="nonConformitySearch" inline class="label-input-form">
+          <el-form-item label="标准号/标准名称" class="search-item">
+            <el-input v-model="nonConformitySearch.standNumOrName"
+                      placeholder="请输入"
+                      clearable
+                      :maxlength="100"></el-input>
+          </el-form-item>
+          <el-form-item label="项目名称" class="search-item">
+            <el-select filterable clearable v-model="nonConformitySearch.productName">
+              <el-option v-for="item1 in productNameList"
+                         :key="item1.value"
+                         :label="item1.label"
+                         :value="item1.value"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="责任部门" class="search-item">
+            <el-input v-model="nonConformitySearch.responseUnit" v-show="false" />
+            <el-popover
+              placement="bottom"
+              popper-class="user-dept-popper"
+              trigger="click"
+              :value="false"
+            >
+              <el-input
+                slot="reference"
+                v-model="nonConformitySearch.responseUnitShow"
+                placeholder="根据责任部门查找"
+                readonly
+                clearable
+                id="searchResp"
+              />
+              <div class="api">
+                <laws-tree
+                  :zNodes="zNodesSItem"
+                  treeDivId="zNodesSItemSearch"
+                  deptSelect
+                  showRMenu
+                  @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"
+                  class="ztree" style="width: 200px;height: 400px;overflow: auto">
+                </laws-tree>
+              </div>
+            </el-popover>
+          </el-form-item>
+          <el-form-item class="search-item btn-box">
+            <el-button
+              icon="el-icon-search"
+              type="primary"
+              class="common-button-primary"
+              size="mini"
+              @click="getTableByPage('')">
+            </el-button>
+          </el-form-item>
+          <el-form-item class="search-item btn-box">
+            <el-button
+              class="common-button-default"
+              icon="el-icon-refresh-left"
+              size="mini"
+              @click="clearAllSearch"></el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+    <div class="content-center">
+      <el-button
+        class="common-button-primary"
+        type="primary"
+        size="mini"
+        title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
+      ><i class="iconfont">&#xe6e9;</i>导出</el-button>
+      <el-button
+        class="common-button-primary"
+        size="mini"
+        type="primary"
+        @click="historyClick"
+      >历史数据</el-button>
+    </div>
+    <div class="container">
+      <loading :loading="loading">数据获取中....</loading>
+      <el-table
+        :data="nonList"
+        tooltip-effect="dark"
+        style="width: 100%;"
+       height="tableHeight"
+        border
+        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          fixed="left"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="standNum"
+          fixed="left"
+          width="180"
+          label="标准编号">
+          <template slot-scope="scope">
+            <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standNum }}</a>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="standName"
+          fixed="left"
+          width="180"
+          label="标准名称">
+          <template slot-scope="scope">
+            <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="standNum"
+          fixed="left"
+          width="180"
+          label="条款号">
+        </el-table-column>
+        <el-table-column
+          prop="standName"
+          fixed="left"
+          width="180"
+          label="条款名称">
+        </el-table-column>
+        <el-table-column
+          prop="productNameShow"
+          width="180"
+          label="产品类型">
+        </el-table-column>
+        <el-table-column
+          prop="productNameShow"
+          width="180"
+          label="产品线">
+        </el-table-column>
+        <el-table-column
+          prop="productNameShow"
+          width="180"
+          label="项目名称">
+        </el-table-column>
+        <el-table-column
+          prop="responseUnitShow"
+          width="180"
+          label="责任部门">
+        </el-table-column>
+        <el-table-column
+          prop="responseEnginShow"
+          width="150"
+          label="责任工程师">
+        </el-table-column>
+        <el-table-column
+          prop="responseEnginShow"
+          width="150"
+          label="认证工程师">
+        </el-table-column>
+        <el-table-column
+          prop="responseEnginShow"
+          width="150"
+          label="质量工程师">
+        </el-table-column>
+        <el-table-column
+          prop="planCloseTime"
+          width="150"
+          sortable="custom"
+          label="计划关闭时间">
+          <template slot-scope="scope">{{(scope.row.planCloseTime ? scope.row.planCloseTime.substring(0, 11): '')}}</template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="50" fixed="right">
+          <template slot-scope="scope">
+            <div @click.stop style="display: inline-block">
+              <el-dropdown trigger="click" @command="handleCommand">
+                <i class="iconfont">&#xe61e;</i>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'R4FTCUQSXFUZPUSN3W63'">查看</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'G7GL8ZAZ5EYK6LRXW5MT'">编辑</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '关闭']" v-btn-permission="'Q8GPXE8L36KN2XVMZ6Y4'">关闭</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination :page="pageNo" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "rectificationDatabase",
+  data () {
+    return {
+      loading: false,
+      tableHeight: null, //table高度
+      nonList:[], //未符合项表格数据
+      // 总数
+      total: 0,
+      // 当前页数
+      pageNo: 1,
+      nonConformitySearch: {
+        standNumOrName: '', // 标准号/名称
+        productName: '', // 项目名称
+        responseUnit: '' // 责任部门
+      },
+      // 项目名称下拉列表数据
+      productNameList: [],
+      // 责任部门
+      zNodesSItem: [],
+    }
+  },
+  methods: {
+    // 查询未符合项table列表
+    getTableByPage () {
+       console.log('查询符合项')
+    },
+    // 点击历史记录按钮事件
+    historyClick () {
+      this.$router.push({
+        name: 'HistoricalData'
+      })
+    },
+    // 清空 查询条件
+    clearAllSearch (search = true) {
+      this.nonConformitySearch = {
+        standNumOrName: '',
+        productName: '',
+        responseUnit: ''
+      }
+    },
+    // 更多
+    handleCommand (command) {
+      switch (command[1]) {
+        case '查看':
+          this.showUser(command[0])
+          break
+        case '编辑':
+          this.openEditModal(command[0])
+          break
+        case '关闭':
+          this.userClo(command[0])
+          break
+      }
+    },
+    //点击查看按钮事件
+    showUser(row) {
+        console.log(row)
+    },
+  //点击编辑按钮事件
+    openEditModal(item) {
+      console.log(item)
+    },
+    //点击关闭按钮事件
+    userClo(row) {
+      console.log(row)
+    },
+    // 分页事件
+    pageChange (page) {
+      this.pageNo = page
+      this.getTableByPage()
+    },
+    pageSizeChange (pageSize) {
+      this.pageSize = this.$store.getters.userInfo.configContent
+      this.getTableByPage()
+    },
+  },
+  mounted () {},
+};
+</script>
+
+<style lang="less" scoped>
+#rectification-dataBase {
+  //margin: 10px;
+  .content-center{
+    margin:10px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+}
+</style>

src/router/index.js

@@ -674,7 +674,7 @@ const routes = [
           import('@/pages/regulatoryRepository/nonConfomity'),
         meta: {
           requireAuth: true,
-          title: '未符合项跟踪',
+          title: '未符合项整改',
           menuId: 'HQSK8WWPDJG7R5F53LTK'
         }
       },