对接未符合项

jero-web/src/common/lang/en-us.js

@@ -792,4 +792,8 @@ module.exports = {
   number:'No',
   Deadline:'Deadline',
   toBeConfirmed:'To be confirmed',
+  designComplianceReview:'Design compliance review',
+  preHomeConfirmation:'Pre home confirmation',
+  verificationComplianceReview:'Verification compliance review',
+  Deployment:'Deployment',
 }

jero-web/src/common/lang/zh-cn.js

@@ -493,6 +493,7 @@ module.exports = {
   sentProcess: '已发流程',
   monitoringProcess: '监控流程',
   ConfirmDeployment: '确认部署？',
+  Deployment:'部署',
   ConfirmReplication: '确认复制？',
   ProcessName: '流程名称',
   ProcessType: '流程类型',
@@ -797,4 +798,7 @@ module.exports = {
   TheDoesNotContainData:'该虚拟清单的维护清单中没有数据,是否需要添加',
   number:'序号',
   Deadline:'截止时间',
+  designComplianceReview:'设计符合性审查',
+  preHomeConfirmation:'Pre-Home确认',
+  verificationComplianceReview:'验证符合性审查',
 }

jero-web/src/views/documentManage/library/modules/addForm.vue

@@ -32,7 +32,7 @@
     },
     data() {
       return {
-        title: '新增',
+        title:this.$t('add'),
         drawerWidth: 900,
         visible: false,
         confirmLoading: false,

jero-web/src/views/processCenter/procedure/index.vue

@@ -20,7 +20,7 @@
         >
           <span slot="operation" slot-scope="record">
              <a style="margin-right: 8px" @click="edit(record)">{{$t('edit')}}</a>
-             <a style="margin-right: 8px" @click="deploy(record.id)">部署</a>
+             <a style="margin-right: 8px" @click="deploy(record.id)">{{$t('Deployment')}}</a>
 <!--             <a style="margin-right: 8px" @click="copyModel(record.id)">复制</a>-->
              <a style="margin-right: 8px" @click="deleteRow(record)">{{$t('delete')}}</a>
           </span>

jero-web/src/views/projectManagement/components/addModel.vue

@@ -284,7 +284,7 @@
       },
       addModel() {
         this.visible = true
-        this.title = '新增'
+        this.title = this.$t('add')
         this.formInline = {}
         this.formInline.studioEngineerName = this.userInfo().username
         this.formInline.studioEngineer = this.userInfo().id
@@ -294,7 +294,7 @@
       },
       editModel(value) {
         this.visible = true
-        this.title = '编辑'
+        this.title = this.$t('edit')
         this.$nextTick(() => {
           this.formInline = value
           this.$refs.ruleForm.clearValidate()

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -874,6 +874,9 @@
                 if ((this.dataSource[i].taskAffirmStatus == 'Not started' || this.dataSource[i].taskAffirmStatus == 'rejected') &&
                   this.dataSource[i].engineeringInterfacePerson && this.dataSource[i].inventoryAffirmStatus == 'accepted') {
                   isTrue = true
+                  // if (this.dataSource[i]){
+                  //
+                  // }
                 } else {
                   isTrue = false
                   this.$message.warning(this.$t('taskDataConfirmation'))

jero-web/src/views/projectManagement/projectNonConformance/index.vue

@@ -22,40 +22,135 @@
         </a-col>
         <a-col :md="6" :sm="8">
           <div class="box-title-text">
-            <div class="title-text" :title="$t('areaOfResponsibility')">
-              <span>{{$t('areaOfResponsibility')}}</span>
+            <div class="title-text" :title="$t('ProcessType')">
+              <span>{{$t('ProcessType')}}</span>
             </div>
-            <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
-                               :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                               :type="'select'"
-                               :triggerChange="false" :dictCode="'region'"/>
+            <a-select allowClear
+                      class="box-input"
+                      v-model="queryParam.flowType"
+                      :placeholder="$t('PleaseSelect')+$t('ProcessType')">
+              <a-select-option :value="2">
+               <span class="itemOption">
+                     {{ $t('designComplianceReview') }}
+               </span>
+              </a-select-option>
+              <a-select-option :value="3">
+               <span class="itemOption">
+                     {{ $t('preHomeConfirmation') }}
+               </span>
+              </a-select-option>
+              <a-select-option :value="4">
+               <span class="itemOption">
+                     {{ $t('verificationComplianceReview') }}
+               </span>
+              </a-select-option>
+            </a-select>
           </div>
         </a-col>
+        <template v-if="toggleSearchStatus">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('RelatedItems')">
+                <span>{{$t('RelatedItems')}}</span>
+              </div>
+              <a-select allowClear
+                        class="box-input"
+                        v-model="queryParam.projectName"
+                        :placeholder="$t('PleaseSelect')+$t('RelatedItems')">
+                <a-select-option :value="2">
+               <span class="itemOption">
+                     {{ $t('designComplianceReview') }}
+               </span>
+                </a-select-option>
+                <a-select-option :value="3">
+               <span class="itemOption">
+                     {{ $t('preHomeConfirmation') }}
+               </span>
+                </a-select-option>
+                <a-select-option :value="4">
+               <span class="itemOption">
+                     {{ $t('verificationComplianceReview') }}
+               </span>
+                </a-select-option>
+              </a-select>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('problemType')">
+                <span>{{$t('problemType')}}</span>
+              </div>
+              <a-select allowClear
+                        class="box-input"
+                        v-model="queryParam.problemType"
+                        :placeholder="$t('PleaseSelect')+$t('problemType')">
+                <a-select-option value="inconformity">
+               <span class="itemOption">
+                     {{ $t('nonConformity') }}
+               </span>
+                </a-select-option>
+                <a-select-option value="to track">
+               <span class="itemOption">
+                     {{ $t('Tracked') }}
+               </span>
+                </a-select-option>
+              </a-select>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('Sponsor')">
+                <span>{{$t('Sponsor')}}</span>
+              </div>
+              <PersonnelSelection :query="{db_field_name:'initiator',db_field_txt:$t('Sponsor')}"
+                                  :isInput="true"
+                                  class="box-input"
+                                  :personneQuery="queryParam"
+                                  @change="PersonnelSelectionChange"
+                                  v-model="queryParam.initiatorName"/>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('personLiable')">
+                <span>{{$t('personLiable')}}</span>
+              </div>
+              <PersonnelSelection :query="{db_field_name:'duty',db_field_txt:$t('personLiable')}"
+                                  :isInput="true"
+                                  class="box-input"
+                                  :personneQuery="queryParam"
+                                  @change="PersonnelSelectionChange"
+                                  v-model="queryParam.dutyName"/>
+            </div>
+          </a-col>
+        </template>
         <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 @click="handleToggleSearch" style="margin-left: 8px">
+                        {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                         <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                 </a>
                </a-col>
       </span>
       </a-row>
     </div>
     <div class="table-operator">
-      <div @click="handleAdd" class="operator-text" v-has="'document:getInfoById'">
-        <a-icon type="plus"/>
-        {{$t('add')}}
-      </div>
-      <div @click="handleDel" class="operator-text" v-has="'document:deleteBatch'">
-        <a-icon type="delete"/>
-        {{$t('BatchDelete')}}
+      <div @click="handleExport" class="operator-text">
+        <a-icon type="export" :rotate="-90"/>
+        {{ $t('export') }}
       </div>
     </div>
     <div>
       <a-table
         ref="table"
         size="middle"
+        rowKey="id"
         :loading="loading"
         :pagination="false"
         :scroll="{x: true}"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :data-source="dataSource"
         :columns="columns"
       >
@@ -77,14 +172,20 @@
 
 <script>
   import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
 
   export default {
     name: 'projectNonConformance',
+    components: {
+      PersonnelSelection
+    },
     data() {
       return {
         queryParam: {},
         loading: false,
         dataSource: [],
+        selectedRowKeys: [],
+        toggleSearchStatus: false,
         columns: [
           {
             title: this.$t('standard'),
@@ -126,7 +227,8 @@
         pageSize: 10,
         pageNo: 1,
         url: {
-          page: '/project/ncrTrackController/queryPage'
+          page: '/project/ncrTrackController/queryPage',
+          exportData: ''
         }
       }
     },
@@ -134,10 +236,16 @@
       this.getList()
     },
     methods: {
+      handleToggleSearch() {
+        this.toggleSearchStatus = !this.toggleSearchStatus
+      },
       searchQuery() {
         this.pageNo = 1
         this.getList()
       },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+      },
       searchReset() {
         this.pageNo = 1
         this.queryParam = {}
@@ -168,6 +276,18 @@
             this.loading = false
           }
         })
+      },
+      handleExport() {
+        let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+        let query = {
+          ...this.queryParam,
+          ids: selectedRowKeys.join(',')
+        }
+        downloadFile(this.url.exportData, this.$route.query.projectName + this.$t('listOfRegulations') + '.zip', query, this.Deselect)
+      },
+      PersonnelSelectionChange(value, id) {
+        this.queryParam[value] = id
+        this.queryParam = { ...this.queryParam }
       }
     }
   }