diff --git a/src/views/modules/schedule/com_schedule_order_expand.vue b/src/views/modules/schedule/com_schedule_order_expand.vue
index 4b5991c..ac39a7b 100644
--- a/src/views/modules/schedule/com_schedule_order_expand.vue
+++ b/src/views/modules/schedule/com_schedule_order_expand.vue
@@ -59,11 +59,11 @@
               value-format="HH:mm">
             </el-time-picker>
           </el-form-item>
-          <el-form-item :label="''" style="margin-top: 20px;">
-            <el-checkbox v-model="pageData.splitFlag" class="customer-checkbox" true-label="Y" false-label="N" style="margin-top: 5px;"
-                         label="分批排产"></el-checkbox>
+          <el-form-item :label="''" style="margin-left: 0px; margin-top: 20px;">
+            <el-checkbox v-model="pageData.closeModal" class="customer-checkbox" true-label="Y" false-label="N" style="margin-top: 5px;"
+                         label="排产后关闭对话框"></el-checkbox>
           </el-form-item>
-          <el-form-item :label="'本次排产数量:'" style="margin-left: 50px;">
+          <el-form-item :label="'本次排产数量:'" style="margin-left: 0px;">
             <el-input v-model="pageData.scheduledQty" style="width: 120px"></el-input>
           </el-form-item>
           <el-form-item :label="''" style="margin-top: 20px;">
@@ -168,7 +168,7 @@ export default {
         needDate: '',
         qtyToSchedule: 0,
         scheduledQty: 0,
-        splitFlag: 'N',
+        closeModal: 'Y',
         calendarId: '',
         checkFlag: true
       },
@@ -736,24 +736,6 @@ export default {
           status: true,
           fixed: false
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleSite',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "site",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "复制",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
@@ -790,24 +772,6 @@ export default {
           status: true,
           fixed: false
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleRecordType',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "是否关闭",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "RecordType",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
@@ -1021,9 +985,10 @@ export default {
       this.pageData.orderNo = orderRow.orderNo;
       this.pageData.itemNo = orderRow.itemNo;
       this.pageData.scheduledQty = 0;
-      this.pageData.splitFlag = 'N';
+      this.pageData.closeModal = 'Y';
       //清空参数
       this.resourceList = [];
+      this.resourceShiftList = [];
       this.pageData.resourceId = '';
       this.pageData.workCenterNo = '';
       this.orderScheduleList = [];
@@ -1048,6 +1013,10 @@ export default {
     getOrderAvailableResourceData(){
       getOrderAvailableResource(this.pageData).then(({data}) => {
         this.resourceList = data.rows;
+        //判断是否只有一个  默认选中第一个
+        if(data.rows.length == 1){
+          this.pageData.resourceId = data.rows[0].resourceId;
+        }
       });
     },
 
@@ -1129,9 +1098,11 @@ export default {
             this.scheduleOrderOperation(false);
           });
         }else{
+          //清掉上一次排产数量
+          this.pageData.scheduledQty = 0;
           this.$message.success(data.msg);
           //判断是否是分批排产
-          if(this.pageData.splitFlag === 'Y'){
+          if(this.pageData.closeModal == 'N'){
             //刷新明细的报工页面
             this.refreshShopOrderData();
             //刷新列表
diff --git a/src/views/modules/schedule/order_schedule.vue b/src/views/modules/schedule/order_schedule.vue
index 028a370..6be4531 100644
--- a/src/views/modules/schedule/order_schedule.vue
+++ b/src/views/modules/schedule/order_schedule.vue
@@ -974,7 +974,79 @@ export default {
           sortLv: 0,
           status: true,
           fixed: false
-        }
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5301,
+          serialNumber: '5301OrderEficiency',
+          tableId: "5301Order",
+          tableName: "工单表",
+          columnProp: "efficiency",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "效率",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5301,
+          serialNumber: '5301OrderCostRollUpFlag',
+          tableId: "5301Order",
+          tableName: "工单表",
+          columnProp: "costRollUpFlag",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "已排料",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5301,
+          serialNumber: '5301OrderManualFlag',
+          tableId: "5301Order",
+          tableName: "工单表",
+          columnProp: "manualFlag",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "刀模已发",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5301,
+          serialNumber: '5301OrderRepairSOFlag',
+          tableId: "5301Order",
+          tableName: "工单表",
+          columnProp: "repairSOFlag",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "印版已发",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
       ],
       columnOrderScheduleArray: [
         {
@@ -1499,24 +1571,6 @@ export default {
           status: true,
           fixed: false
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleSite',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "site",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "复制",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
@@ -1553,24 +1607,6 @@ export default {
           status: true,
           fixed: false
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301ScheduleRecordType',
-          tableId: "5301Schedule",
-          tableName: "排产明细表",
-          columnProp: "是否关闭",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "RecordType",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
diff --git a/src/views/modules/schedule/order_schedule_expand.vue b/src/views/modules/schedule/order_schedule_expand.vue
index c86ab9c..2d97581 100644
--- a/src/views/modules/schedule/order_schedule_expand.vue
+++ b/src/views/modules/schedule/order_schedule_expand.vue
@@ -77,7 +77,7 @@
     </el-form>
 
     <!--  工单主表信息  -->
-    <el-main style="margin-top: 25px; padding: 0px; width: 104%;">
+    <el-main style="margin-top: 25px; padding: 0px; width: 100%;">
       <el-form :inline="true"  label-position="top" label-width="100px">
         <el-form-item :label="'主记录'">
         </el-form-item>
@@ -742,7 +742,79 @@ export default {
           sortLv: 0,
           status: true,
           fixed: false
-        }
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5301,
+          serialNumber: '5301OrderEficiency',
+          tableId: "5301Order",
+          tableName: "工单表",
+          columnProp: "efficiency",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "效率",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5301,
+          serialNumber: '5301OrderCostRollUpFlag',
+          tableId: "5301Order",
+          tableName: "工单表",
+          columnProp: "costRollUpFlag",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "已排料",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5301,
+          serialNumber: '5301OrderManualFlag',
+          tableId: "5301Order",
+          tableName: "工单表",
+          columnProp: "manualFlag",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "刀模已发",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5301,
+          serialNumber: '5301OrderRepairSOFlag',
+          tableId: "5301Order",
+          tableName: "工单表",
+          columnProp: "repairSOFlag",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "印版已发",
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
       ],
       calendarOutList: [],
       primaryMenuButton: {