product-inventory-management.git

			@@ -210,7 +210,7 @@
			<el-form-item label="折扣有效期">
			<el-date-picker
			v-model="formData.discountEndTime"
			type="datetime"
			type="datetime" format="YYYY-MM-DD"
			placeholder="选择结束时间"
			style="width: 100%"
			/>
			@@ -241,12 +241,12 @@
			<el-row :gutter="20">
			<el-col :span="12">
			<el-form-item label="生效时间" prop="effectiveTime">
			<el-date-picker v-model="formData.effectiveTime" type="datetime" placeholder="选择生效时间" style="width: 100%" />
			<el-date-picker v-model="formData.effectiveTime" type="datetime" format="YYYY-MM-DD" placeholder="选择生效时间" style="width: 100%" />
			</el-form-item>
			</el-col>
			<el-col :span="12">
			<el-form-item label="失效时间">
			<el-date-picker v-model="formData.expireTime" type="datetime" placeholder="选择失效时间" style="width: 100%" />
			<el-date-picker v-model="formData.expireTime" type="datetime" format="YYYY-MM-DD" placeholder="选择失效时间" style="width: 100%" />
			</el-form-item>
			</el-col>
			</el-row>
			@@ -288,10 +288,10 @@
			/>
			</el-form-item>
			<el-form-item label="生效时间">
			<el-date-picker v-model="batchDiscountForm.effectiveTime" type="datetime" placeholder="选择生效时间" style="width: 100%" />
			<el-date-picker v-model="batchDiscountForm.effectiveTime" type="datetime" format="YYYY-MM-DD" placeholder="选择生效时间" style="width: 100%" />
			</el-form-item>
			<el-form-item label="失效时间">
			<el-date-picker v-model="batchDiscountForm.expireTime" type="datetime" placeholder="选择失效时间" style="width: 100%" />
			<el-date-picker v-model="batchDiscountForm.expireTime" type="datetime" format="YYYY-MM-DD" placeholder="选择失效时间" style="width: 100%" />
			</el-form-item>
			<el-form-item label="适用商品">
			<div class="selected-items">