diff --git a/src/views/mes/orderInfo/editProductPlan.vue b/src/views/mes/orderInfo/editProductPlan.vue
index 8e4296f..929d2f7 100644
--- a/src/views/mes/orderInfo/editProductPlan.vue
+++ b/src/views/mes/orderInfo/editProductPlan.vue
@@ -1,58 +1,67 @@
-
- 工单信息
-
+
+ 工单信息
- {{ form.orderCode }}
- {{ form.materialCode }}
- {{ form.planBeginTime }}
+
+ {{ formData.orderCode }}
+
+
+ {{ formData.materialCode }}
+
+
+ {{ formData.planBeginTime }}
+
- {{
- form.planAmount
- }}/{{
- form.dispatchAmount == null || form.dispatchAmount === undefined ? 0 : form.dispatchAmount
- }}/{{ form.completeAmount }}
+ {{ formData.planAmount }}/{{ formData.dispatchAmount }}/{{ formData.completeAmount }}
- {{ form.dispatchName }}
- {{ form.materialName }}
- {{ form.planEndTime }}
-
-
-
+
+ {{ formData.dispatchName }}
+
+
+ {{ formData.materialName }}
+
+
+ {{ formData.planEndTime }}
+
+
+ {{ getOrderStatusText(formData.orderStatus) }}
-
-
- 派工信息
-
+ 派工信息
-
+
新增
-
-
-
-
-
+
+ && formData.orderStatus!==ORDER_STATUS.FINISHED && formData.orderStatus!==ORDER_STATUS.RECALLED && formData.orderStatus!==ORDER_STATUS.DELETED">
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.dispatchAmount || scope.row.releaseAmount || 0 }}
+
+
- -->
+
-
+
-
+ >
+
-
-
-
-
+
-
+
+
-
+
-
+
+
-
+
-
+
+
-
-
+
{{scope.row.planStatus}}
-
-
-
-
+
删除
+ v-if="scope.row.children == null"
+ :disabled="scope.row.planStatus !== PLAN_STATUS.TO_DISPATCH &&
+ scope.row.planStatus !== PLAN_STATUS.DISPATCHED ||
+ formData.orderStatus === ORDER_STATUS.FINISHED ||
+ formData.orderStatus === ORDER_STATUS.RECALLED ||
+ formData.orderStatus === ORDER_STATUS.DELETED"
+ >
+ 删除
-
-
+
-
+
提交
返回
-
-
+
diff --git a/src/views/mes/orderInfo/old.vue b/src/views/mes/orderInfo/old.vue
new file mode 100644
index 0000000..4e8e671
--- /dev/null
+++ b/src/views/mes/orderInfo/old.vue
@@ -0,0 +1,914 @@
+
+
+
+
+ 工单信息
+
+
+
+ {{ formData.orderCode }}
+
+
+ {{ formData.materialCode }}
+
+
+ {{ formData.planBeginTime }}
+
+
+ {{ formData.planAmount }}/{{ formData.dispatchAmount }}/{{ formData.completeAmount }}
+
+
+
+
+ {{ formData.dispatchName }}
+
+
+ {{ formData.materialName }}
+
+
+ {{ formData.planEndTime }}
+
+
+ {{ getOrderStatusText(formData.orderStatus) }}
+
+
+
+
+ 派工信息
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.dispatchAmount || scope.row.releaseAmount || 0 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row.planStatus}}
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+ 提交
+
+ 返回
+
+
+
+
+
+
+
+
+
+