Merge remote-tracking branch 'origin/master'

src/views/wms/shifts/index.vue

@@ -9,9 +9,9 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="班次名称" prop="shiftDescGlobal">
+			<el-form-item label="班次名称" prop="shiftDesc">
 				<el-input
-					v-model="queryParams.shiftDescGlobal"
+					v-model="queryParams.shiftDesc"
 					placeholder="请输入班次名称"
 					clearable
 					@keyup.enter.native="handleQuery"
@@ -80,7 +80,7 @@
        			 label="序号">
       		</el-table-column>
 			<el-table-column label="班次编码" align="center" prop="shiftCode" />
-			<el-table-column label="班次名称" align="center" prop="shiftDescGlobal" />
+			<el-table-column label="班次名称" align="center" prop="shiftDesc" />
 			<el-table-column label="开始时间" align="center" prop="shiftStartTime" />
       		<el-table-column label="结束时间" align="center" prop="shiftEndTime" />
 			<el-table-column label="创建人" align="center" prop="createBy" />
@@ -124,8 +124,8 @@
 				<el-form-item label="班次编码" prop="shiftCode" style="width:400px">
 					<el-input v-model="form.shiftCode" placeholder="请输入班次编码" />
 				</el-form-item>
-				<el-form-item label="班次名称" prop="shiftDescGlobal" style="width:400px">
+				<el-form-item label="班次名称" prop="shiftDesc" style="width:400px">
-					<el-input v-model="form.shiftDescGlobal" placeholder="请输入班次名称" />
+					<el-input v-model="form.shiftDesc" placeholder="请输入班次名称" />
 				</el-form-item>
 				<el-form-item label="开始时间" prop="shiftStartTime" style="width:400px">
         	<el-time-select
@@ -285,6 +285,7 @@ export default {
 		/** 新增按钮操作 */
 		handleAdd() {
 			this.reset();
+			this.form.shiftStartTime = null;
 			this.open = true;
 			this.title = "添加班次管理";
 		},