订单管理优化

src/views/productplan/workbench/order.vue

@@ -172,12 +172,17 @@
 							<el-option
 								v-for="item in articleArray"
 								:key="item['Article-ArtId']"
-								:label="item['Article-Descr1']"
+								:label="item['Article-ArtId']"
 								:value="item['Article-ArtId']"
 							/>
 						</el-select>
 					</el-form-item>
 				</el-col>
+				<el-col :span="12" :offset="12">
+					<el-form-item label="物料描述">
+						<el-input v-model="form['Article-Descr1']" disabled placeholder="请输入" />
+					</el-form-item>
+				</el-col>
 				</el-row>
 
 				<el-col :span="24">
@@ -231,7 +236,7 @@
 											/>
 										</el-form-item>
 							</el-col>
-							<el-col :span="12">
+							<!-- <el-col :span="12">
 								<el-form-item :label="getColumnName('OM_WorkOrder-PlanStartTime')" prop="OM_WorkOrder-PlanStartTime">
 											<el-date-picker
 												v-model="form['OM_WorkOrder-PlanStartTime']"
@@ -252,7 +257,7 @@
 												:disabled="!isAdd"
 											/>
 										</el-form-item>
-							</el-col>
+							</el-col> -->
 						</el-tab-pane>
 					</el-tabs>
 				</el-col>
@@ -473,6 +478,7 @@ export default {
 				if (code === 200) {
 					this.$set(this.form,'OM_WorkOrder-QuantityPerHour',data['Article-QuantityPerHour']) // 小时产出JPH
 					this.$set(this.form,'OM_WorkOrder-PlanResourceId',data['Article-PlanResourceId']) // 计划资源ID
+					this.$set(this.form,'Article-Descr1',data['Article-Descr1']) // 计划资源ID
 					// 接口需要的隐藏参数
 					this.$set(this.form,'OM_WorkOrder-QtyUomId',data['Article-UomId'])
 					this.$set(this.form,'OM_WorkOrder-UsedResourceId',data['Article-UsedResourceId'])
@@ -537,8 +543,8 @@ export default {
 				'OM_WorkOrder-ParentOrderId': undefined,
 				'OM_WorkOrder-UsedResourceId': undefined,
 				'OM_WorkOrder-PlanQty': undefined,
-				'OM_WorkOrder-PlanStartTime': undefined,
-				'OM_WorkOrder-PlanEndTime': undefined,
+				// 'OM_WorkOrder-PlanStartTime': undefined,
+				// 'OM_WorkOrder-PlanEndTime': undefined,
 				'OM_WorkOrder-ActStartTime': undefined,
 				'OM_WorkOrder-ActEndTime': undefined,
 				'OM_WorkOrderStatus-Status': undefined,
@@ -605,8 +611,8 @@ export default {
 				let formData = response.data
 				formData['OM_WorkOrder-PlanStartDate'] = this.dateTransCommon(formData['OM_WorkOrder-PlanStartDate'])
 				formData['OM_WorkOrder-PlanEndDate'] = this.dateTransCommon(formData['OM_WorkOrder-PlanEndDate'])
-				formData['OM_WorkOrder-PlanStartTime'] = this.timeTransCommon(formData['OM_WorkOrder-PlanStartTime'])
-				formData['OM_WorkOrder-PlanEndTime'] = this.timeTransCommon(formData['OM_WorkOrder-PlanEndTime'])
+				// formData['OM_WorkOrder-PlanStartTime'] = this.timeTransCommon(formData['OM_WorkOrder-PlanStartTime'])
+				// formData['OM_WorkOrder-PlanEndTime'] = this.timeTransCommon(formData['OM_WorkOrder-PlanEndTime'])
 				formData['OM_WorkOrder-ActStartTime'] = this.timeTransCommon(formData['OM_WorkOrder-ActStartTime'])
 				formData['OM_WorkOrder-ActEndTime'] = this.timeTransCommon(formData['OM_WorkOrder-ActEndTime'])
 				this.form = formData
@@ -633,12 +639,12 @@ export default {
 					if (params['OM_WorkOrder-PlanEndDate']) {
 						params['OM_WorkOrder-PlanEndDate'] = moment(params['OM_WorkOrder-PlanEndDate']).format('YYYYMMDD')
 					}
-					if (params['OM_WorkOrder-PlanStartTime']) {
-						params['OM_WorkOrder-PlanStartTime'] = this.trimTrans(params['OM_WorkOrder-PlanStartTime'])
-					}
-					if (params['OM_WorkOrder-PlanEndTime']) {
-						params['OM_WorkOrder-PlanEndTime'] = this.trimTrans(params['OM_WorkOrder-PlanEndTime'])
-					}
+					// if (params['OM_WorkOrder-PlanStartTime']) {
+					// 	params['OM_WorkOrder-PlanStartTime'] = this.trimTrans(params['OM_WorkOrder-PlanStartTime'])
+					// }
+					// if (params['OM_WorkOrder-PlanEndTime']) {
+					// 	params['OM_WorkOrder-PlanEndTime'] = this.trimTrans(params['OM_WorkOrder-PlanEndTime'])
+					// }
 					if (params['OM_WorkOrder-ActStartTime']) {
 						params['OM_WorkOrder-ActStartTime'] = this.trimTrans(params['OM_WorkOrder-ActStartTime'])
 					}