Merge pull request '生产订单管理新增已派工工单按钮' (#111) from feature_supplier into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT/pulls/111
Reviewed-by: Liwei <wei.li@le-it.com.cn>

src/api/productplan/base.js

@@ -173,6 +173,14 @@ export function setWorkorderNum(data){
 		data
 	})
 }
+// 更新已派工工单
+export function setSancelrelease (data) {
+	return request({
+		url: '/admin/om/workorder/cancelrelease',
+		method: 'post',
+		data
+	})
+}
 // 订单明细
 export function getSerialOrder (query) {
 	return request({

src/views/productplan/workbench/order.vue

@@ -104,7 +104,7 @@
           <span v-else>{{ scope.row[item] }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="400" fixed="right">
+      <el-table-column label="操作" align="center" width="500" fixed="right">
         <template slot-scope="scope">
 					<el-button
             size="mini"
@@ -140,6 +140,13 @@
 						:disabled="scope.row['OM_WorkOrderStatus-Status'] > 40 || scope.row['OM_WorkOrderStatus-Status'] <24 || scope.row['OM_WorkOrderStatus-Status'] === 39"
             @click="terminateOrder(scope.row)"
           >订单终止</el-button>
+					<el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+						:disabled="scope.row['OM_WorkOrderStatus-Status'] !== 40 && scope.row['OM_WorkOrderStatus-Status'] !== 26"
+            @click="cancelOrder(scope.row)"
+          >终止已派工工单</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -236,28 +243,6 @@
 											/>
 										</el-form-item>
 							</el-col>
-							<!-- <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']"
-												type="datetime"
-												value-format="yyyy-MM-dd HH:mm:ss"
-												placeholder="选择日期时间"
-												:disabled="!isAdd"
-											/>
-										</el-form-item>
-							</el-col>
-							<el-col :span="12">
-								<el-form-item :label="getColumnName('OM_WorkOrder-PlanEndTime')" prop="OM_WorkOrder-PlanEndTime">
-											<el-date-picker
-												v-model="form['OM_WorkOrder-PlanEndTime']"
-												type="datetime"
-												value-format="yyyy-MM-dd HH:mm:ss"
-												placeholder="选择日期时间"
-												:disabled="!isAdd"
-											/>
-										</el-form-item>
-							</el-col> -->
 						</el-tab-pane>
 					</el-tabs>
 				</el-col>
@@ -285,6 +270,26 @@
 			<div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitTerminateOrderForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
+      </div>
+		</el-dialog>
+		<el-dialog title="终止已派工工单" :visible.sync="isSancelrelease" width="1000px" :close-on-click-modal="false">
+			<el-form ref="cancelOrderForm" :model="cancelOrderForm" :rules="rules" label-width="150px">
+				<el-row>
+					<el-col :span="12">
+						<el-form-item label="剩余数量">
+							<el-input disabled v-model="cancelOrderForm.plan" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="终止数量">
+							<el-input v-model="cancelOrderForm.qty" type="number" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitCancelOrderForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
 		</el-dialog>
 		<el-dialog title="明细" :visible.sync="isDetailsOrder" width="90%" :close-on-click-modal="false">
@@ -339,7 +344,8 @@ import {
 	getArticleData,
 	getWorkorderNum,
 	setWorkorderNum,
-	getSerialOrder
+	getSerialOrder,
+	setSancelrelease
 } from '@/api/productplan/base'
 import { getProjectList } from '@/api/system/project'
 import { getWorkshopList } from '@/common/workshop'
@@ -408,7 +414,9 @@ export default {
         ],
       },
 			terminateOrderForm:{},
+			cancelOrderForm: {},
 			isTerminateOrder: false,
+			isSancelrelease: false,
 			isDetailsOrder: false,
 			dataDetailsList: [],
 			detailsHeaders: [],
@@ -525,7 +533,8 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false
-			this.isTerminateOrder=false
+			this.isTerminateOrder = false
+			this.isSancelrelease = false
 			this.isDetailsOrder = false
       this.reset()
     },
@@ -543,8 +552,6 @@ export default {
 				'OM_WorkOrder-ParentOrderId': undefined,
 				'OM_WorkOrder-UsedResourceId': undefined,
 				'OM_WorkOrder-PlanQty': undefined,
-				// 'OM_WorkOrder-PlanStartTime': undefined,
-				// 'OM_WorkOrder-PlanEndTime': undefined,
 				'OM_WorkOrder-ActStartTime': undefined,
 				'OM_WorkOrder-ActEndTime': undefined,
 				'OM_WorkOrderStatus-Status': undefined,
@@ -597,7 +604,6 @@ export default {
 				this.detailsTimeHeaders = [
 					'OM_SerialOrder-PlanStartTime',
 					'OM_SerialOrder-PlanEndTime',
-					// 'OM_SerialOrder-ActStartTime',
 					'OM_SerialOrder-ActEndTime',
 				]
 				this.detailsLoading = false
@@ -611,8 +617,6 @@ 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-ActStartTime'] = this.timeTransCommon(formData['OM_WorkOrder-ActStartTime'])
 				formData['OM_WorkOrder-ActEndTime'] = this.timeTransCommon(formData['OM_WorkOrder-ActEndTime'])
 				this.form = formData
@@ -639,12 +643,6 @@ 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-ActStartTime']) {
 						params['OM_WorkOrder-ActStartTime'] = this.trimTrans(params['OM_WorkOrder-ActStartTime'])
 					}
@@ -707,6 +705,30 @@ export default {
       }).catch(function() {})
     },
 		handleClick(tab, event) {},
+		// 打开终止已派工工单弹框
+		cancelOrder(row) {
+			this.cancelOrderForm={
+				workOrderId: row['OM_WorkOrder-WorkOrderId'],
+				qty: undefined,
+				plan: row['OM_WorkOrderQty-ReleasedQty']-row['OM_WorkOrderQty-ActQty']
+			};
+			this.isSancelrelease = true
+		},
+		// 确认终止已派工工单
+		submitCancelOrderForm() {
+			this.$refs['cancelOrderForm'].validate(valid => {
+				// if (valid) {
+					setSancelrelease({
+						...this.cancelOrderForm,
+						qty: Number(this.cancelOrderForm.qty) || 0
+					}).then(({code, data})=>{
+						if(code===200){
+							this.isSancelrelease = false
+						}
+					})
+				// }
+			})
+		},
 		// 当前要终止的订单
 		terminateOrder(item){
 			getWorkorderNum(item['OM_WorkOrder-WorkOrderId']).then(({code, data})=>{