diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 3bb003b..8eebfc3 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -458,6 +458,7 @@
                     删除卷
                   </el-button>
                   <el-button type="primary" @click="notOverFinishRollModal"
+                             :disabled="!buttonTags.createNewRollFlag"
                              style=" width: 120px; margin-bottom: 5px;margin-left: 3PX; ">
                     未生产下机拆卷
                   </el-button>
@@ -2910,6 +2911,7 @@ export default {
         switchrollReverse(this.scheduleData).then(({data}) => {
           if (data.code == 0) {
             this.$message.success(data.msg)
+            this.refreshPageData()
           }
           if (data.code == 400) {
             this.$message.warning(data.msg)
diff --git a/src/views/modules/yieldReport/not_over_finish_roll.vue b/src/views/modules/yieldReport/not_over_finish_roll.vue
index 084027d..ad3514c 100644
--- a/src/views/modules/yieldReport/not_over_finish_roll.vue
+++ b/src/views/modules/yieldReport/not_over_finish_roll.vue
@@ -7,42 +7,53 @@
         <!-- 菜单信息 -->
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="'当前时间'">
-              <el-date-picker disabled="disabled" style="width: 145px;"
-                              v-model="pageData.reportedTime"
-                              format="yyyy-MM-dd HH:mm:ss"
-                              value-format="yyyy-MM-dd HH:mm:ss"
-                              placeholder="">
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item :label="'未生产下机拆卷数量'">
-              <el-input  style="width: 145px;"
-                              v-model="pageData.newCreateRollQty"
-                              oninput="value=value.replace(/[^0-9]/g,'')"
-                              placeholder="">
-              </el-input>
-            </el-form-item>
+            <fieldset class="customer-fieldset"
+                      style="margin-left: 3px; margin-top: -10px; ;width: 550px;">
+              <legend>人员排程班次信息</legend>
+              <el-form-item class="customer-item" :label="'当前时间'">
+                <el-date-picker disabled="disabled" style="width: 145px;"
+                                v-model="pageData.reportedTime"
+                                format="yyyy-MM-dd HH:mm:ss"
+                                value-format="yyyy-MM-dd HH:mm:ss"
+                                placeholder="">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item class="customer-item" label="操作员:">
+                <el-input v-model="operatorData.operatorId" disabled="disabled" style="width: 80px;" ></el-input>
+              </el-form-item>
+              <el-form-item class="customer-item" label="操作员姓名:">
+                <el-input v-model="operatorData.operatorName" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
+              </el-form-item>
+              <el-form-item class="customer-item" label="排产日期:">
+                <el-input v-model="pageData.scheduledDate" disabled="disabled" style="width: 80px;" ></el-input>
+              </el-form-item>
+              <el-form-item class="customer-item" label="班次:">
+                <el-input v-model="pageData.shiftDesc" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
+              </el-form-item>
+            </fieldset>
+            <el-form style="margin-top: -60px;margin-left: 560px">
             <el-form-item class="customer-button">
               <el-button class="customer-bun-min" type="primary" :disabled="buttonTags.createRollFlag" style="margin-left: 10px; margin-bottom: 5px;">
                 列表</el-button>
             </el-form-item>
             <el-form-item class="customer-button">
               <el-button class="customer-bun-min" type="primary" @click="refreshPageData" style="margin-left: 10px; margin-bottom: 5px;">
-              刷新</el-button>
+                刷新</el-button>
             </el-form-item>
             <el-form-item class="customer-button">
               <el-button  class="customer-bun-min" type="primary" @click="finishRollBun"  style="margin-left: 10px; margin-bottom: 5px;">
-              结束卷</el-button>
+                结束卷</el-button>
             </el-form-item>
             <el-form-item class="customer-button">
               <el-button  class="customer-bun-min" type="primary" @click="closeDialog" style="margin-left: 10px; margin-bottom: 5px;">
-              关闭</el-button>
+                关闭</el-button>
             </el-form-item>
+            </el-form>
           </el-col>
         </el-row>
         <!--  卷数量统计 班次信息  -->
         <el-form>
-          <fieldset class="customer-fieldset" style="width: 505px;">
+          <fieldset class="customer-fieldset" style="width: 898px;margin-top: 10px">
             <legend>卷数量统计</legend>
             <el-form-item class="customer-item">
               <el-checkbox disabled="disabled" style="margin-top: 15px;" true-label="Y" false-label="N"
@@ -61,22 +72,12 @@
             <el-form-item class="customer-item" label="其他卷数量:" style="margin-top: -10px;">
               <el-input v-model="pageData.otherRollQty" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
             </el-form-item>
-          </fieldset>
-          <!-- 操作员信息和班次信息 -->
-          <fieldset class="customer-fieldset"
-                    style="margin-left: 510px; margin-top: -70px; ;width: 390px;">
-            <legend>人员排程班次信息</legend>
-            <el-form-item class="customer-item" label="操作员:">
-              <el-input v-model="operatorData.operatorId" disabled="disabled" style="width: 80px;" ></el-input>
-            </el-form-item>
-            <el-form-item class="customer-item" label="操作员姓名:">
-              <el-input v-model="operatorData.operatorName" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
-            </el-form-item>
-            <el-form-item class="customer-item" label="排产日期:">
-              <el-input v-model="pageData.scheduledDate" disabled="disabled" style="width: 80px;" ></el-input>
-            </el-form-item>
-            <el-form-item class="customer-item" label="班次:">
-              <el-input v-model="pageData.shiftDesc" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
+            <el-form-item :label="'未生产下机拆卷数量'" class="customer-item" >
+              <el-input  style="width: 110px;"
+                         v-model="pageData.newCreateRollQty"
+                         oninput="value=value.replace(/[^0-9]/g,'')"
+                         placeholder="">
+              </el-input>
             </el-form-item>
           </fieldset>
         </el-form>
@@ -774,17 +775,17 @@ export default {
         return false;
       }
       //首先判断数值是否通过判断
-      let approvedQty = this.pageData.approvedQty;
-      if(approvedQty == null || approvedQty == ''){
-        this.$message.error('请输入良品总数量!');
-        this.pageData.approvedQty = 0;//重新赋值
-        return false;
-      }
-      if(approvedQty <= 0){
-        this.$message.error('良品总数量必须大于0!');
-        this.pageData.approvedQty = 0;//重新赋值
-        return false;
-      }
+      // let approvedQty = this.pageData.approvedQty;
+      // if(approvedQty == null || approvedQty == ''){
+      //   this.$message.error('请输入良品总数量!');
+      //   this.pageData.approvedQty = 0;//重新赋值
+      //   return false;
+      // }
+      // if(approvedQty <= 0){
+      //   this.$message.error('良品总数量必须大于0!');
+      //   this.pageData.approvedQty = 0;//重新赋值
+      //   return false;
+      // }
       //班次判断
       if(this.pageData.shiftDesc == '无班次'){
         this.$message.error('该时间段内没有匹配的班次信息,请联系相关人员！!');
diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue
index 7d0ed37..bf80e25 100644
--- a/src/views/modules/yieldReport/produce_order.vue
+++ b/src/views/modules/yieldReport/produce_order.vue
@@ -74,7 +74,12 @@
         </el-checkbox>
       </el-form-item>
     </el-form>
-
+    <!--  查询时间和产品  -->
+    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 5px;">
+      <el-form-item >
+        <el-input v-model="searchData.site" style="width: 85px"></el-input>
+      </el-form-item>
+    </el-form>
     <!--  工单主表信息  -->
     <el-main style="margin-left: -20px; margin-top: -20px; width: 104%;">
       <el-table @row-click="setCurrentRow"