Merge pull request '优化' (#114) from wangxy into develop

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

src/components/queryComponent/index.vue

@@ -181,6 +181,10 @@ export default {
 				this.msgError('请先选择客户')
 				return
 			}
+			if (this.customerId === 'MAIN' || this.customerId === 'CUST' || this.customerId === 'GRP') {
+				this.msgError('请先选择客户')
+				return
+			}
       this.$router.push({path:'/plan/workbench/homePage/beta/predict/predictEdit', query: {
 				CustomerId: this.customerId,
 				CreateModel: this.CreateModel,

src/views/plan/workbench/homePage/beta/predict/predictEdit.vue

@@ -13,6 +13,16 @@
 								<el-input v-model="formData['AP_CustDemandVerHead-VersionId']" :disabled="item.title === '修改'" placeholder="请输入" />
 							</el-form-item>
 						</el-col>
+						<el-col :span="6" v-if="item.title !== '修改' && item.title !== '复制'">
+							<el-form-item label="起始周">
+								<el-select v-model="startWeek" @change="changeStartWeek" placeholder="请选择" style="width:100%;">
+									<el-option v-for="item in startWeekArray"
+														:key="item['val']"
+														:label="item['key']"
+														:value="item['val']" />
+								</el-select>
+							</el-form-item>
+						</el-col>
 						<el-col :span="6">
 							<el-form-item :label="getColumnName('AP_CustDemandVerHead-Descr')" prop="AP_CustDemandVerHead-Descr">
 								<el-input v-model="formData['AP_CustDemandVerHead-Descr']" placeholder="请输入" />
@@ -186,7 +196,9 @@ export default {
 			defaultItem:{
 				AriId:undefined
 			},
+			startWeek: '',
 			getCreateModeArray: [], // 获取关联模型数据
+			startWeekArray: [],
 			orgListArray: [],
 			CustDemandVerDetail: {},
 		}
@@ -199,6 +211,7 @@ export default {
 		} else if (this.item.title === '复制') {
 			this.handleUpdate(this.item.CustomerId, this.item.VersionId)
 		}else {
+			this.getWeekData()
 			this.handleAdd(this.item.CustomerId)
 		}
 	},
@@ -222,6 +235,14 @@ export default {
 				}
 			})
 		},
+		// 获取周
+		getWeekData() {
+			get(`/admin/ap/custdemandverhead/selectweeks`).then(res => {
+				if (res.code === 200) {
+					this.startWeekArray = res.data || []
+				}
+			})
+		},
 		// 获取使用组织数据
 		getOrgListData() {
 			get(`/admin/common/org/list`).then(res => {
@@ -235,9 +256,16 @@ export default {
 			this.formData['AP_CustDemandVerHead-CreateMode'] = this.item.CreateModel
 			this.handleUpdateAdd(CustomerId)
 		},
+		changeStartWeek(data) {
+			this.handleUpdateAdd(this.item.CustomerId, data)
+		},
 		// 新增初始显示数据
-		handleUpdateAdd(CustomerId) {
-			get(`/admin/ap/custdemandverhead/selectonebycust`, {"customerId": CustomerId})
+		handleUpdateAdd(CustomerId, startWeek) {
+			let params= {
+				"customerId": CustomerId,
+				"startWeek": startWeek || undefined
+			}
+			get(`/admin/ap/custdemandverhead/selectonebycust`, params)
 			.then(res => {
 				if (res.code === 200) {
 					let formNewData = res.data