diff --git a/src/views/modules/yieldReport/com_finish_roll.vue b/src/views/modules/yieldReport/com_finish_roll.vue
index 5621c92..d669591 100644
--- a/src/views/modules/yieldReport/com_finish_roll.vue
+++ b/src/views/modules/yieldReport/com_finish_roll.vue
@@ -1,24 +1,63 @@
 <template>
-    <el-dialog v-drag
+  <div class="customer-css">
+    <el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners"
+               width="830px"  class="customer-dialog">
+      <el-form :inline="true" label-position="top" style="height: 480px;"
+               label-width="80px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="'当前时间'">
+              <el-date-picker disabled="disabled" style="width: 145px;"
+                              v-model="scheduleData.reportTime"
+                              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-button">
+              <el-button type="primary" :disabled="buttonTags.createRollFlag" style="margin-left: 10px; margin-bottom: 5px;">
+                列表</el-button>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" :disabled="buttonTags.switchRollFlag" style="margin-left: 10px; margin-bottom: 5px;">
+              刷新</el-button>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" :disabled="buttonTags.separatorRollFlag" style="margin-left: 10px; margin-bottom: 5px;">
+              结束卷</el-button>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" :disabled="buttonTags.separatorRollFlag" style="margin-left: 10px; margin-bottom: 5px;">
+              关闭</el-button>
+            </el-form-item>
+            <el-form-item label="订单号:">
+              <el-input v-model="scheduleData.orderNo" readonly style="width: 130px;" ></el-input>
+            </el-form-item>
+            <el-form-item label="物料编码:">
+              <el-input v-model="scheduleData.partNo" readonly style="width: 130px;"></el-input>
+            </el-form-item>
+            <el-form-item label="物料名称/规则:"  >
+              <el-input v-model="scheduleData.partDesc" readonly style="width: 200px;"></el-input>
+            </el-form-item>
+            <el-form-item label="派工单号:">
+              <el-input v-model="scheduleData.seqNo" readonly style="width: 80px;"></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+      </el-form>
 
-               width="830px"  class="customer-dialog"
-               :close-on-click-modal="false"
-               :visible.sync="visibleFlag">
-      <div style="height: 380px;">
-        我是中国人，tom是美国人!
-      </div>
 
     </el-dialog>
+  </div>
 </template>
 
 <script>
 export default {
   name: "com_finish_roll",
-
   data() {
     return {
-      titleCon:'',
-      visibleFlag: false,
+      titleCon: '',
       sfdcTimeList: [],
       scheduleData: {
         site: this.$store.state.user.site,
@@ -28,7 +67,7 @@ export default {
         partNo: '',
         rollNo: '',
         partDesc: '',
-        planStartTime: '',
+        reportTime: this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'),
         planFinishTime: '',
         qtyRequiredOriginal: 0,
         scheduledDate: '',
@@ -50,6 +89,7 @@ export default {
         operatorId: '',
         operatorName: '',
         status: '',
+        seqNo: '',
         showFlag: false
       },
       buttonTags:{
@@ -81,12 +121,16 @@ export default {
 
 
 
-    init1(seqNo, rollNo) {
-       alert(seqNo);
-      // this.scheduleData.seqNo = seqNo;
+    init(seqNo, operatorData) {
+      //初始化参数
+      this.scheduleData.seqNo = seqNo;
+      //初始化操作员对象
+      this.operatorData = JSON.parse(JSON.stringify(operatorData));
+      //初始化标题
+      this.titleCon = '结束卷操作 \
+       派工单号:'+seqNo;
       // this.currentRollOps.seqNo = seqNo;
       // this.currentRollOps.rollNo = rollNo;
-      this.visibleFlag = true;
       //刷新当前派工单的信息
       //this.refreshPageData();
     },
@@ -101,8 +145,9 @@ export default {
 </script>
 
 <style scoped lang="scss">
-/deep/ .customer-tab .el-tabs__content{
-  padding: 0px !important;
+/*调节页面button和input的上下间距*/
+.customer-css .customer-button{
+  margin-top: 20px;
 }
 
 
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 4599dfd..d3a7b23 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -1,11 +1,11 @@
 <template>
-  <div class="produce-report customer-css">
+  <div class="produce-report">
     <el-dialog v-drag
       width="830px" class="customer-dialog"
-      :title="titleCon"
-      :close-on-click-modal="false"
-      :visible.sync="visibleFlag">
-      <el-form :inline="true" label-position="top" style="height: 480px;"               label-width="80px">
+      :title="titleCon" v-bind="$attrs" v-on="$listeners"
+      >
+      <el-form :inline="true" label-position="top" style="height: 480px;"
+               label-width="80px">
         <!-- 第一行信息 -->
         <el-form style="margin-top: -10px;">
           <el-form-item label="订单号:">
@@ -72,7 +72,7 @@
           </el-form-item>
           <el-form-item>
             <el-button type="primary" :disabled="buttonTags.finishRollFlag"
-              @click="finishRoll" style="margin-left: 10px; margin-bottom: 5px;">
+              @click="finishRollModal" style="margin-left: 10px; margin-bottom: 5px;">
               结束卷</el-button>
           </el-form-item>
           <el-form-item>
@@ -346,13 +346,15 @@
     </el-dialog>
 
     <!-- 切换操作员 -->
-    <comSwitchOperator v-show="showOperatorFlag" ref="comSwitchOperator"
+    <comSwitchOperator ref="comSwitchOperator" :close-on-click-modal="false"
+                       :visible.sync="showOperatorFlag"
                        @initOperatorData="initOperatorData">
 
     </comSwitchOperator>
 
     <!--  结束卷的modal -->
-    <comFinishRoll ref="comFinishRoll" v-show="showFinishFlag" >
+    <comFinishRoll ref="comFinishRoll" :close-on-click-modal="false"
+                   :visible.sync="showFinishFlag" >
 
     </comFinishRoll>
   </div>
@@ -374,12 +376,12 @@ import {
 } from "@/api/yieldReport/produce_report_normal.js";
 /*引入组件*/
 import comSwitchOperator from "./com_switch_operator";/*切换操作员*/
+import comFinishRoll from "./com_finish_roll";/*结束卷数的组件*/
 export default {
   name: "com_produce_report_normal",
   data() {
     return {
       titleCon:'',
-      visibleFlag: false,
       showOperatorFlag: false,
       showFinishFlag: false,
       activeTable: 'sfdc_time',
@@ -2563,7 +2565,6 @@ export default {
         operatorId: '',
         operatorName: '',
         status: '',
-        seqNo: '',
         showFlag: false
       },
       buttonTags:{
@@ -2584,6 +2585,7 @@ export default {
   },
   components: {
     comSwitchOperator,/*切换用户的组件*/
+    comFinishRoll,/*结束卷的组件*/
   },
   methods: {
     // 获取多语言列表
@@ -2769,14 +2771,14 @@ export default {
         + this.scheduleData.resourceDesc + ' （' + this.operatorData.operatorName+ '）';
     },
 
-    finishRoll(val1,val2){
-      alert(val1+val2)
+    /*结束卷操作*/
+    finishRollModal(){
       //1.首先调用菜单判断方式 看看是否可以结束卷
       //checkProduceButton('finishRollFlag');
       //打开结束卷的页面
       this.$nextTick(() => {
         this.showFinishFlag = true;
-        this.$refs.comFinishRoll.init1(val1,val2)
+        this.$refs.comFinishRoll.init(this.scheduleData.seqNo, this.operatorData)
         // this.$refs.com_finish_roll.init(this.scheduleData.seqNo, this.currentRollOps.rollNo);
       });
     },
diff --git a/src/views/modules/yieldReport/com_switch_operator.vue b/src/views/modules/yieldReport/com_switch_operator.vue
index a3c3ac6..9e4014f 100644
--- a/src/views/modules/yieldReport/com_switch_operator.vue
+++ b/src/views/modules/yieldReport/com_switch_operator.vue
@@ -1,7 +1,6 @@
 <template>
   <!--  展示员工切换的模块  -->
-  <el-dialog :title="titleCon" :close-on-click-modal="false"
-               v-drag :visible.sync="visibleFlag" width="300px">
+  <el-dialog :title="titleCon" v-bind="$attrs" v-on="$listeners"  width="300px">
       <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
         <el-form-item :label="'操作员:'">
           <el-input v-model="operatorData.operatorId" style="width: 110px"></el-input>
diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue
index a80efdb..b2e4d4e 100644
--- a/src/views/modules/yieldReport/produce_order.vue
+++ b/src/views/modules/yieldReport/produce_order.vue
@@ -107,14 +107,15 @@
     </el-main>
 
     <!-- 切换操作员 -->
-    <comSwitchOperator v-show="showOperatorFlag" ref="comSwitchOperator"
+    <comSwitchOperator ref="comSwitchOperator" :close-on-click-modal="false"
+                       :visible.sync="showOperatorFlag"
                        @initOperatorData="initOperatorData">
 
     </comSwitchOperator>
 
     <!-- 正常报工的组件 -->
-    <comProduceReportNormal v-if="showReportFlag" ref="comProduceReportNormal"
-                            @rollInit="rollInit" @switchOperatorModal>
+    <comProduceReportNormal :close-on-click-modal="false"
+                            :visible.sync="showReportFlag" ref="comProduceReportNormal">
 
     </comProduceReportNormal>