Merge pull request '修复已知bug' (#70) from xuxiaoming into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front/pulls/70

src/views/factoryModel/customer/addOrEdit.vue

@@ -1,6 +1,6 @@
 <template>
 	<el-dialog :title="title" model-value width="1400px" :close-on-click-modal="false" :before-close="cancel">
-		<el-form ref="formData" :model="formData" :rules="rules" label-width="130px">
+		<el-form ref="formData" :model="formData" :rules="rules" label-width="140px">
 			<el-row :gutter="20">
 				<el-col :span="8">
 					<el-form-item :label="getColumnName('Customer-CustomerId')" prop="Customer-CustomerId">
@@ -155,6 +155,19 @@
 						</el-select>
 					</el-form-item>
 				</el-col>
+				<el-col :span="8">
+					<el-form-item :label="getColumnName('Customer-LockWeeks')">
+						<el-input v-model.number="formData['Customer-LockWeeks']" placeholder="请输入" />
+					</el-form-item>
+				</el-col>
+					<el-col :span="8">
+						<el-form-item
+						:label="getColumnName('Customer-EnableDemandLockToggle')"
+						prop="Customer-EnableDemandLockToggle" >
+						<el-switch v-model="formData['Customer-EnableDemandLockToggle']" active-color="#35B0A6" inactive-color="#FF3B31" />
+					</el-form-item>
+
+				</el-col>
 			</el-row>
 		</el-form>
 		<template #footer>

src/views/productionPlanning/customerForecastDemandReview/index.vue

@@ -104,7 +104,7 @@ export default {
   },
   mounted () {
     this.dragChangeSize((moveLen)=>{
-      this.SET_articleDemandHeight(moveLen + "px")
+      this.SET_articleDemandHeight((moveLen - 95) + "px")
     });
   },
   watch: {