diff --git a/src/views/modules/schedule/closeSchedule.vue b/src/views/modules/schedule/closeSchedule.vue
index 787ff0f..e45b042 100644
--- a/src/views/modules/schedule/closeSchedule.vue
+++ b/src/views/modules/schedule/closeSchedule.vue
@@ -11,6 +11,9 @@
         <span slot="label" style="" @click="getBaseList(24)"><a herf="#">加工中心编码</a></span>
         <el-input v-model="searchData.sWorkCenterNo" style="width: 130px"></el-input>
       </el-form-item>
+      <el-form-item :label="'生产线名称'">
+        <el-input v-model="searchData.productionLineDesc" style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item >
         <span slot="label" style="" @click="getBaseList(5)"><a herf="#">物料编码</a></span>
         <el-input v-model="searchData.partNo" style="width: 120px"></el-input>
@@ -114,6 +117,14 @@
 <!--        min-width="60"-->
 <!--        label="工厂编码">-->
 <!--      </el-table-column>-->
+      <el-table-column
+        prop="productionLineDesc"
+        header-align="center"
+        align="left"
+        min-width="70"
+        sortable
+        label="生产线">
+      </el-table-column>
       <el-table-column
         prop="seqNo"
         header-align="center"
@@ -442,6 +453,7 @@
         tableData: [],
         date1: '',
         searchData: {
+          productionLineDesc:'',
           orderNo: '',
           sWorkCenterNo: '',
           partNo: '',
diff --git a/src/views/modules/schedule/scheduleForSOTask.vue b/src/views/modules/schedule/scheduleForSOTask.vue
index 8d24bd1..5412095 100644
--- a/src/views/modules/schedule/scheduleForSOTask.vue
+++ b/src/views/modules/schedule/scheduleForSOTask.vue
@@ -63,6 +63,9 @@
         <el-form-item :label="'工序名称'">
           <el-input v-model="searchData.operationDesc" style="width: 120px"></el-input>
         </el-form-item>
+        <el-form-item :label="'生产线名称'">
+          <el-input v-model="searchData.productionLineDesc" style="width: 120px"></el-input>
+        </el-form-item>
         <el-form-item :label="' '">
           <el-button @click="search()" style="margin-left: 24px" type="primary">查询</el-button>
           <download-excel
@@ -103,37 +106,37 @@
       <el-table-column
         prop="site"
         header-align="center"
-        align="left"
-        min-width="120"
-        label="工厂编号">
+        align="center"
+        min-width="35"
+        label="工厂">
       </el-table-column>
       <el-table-column
         prop="orderNo"
         header-align="center"
-        align="left"
+        align="center"
         min-width="120"
         label="日计划号">
       </el-table-column>
       <el-table-column
         prop="itemNo"
         header-align="center"
-        align="left"
-        min-width="60"
+        align="center"
+        min-width="50"
         label="工序号">
       </el-table-column>
       <el-table-column
         prop="operationDesc"
         header-align="center"
         align="left"
-        min-width="160"
+        min-width="120"
         sortable
         label="工序名称">
       </el-table-column>
       <el-table-column
         prop="partNo"
         header-align="center"
-        align="left"
-        min-width="120"
+        align="center"
+        min-width="90"
         sortable
         label="物料编码">
       </el-table-column>
@@ -146,17 +149,18 @@
         label="物料名称">
       </el-table-column>
       <el-table-column
-        prop="workCenterNo"
+        prop="productionLineDesc"
         header-align="center"
         align="left"
-        min-width="100"
-        label="加工中心">
+        min-width="70"
+        sortable
+        label="生产线">
       </el-table-column>
       <el-table-column
         prop="workCenterDesc"
         header-align="center"
         align="left"
-        min-width="100"
+        min-width="80"
         sortable
         label="加工中心名称">
       </el-table-column>
@@ -164,7 +168,7 @@
         prop="planTypeDesc"
         header-align="center"
         align="left"
-        min-width="80"
+        min-width="90"
         sortable
         label="计划方式">
       </el-table-column>
@@ -216,7 +220,7 @@
         prop="soremark"
         header-align="center"
         align="right"
-        min-width="160"
+        min-width="200"
         label="生产订单备注">
       </el-table-column>
 <!--      <el-table-column-->
@@ -323,7 +327,7 @@
       </el-form>
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="计划方式:">
-          <el-input v-model="schedulingModalData.planTypeDesc" disabled style="width: 150px"></el-input>
+          <el-input v-model="schedulingModalData.planTypeDesc" readonly style="width: 150px"></el-input>
         </el-form-item>
         <el-form-item label="派工备注:">
           <el-input v-model="schedulingModalData.remark"  style="width: 500px"></el-input>
@@ -331,7 +335,7 @@
       </el-form>
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="erp生产订单备注:">
-          <el-input type="textarea"  :rows="2" resize='none' maxlength="10000" v-model="schedulingModalData.soremark" disabled style="width: 656px;height: 40px"></el-input>
+          <el-input type="textarea"  :rows="2" resize='none' maxlength="10000" v-model="schedulingModalData.soremark" readonly style="width: 656px;height: 40px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 30px;">
@@ -446,10 +450,10 @@
           </el-table-column>
         </el-table>
       </div>
-      <el-footer style="height:40px;margin-top: 20px;text-align:center">
-        <el-button type="primary" @click="scheduledModalFlag = false">取消</el-button>
-        <!--        <el-button type="primary" :disabled="bannersBut" @click="saveBanners()">确定</el-button>-->
-      </el-footer>
+<!--      <el-footer style="height:40px;margin-top: 20px;text-align:center">-->
+<!--        <el-button type="primary" @click="scheduledModalFlag = false">取消</el-button>-->
+<!--        &lt;!&ndash;        <el-button type="primary" :disabled="bannersBut" @click="saveBanners()">确定</el-button>&ndash;&gt;-->
+<!--      </el-footer>-->
     </el-dialog>
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
   </div>
@@ -498,6 +502,7 @@
         date1:'',
         searchData: {
           orderNo: '',
+          productionLineDesc:'',
           workCenterNo:'',
           operationDesc:'',
           startDate1: new Date(),
@@ -656,7 +661,7 @@
           let data={
             scheduleQty: '',
             resourceId: this.schedulingModalData.resourceId,
-            shiftNo: this.schedulingModalData.shiftNo,
+            shiftNo: this.schedulingModalData.shiftNo?this.schedulingModalData.shiftNo:'白班',
             scheduleDate: null,
             operatorId:this.schedulingModalData.operatorId,
             createBy:this.$store.state.user.name,
diff --git a/src/views/modules/schedule/soscheduleRouting.vue b/src/views/modules/schedule/soscheduleRouting.vue
index ff855dd..7644e58 100644
--- a/src/views/modules/schedule/soscheduleRouting.vue
+++ b/src/views/modules/schedule/soscheduleRouting.vue
@@ -11,6 +11,9 @@
         <span slot="label" style="" @click="getBaseList(24)"><a herf="#">加工中心编码</a></span>
         <el-input v-model="searchData.sWorkCenterNo" style="width: 130px"></el-input>
       </el-form-item>
+      <el-form-item :label="'生产线名称'">
+        <el-input v-model="searchData.productionLineDesc" style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item >
         <span slot="label" style="" @click="getBaseList(5)"><a herf="#">物料编码</a></span>
         <el-input v-model="searchData.partNo" style="width: 120px"></el-input>
@@ -120,6 +123,14 @@
 <!--        min-width="70"-->
 <!--        label="工厂编码">-->
 <!--      </el-table-column>-->
+      <el-table-column
+        prop="productionLineDesc"
+        header-align="center"
+        align="left"
+        min-width="70"
+        sortable
+        label="生产线">
+      </el-table-column>
       <el-table-column
         prop="seqNo"
         header-align="center"
@@ -386,6 +397,7 @@
         tableData: [],
         date1: '',
         searchData: {
+          productionLineDesc:'',
           userId:this.$store.state.user.name,
           orderNo: '',
           sWorkCenterNo: '',