Merge remote-tracking branch 'origin/master'

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

@@ -68,7 +68,7 @@
       </div>
     </div>
     <div class="content-text">
-      <div class="text-field">
+      <div class="text-field" style="width: 50%">
         <span class="text-field-left" :title="$t('ListOfRelevantPersonnel')">{{$t('ListOfRelevantPersonnel')}}</span>
         <span class="text-field-right"
         >

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

@@ -44,8 +44,8 @@
             </span>
       </a-row>
     </div>
-    <div class="table-operator">
+    <div class="table-operator" style="overflow:hidden;">
-      <div style="float: left;margin-bottom: 19px;margin-left: 20px" v-if="isDisplay">
+      <div style="float: left;margin-bottom: 10px;margin-left: 20px" v-if="isDisplay">
         <div class="operator-text" @click="initiateListConfirmationcClick('清单')">
           <a-icon type="solution"/>
           {{ $t('initiateListConfirmation') }}
@@ -63,7 +63,7 @@
           {{ $t('fixedPlate') }}
         </div>
       </div>
-      <div style="float: right;margin-top: 1px" v-if="isDisplay">
+      <div style="float: right;margin-top: 1px;" v-if="isDisplay">
         <a-popconfirm overlayClassName='popconfirm' placement="bottomRight">
           <template slot="title" id="popconfirm">
             <div class="operator-text-title">

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

@@ -206,7 +206,7 @@
           {
             title: this.$t('operation'),
             align: 'center',
-            width: 80,
+            width: 100,
             fixed: 'right',
             scopedSlots: { customRender: 'operation' }
           }

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

@@ -22,32 +22,43 @@
         </a-col>
         <a-col :md="6" :sm="8">
           <div class="box-title-text">
-            <div class="title-text" :title="$t('ProcessType')">
+            <div class="title-text" style="width: 64px" :title="$t('areaOfResponsibility')">
-              <span>{{$t('ProcessType')}}</span>
+              <span>{{$t('areaOfResponsibility')}}</span>
             </div>
-            <a-select allowClear
+            <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
-                      class="box-input"
+                               :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                      v-model="queryParam.flowType"
+                               :type="'select'"
-                      :placeholder="$t('PleaseSelect')+$t('ProcessType')">
+                               :triggerChange="false" :dictCode="'duty_territory'"/>
-              <a-select-option :value="this.$t('designComplianceReview')">
-               <span class="itemOption">
-                     {{ $t('designComplianceReview') }}
-               </span>
-              </a-select-option>
-              <a-select-option :value="this.$t('preHomeConfirmation')">
-               <span class="itemOption">
-                     {{ $t('preHomeConfirmation') }}
-               </span>
-              </a-select-option>
-              <a-select-option :value="this.$t('verificationComplianceReview')">
-               <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('ProcessType')">
+                <span>{{$t('ProcessType')}}</span>
+              </div>
+              <a-select allowClear
+                        class="box-input"
+                        v-model="queryParam.flowType"
+                        :placeholder="$t('PleaseSelect')+$t('ProcessType')">
+                <a-select-option :value="this.$t('designComplianceReview')">
+               <span class="itemOption">
+                     {{ $t('designComplianceReview') }}
+               </span>
+                </a-select-option>
+                <a-select-option :value="this.$t('preHomeConfirmation')">
+               <span class="itemOption">
+                     {{ $t('preHomeConfirmation') }}
+               </span>
+                </a-select-option>
+                <a-select-option :value="this.$t('verificationComplianceReview')">
+               <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('RelatedItems')">
@@ -183,27 +194,38 @@
           {
             title: this.$t('standard'),
             align: 'center',
-            dataIndex: 'serialNumber'
+            dataIndex: 'serialNumber',
+            ellipsis: true
           },
           {
             title: this.$t('title'),
             align: 'center',
-            dataIndex: 'title'
+            dataIndex: 'title',
+            ellipsis: true
+          },
+          {
+            title: this.$t('areaOfResponsibility'),
+            align: 'center',
+            dataIndex: 'dutyTerritory_dictText',
+            ellipsis: true
           },
           {
             title: this.$t('ProcessType'),
             align: 'center',
-            dataIndex: 'flowType'
+            dataIndex: 'flowType',
+            ellipsis: true
           },
           {
             title: this.$t('RelatedItems'),
             align: 'center',
-            dataIndex: 'projectName'
+            dataIndex: 'projectName',
+            ellipsis: true
           },
           {
             title: this.$t('problemType'),
             align: 'center',
-            dataIndex: 'problemType'
+            dataIndex: 'problemType',
+            ellipsis: true
           },
           {
             title: this.$t('Sponsor'),
@@ -221,7 +243,7 @@
         pageNo: 1,
         url: {
           page: '/project/ncrTrackController/queryPage',
-          exportData: ''
+          exportData: '/project/ncrTrackController/exportData'
         }
       }
     },
@@ -287,7 +309,10 @@
           ...this.queryParam,
           ids: selectedRowKeys.join(',')
         }
-        downloadFile(this.url.exportData, this.$route.query.projectName + this.$t('listOfRegulations') + '.zip', query, this.Deselect)
+        downloadFile(this.url.exportData, this.$t('NonConformance') + '.xls', query, this.Deselect)
+      },
+      Deselect() {
+        this.selectedRowKeys = []
       },
       PersonnelSelectionChange(value, id) {
         this.queryParam[value] = id