From 510c80d736e55f69500b9f3c1a05634303c1de00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Mon, 13 Mar 2023 14:16:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=AE=A4=E8=AF=81=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificationList/components/addModel.vue |   6 +-
 .../components/transferList.vue               | 129 +++----
 .../components/transferListvirtal.vue         | 314 ++++++++++++++++++
 .../components/certificationList/index.vue    |  16 +-
 4 files changed, 399 insertions(+), 66 deletions(-)
 create mode 100644 jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue

diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
index 3edbcd8c6..f5a011acc 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
@@ -20,12 +20,16 @@
                 </div>
                 <a-form-model-item class="itemModel" prop="serialNumber">
                   <a-select :placeholder="$t('PleaseSelect')+$t('regulationNo')"
+                            optionFilterProp="label"
                             @change="serialNumberChange"
+                            showSearch
                             v-model="formInline.bussDocumentLibraryId">
                     <a-select-option v-for="(item, key) in projectNameList"
+                                     :label="item.serialNumber"
                                      :key="key"
                                      :value="item.id">
-                     <span style="display: inline-block;width: 100%" :title=" item.serialNumber ">
+                     <span style="display: inline-block;width: 100%"
+                           :title=" item.serialNumber ">
                            {{ item.serialNumber}}
                      </span>
                     </a-select-option>
diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue
index 3198cb9d6..5e6100722 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue
@@ -1,76 +1,84 @@
 <template>
-  <a-drawer
-    :title="$t('Transfer')"
-    :maskClosable="false"
-    :width="1000"
-    placement="right"
-    :closable="true"
-    @close="handleCancel"
-    :visible="visible"
-    style="height: 100%;overflow: auto;padding-bottom: 53px;">
-    <div style="margin-bottom: 60px">
-      <div class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="searchQuery">
-          <a-row :gutter="24">
-            <a-col :md="12" :sm="8">
-              <div class="box-title-text">
-                <div class="title-text" :title="$t('VirtualListName')">
-                  <span>{{$t('VirtualListName')}}</span>
+  <div>
+    <a-drawer
+      :title="$t('Transfer')"
+      :maskClosable="false"
+      :width="1000"
+      placement="right"
+      :closable="true"
+      @close="handleCancel"
+      :visible="visible"
+      style="height: 100%;overflow: auto;padding-bottom: 53px;">
+      <div style="margin-bottom: 60px">
+        <div class="table-page-search-wrapper">
+          <a-form layout="inline" @keyup.enter.native="searchQuery">
+            <a-row :gutter="24">
+              <a-col :md="12" :sm="8">
+                <div class="box-title-text">
+                  <div class="title-text" :title="$t('VirtualListName')">
+                    <span>{{$t('VirtualListName')}}</span>
+                  </div>
+                  <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('VirtualListName')"
+                           v-model="queryParam.name"></j-input>
                 </div>
-                <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('VirtualListName')"
-                         v-model="queryParam.name"></j-input>
-              </div>
-            </a-col>
-            <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+              </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>
                   <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
                </a-col>
       </span>
-          </a-row>
-        </a-form>
-      </div>
-      <a-table
-        :components="drag(columns,'columns')"
-        :columns="columns"
-        rowKey="id"
-        :scroll="{x: 800}"
-        :data-source="dataList"
-        :pagination="false"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' }"
-        :loading="loading">
+            </a-row>
+          </a-form>
+        </div>
+        <a-table
+          :components="drag(columns,'columns')"
+          :columns="columns"
+          rowKey="id"
+          :scroll="{x: 800}"
+          :data-source="dataList"
+          :pagination="false"
+          :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' }"
+          :loading="loading">
 
-      </a-table>
-      <div class="page" v-if="dataList.length > 0">
-        <a-pagination
-          :show-total="total => $t('total')+` ${total} `+$t('strip')"
-          show-quick-jumper
-          show-size-changer
-          :page-size.sync="pageSize"
-          :total="total"
-          :current="pageNo"
-          @change="onChange"
-          @showSizeChange="SizeChange"
-        />
+        </a-table>
+        <div class="page" v-if="dataList.length > 0">
+          <a-pagination
+            :show-total="total => $t('total')+` ${total} `+$t('strip')"
+            show-quick-jumper
+            show-size-changer
+            :page-size.sync="pageSize"
+            :total="total"
+            :current="pageNo"
+            @change="onChange"
+            @showSizeChange="SizeChange"
+          />
+        </div>
       </div>
-    </div>
 
-    <div class="drawer-bootom-button">
-      <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
-      <a-button @click="handleSubmit(undefined)" type="primary" :loading="confirmLoading">{{$t('determine')}}</a-button>
-    </div>
-  </a-drawer>
+      <div class="drawer-bootom-button">
+        <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+        <a-button @click="handleSubmit(undefined)" type="primary" :loading="confirmLoading">{{$t('determine')}}
+        </a-button>
+      </div>
+    </a-drawer>
+    <transferListvirtal :url="url" @transferListFormHomo="transferListFormHomo" ref="transferListvirtalRef"/>
+  </div>
+
 </template>
 
 <script>
   import { getAction, postAction } from '@/api/manage'
   import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+  import transferListvirtal from './transferListvirtal'
 
   export default {
     name: 'transferList',
-    components: {},
+    components: {
+      transferListvirtal
+    },
     props: ['url'],
-    mixins:[ResizeHeader, ResizeColumnProvide],
+    mixins: [ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         visible: false,
@@ -150,7 +158,7 @@
           ...this.queryParam
         }
         this.loading = true
-        postAction('/project/projectLawsInventoryEO/getPageInfoDummy', query).then((res) => {
+        getAction('/authDummy/authDummyInventoryBaseEO/page', query).then((res) => {
           if (res.success) {
             this.dataList = res.result.records || []
             this.total = res.result.total
@@ -160,6 +168,11 @@
           }
         })
       },
+      transferListFormHomo() {
+        this.visible = false
+        this.selectedRowKeys = []
+        this.$emit('transferListForm')
+      },
       onSelectChange(value) {
         this.selectedRowKeys = value
         if (this.selectedRowKeys.length > 1) {
@@ -168,6 +181,7 @@
       },
       handleCancel() {
         this.visible = false
+        this.selectedRowKeys = []
         this.$emit('visible')
       },
       handleSubmit(flag) {
@@ -175,8 +189,9 @@
           this.confirmLoading = true
           let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
           this.confirmLoading = false
-          this.$emit('transferListForm',selectedRowKeys.join(','))
-          this.selectedRowKeys = []
+          // this.$emit('transferListForm',selectedRowKeys.join(','))
+          this.$refs.transferListvirtalRef.transferModel(selectedRowKeys.join(','))
+          // this.selectedRowKeys = []
           // postAction('project/projectLawsInventoryEO/add', {
           //   dummyInventoryBaseId: selectedRowKeys.join(','),
           //   projectLibraryId: this.$route.query.id,
diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue b/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue
new file mode 100644
index 000000000..bccc92ecd
--- /dev/null
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue
@@ -0,0 +1,314 @@
+<template>
+  <a-drawer
+    :title="$t('Transfer')"
+    :maskClosable="false"
+    :width="1000"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <div style="margin-bottom: 60px">
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :md="12" :sm="5">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('standard')">
+                  <span>{{$t('standard')}}</span>
+                </div>
+                <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                         v-model="queryParam.serialNumber"></j-input>
+              </div>
+            </a-col>
+            <a-col :md="12" :sm="5">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('category')">
+                  <span>{{$t('category')}}</span>
+                </div>
+                <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('category')"
+                         v-model="queryParam.category"></j-input>
+              </div>
+            </a-col>
+            <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="12" :sm="24">
+                 <globalAdvancedQuery ref="globalAdvancedQueryRef"
+                                      @handleSuperQuery="handleSuperQuery"
+                                      :fieldList="fieldList"/>
+                  <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>
+        </a-form>
+      </div>
+      <a-table
+        :columns="columns"
+        rowKey="id"
+        :scroll="{x: 800,y:600}"
+        :data-source="dataList"
+        :pagination="false"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:'' }"
+        :loading="loading">
+
+      </a-table>
+<!--      <div class="page" v-if="dataList.length > 0">-->
+<!--        <a-pagination-->
+<!--          :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
+<!--          show-quick-jumper-->
+<!--          show-size-changer-->
+<!--          :page-size.sync="pageSize"-->
+<!--          :total="total"-->
+<!--          :current="pageNo"-->
+<!--          @change="onChange"-->
+<!--          @showSizeChange="SizeChange"-->
+<!--        />-->
+<!--      </div>-->
+    </div>
+
+    <div class="drawer-bootom-button">
+      <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit(undefined)" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+import { getAction, postAction } from '@/api/manage'
+import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
+
+export default {
+  name: 'transferList',
+  components: {
+    globalAdvancedQuery
+  },
+  props: ['url'],
+  data() {
+    return {
+      visible: false,
+      queryParam: {},
+      confirmLoading: false,
+      selectedRowKeys: [],
+      columns: [
+        {
+          title: this.$t('category'),
+          align: 'left',
+          dataIndex: 'category',
+          width: 150,
+          ellipsis: true,
+        },
+        {
+          title: this.$t('inspectionItems'),
+          align: 'left',
+          dataIndex: 'inspectionItem',
+          width: 150,
+          ellipsis: true,
+          scopedSlots: { customRender: 'inspectionItems' }
+        },
+        {
+          title: 'WVTA ID',
+          align: 'left',
+          dataIndex: 'wvtaId',
+          width: 150,
+          ellipsis: true,
+        },
+        {
+          title: this.$t('standard'),
+          align: 'left',
+          dataIndex: 'serialNumber',
+          width: 150,
+          ellipsis: true,
+        },
+        {
+          title: this.$t('areaOfResponsibility'),
+          align: 'left',
+          dataIndex: 'dutyTerritory_dictText',
+          width: 200,
+          ellipsis: true,
+        },
+        {
+          title: this.$t('Deliverables'),
+          align: 'left',
+          dataIndex: 'deliverable',
+          width: 200,
+          ellipsis: true,
+        },
+      ],
+      fieldList: [
+        {
+          type: 'string',
+          value: 'wvtaId',
+          text: 'WVTA ID'
+        },
+        {
+          type: 'string',
+          value: 'inspectionItem',
+          text: this.$t('inspectionItems'),
+        },
+        {
+          type: '',
+          value: 'dutyTerritory',
+          text: this.$t('areaOfResponsibility'),
+          dictCode: 'duty_territory'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+        },
+      ],
+      dataList: [],
+      content: [],
+      loading: false,
+      dummyInventoryBaseId:'',
+      pageNo: 1,
+      pageSize: 10,
+      total: 0
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    transferModel(id) {
+      this.visible = true
+      this.dummyInventoryBaseId = id
+      this.queryParam = {}
+      this.selectedRowKeys = []
+      this.replacePage()
+    },
+    searchQuery() {
+      this.pageNo = 1
+      this.replacePage()
+    },
+    searchReset() {
+      this.pageNo = 1
+      this.queryParam = {}
+      this.replacePage()
+      this.$refs.globalAdvancedQueryRef.resetLine()
+      this.$refs.globalAdvancedQueryRef.emitCallback()
+    },
+    onChange(page, pageSize) {
+      this.pageNo = page
+      this.replacePage()
+    },
+    SizeChange(page, pageSize) {
+      this.pageNo = 1
+      this.pageSize = pageSize
+      this.replacePage()
+    },
+    handleSuperQuery(params, matchType) {
+      let sqp = {}
+      if (!params || (params && params.length == 0)) {
+        sqp['superQueryParams'] = ''
+        this.$refs.globalAdvancedQueryRef.superQueryFlag = false
+      } else {
+        this.$refs.globalAdvancedQueryRef.superQueryFlag = true
+        sqp['superQueryParams'] = encodeURI(JSON.stringify(params))
+        sqp['superQueryMatchType'] = matchType
+      }
+      this.queryParamQuery = sqp
+      this.replacePage()
+    },
+    replacePage() {
+      let query = {
+        // pageNo: this.pageNo,
+        // pageSize: this.pageSize,
+        ...this.queryParamQuery,
+        ...this.queryParam,
+        authDummyInventoryBaseId: this.dummyInventoryBaseId
+      }
+      this.loading = true
+      getAction('/authDummy/authDummyInventoryInfoEO/list', query).then((res) => {
+        if (res.success) {
+          this.dataList = res.result || []
+          this.loading = false
+        } else {
+          this.loading = false
+        }
+      })
+    },
+    onSelectChange(value) {
+      this.selectedRowKeys = value
+      // if (this.selectedRowKeys.length > 1) {
+      //   this.selectedRowKeys.shift()
+      // }
+    },
+    handleCancel() {
+      this.visible = false
+    },
+    handleSubmit(flag) {
+      if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+        this.confirmLoading = true
+        let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+        postAction('project/projectCertificationInventoryEO/callAdd', {
+          authDummyInventoryBaseId: this.dummyInventoryBaseId,
+          projectLibraryId: this.$route.query.id,
+          authDummyInventoryInfoIds: selectedRowKeys.join(','),
+        }).then((res) => {
+          if (res.success) {
+            this.confirmLoading = false
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.visible = false
+            this.selectedRowKeys = []
+            this.$emit('transferListFormHomo')
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+            this.confirmLoading = false
+          }
+        })
+      } else {
+        this.$message.warning(this.$t('selectLeastOne'))
+      }
+    },
+  }
+}
+</script>
+
+<style scoped>
+.page {
+  text-align: right;
+  margin-top: 20px;
+}
+
+.drawer-bootom-button {
+  position: absolute;
+  bottom: 0;
+  z-index: 100;
+  width: 100%;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
+
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+
+.title-text {
+  width: 20%;
+  min-width: 110px;
+  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;
+}
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index acb6c31bf..f54d8afce 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -54,10 +54,10 @@
                   <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 @click="handleToggleSearch" style="margin-left: 8px">-->
+                 <!--                            {{ !toggleSearchStatus ? $t('open') : $t('away') }}-->
+                 <!--                            <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+                 <!--                 </a>-->
                </a-col>
             </span>
         </a-row>
@@ -516,7 +516,7 @@
             type: 'date',
             value: 'endTime',
             text: this.$t('closingDate')
-          },
+          }
         ],
         disabled: false,
         queryParamQuery: {},
@@ -762,7 +762,7 @@
         if (this.roleSwitchingCode == 2) {
           this.preservationClick()
         }
-        this.replacePage()
+        this.getList()
       },
       SizeChange(page, pageSize) {
         this.pageNo = 1
@@ -770,7 +770,7 @@
         if (this.roleSwitchingCode == 2) {
           this.preservationClick()
         }
-        this.replacePage()
+        this.getList()
       },
       searchQuery() {
         this.pageNo = 1
@@ -1129,8 +1129,8 @@
       },
       transferListForm() {
         this.pageNo = 1
-        this.getList()
         this.selectedRowKeys = []
+        this.getList()
       },
       batSettingForm() {
         this.pageNo = 1