From c3e13e950e3fce46992dfde0d90ac2c480201776 Mon Sep 17 00:00:00 2001
From: sjz-mxj <1375998991@qq.com>
Date: Fri, 19 May 2023 14:29:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=8F=96=E5=80=BC=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/login.vue   | 4 ++--
 pages/stock/list.vue   | 6 +++---
 pages/stock/record.vue | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pages/home/login.vue b/pages/home/login.vue
index 5b5b2f0..5224f69 100644
--- a/pages/home/login.vue
+++ b/pages/home/login.vue
@@ -1,4 +1,4 @@
-<style lang="scss">
+;<style lang="scss">
 	.container{
 		background-image:url(/static/login_bg.png);
 		background-size:calc(100% + 400rpx);
@@ -109,7 +109,7 @@ export default {
 	onLoad(options){
 		this.formData.username=options.phone||""
 		if(process.env.NODE_ENV === 'development'){
-			this.formData.username="13383434048"//"18636155239"
+			this.formData.username="18788469459"//
 			this.formData.password="1qaz@WSX"
 		}
 		
diff --git a/pages/stock/list.vue b/pages/stock/list.vue
index b218a28..adab124 100644
--- a/pages/stock/list.vue
+++ b/pages/stock/list.vue
@@ -167,7 +167,7 @@
 				<d-form :label="`${({in:'入',out:'出'})[mode]}库类型`" field="inOutType" required type="select" :columns="inOutType.list" :value="inOutType.value" @select="inOutType.value=$event.map(v=>v.value);formData.inOutType=inOutType.value.at(-1)"/>
 				<d-form :label="`${({in:'入',out:'出'})[mode]}库批次号`" field="inOutBatchNo" required :disabled="formData.substanceType==2" :value="formData.inOutBatchNo" @input="formData.inOutBatchNo=$event" :btnText="formData.substanceType==1?'生成':''" :btnFun="()=>this.formData.inOutBatchNo=`${({in:'RK',out:'CK'})[this.mode]}${new Date().format('yyyyMMdd')}${new Date().getTime()}`"/>
 				<d-form :label="({1:`${({in:'入',out:'出'})[mode]}库数量`,2:'重量'})[formData.substanceType]" field="number" required :suffix="number.suffix" :value="formData.number" @input="formData.number=$event" type="digit"/>
-				<d-form label="操作日期" field="operationTime" required type="calendar" v-model="formData.operationTime"/>
+				<d-form label="操作日期" field="operationTime" required type="calendar" v-model="formData.operateTime"/>
 				<template v-if="formData.substanceType==2&&formData.inOutType=='out01'&&recoveryBatch.list.length>0">
 					<view style="display:flex;margin:-20rpx 0;">
 						<d-form label="规格" required field="specification" type="digit" suffix="kg" :value="formData.specification" @input="formData.specification=$event"/>
@@ -209,7 +209,7 @@ export default{
 				pic:[],
 				number:"",
 				substanceType:"",
-				operationTime:"",
+				operateTime:"",
 
 				tradeWeight:"",
 				specification:"",
@@ -228,7 +228,7 @@ export default{
 					if(!val)call(new Error(`${({in:'入',out:'出'})[this.mode]}库批次号必填！`));
 					else call()
 				},trigger:['blur','change']},
-				operationTime:{required:true,message:"请选择操作日期！",trigger:['blur','change']},
+				operateTime:{required:true,message:"请选择操作日期！",trigger:['blur','change']},
 				number:{required:true,validator:(rule,val,call)=>{
 					var title=({1:({in:'入',out:'出'})[this.mode],2:'交易重量'})[this.formData.substanceType]
 					if(!(val>0))call(new Error(`请输入${title}！`));
diff --git a/pages/stock/record.vue b/pages/stock/record.vue
index a261121..0832ab3 100644
--- a/pages/stock/record.vue
+++ b/pages/stock/record.vue
@@ -141,7 +141,7 @@
 					<view class="company">
 						<text>{{v.supplier}}</text> <text>{{v.number}}{{v.packgeUnit}}(共{{v.equivalentAmount}}{{v.unit}})</text>
 					</view>
-					<view class="date"> 操作时间：{{v.createTime}} </view>
+					<view class="date"> 操作日期：{{v.operateTime}} </view>
 				</template>
 				<template v-else>
 					<view class="head">
@@ -153,7 +153,7 @@
 						<text>{{v.number}}{{v.unit}}</text>
 					</view>
 					<view class="warehouse"> 所在仓库：{{v.warehouseName}} </view>
-					<view class="date"> 操作时间：{{v.createTime}} </view>
+					<view class="date"> 操作日期：{{v.operateTime}} </view>
 				</template>
 			</view>
 			<u-empty v-if="list.length<=0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>