From be9fddb19ab2b2feabbb1b3199e966d02ab24823 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 12 Jan 2023 15:13:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=A8=A1=E6=9D=BF=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=99=A4=E4=BB=BB=E5=8A=A1=E4=BF=A1=E6=81=AF=E5=A4=96?=
 =?UTF-8?q?=E7=9A=84=E5=85=A8=E9=83=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/transferListvirtal.vue         | 98 +++++++++++++++++--
 .../components/transferListvirtal.vue         | 92 +++++++++++++++--
 2 files changed, 177 insertions(+), 13 deletions(-)

diff --git a/jero-web/src/views/documentTools/virtualList/components/transferListvirtal.vue b/jero-web/src/views/documentTools/virtualList/components/transferListvirtal.vue
index 3c60725cf..839a9eb0e 100644
--- a/jero-web/src/views/documentTools/virtualList/components/transferListvirtal.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/transferListvirtal.vue
@@ -30,8 +30,19 @@
                          v-model="queryParam.title"></j-input>
               </div>
             </a-col>
+            <a-col :md="12" :sm="5">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('areaOfResponsibility')">
+                  <span>{{ $t('areaOfResponsibility') }}</span>
+                </div>
+                <j-multi-select-tag class="box-input" v-model="queryParam.dutyTerritory"
+                                    :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                    :type="'select'"
+                                    :triggerChange="false" :dictCode="'duty_territory'"/>
+              </div>
+            </a-col>
             <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
-               <a-col :md="12" :sm="24">
+               <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>
@@ -42,7 +53,7 @@
       <a-table
         :columns="columns"
         rowKey="id"
-        :scroll="{x: 800}"
+        :scroll="{x: 800,y:600}"
         :data-source="dataList"
         :pagination="false"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' }"
@@ -79,6 +90,7 @@ export default {
   props: ['url'],
   data() {
     return {
+      toggleSearchStatus: false,
       visible: false,
       queryParam: {},
       confirmLoading: false,
@@ -86,27 +98,96 @@ export default {
       columns: [
         {
           title: this.$t('standard'),
-          align: 'center',
+          align: 'left',
           dataIndex: 'serialNumber',
+          width: 100,
+          fixed: 'left',
           scopedSlots: { customRender: 'standard' }
         },
         {
           title: this.$t('title'),
-          align: 'center',
+          align: 'left',
           dataIndex: 'title',
+          width: 100,
+          fixed: 'left',
           scopedSlots: { customRender: 'titleName' }
         },
         {
           title: this.$t('subtitle'),
-          align: 'center',
+          align: 'left',
           dataIndex: 'subtitle',
+          ellipsis: true,
+          width: 150
+        },
+        {
+          title: this.$t('zoneOfApplication'),
+          align: 'left',
+          dataIndex: 'region_dictText',
+          width: 150,
+          ellipsis: true
+        },
+        {
+          title: this.$t('correspondingStandard'),
+          align: 'left',
+          dataIndex: 'correspondingStandard',
+          width: 150,
+          ellipsis: true
+        },
+        {
+          title: this.$t('implementationCategory'),
+          align: 'left',
+          dataIndex: 'implementType_dictText',
+          width: 150,
+          ellipsis: true
+        },
+        {
+          title: this.$t('ImplementationDate'),
+          align: 'left',
+          width: 200,
+          dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1',
+          ellipsis: true
+        },
+        {
+          title: this.$t('vehicleInProductionDate'),
+          align: 'left',
+          width: 220,
+          dataIndex: 'implementTime',
+          ellipsis: true
+        },
+        {
+          title: this.$t('certificationType'),
+          align: 'left',
+          dataIndex: 'attestationType_dictText',
+          width: 180,
+          ellipsis: true
+        },
+        {
+          title: this.$t('certificationLevel'),
+          align: 'left',
+          dataIndex: 'attestationRank_dictText',
+          width: 180,
+          ellipsis: true
+        },
+        {
+          title: this.$t('applicableSupplement'),
+          align: 'left',
+          width: 220,
+          dataIndex: 'applicableSupplement',
+          ellipsis: true
+        },
+        {
+          title: 'WVTA ID',
+          align: 'left',
+          dataIndex: 'wvtaId',
+          width: 180,
           ellipsis: true
         },
         {
           title: this.$t('areaOfResponsibility'),
-          align: 'center',
+          align: 'left',
           ellipsis: true,
-          dataIndex: 'dutyTerritory_dictText'
+          dataIndex: 'dutyTerritory_dictText',
+          width: 180
         },
       ],
       dataList: [],
@@ -122,6 +203,9 @@ export default {
 
   },
   methods: {
+    handleToggleSearch() {
+      this.toggleSearchStatus = !this.toggleSearchStatus
+    },
     transferModel(id) {
       this.visible = true
       this.dummyInventoryBaseId = id
diff --git a/jero-web/src/views/projectManagement/components/transferListvirtal.vue b/jero-web/src/views/projectManagement/components/transferListvirtal.vue
index 832c2c091..f5046f329 100644
--- a/jero-web/src/views/projectManagement/components/transferListvirtal.vue
+++ b/jero-web/src/views/projectManagement/components/transferListvirtal.vue
@@ -30,6 +30,17 @@
                          v-model="queryParam.title"></j-input>
               </div>
             </a-col>
+            <a-col :md="12" :sm="5">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('areaOfResponsibility')">
+                  <span>{{ $t('areaOfResponsibility') }}</span>
+                </div>
+                <j-multi-select-tag class="box-input" v-model="queryParam.dutyTerritory"
+                                    :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                    :type="'select'"
+                                    :triggerChange="false" :dictCode="'duty_territory'"/>
+              </div>
+            </a-col>
             <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="12" :sm="24">
                   <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
@@ -42,7 +53,7 @@
       <a-table
         :columns="columns"
         rowKey="id"
-        :scroll="{x: 800}"
+        :scroll="{x: 800,y:600}"
         :data-source="dataList"
         :pagination="false"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:'' }"
@@ -86,27 +97,96 @@ export default {
       columns: [
         {
           title: this.$t('standard'),
-          align: 'center',
+          align: 'left',
           dataIndex: 'serialNumber',
+          width: 100,
+          fixed: 'left',
           scopedSlots: { customRender: 'standard' }
         },
         {
           title: this.$t('title'),
-          align: 'center',
+          align: 'left',
           dataIndex: 'title',
+          width: 100,
+          fixed: 'left',
           scopedSlots: { customRender: 'titleName' }
         },
         {
           title: this.$t('subtitle'),
-          align: 'center',
+          align: 'left',
           dataIndex: 'subtitle',
+          ellipsis: true,
+          width: 150
+        },
+        {
+          title: this.$t('zoneOfApplication'),
+          align: 'left',
+          dataIndex: 'region_dictText',
+          width: 150,
+          ellipsis: true
+        },
+        {
+          title: this.$t('correspondingStandard'),
+          align: 'left',
+          dataIndex: 'correspondingStandard',
+          width: 150,
+          ellipsis: true
+        },
+        {
+          title: this.$t('implementationCategory'),
+          align: 'left',
+          dataIndex: 'implementType_dictText',
+          width: 150,
+          ellipsis: true
+        },
+        {
+          title: this.$t('ImplementationDate'),
+          align: 'left',
+          width: 200,
+          dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1',
+          ellipsis: true
+        },
+        {
+          title: this.$t('vehicleInProductionDate'),
+          align: 'left',
+          width: 220,
+          dataIndex: 'implementTime',
+          ellipsis: true
+        },
+        {
+          title: this.$t('certificationType'),
+          align: 'left',
+          dataIndex: 'attestationType_dictText',
+          width: 180,
+          ellipsis: true
+        },
+        {
+          title: this.$t('certificationLevel'),
+          align: 'left',
+          dataIndex: 'attestationRank_dictText',
+          width: 180,
+          ellipsis: true
+        },
+        {
+          title: this.$t('applicableSupplement'),
+          align: 'left',
+          width: 220,
+          dataIndex: 'applicableSupplement',
+          ellipsis: true
+        },
+        {
+          title: 'WVTA ID',
+          align: 'left',
+          dataIndex: 'wvtaId',
+          width: 180,
           ellipsis: true
         },
         {
           title: this.$t('areaOfResponsibility'),
-          align: 'center',
+          align: 'left',
           ellipsis: true,
-          dataIndex: 'dutyTerritory_dictText'
+          dataIndex: 'dutyTerritory_dictText',
+          width: 180
         },
       ],
       dataList: [],