添加市场认证清单的调取

jero-web/src/views/virtualAuthenticationList/components/transferList.vue

@@ -1,215 +1,290 @@
 <template>
-  <a-drawer
+  <div>
-    :title="$t('Transfer')"
+    <a-drawer
-    :maskClosable="false"
+      :title="$t('Transfer')"
-    :width="1000"
+      :maskClosable="false"
-    placement="right"
+      :width="1000"
-    :closable="true"
+      placement="right"
-    @close="handleCancel"
+      :closable="true"
-    :visible="visible"
+      @close="handleCancel"
-    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+      :visible="visible"
-    <div style="margin-bottom: 60px">
+      style="height: 100%;overflow: auto;padding-bottom: 53px;">
-      <div class="table-page-search-wrapper">
+      <div style="margin-bottom: 60px">
-        <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <div class="table-page-search-wrapper">
-          <a-row :gutter="24">
+          <a-form layout="inline" @keyup.enter.native="searchQuery">
-            <a-col :md="12" :sm="8">
+            <a-row :gutter="24">
-              <div class="box-title-text">
+              <a-col :md="12" :sm="8">
-                <div class="title-text" :title="$t('CertificationListName')">
+                <div class="box-title-text">
-                  <span>{{$t('CertificationListName')}}</span>
+                  <div class="title-text" :title="$t('CertificationListName')">
+                    <span>{{$t('CertificationListName')}}</span>
+                  </div>
+                  <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('CertificationListName')"
+                           v-model="queryParam.name"></j-input>
                 </div>
-                <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('CertificationListName')"
+              </a-col>
-                         ></j-input>
+              <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
-              </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>
+      </span>
-          </a-row>
+            </a-row>
-        </a-form>
+          </a-form>
-      </div>
+        </div>
-      <a-table
+        <a-table
-        :columns="columns"
+          :components="drag(columns,'columns')"
-        rowKey="id"
+          :columns="columns"
-        :scroll="{x: 800}"
+          rowKey="id"
-        :data-source="dataList"
+          :scroll="{x: 800}"
-        :pagination="false"
+          :data-source="dataList"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' }"
+          :pagination="false"
-        :loading="loading">
+          :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' }"
+          :loading="loading">
 
-      </a-table>
+        </a-table>
-      <div class="page" v-if="dataList.length > 0">
+        <div class="page" v-if="dataList.length > 0">
-        <a-pagination
+          <a-pagination
-          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+            :show-total="total => $t('total')+` ${total} `+$t('strip')"
-          show-quick-jumper
+            show-quick-jumper
-          show-size-changer
+            show-size-changer
-          :page-size.sync="pageSize"
+            :page-size.sync="pageSize"
-          :total="total"
+            :total="total"
-          :current="pageNo"
+            :current="pageNo"
-          @change="onChange"
+            @change="onChange"
-          @showSizeChange="SizeChange"
+            @showSizeChange="SizeChange"
-        />
+          />
+        </div>
       </div>
-    </div>
 
-    <div class="drawer-bootom-button">
+      <div class="drawer-bootom-button">
-      <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+        <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
-      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('determine')}}</a-button>
+        <a-button @click="handleSubmit(undefined)" type="primary" :loading="confirmLoading">{{$t('determine')}}
-    </div>
+        </a-button>
-  </a-drawer>
+      </div>
+    </a-drawer>
+    <transferListvirtal :url="url" @transferListFormHomo="transferListFormHomo" ref="transferListvirtalRef"/>
+  </div>
+
 </template>
 
 <script>
-export default {
+  import { getAction, postAction } from '@/api/manage'
-  name: 'transferList',
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
-  data() {
+  import transferListvirtal from './transferListvirtal'
-    return {
+
-      visible: false,
+  export default {
-      confirmLoading: false,
+    name: 'transferList',
-      selectedRowKeys: [],
+    components: {
-      columns: [
+      transferListvirtal
-        {
-          title: this.$t('VirtualListName'),
-          dataIndex: 'name',
-          align: 'left',
-          ellipsis: true,
-          width: 223
-        },
-        {
-          title: this.$t('instructionForUse'),
-          dataIndex: 'useExplain',
-          align: 'left',
-          ellipsis: true,
-          width: 223
-        },
-        {
-          title: this.$t('updateTime'),
-          dataIndex: 'updateTime',
-          align: 'left',
-          ellipsis: true,
-          width: 223
-        },
-        {
-          title: this.$t('creater'),
-          dataIndex: 'createBy',
-          align: 'left',
-          ellipsis: true,
-          width: 223
-        }
-      ],
-      dataList: [],
-      loading: false,
-      pageNo: 1,
-      pageSize: 10,
-      total: 0
-    }
-  },
-  methods: {
-    transferModel() {
-      this.visible = true
     },
-    searchQuery() {
+    props: ['url'],
-      this.pageNo = 1
+    mixins: [ResizeHeader, ResizeColumnProvide],
-      this.replacePage()
+    data() {
-    },
+      return {
-    searchReset() {
+        visible: false,
-      this.pageNo = 1
+        queryParam: {},
-      this.queryParam = {}
+        confirmLoading: false,
-      this.replacePage()
+        selectedRowKeys: [],
-    },
+        columns: [
-    onChange(page, pageSize) {
+          {
-      this.pageNo = page
+            title: this.$t('CertificationListName'),
-      this.replacePage()
+            dataIndex: 'name',
-    },
+            align: 'left',
-    SizeChange(page, pageSize) {
+            ellipsis: true,
-      this.pageNo = 1
+            width: 223
-      this.pageSize = pageSize
+          },
-      this.replacePage()
+          {
-    },
+            title: this.$t('instructionForUse'),
-    replacePage() {
+            dataIndex: 'useExplain',
-      let query = {
+            align: 'left',
-        pageNo: this.pageNo,
+            ellipsis: true,
-        pageSize: this.pageSize,
+            width: 223
-        ...this.queryParam
+          },
+          {
+            title: this.$t('updateTime'),
+            dataIndex: 'updateTime',
+            align: 'left',
+            ellipsis: true,
+            width: 223
+          },
+          {
+            title: this.$t('creater'),
+            dataIndex: 'createBy',
+            align: 'left',
+            ellipsis: true,
+            width: 223
+          }
+        ],
+        dataList: [],
+        content: [],
+        loading: false,
+        pageNo: 1,
+        pageSize: 10,
+        total: 0
       }
-      this.loading = true
-      // postAction('', query).then((res) => {
-      //   if (res.success) {
-      //     this.dataList = res.result.records || []
-      //     this.total = res.result.total
-      //     this.loading = false
-      //   } else {
-      //     this.loading = false
-      //   }
-      // })
     },
-    handleSubmit(){
+    mounted() {
 
     },
-    onSelectChange(value) {
+    methods: {
-      this.selectedRowKeys = value
+      transferModel() {
-      if (this.selectedRowKeys.length > 1) {
+        this.visible = true
-        this.selectedRowKeys.shift()
+        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,
+          state:'1',
+        }
+        this.loading = true
+        getAction('/authDummy/authDummyInventoryBaseEO/page', query).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.replacePage()
+              return
+            }
+            this.dataList = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      transferListFormHomo() {
+        this.visible = false
+        this.selectedRowKeys = []
+        this.$emit('transferListForm')
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+        if (this.selectedRowKeys.length > 1) {
+          this.selectedRowKeys.shift()
+        }
+      },
+      handleCancel() {
+        this.visible = false
+        this.selectedRowKeys = []
+        this.$emit('visible')
+      },
+      handleSubmit(flag) {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.confirmLoading = true
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          this.confirmLoading = false
+          // 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,
+          //   flag: flag
+          // }).then((res) => {
+          //   if (res.success) {
+          //     this.confirmLoading = false
+          //     // this.$message.success(this.$t('OperationSuccessful'))
+          //     // this.visible = false
+          //     this.selectedRowKeys = []
+          //     this.$emit('transferListForm',selectedRowKeys.join(','))
+          //   } 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'))
+        }
+      },
+      getAdd() {
+        let _this = this
+        this.$confirm({
+          content: _this.$t('TheDoesNotContainData'),
+          onOk() {
+            _this.handleSubmit('1')
+          }
+        })
       }
-    },
+    }
-    handleCancel() {
-      this.visible = false
-    },
   }
-}
 </script>
 
 <style scoped>
-.box-title-text {
+  .page {
-  line-height: 1.4;
+    text-align: right;
-  display: flex;
+    margin-top: 20px;
-  align-items: center;
+  }
-  margin-bottom: 10px;
-}
 
-.title-text {
+  .drawer-bootom-button {
-  width: 20%;
+    position: absolute;
-  min-width: 110px;
+    bottom: 0;
-  color: #000F16;
+    z-index: 100;
-  display: inline-block;
+    width: 100%;
-  font-weight: 500;
+    border-top: 1px solid #e8e8e8;
-  font-size: 14px;
+    padding: 10px 16px;
-  margin-right: 16px;
+    text-align: right;
-  margin-top: 3px;
+    left: 0;
-  text-align: right;
+    background: #fff;
-  white-space: nowrap;
+    border-radius: 0 0 2px 2px;
-  overflow: hidden;
+  }
-  text-overflow: ellipsis;
-}
 
-.box-input {
+  .box-title-text {
-  display: inline-block;
+    line-height: 1.4;
-  width: 70%;
+    display: flex;
-  height: 38px;
+    align-items: center;
-  margin-top: 2px;
+    margin-bottom: 10px;
-}
+  }
 
-.box-button {
+  .title-text {
-  height: 38px;
+    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;
+  }
 
-.page {
+  .box-input {
-  text-align: right;
+    display: inline-block;
-  margin-top: 20px;
+    width: 70%;
-}
+    height: 38px;
+    margin-top: 2px;
+  }
 
-.drawer-bootom-button {
+  .box-button {
-  position: absolute;
+    height: 38px;
-  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;
-}
 </style>

jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue

@@ -0,0 +1,313 @@
+<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: 'dutyTerritoryName',
+          width: 200,
+          ellipsis: true,
+        },
+        {
+          title: this.$t('typeOfDeliverables'),
+          align: 'left',
+          dataIndex: 'deliverableTypeName',
+          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('/authDummy/authDummyInventoryInfoEO/acquireAdd', {
+          authDummyInventoryBaseId: 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>

jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue

@@ -232,7 +232,7 @@
       </div>
     </div>
     <UpdateLog :url="url" ref="UpdateLogRef"/>
-    <transfer-list ref="transferListRef"></transfer-list>
+    <transferList :url="url" @transferListForm="transferListForm" ref="transferListRef"/>
     <addModel :url="url" ref="addModelRef" @addModelList="addModelList"/>
     <edit-model :url="url" ref="editModelRef" @editModelList="editModelList"></edit-model>
     <bat-setting :url="url" ref="batSettingRef" @batSettingList="batSettingList"></bat-setting>
@@ -382,6 +382,10 @@
       searchQuery() {
         this.getList()
       },
+      transferListForm() {
+        this.selectedRowKeys = []
+        this.getList()
+      },
       //清空
       searchReset() {
         this.queryParam = {}