From 5578c41c6c4845fec34b0b76077f60369b5d69e8 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 19 Apr 2022 16:14:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=9C=AA=E7=AC=A6=E5=90=88?=
 =?UTF-8?q?=E9=A1=B9=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   8 +-
 jero-web/src/common/lang/zh-cn.js             |   7 +-
 .../ProjectDetails/index.vue                  |  32 +--
 .../components/nonConformance.vue             | 192 ++++++++++++++++++
 4 files changed, 224 insertions(+), 15 deletions(-)
 create mode 100644 jero-web/src/views/projectManagement/components/nonConformance.vue

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 78cd46eac..0a5a7eb63 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -675,5 +675,11 @@ module.exports = {
   basicInformationOfParameters:'Basic information of parameters',
   regulatoryCertificationTaskPlan:'Regulatory / certification task plan',
   bringInRelevantPersonnel:'Bring in relevant personnel',
-  confirmBringInRelevantPersonnel:'confirm Bring in relevant personnel'
+  confirmBringInRelevantPersonnel:'confirm Bring in relevant personnel',
+  problemType:'Problem type',
+  projectDetails:'Project details',
+  listOfRegulations:'List of regulations',
+  taskList:'Task list',
+  TaskParameterCollection:'Task parameter collection',
+  nonConformance:'Non conformance',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 147e766b6..c4cbd700f 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -680,5 +680,10 @@ module.exports = {
   regulatoryCertificationTaskPlan:'法规/认证任务计划',
   bringInRelevantPersonnel:'带入相关人员',
   confirmBringInRelevantPersonnel:'确认带入相关人员？',
-
+  problemType:'问题类型',
+  projectDetails:'项目详情',
+  listOfRegulations:'法规清单',
+  taskList:'任务清单',
+  TaskParameterCollection:'任务参数收集',
+  nonConformance:'未符合项',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue
index c8413059e..b1c26d5d1 100644
--- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue
+++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue
@@ -10,28 +10,28 @@
         </span>
       </div>
     </div>
-    <div style="padding: 67px 0 0 0;background: #fff;height:100%">
+    <div style="padding: 67px 0 0 0;background: #ffffff;height:100%">
       <div class="detail-content" style="height: 100%">
         <div class="Virtual-detail-left">
-          <div class="Virtual-detail-left-text" @click="textClick(0,'项目详情')">
+          <div class="Virtual-detail-left-text" :title="$t('projectDetails')" @click="textClick(0,'项目详情')">
             <a-icon type="container"/>
-            项目详情
+            {{$t('projectDetails')}}
           </div>
-          <div class="Virtual-detail-left-text" @click="textClick(1,'法规清单')">
+          <div class="Virtual-detail-left-text" :title="$t('listOfRegulations')" @click="textClick(1,'法规清单')">
             <a-icon type="container"/>
-            法规清单
+            {{$t('listOfRegulations')}}
           </div>
-          <div class="Virtual-detail-left-text" @click="textClick(2,'任务清单')">
+          <div class="Virtual-detail-left-text" :title="$t('taskList')" @click="textClick(2,'任务清单')">
             <a-icon type="container"/>
-            任务清单
+            {{$t('taskList')}}
           </div>
-          <div class="Virtual-detail-left-text" @click="textClick(3,'任务参数收集')">
+          <div class="Virtual-detail-left-text" :title="$t('TaskParameterCollection')" @click="textClick(3,'任务参数收集')">
             <a-icon type="container"/>
-            任务参数收集
+            {{$t('TaskParameterCollection')}}
           </div>
-          <div class="Virtual-detail-left-text" @click="textClick(4,'未符合项')">
+          <div class="Virtual-detail-left-text" :title="$t('nonConformance')" @click="textClick(4,'未符合项')">
             <a-icon type="container"/>
-            未符合项
+            {{$t('nonConformance')}}
           </div>
         </div>
         <div class="Virtual-detail-right">
@@ -39,6 +39,7 @@
           <listOfRegulations v-else-if="textTitle === '法规清单'"/>
           <TaskList v-else-if="textTitle === '任务清单'"/>
           <TaskParameterCollection v-else-if="textTitle === '任务参数收集'"/>
+          <nonConformance v-else-if="textTitle === '未符合项'"/>
         </div>
       </div>
     </div>
@@ -50,6 +51,7 @@
   import listOfRegulations from '../components/listOfRegulations'
   import ProjectDetailsName from '../components/ProjectDetails'
   import TaskParameterCollection from '../components/TaskParameterCollection'
+  import nonConformance from '../components/nonConformance'
 
   export default {
     name: 'ProjectDetails',
@@ -57,11 +59,12 @@
       TaskList,
       listOfRegulations,
       ProjectDetailsName,
-      TaskParameterCollection
+      TaskParameterCollection,
+      nonConformance
     },
     data() {
       return {
-        title: '项目详情',
+        title: this.$t('projectDetails'),
         textTitle: '项目详情'
       }
     },
@@ -139,6 +142,9 @@
       .Virtual-detail-left-text {
         padding: 2px 12px;
         cursor: pointer;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
       }
     }
 
diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue
new file mode 100644
index 000000000..2af6ec662
--- /dev/null
+++ b/jero-web/src/views/projectManagement/components/nonConformance.vue
@@ -0,0 +1,192 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-row :gutter="24">
+        <a-col :md="6" :sm="8">
+          <div class="box-title-text">
+            <div class="title-text" :title="$t('standard')">
+              <span>{{$t('standard')}}</span>
+            </div>
+            <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                     v-model="queryParam.serialNumber"></a-input>
+          </div>
+        </a-col>
+        <a-col :md="6" :sm="8">
+          <div class="box-title-text">
+            <div class="title-text" :title="$t('title')">
+              <span>{{$t('title')}}</span>
+            </div>
+            <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                     v-model="queryParam.title"></a-input>
+          </div>
+        </a-col>
+        <a-col :md="6" :sm="8">
+          <div class="box-title-text">
+            <div class="title-text" style="width: 64px"  :title="$t('areaOfResponsibility')">
+              <span>{{$t('areaOfResponsibility')}}</span>
+            </div>
+            <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
+                               :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                               :type="'select'"
+                               :triggerChange="false" :dictCode="'region'"/>
+          </div>
+        </a-col>
+        <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+               </a-col>
+      </span>
+      </a-row>
+    </div>
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: true}"
+        :data-source="dataSource"
+        :columns="columns"
+      >
+      </a-table>
+    </div>
+    <div class="page">
+      <a-pagination
+        :show-total="total => $t('total')+` ${total} `+$t('strip')"
+        show-quick-jumper
+        show-size-changer
+        :page-size.sync="pageSize"
+        :total="total"
+        @change="pageOnChange"
+        @showSizeChange="SizeChange"
+      />
+    </div>
+  </a-card>
+</template>
+
+<script>
+  export default {
+    name: 'nonConformance',
+    data() {
+      return {
+        queryParam: {},
+        loading: false,
+        dataSource: [],
+        columns: [
+          {
+            title: this.$t('standard'),
+            align: 'center',
+            dataIndex: 'serialNumber'
+          },
+          {
+            title: this.$t('title'),
+            align: 'center',
+            dataIndex: 'title'
+          },
+          {
+            title: this.$t('ProcessType'),
+            align: 'center',
+            dataIndex: 'ProcessType'
+          },
+          {
+            title: this.$t('areaOfResponsibility'),
+            align: 'center',
+            dataIndex: 'dutyTerritory_dictText'
+          },
+          {
+            title: this.$t('problemType'),
+            align: 'center',
+            dataIndex: 'problemType'
+          },
+          {
+            title: this.$t('problemType'),
+            align: 'center',
+            dataIndex: 'problemType'
+          },
+          {
+            title: this.$t('Sponsor'),
+            align: 'center',
+            dataIndex: 'Sponsor'
+          },
+          {
+            title: this.$t('personLiable'),
+            align: 'center',
+            dataIndex: 'personLiable'
+          }
+        ],
+        total: 0,
+        pageSize: 10,
+        pageNo: 1,
+        url: {}
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      searchQuery() {
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.getList()
+      },
+      pageOnChange(page, pageSize) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 32px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+    /*margin-top: 2px;*/
+  }
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+</style>
\ No newline at end of file