Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

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({
+          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('designComplianceReview'))
-            path: '/taskListProcess',
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
         } 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({
+          this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('verificationComplianceReview'))
-            path: '/taskListProcess',
+        }
-            query: query
-          })
-          window.open(newUrl.href, '_blank')
       }
-      },
     }
   }
 </script>

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,

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>
@@ -513,11 +514,6 @@
             value: 'category',
             text: this.$t('category')
           },
-          {
-            type: 'string',
-            value: 'inspectionItem',
-            text: this.$t('inspectionItems')
-          },
           {
             type: 'string',
             value: 'configItem',

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) {

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) {

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

@@ -1,4 +1,5 @@
 <template>
+  <div>
     <a-drawer
       :title="$t('Transfer')"
       :maskClosable="false"
@@ -18,7 +19,7 @@
                     <span>{{$t('CertificationListName')}}</span>
                   </div>
                   <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('CertificationListName')"
-                         ></j-input>
+                           v-model="queryParam.name"></j-input>
                 </div>
               </a-col>
               <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
@@ -31,6 +32,7 @@
           </a-form>
         </div>
         <a-table
+          :components="drag(columns,'columns')"
           :columns="columns"
           rowKey="id"
           :scroll="{x: 800}"
@@ -56,22 +58,36 @@
 
       <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>
+        <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 {
+  import { getAction, postAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+  import transferListvirtal from './transferListvirtal'
+
+  export default {
     name: 'transferList',
+    components: {
+      transferListvirtal
+    },
+    props: ['url'],
+    mixins: [ResizeHeader, ResizeColumnProvide],
     data() {
       return {
         visible: false,
+        queryParam: {},
         confirmLoading: false,
         selectedRowKeys: [],
         columns: [
           {
-          title: this.$t('VirtualListName'),
+            title: this.$t('CertificationListName'),
             dataIndex: 'name',
             align: 'left',
             ellipsis: true,
@@ -100,15 +116,22 @@ export default {
           }
         ],
         dataList: [],
+        content: [],
         loading: false,
         pageNo: 1,
         pageSize: 10,
         total: 0
       }
+    },
+    mounted() {
+
     },
     methods: {
       transferModel() {
         this.visible = true
+        this.queryParam = {}
+        this.selectedRowKeys = []
+        this.replacePage()
       },
       searchQuery() {
         this.pageNo = 1
@@ -132,21 +155,29 @@ export default {
         let query = {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
-        ...this.queryParam
+          ...this.queryParam,
+          state:'1',
         }
         this.loading = true
-      // postAction('', query).then((res) => {
+        getAction('/authDummy/authDummyInventoryBaseEO/page', query).then((res) => {
-      //   if (res.success) {
+          if (res.success) {
-      //     this.dataList = res.result.records || []
+            if (res.result.current > 1 && res.result.records.length == 0) {
-      //     this.total = res.result.total
+              this.pageNo = 1
-      //     this.loading = false
+              this.replacePage()
-      //   } else {
+              return
-      //     this.loading = false
+            }
-      //   }
+            this.dataList = res.result.records || []
-      // })
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
       },
-    handleSubmit(){
+      transferListFormHomo() {
-
+        this.visible = false
+        this.selectedRowKeys = []
+        this.$emit('transferListForm')
       },
       onSelectChange(value) {
         this.selectedRowKeys = value
@@ -156,20 +187,82 @@ export default {
       },
       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')
+          }
+        })
+      }
+    }
   }
-}
 </script>
 
 <style scoped>
-.box-title-text {
+  .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 {
+  .title-text {
     width: 20%;
     min-width: 110px;
     color: #000F16;
@@ -182,34 +275,16 @@ export default {
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
-}
+  }
 
-.box-input {
+  .box-input {
     display: inline-block;
     width: 70%;
     height: 38px;
     margin-top: 2px;
-}
+  }
 
-.box-button {
+  .box-button {
     height: 38px;
-}
+  }
-
-.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;
-}
 </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/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,14 +148,14 @@
 </template>
 
 <script>
-import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
-import VueDraggableResizable from 'vue-draggable-resizable'
+  import VueDraggableResizable from 'vue-draggable-resizable'
-import tableDragResize from '@/mixins/tableDragResize'
+  import tableDragResize from '@/mixins/tableDragResize'
-import { mapGetters } from 'vuex'
+  import { mapGetters } from 'vuex'
-import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
-export default {
+  export default {
-  name:'index',
+    name: 'index',
     components: {
       VueDraggableResizable
     },
@@ -193,7 +194,7 @@ export default {
         visible: false,
         title: this.$t('newlyAdded'),
         userData: {},
-      administrators:false,
+        administrators: false,
         loading: false,
         total: 0,
         pageSize: 10,
@@ -239,7 +240,7 @@ export default {
             width: 400,
             scopedSlots: { customRender: 'operation' }
           }
-      ],
+        ]
       }
     },
     mounted() {
@@ -277,6 +278,18 @@ export default {
       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() {
@@ -292,6 +305,9 @@ export default {
                 })
               }
             })
+          }else{
+             this.$message.warning(this.$t(''))
+          }
         } else {
           this.$message.warning(this.$t('selectLeastOne'))
         }
@@ -393,7 +409,7 @@ export default {
             name: item.name,
             useExplain: item.useExplain,
             id: item.id,
-          title: '虚拟认证清单详情'
+            title: '市场认证清单详情'
           }
         })
         window.open(newUrl.href, '_blank')
@@ -450,7 +466,7 @@ export default {
           ...this.queryParam
         }
         this.loading = true
-      getAction(this.url.list,query).then((res) => {
+        getAction(this.url.list, query).then((res) => {
           if (res.success) {
             if (res.result.current > 1 && res.result.records.length == 0) {
               this.pageNo = 1
@@ -464,22 +480,22 @@ export default {
             this.loading = false
           }
         })
-    },
       }
-}
+    }
+  }
 </script>
 
 <style scoped>
-@import '~@assets/less/common.less';
+  @import '~@assets/less/common.less';
 
-.box-title-text {
+  .box-title-text {
     line-height: 1.4;
     display: flex;
     align-items: center;
     margin-bottom: 10px;
-}
+  }
 
-.title-text {
+  .title-text {
     width: 20%;
     min-width: 110px;
     color: #000F16;
@@ -492,39 +508,39 @@ export default {
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
-}
+  }
 
-.box-input {
+  .box-input {
     display: inline-block;
     width: 70%;
     height: 38px;
     margin-top: 2px;
-}
+  }
 
-.box-button {
+  .box-button {
     height: 38px;
     /*margin-top: 2px;*/
-}
+  }
 
-.text-operation {
+  .text-operation {
     margin-right: 8px;
-}
+  }
 
-.page {
+  .page {
     text-align: right;
     margin-top: 20px;
-}
+  }
 
-.formAdd {
+  .formAdd {
     margin-bottom: 40px;
-}
+  }
 
-.box-title-text-add {
+  .box-title-text-add {
     line-height: 1.4;
     display: flex;
-}
+  }
 
-.title-text-add {
+  .title-text-add {
     width: 114px;
     text-align: right;
     display: inline-block;
@@ -537,30 +553,30 @@ export default {
     height: 42px;
     line-height: 42px;
     margin-top: 3px;
-}
+  }
 
-.Required {
+  .Required {
     color: red;
     margin-right: 4px;
-}
+  }
 
-.title-text-text {
+  .title-text-text {
     margin-top: 9px;
-}
+  }
 
-.itemModel {
+  .itemModel {
     width: calc(100% - 130px);
     display: inline-block;
     margin-top: 2px;
-}
+  }
 
-.box-input-add {
+  .box-input-add {
     display: inline-block;
     height: 38px;
     width: 100%;
-}
+  }
 
-.drawer-bootom-button {
+  .drawer-bootom-button {
     position: absolute;
     bottom: 0;
     z-index: 100;
@@ -571,6 +587,6 @@ export default {
     left: 0;
     background: #fff;
     border-radius: 0 0 2px 2px;
-}
+  }
 </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>
@@ -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.isTrue = this.$route.query.title == '市场认证清单详情' ? false : true
-      this.isFalse = this.$route.query.title == '虚拟认证清单详情' ? true : false
+      this.isFalse = this.$route.query.title == '市场认证清单详情' ? true : false
       this.getList()
     },
     computed: {},
@@ -382,6 +382,10 @@
       searchQuery() {
         this.getList()
       },
+      transferListForm() {
+        this.selectedRowKeys = []
+        this.getList()
+      },
       //清空
       searchReset() {
         this.queryParam = {}