定版

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -487,7 +487,7 @@
                 <a-select allowClear
                           :placeholder="$t('pleaseSelect')+$t('expeditionProcess')"
                           mode="multiple"
-                          v-model="formInlineQuestion.questionStatus">
+                          v-model="formInlineQuestion.expeditingType">
                   <a-select-option :value="item.value" v-for="item in questionList">
                  <span class="itemOption-index" :title="item.name">
                      {{ item.name }}
@@ -559,7 +559,7 @@
         roleSwitchingList: [],
         formInlineQuestion: {},
         rulesRoleQuestion: {
-          questionStatus: [
+          expeditingType: [
             {
               required: true,
               message: this.$t('expeditionProcess') + this.$t('cannotEmpty'),
@@ -569,11 +569,11 @@
         },
         questionList: [
           {
-            value: '1',
+            value: 'lawsInventoryDesignExpediting',
             name: this.$t('designComplianceProcess')
           },
           {
-            value: '2',
+            value: 'lawsInventoryVerifyExpediting',
             name: this.$t('validationComplianceProcess')
           }
         ],
@@ -1524,13 +1524,13 @@
       handleOkQuestion() {
         this.$refs.ruleFormQuestion.validate(valid => {
           let formInlineQuestion = JSON.parse(JSON.stringify(this.formInlineQuestion))
-          if (formInlineQuestion.questionStatus && formInlineQuestion.questionStatus.length > 0) {
-            formInlineQuestion.questionStatus = formInlineQuestion.questionStatus.join(',')
+          if (formInlineQuestion.expeditingType && formInlineQuestion.expeditingType.length > 0) {
+            formInlineQuestion.expeditingType = formInlineQuestion.expeditingType.join(',')
           }
           let query = {
             ids: this.questionIdList.join(','),
             projectLibraryId: this.$route.query.id,
-            questionStatus: formInlineQuestion.questionStatus
+            expeditingType: formInlineQuestion.expeditingType
           }
           this.confirmLoadingQuestion = true
           postAction('project/projectLawsInventoryEO/expediting', query).then((res) => {

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

@@ -50,9 +50,6 @@
             </template>
             <span style="float: right;overflow: hidden;" 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 @click="handleToggleSearch" style="margin-left: 8px">
@@ -103,14 +100,10 @@
 
 <script>
 import { getAction, postAction } from '@/api/manage'
-import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
 import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
 export default {
   name: 'codeNumber',
-  components: {
-    globalAdvancedQuery
-  },
   mixins: [ResizeHeader, ResizeColumnProvide],
   data() {
     return {
@@ -184,7 +177,6 @@ export default {
       pageNo: 1,
       pageSize: 10,
       total: 0,
-      fieldList: [],
       queryParamQuery: {},
       queryConditionVOList: []
     }
@@ -202,7 +194,6 @@ export default {
       this.selectedRowKeys = []
       this.queryConditionVOList = []
       this.replacePage()
-      this.queryConditionInventory()
     },
     // number() {
     //   this.regulation = ''
@@ -214,9 +205,6 @@ export default {
     searchReset() {
       this.pageNo = 1
       this.queryParam = {}
-      this.queryConditionVOList = []
-      this.$refs.globalAdvancedQueryRef.resetLine()
-      this.$refs.globalAdvancedQueryRef.emitCallback()
       this.replacePage()
     },
     onChange(page, pageSize) {
@@ -228,18 +216,6 @@ export default {
       this.pageSize = pageSize
       this.replacePage()
     },
-    queryConditionInventory() {
-      let query = {
-        flag: 1
-      }
-      getAction(this.url.queryConditionInventory, query).then((res) => {
-        if (res.success) {
-          this.fieldList = res.result || []
-        } else {
-          this.fieldList = []
-        }
-      })
-    },
     replacePage() {
       let queryConditionVOList = JSON.parse(JSON.stringify(this.queryConditionVOList))
       let query = {
@@ -268,20 +244,6 @@ export default {
     handleCancel() {
       this.visible = false
     },
-    handleSuperQuery(params, matchType) {
-      let sqp = {}
-      if (!params || (params && params.length == 0)) {
-        this.queryConditionVOList = []
-        this.$refs.globalAdvancedQueryRef.superQueryFlag = false
-      } else {
-        this.$refs.globalAdvancedQueryRef.superQueryFlag = true
-        this.queryConditionVOList = params
-        this.queryConditionVOList.forEach(res => {
-          res.type = matchType
-        })
-      }
-      this.replacePage()
-    },
     handleSubmit() {
       if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
         this.confirmLoading = true

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

@@ -56,7 +56,7 @@
 
     <div class="drawer-bootom-button">
       <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
-      <a-button @click="handleSubmit(undefined)" type="primary" :loading="confirmLoading">{{$t('determine')}}</a-button>
+      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('determine')}}</a-button>
     </div>
   </a-drawer>
 </template>
@@ -144,6 +144,9 @@ export default {
       //     this.loading = false
       //   }
       // })
+    },
+    handleSubmit(){
+
     },
     onSelectChange(value) {
       this.selectedRowKeys = value

jero-web/src/views/virtualAuthenticationList/index.vue

@@ -48,7 +48,7 @@
       :components="drag(columns,'columns')"
       :loading="loading"
       :pagination="false"
-      :scroll="{x: '100%'}"
+      :scroll="{x: '100%',y:'calc(100vh - 300px)'}"
       rowKey="id"
       :data-source="dataSource"
       :columns="columns"
@@ -67,7 +67,7 @@
            <a class="text-operation"
               v-has="'dummyInventoryBase:issue'"
               @click="withdraw(record)">
-             {{record.state == 2 ? $t('release') : $t('withdraw')}}
+             {{!record.state || record.state == 2 ? $t('release') : $t('withdraw')}}
            </a>
         <!--          v-if="record.createBy == userData.username || administrators"-->
            <a class="text-operation" :disabled="record.state == 1?true:false"
@@ -309,7 +309,7 @@ export default {
     withdraw(val) {
       let item = {}
       let content = ''
-      if (val.state == 2) {
+      if (!val.state || val.state == 2) {
         content = this.$t('confirmRelease')
         item.state = 1
       } else {