From dc8c72b70bdf9bd09f67c43016cbad45c8437287 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 13 Dec 2022 10:05:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E8=B0=83?=
 =?UTF-8?q?=E5=8F=96=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../virtualList/components/transferList.vue   |   4 +-
 .../components/transferListvirtal.vue         |   2 +-
 .../components/listOfRegulations.vue          |  12 +-
 .../components/transferList.vue               |  47 ++--
 .../components/transferListvirtal.vue         | 254 ++++++++++++++++++
 5 files changed, 293 insertions(+), 26 deletions(-)
 create mode 100644 jero-web/src/views/projectManagement/components/transferListvirtal.vue

diff --git a/jero-web/src/views/documentTools/virtualList/components/transferList.vue b/jero-web/src/views/documentTools/virtualList/components/transferList.vue
index 7899e49e3..62b60efdf 100644
--- a/jero-web/src/views/documentTools/virtualList/components/transferList.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/transferList.vue
@@ -56,7 +56,7 @@
 
     <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>
+      <a-button @click="handleSubmit(undefined)" type="primary" :loading="confirmLoading">{{$t('determine')}}</a-button>
     </div>
   </a-drawer>
 </template>
@@ -167,8 +167,8 @@
           this.confirmLoading = true
           let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
           this.confirmLoading = false
-          this.selectedRowKeys = []
           this.$emit('transferListForm',selectedRowKeys.join(','))
+          this.selectedRowKeys = []
           // postAction('project/projectLawsInventoryEO/add', {
           //   dummyInventoryBaseId: selectedRowKeys.join(','),
           //   projectLibraryId: this.$route.query.id,
diff --git a/jero-web/src/views/documentTools/virtualList/components/transferListvirtal.vue b/jero-web/src/views/documentTools/virtualList/components/transferListvirtal.vue
index 91ea2ddd9..3c60725cf 100644
--- a/jero-web/src/views/documentTools/virtualList/components/transferListvirtal.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/transferListvirtal.vue
@@ -1,6 +1,6 @@
 <template>
   <a-drawer
-    :title="$t('VirtualList')"
+    :title="$t('Transfer')"
     :maskClosable="false"
     :width="1000"
     placement="right"
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 87109f960..6fd855ff8 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -300,7 +300,8 @@
     <listAddModel :url="url" @addModelList="addModelList" ref="addModelRef"/>
     <listEditModel :url="url" @editModelList="addModelList" ref="editModelRef"/>
     <batSetting :url="url" @batSettingList="addModelList" ref="batSettingRef"/>
-    <transferList :url="url" @transferListForm="addModelList" ref="transferListRef"/>
+    <transferList :url="url" @transferListForm="transferListForm" ref="transferListRef"/>
+    <transferListvirtal :url="url" @transferListFormHomo="transferListFormHomo" ref="transferListvirtalRef"/>
     <fixedPlate @fixedPlateForm="addModelList" ref="fixedPlateRef"/>
     <a-modal
       :title="listTitle"
@@ -456,6 +457,7 @@
   import listEditModel from './listEditModel'
   import batSetting from './batSetting'
   import transferList from './transferList'
+  import transferListvirtal from './transferListvirtal'
   import fixedPlate from './fixedPlateForm'
   import resultReportedUpload from './resultReportedUpload'
   import listOfRegulationsView from './listOfRegulationsView'
@@ -475,6 +477,7 @@
       listEditModel,
       batSetting,
       transferList,
+      transferListvirtal,
       globalAdvancedQuery,
       fixedPlate,
       resultReportedUpload,
@@ -1472,6 +1475,13 @@
         this.selectedRowKeys = []
         this.getList()
       },
+      transferListForm(id){
+        this.$refs.transferListvirtalRef.transferModel(id)
+      },
+      transferListFormHomo(){
+        this.$refs.transferListRef.handleCancel()
+        this.getList()
+      },
       handleSuperQuery(params, matchType) {
         let sqp = {}
         if (!params || (params && params.length == 0)) {
diff --git a/jero-web/src/views/projectManagement/components/transferList.vue b/jero-web/src/views/projectManagement/components/transferList.vue
index 30f90c44b..db2cf7d98 100644
--- a/jero-web/src/views/projectManagement/components/transferList.vue
+++ b/jero-web/src/views/projectManagement/components/transferList.vue
@@ -56,7 +56,7 @@
 
     <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>
+      <a-button @click="handleSubmit(undefined)" type="primary" :loading="confirmLoading">{{$t('determine')}}</a-button>
     </div>
   </a-drawer>
 </template>
@@ -166,27 +166,30 @@
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
           this.confirmLoading = true
           let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
-          postAction(this.url.addModel, {
-            dummyInventoryBaseId: selectedRowKeys.join(','),
-            projectLibraryId: this.$route.query.id,
-            flag: flag
-          }).then((res) => {
-            if (res.success) {
-              this.confirmLoading = false
-              this.$message.success(this.$t('OperationSuccessful'))
-              this.visible = false
-              this.selectedRowKeys = []
-              this.$emit('transferListForm')
-            } else {
-              if (res.message == '该虚拟清单的维护清单中没有数据,是否需要添加') {
-                this.confirmLoading = false
-                this.getAdd()
-                return
-              }
-              this.$message.warning(this.$t('operationFailed'))
-              this.confirmLoading = false
-            }
-          })
+          this.confirmLoading = false
+          this.$emit('transferListForm',selectedRowKeys.join(','))
+          this.selectedRowKeys = []
+          // postAction(this.url.addModel, {
+          //   dummyInventoryBaseId: selectedRowKeys.join(','),
+          //   projectLibraryId: this.$route.query.id,
+          //   flag: flag
+          // }).then((res) => {
+          //   if (res.success) {
+          //     this.confirmLoading = false
+          //     this.$message.success(this.$t('OperationSuccessful'))
+          //     this.visible = false
+          //     this.selectedRowKeys = []
+          //     this.$emit('transferListForm')
+          //   } else {
+          //     if (res.message == '该虚拟清单的维护清单中没有数据,是否需要添加') {
+          //       this.confirmLoading = false
+          //       this.getAdd()
+          //       return
+          //     }
+          //     this.$message.warning(this.$t('operationFailed'))
+          //     this.confirmLoading = false
+          //   }
+          // })
         } else {
           this.$message.warning(this.$t('selectLeastOne'))
         }
diff --git a/jero-web/src/views/projectManagement/components/transferListvirtal.vue b/jero-web/src/views/projectManagement/components/transferListvirtal.vue
new file mode 100644
index 000000000..9f4c4ffdb
--- /dev/null
+++ b/jero-web/src/views/projectManagement/components/transferListvirtal.vue
@@ -0,0 +1,254 @@
+<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('title')">
+                  <span>{{$t('title')}}</span>
+                </div>
+                <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                         v-model="queryParam.title"></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">
+                  <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}"
+        :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'
+
+export default {
+  name: 'transferList',
+  components: {},
+  props: ['url'],
+  data() {
+    return {
+      visible: false,
+      queryParam: {},
+      confirmLoading: false,
+      selectedRowKeys: [],
+      columns: [
+        {
+          title: this.$t('standard'),
+          align: 'center',
+          dataIndex: 'serialNumber',
+          scopedSlots: { customRender: 'standard' }
+        },
+        {
+          title: this.$t('title'),
+          align: 'center',
+          dataIndex: 'title',
+          scopedSlots: { customRender: 'titleName' }
+        },
+        {
+          title: this.$t('subtitle'),
+          align: 'center',
+          dataIndex: 'subtitle',
+          ellipsis: true
+        },
+        {
+          title: this.$t('areaOfResponsibility'),
+          align: 'center',
+          ellipsis: true,
+          dataIndex: 'dutyTerritory_dictText'
+        },
+      ],
+      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()
+    },
+    onChange(page, pageSize) {
+      this.pageNo = page
+      this.replacePage()
+    },
+    SizeChange(page, pageSize) {
+      this.pageNo = 1
+      this.pageSize = pageSize
+      this.replacePage()
+    },
+    replacePage() {
+      let query = {
+        // pageNo: this.pageNo,
+        // pageSize: this.pageSize,
+        ...this.queryParam,
+        dummyInventoryBaseId: this.dummyInventoryBaseId
+      }
+      this.loading = true
+      getAction('/dummy/dummyInventoryInfoEO/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('/dummy/dummyInventoryInfoEO/acquireAdd', {
+          dummyInventoryBaseId: this.dummyInventoryBaseId,
+          ids: 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