Browse Source

下拉模板命名规范及代码生成列宽

CzRger 9 months ago
parent
commit
b6a11a8cd1

+ 4 - 0
snowy-admin-web/src/views/gen/basic.vue

@@ -10,6 +10,8 @@
 							class="xn-wd"
 							placeholder="请选择主表"
 							@select="selectTableColumnsData(formData.dbTable, false)"
+							show-search
+							option-filter-prop="label"
 						/>
 					</a-form-item>
 				</a-col>
@@ -20,6 +22,8 @@
 							:options="tableColumns"
 							class="xn-wd"
 							placeholder="选择主键"
+							show-search
+							option-filter-prop="label"
 						/>
 					</a-form-item>
 				</a-col>

+ 11 - 10
snowy-admin-web/src/views/gen/config.vue

@@ -23,7 +23,7 @@
 						@change="fieldJavaTypeChange(record)"
 						show-search
 						allow-clear
-						optionFilterProp="label"
+						option-filter-prop="label"
 					/>
 				</template>
 				<template v-if="column.dataIndex === 'effectType'">
@@ -36,7 +36,7 @@
 						@change="effectTypeChange(record)"
 						show-search
 						allow-clear
-						optionFilterProp="label"
+						option-filter-prop="label"
 					/>
 				</template>
 				<template v-if="column.dataIndex === 'dictTypeCode'">
@@ -48,7 +48,7 @@
 						placeholder="请选择字典"
 						show-search
 						allow-clear
-						optionFilterProp="label"
+						option-filter-prop="label"
 					/>
 					<span v-else>无</span>
 				</template>
@@ -89,7 +89,7 @@
 						placeholder="请选择"
 						show-search
 						allow-clear
-						optionFilterProp="label"
+						option-filter-prop="label"
 					/>
 					<span v-else-if="record.effectType === 'datepicker' && record.queryWhether === true">时间段</span>
 					<span v-else>无</span>
@@ -170,13 +170,13 @@ const columns = [
 		title: '列省略',
 		align: 'center',
 		dataIndex: 'whetherRetract',
-		width: 80
+		width: 60
 	},
 	{
 		title: '列排序',
 		align: 'center',
 		dataIndex: 'whetherSort',
-		width: 80
+		width: 60
 	},
 	{
 		title: '列固定',
@@ -188,24 +188,25 @@ const columns = [
 		title: '增改',
 		align: 'center',
 		dataIndex: 'whetherAddUpdate',
-		width: 80
+		width: 60
 	},
 	{
 		title: '必填',
 		align: 'center',
 		dataIndex: 'whetherRequired',
-		width: 80
+		width: 60
 	},
 	{
 		title: '查询',
 		align: 'center',
 		dataIndex: 'queryWhether',
-		width: 80
+		width: 60
 	},
 	{
 		title: '查询方式',
 		align: 'center',
-		dataIndex: 'queryType'
+		dataIndex: 'queryType',
+		width: 120
 	},
 	{
 		title: '移动',

+ 3 - 3
snowy-admin-web/src/views/yqyc/general-ledger/one/detail.vue

@@ -25,7 +25,7 @@
                 </a-col>
                 <a-col :span="12">
                     <a-form-item label="账册类型:" name="accountType">
-                        <a-select v-model:value="formData.accountType" :disabled="isView" placeholder="请选择账册类型" :options="accountTypeOptions" show-search allow-clear optionFilterProp="label"/>
+                        <a-select v-model:value="formData.accountType" :disabled="isView" placeholder="请选择账册类型" :options="accountTypeOptions" show-search allow-clear option-filter-prop="label"/>
                     </a-form-item>
                 </a-col>
                 <a-col :span="12">
@@ -50,7 +50,7 @@
                 </a-col>
                 <a-col :span="12">
                     <a-form-item label="业务类型:" name="businessType">
-                        <a-select v-model:value="formData.businessType" :disabled="isView" placeholder="请选择业务类型" :options="businessTypeOptions" show-search allow-clear optionFilterProp="label"/>
+                        <a-select v-model:value="formData.businessType" :disabled="isView" placeholder="请选择业务类型" :options="businessTypeOptions" show-search allow-clear option-filter-prop="label"/>
                     </a-form-item>
                 </a-col>
                 <a-col :span="12">
@@ -60,7 +60,7 @@
                 </a-col>
                 <a-col :span="12">
                     <a-form-item label="法定计量单位:" name="measurementUnit">
-                        <a-select v-model:value="formData.measurementUnit" :disabled="isView" placeholder="请选择法定计量单位" :options="measurementUnitOptions" show-search allow-clear optionFilterProp="label"/>
+                        <a-select v-model:value="formData.measurementUnit" :disabled="isView" placeholder="请选择法定计量单位" :options="measurementUnitOptions" show-search allow-clear option-filter-prop="label"/>
                     </a-form-item>
                 </a-col>
                 <a-col :span="12">

+ 3 - 3
snowy-admin-web/src/views/yqyc/general-ledger/one/index.vue

@@ -14,7 +14,7 @@
                 </a-col>
                 <a-col :span="6">
                     <a-form-item label="账册类型" name="accountType">
-                        <a-select v-model:value="searchFormState.accountType" placeholder="请选择账册类型" :options="accountTypeOptions" show-search allow-clear optionFilterProp="label"/>
+                        <a-select v-model:value="searchFormState.accountType" placeholder="请选择账册类型" :options="accountTypeOptions" show-search allow-clear option-filter-prop="label"/>
                     </a-form-item>
                 </a-col>
                 <a-col :span="6" v-show="advanced">
@@ -34,7 +34,7 @@
                 </a-col>
                 <a-col :span="6" v-show="advanced">
                     <a-form-item label="业务类型" name="businessType">
-                        <a-select v-model:value="searchFormState.businessType" placeholder="请选择业务类型" :options="businessTypeOptions" show-search allow-clear optionFilterProp="label"/>
+                        <a-select v-model:value="searchFormState.businessType" placeholder="请选择业务类型" :options="businessTypeOptions" show-search allow-clear option-filter-prop="label"/>
                     </a-form-item>
                 </a-col>
                 <a-col :span="6" v-show="advanced">
@@ -44,7 +44,7 @@
                 </a-col>
                 <a-col :span="6" v-show="advanced">
                     <a-form-item label="法定计量单位" name="measurementUnit">
-                        <a-select v-model:value="searchFormState.measurementUnit" placeholder="请选择法定计量单位" :options="measurementUnitOptions" show-search allow-clear optionFilterProp="label"/>
+                        <a-select v-model:value="searchFormState.measurementUnit" placeholder="请选择法定计量单位" :options="measurementUnitOptions" show-search allow-clear option-filter-prop="label"/>
                     </a-form-item>
                 </a-col>
                 <a-col :span="6" v-show="advanced">

+ 171 - 0
snowy-admin-web/src/views/yqyc/general-ledger/two/detail.vue

@@ -0,0 +1,171 @@
+<template>
+    <a-card :bordered="false">
+		<a-page-header
+            :title="formData.id ? '编辑二线出岛业务记账管理' : '新增二线出岛业务记账管理'"
+			@back="onClose"
+		>
+			<template #extra>
+				<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
+				<a-popconfirm title="请确认是否保存?" @confirm="onSubmit" v-if="!isView">
+                    <a-button type="primary" :loading="submitLoading">保存</a-button>
+                </a-popconfirm>
+			</template>
+		</a-page-header>
+		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
+            <a-row :gutter="16">
+                <a-col :span="12">
+                    <a-form-item label="企业编码:" name="companyCode">
+                        <a-input v-model:value="formData.companyCode" :disabled="isView" placeholder="请输入企业编码" allow-clear />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="企业名称:" name="companyName">
+                        <a-input v-model:value="formData.companyName" :disabled="isView" placeholder="请输入企业名称" allow-clear />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="账册类型:" name="accountType">
+                        <a-select v-model:value="formData.accountType" :disabled="isView" placeholder="请选择账册类型" :options="accountTypeOptions" show-search allow-clear optionFilterProp="label"/>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="账册编号:" name="accountCode">
+                        <a-input v-model:value="formData.accountCode" :disabled="isView" placeholder="请输入账册编号" allow-clear />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="商品编号:" name="commodityCode">
+                        <a-input v-model:value="formData.commodityCode" :disabled="isView" placeholder="请输入商品编号" allow-clear />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="商品名称:" name="commodityName">
+                        <a-input v-model:value="formData.commodityName" :disabled="isView" placeholder="请输入商品名称" allow-clear />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="业务类型:" name="businessType">
+                        <a-select v-model:value="formData.businessType" :disabled="isView" placeholder="请选择业务类型" :options="businessTypeOptions" show-search allow-clear optionFilterProp="label"/>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="记账数量:" name="accountNumber">
+                        <a-input v-model:value="formData.accountNumber" :disabled="isView" placeholder="请输入记账数量" allow-clear />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="法定计量单位:" name="measurementUnit">
+                        <a-select v-model:value="formData.measurementUnit" :disabled="isView" placeholder="请选择法定计量单位" :options="measurementUnitOptions" show-search allow-clear optionFilterProp="label"/>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="二线出岛申请单号:" name="secondlineOutislandNumber">
+                        <a-input v-model:value="formData.secondlineOutislandNumber" :disabled="isView" placeholder="请输入二线出岛申请单号" allow-clear />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="出库单号:" name="warehouseNumber">
+                        <a-input v-model:value="formData.warehouseNumber" :disabled="isView" placeholder="请输入出库单号" allow-clear />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="出库日期:" name="warehouseTime">
+                        <a-date-picker v-model:value="formData.warehouseTime" :disabled="isView" value-format="YYYY-MM-DD HH:mm:ss" show-time placeholder="请选择出库日期" style="width: 100%" allow-clear/>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="记账日期:" name="accountTime">
+                        <a-date-picker v-model:value="formData.accountTime" :disabled="isView" value-format="YYYY-MM-DD HH:mm:ss" show-time placeholder="请选择记账日期" style="width: 100%" allow-clear/>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="备注:" name="remark">
+                        <a-input v-model:value="formData.remark" :disabled="isView" placeholder="请输入备注" allow-clear />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="文件路径:" name="fileUrl">
+                        <a-input v-model:value="formData.fileUrl" :disabled="isView" placeholder="请输入文件路径" allow-clear />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="制单人:" name="creator">
+                        <a-input v-model:value="formData.creator" :disabled="isView" placeholder="请输入制单人" allow-clear />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="规格:" name="specs">
+                        <a-input v-model:value="formData.specs" :disabled="isView" placeholder="请输入规格" allow-clear />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="单价:" name="unitPrice">
+                        <a-input v-model:value="formData.unitPrice" :disabled="isView" placeholder="请输入单价" allow-clear />
+                    </a-form-item>
+                </a-col>
+            </a-row>
+        </a-form>
+	</a-card>
+</template>
+
+<script setup name="qySecondlineWarehouseDetail">
+	import tool from '@/utils/tool'
+	import { cloneDeep } from 'lodash-es'
+	import { required } from '@/utils/formRules'
+	import qySecondlineWarehouseApi from '@/api/biz/qySecondlineWarehouseApi'
+	// 抽屉状态
+	const emit = defineEmits({ successful: null })
+	const formRef = ref()
+	// 表单数据
+	const formData = ref({})
+	const submitLoading = ref(false)
+	const isView = ref(false)
+	const accountTypeOptions = ref([])
+	const businessTypeOptions = ref([])
+	const measurementUnitOptions = ref([])
+
+	// 打开抽屉
+	const onOpen = (record, view = false) => {
+	    isView.value = view
+		if (record) {
+			let recordData = cloneDeep(record)
+			formData.value = Object.assign({}, recordData)
+		}
+		accountTypeOptions.value = tool.dictList('account_type')
+		businessTypeOptions.value = tool.dictList('bussiness_type')
+		measurementUnitOptions.value = tool.dictList('measurement unit')
+	}
+	// 关闭抽屉
+	const onClose = () => {
+		formRef.value.resetFields()
+		formData.value = {}
+		isView.value = true
+		emit('onClose')
+	}
+	// 默认要校验的
+	const formRules = {
+	}
+	// 验证并提交数据
+	const onSubmit = () => {
+		formRef.value
+			.validate()
+			.then(() => {
+				submitLoading.value = true
+				const formDataParam = cloneDeep(formData.value)
+				qySecondlineWarehouseApi
+					.qySecondlineWarehouseSubmitForm(formDataParam, formDataParam.id)
+					.then(() => {
+						onClose()
+						emit('successful')
+					})
+					.finally(() => {
+						submitLoading.value = false
+					})
+			})
+			.catch(() => {})
+	}
+	// 抛出函数
+	defineExpose({
+		onOpen
+	})
+</script>

+ 314 - 0
snowy-admin-web/src/views/yqyc/general-ledger/two/index.vue

@@ -0,0 +1,314 @@
+<template>
+	<a-card :bordered="false" v-if="indexShow">
+		<a-form ref="searchFormRef" name="advanced_search" :model="searchFormState" class="ant-advanced-search-form">
+            <a-row :gutter="24">
+                <a-col :span="6">
+                    <a-form-item label="企业编码" name="companyCode">
+                        <a-input v-model:value="searchFormState.companyCode" placeholder="请输入企业编码" allow-clear/>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="6">
+                    <a-form-item label="企业名称" name="companyName">
+                        <a-input v-model:value="searchFormState.companyName" placeholder="请输入企业名称" allow-clear/>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="6">
+                    <a-form-item label="账册类型" name="accountType">
+                        <a-select v-model:value="searchFormState.accountType" placeholder="请选择账册类型" :options="accountTypeOptions" show-search allow-clear optionFilterProp="label"/>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="6" v-show="advanced">
+                    <a-form-item label="账册编号" name="accountCode">
+                        <a-input v-model:value="searchFormState.accountCode" placeholder="请输入账册编号" allow-clear/>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="6" v-show="advanced">
+                    <a-form-item label="商品编号" name="commodityCode">
+                        <a-input v-model:value="searchFormState.commodityCode" placeholder="请输入商品编号" allow-clear/>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="6" v-show="advanced">
+                    <a-form-item label="商品名称" name="commodityName">
+                        <a-input v-model:value="searchFormState.commodityName" placeholder="请输入商品名称" allow-clear/>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="6" v-show="advanced">
+                    <a-form-item label="业务类型" name="businessType">
+                        <a-select v-model:value="searchFormState.businessType" placeholder="请选择业务类型" :options="businessTypeOptions" show-search allow-clear optionFilterProp="label"/>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="6" v-show="advanced">
+                    <a-form-item label="记账数量" name="accountNumber">
+                        <a-input v-model:value="searchFormState.accountNumber" placeholder="请输入记账数量" allow-clear/>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="6" v-show="advanced">
+                    <a-form-item label="法定计量单位" name="measurementUnit">
+                        <a-select v-model:value="searchFormState.measurementUnit" placeholder="请选择法定计量单位" :options="measurementUnitOptions" show-search allow-clear optionFilterProp="label"/>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="6" v-show="advanced">
+                    <a-form-item label="二线出岛申请单号" name="secondlineOutislandNumber">
+                        <a-input v-model:value="searchFormState.secondlineOutislandNumber" placeholder="请输入二线出岛申请单号" allow-clear/>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="6" v-show="advanced">
+                    <a-form-item label="出库单号" name="warehouseNumber">
+                        <a-input v-model:value="searchFormState.warehouseNumber" placeholder="请输入出库单号" allow-clear/>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="6" v-show="advanced">
+                    <a-form-item label="出库日期" name="warehouseTime">
+                        <a-range-picker v-model:value="searchFormState.warehouseTime" show-time allow-clear/>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="6" v-show="advanced">
+                    <a-form-item label="记账日期" name="accountTime">
+                        <a-range-picker v-model:value="searchFormState.accountTime" show-time allow-clear/>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="6">
+                    <a-button type="primary" @click="onSearch()">查询</a-button>
+                    <a-button style="margin: 0 8px" @click="reset">重置</a-button>
+                    <a @click="toggleAdvanced" style="margin-left: 8px">
+                        {{ advanced ? '收起' : '展开' }}
+                        <component :is="advanced ? 'up-outlined' : 'down-outlined'"/>
+                    </a>
+                </a-col>
+            </a-row>
+        </a-form>
+		<s-table
+			ref="tableRef"
+			:columns="columns"
+			:data="loadData"
+			:alert="options.alert.show"
+			bordered
+			:row-key="(record) => record.id"
+			:tool-config="toolConfig"
+			:row-selection="options.rowSelection"
+			v-model:filterParam="filterParam"
+			:scroll="{ x: 2000 }"
+		>
+			<template #operator class="table-operator">
+				<a-space>
+					<a-button type="primary" @click="onDetail()" v-if="hasPerm('qySecondlineWarehouseAdd')">
+						<template #icon><plus-outlined /></template>
+						新增
+					</a-button>
+					<xn-batch-delete
+						v-if="hasPerm('qySecondlineWarehouseDelete')"
+						:selectedRowKeys="selectedRowKeys"
+						@batchDelete="deleteBatchQySecondlineWarehouse"
+					/>
+					<a-button @click="onExport" v-if="hasPerm('qySecondlineWarehouseBatchExport')">
+                        <template #icon><export-outlined /></template>
+                        批量导出
+                    </a-button>
+				</a-space>
+			</template>
+			<template #bodyCell="{ column, record }">
+				<template v-if="column.dataIndex === 'accountType'">
+					{{ $TOOL.dictTypeData('account_type', record.accountType) }}
+				</template>
+				<template v-if="column.dataIndex === 'businessType'">
+					{{ $TOOL.dictTypeData('bussiness_type', record.businessType) }}
+				</template>
+				<template v-if="column.dataIndex === 'measurementUnit'">
+					{{ $TOOL.dictTypeData('measurement unit', record.measurementUnit) }}
+				</template>
+				<template v-if="column.dataIndex === 'action'">
+					<a-space>
+					    <a @click="onDetail(record, true)" v-if="hasPerm('qySecondlineWarehouseView')">查看</a>
+                        <a-divider type="vertical" v-if="hasPerm('qySecondlineWarehouseView') && hasPerm(['qySecondlineWarehouseEdit', 'qySecondlineWarehouseDelete'], 'or')" />
+						<a @click="onDetail(record)" v-if="hasPerm('qySecondlineWarehouseEdit')">编辑</a>
+						<a-divider type="vertical" v-if="hasPerm(['qySecondlineWarehouseEdit', 'qySecondlineWarehouseDelete'], 'and')" />
+						<a-popconfirm title="确定要删除吗?" @confirm="deleteQySecondlineWarehouse(record)">
+							<a-button type="link" danger size="small" v-if="hasPerm('qySecondlineWarehouseDelete')">删除</a-button>
+						</a-popconfirm>
+					</a-space>
+				</template>
+			</template>
+		</s-table>
+	</a-card>
+	<Detail v-else ref="detailRef" @onClose="indexShow = true" @successful="onSearch()" />
+</template>
+
+<script setup name="qysecondlinewarehouse">
+	import tool from '@/utils/tool'
+	import { cloneDeep } from 'lodash-es'
+	import Detail from './detail.vue'
+	import qySecondlineWarehouseApi from '@/api/biz/qySecondlineWarehouseApi'
+	import downloadUtil from "@/utils/downloadUtil";
+    const { proxy } = getCurrentInstance()
+	const searchFormState = ref({})
+	const searchFormStateReal = ref({}) // 点击搜索后备份的查询参数
+	const searchFormRef = ref()
+	const tableRef = ref()
+	const filterParam = ref({})
+	const detailRef = ref()
+	const indexShow = ref(true)
+	const toolConfig = { refresh: true, height: true, columnSetting: true, striped: false }
+	// 查询区域显示更多控制
+	const advanced = ref(false)
+	const toggleAdvanced = () => {
+		advanced.value = !advanced.value
+	}
+	const columns = [
+		{
+			title: '企业编码',
+			dataIndex: 'companyCode',
+		},
+		{
+			title: '企业名称',
+			dataIndex: 'companyName',
+		},
+		{
+			title: '账册类型',
+			dataIndex: 'accountType',
+		},
+		{
+			title: '账册编号',
+			dataIndex: 'accountCode',
+		},
+		{
+			title: '商品编号',
+			dataIndex: 'commodityCode',
+		},
+		{
+			title: '商品名称',
+			dataIndex: 'commodityName',
+		},
+		{
+			title: '业务类型',
+			dataIndex: 'businessType',
+		},
+		{
+			title: '记账数量',
+			dataIndex: 'accountNumber',
+            sorter: true,
+		},
+		{
+			title: '法定计量单位',
+			dataIndex: 'measurementUnit',
+		},
+		{
+			title: '二线出岛申请单号',
+			dataIndex: 'secondlineOutislandNumber',
+		},
+		{
+			title: '出库单号',
+			dataIndex: 'warehouseNumber',
+		},
+		{
+			title: '出库日期',
+			dataIndex: 'warehouseTime',
+            sorter: true,
+		},
+		{
+			title: '记账日期',
+			dataIndex: 'accountTime',
+            sorter: true,
+		},
+	]
+	// 操作栏通过权限判断是否显示
+	if (hasPerm(['qySecondlineWarehouseEdit', 'qySecondlineWarehouseDelete'])) {
+		columns.push({
+			title: '操作',
+			dataIndex: 'action',
+			align: 'center',
+			width: 200,
+			fixed: 'right',
+		})
+	}
+	const selectedRowKeys = ref([])
+	// 列表选择配置
+	const options = {
+		// columns数字类型字段加入 needTotal: true 可以勾选自动算账
+		alert: {
+			show: true,
+			clear: () => {
+				selectedRowKeys.value = ref([])
+			}
+		},
+		rowSelection: {
+			onChange: (selectedRowKey, selectedRows) => {
+				selectedRowKeys.value = selectedRowKey
+			}
+		}
+	}
+	const loadData = (parameter) => {
+        tableRef.value.clearSelected()
+        // warehouseTime范围查询条件重载
+        if (searchFormStateReal.value.warehouseTime) {
+            searchFormStateReal.value.startWarehouseTime = searchFormStateReal.value.warehouseTime[0]
+            searchFormStateReal.value.endWarehouseTime = searchFormStateReal.value.warehouseTime[1]
+            delete searchFormStateReal.value.warehouseTime
+        }
+        // accountTime范围查询条件重载
+        if (searchFormStateReal.value.accountTime) {
+            searchFormStateReal.value.startAccountTime = searchFormStateReal.value.accountTime[0]
+            searchFormStateReal.value.endAccountTime = searchFormStateReal.value.accountTime[1]
+            delete searchFormStateReal.value.accountTime
+        }
+        return qySecondlineWarehouseApi.qySecondlineWarehousePage(Object.assign(parameter, searchFormStateReal.value)).then((data) => {
+            return data
+        })
+    }
+    // 搜索同时备份参数
+    const onSearch = (parameter) => {
+        searchFormStateReal.value = cloneDeep(searchFormState.value)
+        tableRef.value.refresh(parameter)
+    }
+    // 重置
+    const reset = () => {
+        searchFormRef.value.resetFields()
+        onSearch(true)
+    }
+	// 删除
+	const deleteQySecondlineWarehouse = (record) => {
+		let params = [
+			{
+				id: record.id
+			}
+		]
+		qySecondlineWarehouseApi.qySecondlineWarehouseDelete(params).then(() => {
+			tableRef.value.refresh(true)
+		})
+	}
+	// 批量删除
+	const deleteBatchQySecondlineWarehouse = (params) => {
+		qySecondlineWarehouseApi.qySecondlineWarehouseDelete(params).then(() => {
+			tableRef.value.clearRefreshSelected()
+		})
+	}
+	// 批量导出
+    const onExport = () => {
+        const params = {
+            ...filterParam.value
+        }
+        if (selectedRowKeys.value.length > 0) {
+            params.ids = selectedRowKeys.value
+        } else {
+            Object.entries(searchFormStateReal.value).forEach(([key, value]) => {
+                console.log(key)
+                if (proxy.$util.isValue(value)) {
+                    params[key] = value
+                }
+            })
+        }
+        qySecondlineWarehouseApi.qySecondlineWarehouseExport(params).then((res) => {
+            downloadUtil.resultDownload(res)
+            tableRef.value.clearSelected()
+        })
+    }
+	// 切换至表单
+    const onDetail = (record = null, view) => {
+    	indexShow.value = false
+    	nextTick(() => {
+            detailRef.value.onOpen(record, view)
+    	})
+    }
+	const accountTypeOptions = tool.dictList('account_type')
+	const businessTypeOptions = tool.dictList('bussiness_type')
+	const measurementUnitOptions = tool.dictList('measurement unit')
+</script>

+ 2 - 2
snowy-plugin/snowy-plugin-gen/src/main/resources/frontend/detail.vue.btl

@@ -27,7 +27,7 @@
                         <% } else if (configList[i].effectType == 'textarea') {%>
                         <a-textarea v-model:value="formData.${configList[i].fieldNameCamelCase}" :disabled="isView" placeholder="请输入${configList[i].fieldRemark}" :auto-size="{ minRows: 3, maxRows: 5 }" />
                         <% } else if (configList[i].effectType == 'select') {%>
-                        <a-select v-model:value="formData.${configList[i].fieldNameCamelCase}" :disabled="isView" placeholder="请选择${configList[i].fieldRemark}" :options="${configList[i].fieldNameCamelCase}Options" show-search allow-clear optionFilterProp="label"/>
+                        <a-select v-model:value="formData.${configList[i].fieldNameCamelCase}" :disabled="isView" placeholder="请选择${configList[i].fieldRemark}" :options="${configList[i].fieldNameCamelCase}Options" show-search allow-clear option-filter-prop="label"/>
                         <% } else if (configList[i].effectType == 'radio') {%>
                         <a-radio-group v-model:value="formData.${configList[i].fieldNameCamelCase}" :disabled="isView" placeholder="请选择${configList[i].fieldRemark}" :options="${configList[i].fieldNameCamelCase}Options" />
                         <% } else if (configList[i].effectType == 'checkbox') {%>
@@ -61,7 +61,7 @@
                 <% } else if (configList[i].effectType == 'textarea') {%>
                 <a-textarea v-model:value="formData.${configList[i].fieldNameCamelCase}" :disabled="isView" placeholder="请输入${configList[i].fieldRemark}" :auto-size="{ minRows: 3, maxRows: 5 }" />
                 <% } else if (configList[i].effectType == 'select') {%>
-                <a-select v-model:value="formData.${configList[i].fieldNameCamelCase}" :disabled="isView" placeholder="请选择${configList[i].fieldRemark}" :options="${configList[i].fieldNameCamelCase}Options" show-search allow-clear optionFilterProp="label"/>
+                <a-select v-model:value="formData.${configList[i].fieldNameCamelCase}" :disabled="isView" placeholder="请选择${configList[i].fieldRemark}" :options="${configList[i].fieldNameCamelCase}Options" show-search allow-clear option-filter-prop="label"/>
                 <% } else if (configList[i].effectType == 'radio') {%>
                 <a-radio-group v-model:value="formData.${configList[i].fieldNameCamelCase}" :disabled="isView" placeholder="请选择${configList[i].fieldRemark}" :options="${configList[i].fieldNameCamelCase}Options" />
                 <% } else if (configList[i].effectType == 'checkbox') {%>

+ 2 - 2
snowy-plugin/snowy-plugin-gen/src/main/resources/frontend/form.vue.btl

@@ -22,7 +22,7 @@
 						<% } else if (configList[i].effectType == 'textarea') {%>
 						<a-textarea v-model:value="formData.${configList[i].fieldNameCamelCase}" :disabled="isView" placeholder="请输入${configList[i].fieldRemark}" :auto-size="{ minRows: 3, maxRows: 5 }" />
 						<% } else if (configList[i].effectType == 'select') {%>
-						<a-select v-model:value="formData.${configList[i].fieldNameCamelCase}" :disabled="isView" placeholder="请选择${configList[i].fieldRemark}" :options="${configList[i].fieldNameCamelCase}Options" show-search allow-clear optionFilterProp="label"/>
+						<a-select v-model:value="formData.${configList[i].fieldNameCamelCase}" :disabled="isView" placeholder="请选择${configList[i].fieldRemark}" :options="${configList[i].fieldNameCamelCase}Options" show-search allow-clear option-filter-prop="label"/>
 						<% } else if (configList[i].effectType == 'radio') {%>
 						<a-radio-group v-model:value="formData.${configList[i].fieldNameCamelCase}" :disabled="isView" placeholder="请选择${configList[i].fieldRemark}" :options="${configList[i].fieldNameCamelCase}Options" />
 						<% } else if (configList[i].effectType == 'checkbox') {%>
@@ -56,7 +56,7 @@
 				<% } else if (configList[i].effectType == 'textarea') {%>
 				<a-textarea v-model:value="formData.${configList[i].fieldNameCamelCase}" :disabled="isView" placeholder="请输入${configList[i].fieldRemark}" :auto-size="{ minRows: 3, maxRows: 5 }" />
 				<% } else if (configList[i].effectType == 'select') {%>
-				<a-select v-model:value="formData.${configList[i].fieldNameCamelCase}" :disabled="isView" placeholder="请选择${configList[i].fieldRemark}" :options="${configList[i].fieldNameCamelCase}Options" show-search allow-clear optionFilterProp="label"/>
+				<a-select v-model:value="formData.${configList[i].fieldNameCamelCase}" :disabled="isView" placeholder="请选择${configList[i].fieldRemark}" :options="${configList[i].fieldNameCamelCase}Options" show-search allow-clear option-filter-prop="label"/>
 				<% } else if (configList[i].effectType == 'radio') {%>
 				<a-radio-group v-model:value="formData.${configList[i].fieldNameCamelCase}" :disabled="isView" placeholder="请选择${configList[i].fieldRemark}" :options="${configList[i].fieldNameCamelCase}Options" />
 				<% } else if (configList[i].effectType == 'checkbox') {%>

+ 2 - 2
snowy-plugin/snowy-plugin-gen/src/main/resources/frontend/index.vue.btl

@@ -20,7 +20,7 @@
 					</a-form-item>
 				<% } else if (configList[i].effectType == 'select' || configList[i].effectType == 'radio' || configList[i].effectType == 'checkbox') {%>
 					<a-form-item label="${configList[i].fieldRemark}" name="${configList[i].fieldNameCamelCase}">
-						<a-select v-model:value="searchFormState.${configList[i].fieldNameCamelCase}" placeholder="请选择${configList[i].fieldRemark}" :options="${configList[i].fieldNameCamelCase}Options" show-search allow-clear optionFilterProp="label"/>
+						<a-select v-model:value="searchFormState.${configList[i].fieldNameCamelCase}" placeholder="请选择${configList[i].fieldRemark}" :options="${configList[i].fieldNameCamelCase}Options" show-search allow-clear option-filter-prop="label"/>
 					</a-form-item>
 				<% } else if (configList[i].effectType == 'inputNumber' || configList[i].effectType == 'slider') {%>
 					<a-form-item label="${configList[i].fieldRemark}" name="${configList[i].fieldNameCamelCase}">
@@ -44,7 +44,7 @@
 					</a-form-item>
 				<% } else if (configList[i].effectType == 'select' || configList[i].effectType == 'radio' || configList[i].effectType == 'checkbox') {%>
 					<a-form-item label="${configList[i].fieldRemark}" name="${configList[i].fieldNameCamelCase}">
-						<a-select v-model:value="searchFormState.${configList[i].fieldNameCamelCase}" placeholder="请选择${configList[i].fieldRemark}" :options="${configList[i].fieldNameCamelCase}Options" show-search allow-clear optionFilterProp="label"/>
+						<a-select v-model:value="searchFormState.${configList[i].fieldNameCamelCase}" placeholder="请选择${configList[i].fieldRemark}" :options="${configList[i].fieldNameCamelCase}Options" show-search allow-clear option-filter-prop="label"/>
 					</a-form-item>
 				<% } else if (configList[i].effectType == 'inputNumber' || configList[i].effectType == 'slider') {%>
 					<a-form-item label="${configList[i].fieldRemark}" name="${configList[i].fieldNameCamelCase}">

+ 2 - 2
snowy-plugin/snowy-plugin-gen/src/main/resources/frontend/index_inside.vue.btl

@@ -20,7 +20,7 @@
                     </a-form-item>
                 <% } else if (configList[i].effectType == 'select' || configList[i].effectType == 'radio' || configList[i].effectType == 'checkbox') {%>
                     <a-form-item label="${configList[i].fieldRemark}" name="${configList[i].fieldNameCamelCase}">
-                        <a-select v-model:value="searchFormState.${configList[i].fieldNameCamelCase}" placeholder="请选择${configList[i].fieldRemark}" :options="${configList[i].fieldNameCamelCase}Options" show-search allow-clear optionFilterProp="label"/>
+                        <a-select v-model:value="searchFormState.${configList[i].fieldNameCamelCase}" placeholder="请选择${configList[i].fieldRemark}" :options="${configList[i].fieldNameCamelCase}Options" show-search allow-clear option-filter-prop="label"/>
                     </a-form-item>
                 <% } else if (configList[i].effectType == 'inputNumber' || configList[i].effectType == 'slider') {%>
                     <a-form-item label="${configList[i].fieldRemark}" name="${configList[i].fieldNameCamelCase}">
@@ -44,7 +44,7 @@
                     </a-form-item>
                 <% } else if (configList[i].effectType == 'select' || configList[i].effectType == 'radio' || configList[i].effectType == 'checkbox') {%>
                     <a-form-item label="${configList[i].fieldRemark}" name="${configList[i].fieldNameCamelCase}">
-                        <a-select v-model:value="searchFormState.${configList[i].fieldNameCamelCase}" placeholder="请选择${configList[i].fieldRemark}" :options="${configList[i].fieldNameCamelCase}Options" show-search allow-clear optionFilterProp="label"/>
+                        <a-select v-model:value="searchFormState.${configList[i].fieldNameCamelCase}" placeholder="请选择${configList[i].fieldRemark}" :options="${configList[i].fieldNameCamelCase}Options" show-search allow-clear option-filter-prop="label"/>
                     </a-form-item>
                 <% } else if (configList[i].effectType == 'inputNumber' || configList[i].effectType == 'slider') {%>
                     <a-form-item label="${configList[i].fieldRemark}" name="${configList[i].fieldNameCamelCase}">