From b4b83b8283c0790fc58c74e0de17c9ef70ef0905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Fri, 24 Mar 2023 10:34:43 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B8=82=E5=9C=BA?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E7=9A=84=E8=B0=83=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/transferList.vue               | 449 ++++++++++--------
 .../components/transferListvirtal.vue         | 313 ++++++++++++
 .../certificationListMaintenance.vue          |   6 +-
 3 files changed, 580 insertions(+), 188 deletions(-)
 create mode 100644 jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue

diff --git a/jero-web/src/views/virtualAuthenticationList/components/transferList.vue b/jero-web/src/views/virtualAuthenticationList/components/transferList.vue
index 7679f8d82..25ccd69f9 100644
--- a/jero-web/src/views/virtualAuthenticationList/components/transferList.vue
+++ b/jero-web/src/views/virtualAuthenticationList/components/transferList.vue
@@ -1,215 +1,290 @@
 <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('CertificationListName')">
-                  <span>{{$t('CertificationListName')}}</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('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')"
-                         ></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
-        :columns="columns"
-        rowKey="id"
-        :scroll="{x: 800}"
-        :data-source="dataList"
-        :pagination="false"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' }"
-        :loading="loading">
+      </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-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" 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>
-export default {
-  name: 'transferList',
-  data() {
-    return {
-      visible: false,
-      confirmLoading: false,
-      selectedRowKeys: [],
-      columns: [
-        {
-          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
+  import { getAction, postAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+  import transferListvirtal from './transferListvirtal'
+
+  export default {
+    name: 'transferList',
+    components: {
+      transferListvirtal
     },
-    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
+    props: ['url'],
+    mixins: [ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        visible: false,
+        queryParam: {},
+        confirmLoading: false,
+        selectedRowKeys: [],
+        columns: [
+          {
+            title: this.$t('CertificationListName'),
+            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: [],
+        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) {
-      this.selectedRowKeys = value
-      if (this.selectedRowKeys.length > 1) {
-        this.selectedRowKeys.shift()
+    methods: {
+      transferModel() {
+        this.visible = true
+        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 {
-  line-height: 1.4;
-  display: flex;
-  align-items: center;
-  margin-bottom: 10px;
-}
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
 
-.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;
-}
+  .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-input {
-  display: inline-block;
-  width: 70%;
-  height: 38px;
-  margin-top: 2px;
-}
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
 
-.box-button {
-  height: 38px;
-}
+  .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;
+  }
 
-.page {
-  text-align: right;
-  margin-top: 20px;
-}
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
 
-.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-button {
+    height: 38px;
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue b/jero-web/src/views/virtualAuthenticationList/components/transferListvirtal.vue
new file mode 100644
index 000000000..63389d01a
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
index 76a5a4661..3da9a0222 100644
--- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
+++ b/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 = {}

From d097e13a2ac2c55491bfd07e58b09580338520a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Fri, 24 Mar 2023 11:07:19 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/dashboard/components/myList.vue |  45 +-
 .../components/SentList.vue                   |  13 +
 .../components/doneList.vue                   |  13 +
 .../views/virtualAuthenticationList/index.vue | 774 +++++++++---------
 4 files changed, 449 insertions(+), 396 deletions(-)

diff --git a/jero-web/src/views/dashboard/components/myList.vue b/jero-web/src/views/dashboard/components/myList.vue
index a3f743475..3bd57aa82 100644
--- a/jero-web/src/views/dashboard/components/myList.vue
+++ b/jero-web/src/views/dashboard/components/myList.vue
@@ -10,11 +10,11 @@
     <div class="myList-box-content" v-if="dataSource.length > 0">
       <div class="myList-box-content-box" v-for="(item,index) in dataSource" :key="index" @click="prcClick(item)">
         <div class="top">
-          <span class="top-text" v-if="item.flowType == 10"
+          <span class="top-text" v-if="item.flowType == 10 || item.flowType == 21"
                 :title="item.projectName+'-'+ item.flowTypeShow">
             {{item.projectName+'-'+ item.flowTypeShow}}
           </span>
-          <span class="top-text" :title="item.serialNumber+'-'+item.flowTypeShow">
+          <span v-else class="top-text" :title="item.serialNumber+'-'+item.flowTypeShow">
             {{item.serialNumber+'-'+item.flowTypeShow}}
           </span>
           <!--          <span class="top-admin" :title="prcTypeName[item.prcType]">{{prcTypeName[item.prcType]}}</span>-->
@@ -31,17 +31,22 @@
       <JNoData/>
     </div>
     <JLoading style="z-index: 999" :loading="loading">{{$t('dataLoading')}}</JLoading>
+    <designCompliance ref="designComplianceRef" @designComplianceList="designComplianceList"/>
   </div>
 </template>
 
 <script>
   import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+  import designCompliance from '../../toDoCenter/projectRegulationTasks/components/designCompliance'
   import { mapGetters } from 'vuex'
   import moment from 'moment'
   import store from '@/store/'
 
   export default {
     name: 'myList',
+    components:{
+      designCompliance
+    },
     data() {
       return {
         pageSize: 4,
@@ -97,6 +102,9 @@
           path: '/projectRegulationTasks'
         })
       },
+      designComplianceList(){
+         this.queryProcess()
+      },
       prcClick(row) {
         let query = {}
         row.router = this.$route.path
@@ -126,6 +134,19 @@
             }
           })
           window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '21') {
+          let newUrl = this.$router.resolve({
+            path: '/ProjectDetails',
+            query: {
+              id: row.projectLibraryId,
+              projectName: row.projectName,
+              projectNameId: row.projectNameId,
+              targetMarket: row.targetMarket,
+              studioEngineer: row.studioEngineer,
+              type: '106'
+            }
+          })
+          window.open(newUrl.href, '_blank')
         } else if (row.flowType == '2') {
           row.taskId = row.taskId + ''
           if (row.taskId.length > 30) {
@@ -143,7 +164,7 @@
             TaskKey: row.taskDefinitionKey,
             isDisplay: true,
             flowType: 2,
-            Sponsor: 'designInitiatorName',
+            Sponsor: 'regulationOwnerName',
             personLiable: 'designDutyName',
             typeOfDeliverables: 'designDeliverableTypeName',
             deliverableTemplate: 'designDeliverableTemplate',
@@ -153,13 +174,8 @@
             targetMarket: row.targetMarket,
             projectNameId: row.projectNameId,
             primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.personChargeFeedback
           }
-          let newUrl = this.$router.resolve({
-            path: '/taskListProcess',
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
+          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('designComplianceReview'))
         } else if (row.flowType == '3') {
           row.taskId = row.taskId + ''
           if (row.taskId.length > 30) {
@@ -211,7 +227,7 @@
             TaskKey: row.taskDefinitionKey,
             flowType: 4,
             isDisplay: true,
-            Sponsor: 'verifyInitiatorName',
+            Sponsor: 'regulationOwnerName',
             personLiable: 'verifyDutyName',
             typeOfDeliverables: 'verifyDeliverableTypeName',
             deliverableTemplate: 'verifyDeliverableTemplate',
@@ -221,15 +237,10 @@
             targetMarket: row.targetMarket,
             projectNameId: row.projectNameId,
             primaryKeyId: row.primaryKeyId,
-            PersonChargeFeedback: row.personChargeFeedback
           }
-          let newUrl = this.$router.resolve({
-            path: '/taskListProcess',
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
+          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('verificationComplianceReview'))
         }
-      },
+      }
     }
   }
 </script>
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
index 4b4c5c89a..739c4de1c 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
@@ -208,6 +208,19 @@
             }
           })
           window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '21') {
+          let newUrl = this.$router.resolve({
+            path: '/ProjectDetails',
+            query: {
+              id: row.projectLibraryId,
+              projectName: row.projectName,
+              projectNameId: row.projectNameId,
+              targetMarket: row.targetMarket,
+              studioEngineer: row.studioEngineer,
+              type: '106'
+            }
+          })
+          window.open(newUrl.href, '_blank')
         } else if (row.flowType == '2') {
           row.taskId = row.taskId + ''
           if (row.taskId.length > 30) {
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
index 74873bffe..239842f2a 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
@@ -203,6 +203,19 @@
             }
           })
           window.open(newUrl.href, '_blank')
+        } else if (row.flowType == '21') {
+          let newUrl = this.$router.resolve({
+            path: '/ProjectDetails',
+            query: {
+              id: row.projectLibraryId,
+              projectName: row.projectName,
+              projectNameId: row.projectNameId,
+              targetMarket: row.targetMarket,
+              studioEngineer: row.studioEngineer,
+              type: '106'
+            }
+          })
+          window.open(newUrl.href, '_blank')
         }else if(row.flowType == '2'){
           row.taskId = row.taskId + ''
           if (row.taskId.length > 30) {
diff --git a/jero-web/src/views/virtualAuthenticationList/index.vue b/jero-web/src/views/virtualAuthenticationList/index.vue
index 5c5fe7dd3..10c635433 100644
--- a/jero-web/src/views/virtualAuthenticationList/index.vue
+++ b/jero-web/src/views/virtualAuthenticationList/index.vue
@@ -49,7 +49,7 @@
       :loading="loading"
       :pagination="false"
       :scroll="{x: '100%',y:'calc(100vh - 300px)'}"
-      rowKey="id"
+      :rowKey="(record)=>JSON.stringify(record)"
       :data-source="dataSource"
       :columns="columns"
       @change="tableOnChange"
@@ -113,7 +113,8 @@
               <div class="box-title-text-add">
                 <div class="title-text-add">
                   <span class="Required">*</span>
-                  <span class="title-text-text" :title="$t('CertificationListName')">{{$t('CertificationListName')}}</span>
+                  <span class="title-text-text"
+                        :title="$t('CertificationListName')">{{$t('CertificationListName')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="name">
                   <a-input class="box-input-add"
@@ -147,144 +148,198 @@
 </template>
 
 <script>
-import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
-import VueDraggableResizable from 'vue-draggable-resizable'
-import tableDragResize from '@/mixins/tableDragResize'
-import { mapGetters } from 'vuex'
-import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+  import VueDraggableResizable from 'vue-draggable-resizable'
+  import tableDragResize from '@/mixins/tableDragResize'
+  import { mapGetters } from 'vuex'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
-export default {
-  name:'index',
-  components: {
-    VueDraggableResizable
-  },
-  mixins: [tableDragResize, ResizeHeader, ResizeColumnProvide],
-  data() {
-    return {
-      selectedRowKeys: [],
-      rules: {
-        name: [
+  export default {
+    name: 'index',
+    components: {
+      VueDraggableResizable
+    },
+    mixins: [tableDragResize, ResizeHeader, ResizeColumnProvide],
+    data() {
+      return {
+        selectedRowKeys: [],
+        rules: {
+          name: [
+            {
+              required: true,
+              message: this.$t('CertificationListName') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
+            {
+              max: 100,
+              message: this.$t('CertificationListName') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          useExplain: [
+            {
+              required: true,
+              message: this.$t('instructionForUse') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
+            {
+              max: 500,
+              message: this.$t('instructionForUse') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ]
+        },
+        confirmLoading: false,
+        formInline: {},
+        visible: false,
+        title: this.$t('newlyAdded'),
+        userData: {},
+        administrators: false,
+        loading: false,
+        total: 0,
+        pageSize: 10,
+        pageNo: 1,
+        queryParam: {},
+        orderBy: '1',
+        orderByField: '',
+        url: {
+          list: '/authDummy/authDummyInventoryBaseEO/page',//分页列表查询
+          add: '/authDummy/authDummyInventoryBaseEO/add',//添加
+          edit: '/authDummy/authDummyInventoryBaseEO/edit',//编辑
+          deleteBatch: '/authDummy/authDummyInventoryBaseEO/deleteBatch',//批量删除
+          urlWithdraw: '/authDummy/authDummyInventoryBaseEO/issue'//批量发布或撤回
+        },
+        dataSource: [],
+        columns: [
           {
-            required: true,
-            message: this.$t('CertificationListName') + this.$t('cannotEmpty'),
-            trigger: 'blur'
+            title: this.$t('CertificationListName'),
+            align: 'left',
+            dataIndex: 'name',
+            width: 260,
+            ellipsis: true,
+            scopedSlots: { customRender: 'CertificationListName' }
           },
           {
-            max: 100,
-            message: this.$t('CertificationListName') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
-            trigger: 'blur'
-          }
-        ],
-        useExplain: [
-          {
-            required: true,
-            message: this.$t('instructionForUse') + this.$t('cannotEmpty'),
-            trigger: 'blur'
+            title: this.$t('listStatus'),
+            align: 'left',
+            width: 260,
+            ellipsis: true,
+            dataIndex: 'state_dictText'
           },
           {
-            max: 500,
-            message: this.$t('instructionForUse') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
-            trigger: 'blur'
+            title: this.$t('creater'),
+            align: 'left',
+            width: 260,
+            ellipsis: true,
+            dataIndex: 'createBy'
+          },
+          {
+            title: this.$t('operation'),
+            align: 'left',
+            fixed: 'right',
+            width: 400,
+            scopedSlots: { customRender: 'operation' }
           }
         ]
-      },
-      confirmLoading: false,
-      formInline: {},
-      visible: false,
-      title: this.$t('newlyAdded'),
-      userData: {},
-      administrators:false,
-      loading: false,
-      total: 0,
-      pageSize: 10,
-      pageNo: 1,
-      queryParam: {},
-      orderBy: '1',
-      orderByField: '',
-      url: {
-        list: '/authDummy/authDummyInventoryBaseEO/page',//分页列表查询
-        add: '/authDummy/authDummyInventoryBaseEO/add',//添加
-        edit: '/authDummy/authDummyInventoryBaseEO/edit',//编辑
-        deleteBatch: '/authDummy/authDummyInventoryBaseEO/deleteBatch',//批量删除
-        urlWithdraw: '/authDummy/authDummyInventoryBaseEO/issue'//批量发布或撤回
-      },
-      dataSource: [],
-      columns: [
-        {
-          title: this.$t('CertificationListName'),
-          align: 'left',
-          dataIndex: 'name',
-          width: 260,
-          ellipsis: true,
-          scopedSlots: { customRender: 'CertificationListName' }
-        },
-        {
-          title: this.$t('listStatus'),
-          align: 'left',
-          width: 260,
-          ellipsis: true,
-          dataIndex: 'state_dictText'
-        },
-        {
-          title: this.$t('creater'),
-          align: 'left',
-          width: 260,
-          ellipsis: true,
-          dataIndex: 'createBy'
-        },
-        {
-          title: this.$t('operation'),
-          align: 'left',
-          fixed: 'right',
-          width: 400,
-          scopedSlots: { customRender: 'operation' }
-        }
-      ],
-    }
-  },
-  mounted() {
-    this.getList()
-    this.userData = this.userInfo()
-    this.administrators = false
-    if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
-      this.userInfo().userRoleList.forEach(res => {
-        if (res.roleCode == 'admin') {
-          this.administrators = true
-        }
-      })
-    }
-  },
-  methods: {
-    ...mapGetters(['userInfo']),
-    onSelectChange(value) {
-      this.selectedRowKeys = value
+      }
     },
-    tableOnChange(pagination, filters, sorter) {
-      this.orderBy = sorter.order == 'ascend' ? '1' : '2'
-      this.orderByField = sorter.columnKey
+    mounted() {
       this.getList()
+      this.userData = this.userInfo()
+      this.administrators = false
+      if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+        this.userInfo().userRoleList.forEach(res => {
+          if (res.roleCode == 'admin') {
+            this.administrators = true
+          }
+        })
+      }
     },
-    //添加
-    handleAdd() {
-      this.title = this.$t('newlyAdded')
-      this.formInline = {}
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs.ruleForm.clearValidate()
-      })
-    },
-    //批量删除
-    handleDel() {
-      if (this.selectedRowKeys.length > 0) {
+    methods: {
+      ...mapGetters(['userInfo']),
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+      },
+      tableOnChange(pagination, filters, sorter) {
+        this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+        this.orderByField = sorter.columnKey
+        this.getList()
+      },
+      //添加
+      handleAdd() {
+        this.title = this.$t('newlyAdded')
+        this.formInline = {}
+        this.visible = true
+        this.$nextTick(() => {
+          this.$refs.ruleForm.clearValidate()
+        })
+      },
+      //批量删除
+      handleDel() {
+        if (this.selectedRowKeys.length > 0) {
+          let _this = this
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+          let isTrue
+          for (let i = 0; i < selectedRowKeys.length; i++) {
+            selectedRowKeys[i] = JSON.parse(selectedRowKeys[i])
+            if (selectedRowKeys[i].state == 1) {
+              isTrue = false
+              break
+            } else {
+              isTrue = true
+            }
+          }
+          if (isTrue){
+            this.$confirm({
+              content: _this.$t('ConfirmBatchDeletion'),
+              onOk() {
+                let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+                deleteAction(_this.url.deleteBatch, { ids: idList.join(',') }).then((res) => {
+                  if (res.success) {
+                    _this.$message.success(_this.$t('OperationSuccessful'))
+                    _this.selectedRowKeys = []
+                    _this.getList()
+                  } else {
+                    _this.$message.warning(res.message)
+                  }
+                })
+              }
+            })
+          }else{
+             this.$message.warning(this.$t(''))
+          }
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      //编辑
+      edit(item) {
+        this.title = this.$t('edit')
+        this.formInline = JSON.parse(JSON.stringify(item))
+        this.visible = true
+        this.$nextTick(() => {
+          this.$refs.ruleForm.clearValidate()
+        })
+      },
+      //撤回
+      withdraw(val) {
+        let item = {}
+        let content = ''
+        if (!val.state || val.state == 2) {
+          content = this.$t('confirmRelease')
+          item.state = 1
+        } else {
+          item.state = 2
+          content = this.$t('confirmWithdraw')
+        }
+        item.id = val.id
         let _this = this
         this.$confirm({
-          content: _this.$t('ConfirmBatchDeletion'),
+          content: content,
           onOk() {
-            let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
-            deleteAction(_this.url.deleteBatch, { ids: idList.join(',') }).then((res) => {
+            postAction(_this.url.urlWithdraw, item).then((res) => {
               if (res.success) {
                 _this.$message.success(_this.$t('OperationSuccessful'))
-                _this.selectedRowKeys = []
                 _this.getList()
               } else {
                 _this.$message.warning(res.message)
@@ -292,285 +347,246 @@ export default {
             })
           }
         })
-      } else {
-        this.$message.warning(this.$t('selectLeastOne'))
-      }
-    },
-    //编辑
-    edit(item) {
-      this.title = this.$t('edit')
-      this.formInline = JSON.parse(JSON.stringify(item))
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs.ruleForm.clearValidate()
-      })
-    },
-    //撤回
-    withdraw(val) {
-      let item = {}
-      let content = ''
-      if (!val.state || val.state == 2) {
-        content = this.$t('confirmRelease')
-        item.state = 1
-      } else {
-        item.state = 2
-        content = this.$t('confirmWithdraw')
-      }
-      item.id = val.id
-      let _this = this
-      this.$confirm({
-        content: content,
-        onOk() {
-          postAction(_this.url.urlWithdraw, item).then((res) => {
-            if (res.success) {
-              _this.$message.success(_this.$t('OperationSuccessful'))
-              _this.getList()
-            } else {
-              _this.$message.warning(res.message)
-            }
-          })
-        }
-      })
-    },
-    //认证清单维护
-    maintenanceList(item) {
-      let newUrl = this.$router.resolve({
-        path: '/certificationListMaintenance',
-        query: {
-          name: item.name,
-          useExplain: item.useExplain,
-          id: item.id,
-          title: '认证清单维护'
-        }
-      })
-      window.open(newUrl.href, '_blank')
-    },
-    //订阅
-    subscribe(val) {
-      let _this = this
-      this.$confirm({
-        content: val.readFlag == 0 || !val.readFlag ? _this.$t('ConfirmSubscribe') : _this.$t('cancelConfirmSubscribe'),
-        onOk() {
-          let url = ''
-          if (val.readFlag == 0 || !val.readFlag) {
-            url = '/authDummy/authDummyInventoryBaseEO/read'
-          } else {
-            url = '/authDummy/authDummyInventoryBaseEO/cancelRead'
+      },
+      //认证清单维护
+      maintenanceList(item) {
+        let newUrl = this.$router.resolve({
+          path: '/certificationListMaintenance',
+          query: {
+            name: item.name,
+            useExplain: item.useExplain,
+            id: item.id,
+            title: '认证清单维护'
           }
-          getAction(url, { id: val.id }).then((res) => {
-            if (res.success) {
-              _this.$message.success(_this.$t('OperationSuccessful'))
-              _this.getList()
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      //订阅
+      subscribe(val) {
+        let _this = this
+        this.$confirm({
+          content: val.readFlag == 0 || !val.readFlag ? _this.$t('ConfirmSubscribe') : _this.$t('cancelConfirmSubscribe'),
+          onOk() {
+            let url = ''
+            if (val.readFlag == 0 || !val.readFlag) {
+              url = '/authDummy/authDummyInventoryBaseEO/read'
             } else {
-              _this.$message.warning(_this.$t('operationFailed'))
+              url = '/authDummy/authDummyInventoryBaseEO/cancelRead'
             }
-          })
-        }
-      })
-    },
-    //删除
-    deleteLib(val) {
-      let _this = this
-      this.$confirm({
-        content: _this.$t('ConfirmDelete'),
-        onOk() {
-          deleteAction(_this.url.deleteBatch, { ids: val.id }).then((res) => {
-            if (res.success) {
-              _this.$message.success(_this.$t('OperationSuccessful'))
-              _this.getList()
-            } else {
-              _this.$message.warning(res.message)
-            }
-          })
-        }
-      })
-    },
-    //虚拟认证清单名称事件
-    CertificationListNameClick(item) {
-      let newUrl = this.$router.resolve({
-        path: '/certificationListMaintenance',
-        query: {
-          name: item.name,
-          useExplain: item.useExplain,
-          id: item.id,
-          title: '虚拟认证清单详情'
-        }
-      })
-      window.open(newUrl.href, '_blank')
-    },
-    searchQuery() {
-      this.pageNo = 1
-      this.getList()
-    },
-    searchReset() {
-      this.queryParam = {}
-      this.pageNo = 1
-      this.getList()
-    },
-    pageOnChange(page, pageSize) {
-      this.pageNo = page
-      this.getList()
-    },
-    SizeChange(page, pageSize) {
-      this.pageNo = 1
-      this.pageSize = pageSize
-      this.getList()
-    },
-    handleCancel() {
-      this.visible = false
-    },
-    handleSubmit() {
-      this.$refs.ruleForm.validate(valid => {
-        if (valid) {
-          let url = ''
-          if (this.formInline.id) {
-            url = this.url.edit
-          } else {
-            url = this.url.add
+            getAction(url, { id: val.id }).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.getList()
+              } else {
+                _this.$message.warning(_this.$t('operationFailed'))
+              }
+            })
           }
-          this.confirmLoading = true
-          postAction(url, this.formInline).then((res) => {
-            if (res.success) {
-              this.confirmLoading = false
-              this.$message.success(this.$t('OperationSuccessful'))
-              this.visible = false
+        })
+      },
+      //删除
+      deleteLib(val) {
+        let _this = this
+        this.$confirm({
+          content: _this.$t('ConfirmDelete'),
+          onOk() {
+            deleteAction(_this.url.deleteBatch, { ids: val.id }).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.getList()
+              } else {
+                _this.$message.warning(res.message)
+              }
+            })
+          }
+        })
+      },
+      //虚拟认证清单名称事件
+      CertificationListNameClick(item) {
+        let newUrl = this.$router.resolve({
+          path: '/certificationListMaintenance',
+          query: {
+            name: item.name,
+            useExplain: item.useExplain,
+            id: item.id,
+            title: '虚拟认证清单详情'
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.pageNo = 1
+        this.getList()
+      },
+      pageOnChange(page, pageSize) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      handleSubmit() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            let url = ''
+            if (this.formInline.id) {
+              url = this.url.edit
+            } else {
+              url = this.url.add
+            }
+            this.confirmLoading = true
+            postAction(url, this.formInline).then((res) => {
+              if (res.success) {
+                this.confirmLoading = false
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.visible = false
+                this.getList()
+              } else {
+                this.$message.warning(this.$t('operationFailed'))
+                this.confirmLoading = false
+              }
+            })
+          }
+        })
+      },
+      getList() {
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...this.queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
               this.getList()
-            } else {
-              this.$message.warning(this.$t('operationFailed'))
-              this.confirmLoading = false
+              return
             }
-          })
-        }
-      })
-    },
-    getList() {
-      let query = {
-        pageNo: this.pageNo,
-        pageSize: this.pageSize,
-        ...this.queryParam
-      }
-      this.loading = true
-      getAction(this.url.list,query).then((res) => {
-        if (res.success) {
-          if (res.result.current > 1 && res.result.records.length == 0) {
-            this.pageNo = 1
-            this.getList()
-            return
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
           }
-          this.dataSource = res.result.records || []
-          this.total = res.result.total
-          this.loading = false
-        } else {
-          this.loading = false
-        }
-      })
-    },
+        })
+      }
+    }
   }
-}
 </script>
 
 <style scoped>
-@import '~@assets/less/common.less';
+  @import '~@assets/less/common.less';
 
-.box-title-text {
-  line-height: 1.4;
-  display: flex;
-  align-items: center;
-  margin-bottom: 10px;
-}
+  .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;
-}
+  .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-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
 
-.box-button {
-  height: 38px;
-  /*margin-top: 2px;*/
-}
+  .box-button {
+    height: 38px;
+    /*margin-top: 2px;*/
+  }
 
-.text-operation {
-  margin-right: 8px;
-}
+  .text-operation {
+    margin-right: 8px;
+  }
 
-.page {
-  text-align: right;
-  margin-top: 20px;
-}
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
 
-.formAdd {
-  margin-bottom: 40px;
-}
+  .formAdd {
+    margin-bottom: 40px;
+  }
 
-.box-title-text-add {
-  line-height: 1.4;
-  display: flex;
-}
+  .box-title-text-add {
+    line-height: 1.4;
+    display: flex;
+  }
 
-.title-text-add {
-  width: 114px;
-  text-align: right;
-  display: inline-block;
-  font-weight: 500;
-  font-size: 14px;
-  margin-right: 16px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  height: 42px;
-  line-height: 42px;
-  margin-top: 3px;
-}
+  .title-text-add {
+    width: 114px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 42px;
+    margin-top: 3px;
+  }
 
-.Required {
-  color: red;
-  margin-right: 4px;
-}
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
 
-.title-text-text {
-  margin-top: 9px;
-}
+  .title-text-text {
+    margin-top: 9px;
+  }
 
-.itemModel {
-  width: calc(100% - 130px);
-  display: inline-block;
-  margin-top: 2px;
-}
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
 
-.box-input-add {
-  display: inline-block;
-  height: 38px;
-  width: 100%;
-}
+  .box-input-add {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
 
-.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;
-}
+  .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;
+  }
 </style>
 

From b0574de10e10ec3f6ff5c513a9553cd7a9707cf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Fri, 24 Mar 2023 11:36:08 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=BB=B4=E6=8A=A4=E5=B1=95=E7=A4=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectManagement/components/TaskListModel.vue   | 10 +++++++++-
 .../components/certificationList/index.vue           |  9 +++++----
 .../src/views/virtualAuthenticationList/index.vue    |  2 +-
 .../certificationListMaintenance.vue                 | 12 ++++++------
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/TaskListModel.vue b/jero-web/src/views/projectManagement/components/TaskListModel.vue
index 31e1cc703..06ca28a16 100644
--- a/jero-web/src/views/projectManagement/components/TaskListModel.vue
+++ b/jero-web/src/views/projectManagement/components/TaskListModel.vue
@@ -176,7 +176,15 @@
     data() {
       return {
         formInline: {},
-        rules: {},
+        rules: {
+          certificationProgressRemark:[
+            {
+              max: 500,
+              message: this.$t('remarks') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+        },
         title: this.$t('CertificationProgress'),
         visible: false,
         confirmLoading: false,
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 7f30ea37e..96bec6188 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -70,7 +70,8 @@
 
         <!--        导出-->
         <div @click="handleExport" v-if="roleSwitchingCode == 1 || roleSwitchingCode == 11 ||
-         roleSwitchingCode == 12 || roleSwitchingCode == 13 || roleSwitchingCode == 14"
+         roleSwitchingCode == 12 || roleSwitchingCode == 13 || roleSwitchingCode == 14 ||
+         roleSwitchingCode == 20 || roleSwitchingCode == 21"
              class="operator-text">
           <a-icon type="export" :rotate="-90"/>
           {{ $t('export') }}
@@ -129,7 +130,7 @@
 
               <!--              模板下载-->
               <div @click="handleModule"
-                   v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2 || roleSwitchingCode == 20 || roleSwitchingCode == 21"
+                   v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
                    class="operator-text-title">
                 <a-icon type="download"/>
                 {{ $t('templateDownload') }}
@@ -144,7 +145,7 @@
               </div>
 
               <!--              导入-->
-              <div class="operator-text-title" v-if="roleSwitchingCode != 1">
+              <div class="operator-text-title" v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2">
                 <ImportFile :url="url" :projectLibraryId=$route.query.id :isTrue="true" :accept="'.zip'"
                             @getList="getPersonnelList"/>
               </div>
@@ -167,7 +168,7 @@
             </div>
           </template>
           <div class="operator-text" style="position: relative"
-               v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2 || roleSwitchingCode == 20 || roleSwitchingCode == 21">
+               v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2">
             <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
           </div>
         </a-popconfirm>
diff --git a/jero-web/src/views/virtualAuthenticationList/index.vue b/jero-web/src/views/virtualAuthenticationList/index.vue
index 10c635433..4765a055d 100644
--- a/jero-web/src/views/virtualAuthenticationList/index.vue
+++ b/jero-web/src/views/virtualAuthenticationList/index.vue
@@ -409,7 +409,7 @@
             name: item.name,
             useExplain: item.useExplain,
             id: item.id,
-            title: '虚拟认证清单详情'
+            title: '市场认证清单详情'
           }
         })
         window.open(newUrl.href, '_blank')
diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
index 3da9a0222..95301d8a7 100644
--- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
+++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
@@ -292,7 +292,7 @@
             title: this.$t('category'),
             align: 'left',
             dataIndex: 'category',
-            width: 150,
+            width: 200,
             fixed: 'left',
             ellipsis: true
           },
@@ -300,7 +300,7 @@
             title: this.$t('inspectionItems'),
             align: 'left',
             dataIndex: 'inspectionItem',
-            width: 150,
+            width: 200,
             ellipsis: true,
             fixed: 'left',
             scopedSlots: { customRender: 'inspectionItems' }
@@ -323,7 +323,7 @@
             title: this.$t('standard'),
             align: 'left',
             dataIndex: 'serialNumber',
-            width: 150,
+            width: 210,
             ellipsis: true
           },
           {
@@ -353,7 +353,7 @@
       }
     },
     created() {
-      if (this.$route.query.title == '虚拟认证清单详情') {
+      if (this.$route.query.title == '市场认证清单详情') {
         document.title = this.$t('virtualAuthenticationListDetails')
         this.columns.splice(7, 1)
       } else {
@@ -362,8 +362,8 @@
     },
     mounted() {
       this.title = this.$route.query.title
-      this.isTrue = this.$route.query.title == '虚拟认证清单详情' ? false : true
-      this.isFalse = this.$route.query.title == '虚拟认证清单详情' ? true : false
+      this.isTrue = this.$route.query.title == '市场认证清单详情' ? false : true
+      this.isFalse = this.$route.query.title == '市场认证清单详情' ? true : false
       this.getList()
     },
     computed: {},

From e6e0faf9ca90b6414932ec086fefb9527d0a0aba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Fri, 24 Mar 2023 11:39:33 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=BB=B4=E6=8A=A4=E5=B1=95=E7=A4=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectManagement/components/certificationList/index.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 96bec6188..67604767d 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -514,11 +514,6 @@
             value: 'category',
             text: this.$t('category')
           },
-          {
-            type: 'string',
-            value: 'inspectionItem',
-            text: this.$t('inspectionItems')
-          },
           {
             type: 'string',
             value: 'configItem',