Merge remote-tracking branch 'origin/master'

snowy-admin-web/src/views/yqyc/zero/enterprise-qualification/detail.vue

@@ -74,7 +74,7 @@
         <a-col :span="8">
           <a-form-item label="成立日期：" name="companyRegisterDate">
             <a-date-picker v-model:value="formData.companyRegisterDate" :disabled="true"
-                           value-format="YYYY-MM-DD HH:mm:ss" show-time placeholder="请选择成立日期" style="width: 100%"
+                           value-format="YYYY-MM-DD" placeholder="请选择成立日期" style="width: 100%"
                            allow-clear/>
           </a-form-item>
         </a-col>

snowy-admin-web/src/views/yqyc/zero/enterprise-qualification/index.vue

@@ -1,6 +1,6 @@
 <template>
   <a-card :bordered="false" v-if="indexShow">
-    <a-tabs v-model:activeKey="searchFormState.qybalx" @change="onSearch()">
+    <a-tabs v-model:activeKey="searchFormState.baType" @change="onSearch()">
       <a-tab-pane key="basq" tab="备案申请"/>
       <a-tab-pane key="bgsq" tab="变更申请"/>
       <a-tab-pane key="zxsq" tab="注销申请"/>
@@ -53,7 +53,7 @@
     >
       <template #operator class="table-operator">
         <a-space>
-          <a-button type="primary" @click="onDetail()" v-if="hasPerm('qyRecordAdd') && searchFormState.qybalx === 'basq'">
+          <a-button type="primary" @click="onDetail()" v-if="hasPerm('qyRecordAdd') && searchFormState.baType === 'basq'">
             <template #icon>
               <plus-outlined/>
             </template>
@@ -94,11 +94,11 @@
             </a-popconfirm>
 		  	<a-divider type="vertical" v-if="hasPerm(['qyRecordView', 'qyRecordEdit', 'qyRecordDelete'])"/>
 		    <a @click="resultDetailRef.onOpen(record)" v-if="record.status == 3 || record.status == 4">查看回执</a>
-		  	<template v-if="searchFormState.qybalx === 'bgsq' && (record.status == 3 || record.status == 4)">
+		  	<template v-if="searchFormState.baType === 'bgsq' && (record.status == 3 || record.status == 4)">
 				<a-divider type="vertical"/>
 				<a @click="onChange(record)">变更</a>
 		  	</template>
-		  	<template v-else-if="searchFormState.qybalx === 'zxsq' && record.status == 4">
+		  	<template v-else-if="searchFormState.baType === 'zxsq' && record.status == 4">
 				<a-divider type="vertical"/>
 				<a @click="onKill(record)">注销</a>
 		  	</template>
@@ -124,7 +124,7 @@ import {createVNode} from "vue";
 
 const {proxy} = getCurrentInstance()
 const searchFormState = ref({
-  qybalx: 'basq'
+  baType: 'basq'
 })
 const searchFormStateReal = ref(searchFormState.value) // 点击搜索后备份的查询参数
 const searchFormRef = ref()