diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 1c156a6..6d42447 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -3128,7 +3128,8 @@ export default {
         repairOrderFlag: '',
         checkMultipleRoll: '',
         rowCount: '',
-        rollCount: ''
+        rollCount: '',
+        carrierNo: ''
       },
       currentRollOps: {
         site: this.$store.state.user.site,
@@ -3930,6 +3931,7 @@ export default {
         this.scheduleData.closedFlag = data.row.closedFlag;
         this.scheduleData.rowCount = data.row.rowCount;
         this.scheduleData.rollCount = data.row.rollCount;
+        this.scheduleData.carrierNo = data.row.carrierNo;
       });
     },
     // 获取当前卷的信息
@@ -4087,6 +4089,7 @@ export default {
         this.scheduleData.closedFlag = data.row.closedFlag;
         this.scheduleData.rowCount = data.row.rowCount;
         this.scheduleData.rollCount = data.row.rollCount;
+        this.scheduleData.carrierNo = data.row.carrierNo;
         //设置弹窗的标题
         this.titleCon = '机台工作台' + ' - ' + data.row.itemDesc + ' '
           + data.row.resourceDesc + ' （' + this.operatorData.operatorName + '）';
diff --git a/src/views/modules/yieldReport/com_separate_roll.vue b/src/views/modules/yieldReport/com_separate_roll.vue
index d8447cc..316b422 100644
--- a/src/views/modules/yieldReport/com_separate_roll.vue
+++ b/src/views/modules/yieldReport/com_separate_roll.vue
@@ -1,24 +1,20 @@
 <template>
   <div class="customer-css">
-    <el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners"
-               width="750px" style="height: 680px;" class="customer-dialog">
-      <el-form :inline="true" label-position="top" style="height: auto;"
-               label-width="80px">
+    <el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners" width="550px" style="height: 680px;" class="customer-dialog">
+      <el-form :inline="true" label-position="top" style="height: auto;">
         <!-- 时间和固定载具 -->
         <el-row style="margin-top: -10px;">
-          <el-col :span="6">
+          <el-col :span="11">
             <el-form-item :label=labels.currentTime>
-              <el-date-picker style="width: 100px;"
+              <el-date-picker style="width: 110px;"
                               v-model="pageData.reportDate"
                               format="yyyy-MM-dd"
                               value-format="yyyy-MM-dd"
                               placeholder="">
               </el-date-picker>
             </el-form-item>
-          </el-col>
-          <el-col :span="5" style="margin-left: 10px; margin-top: 27px;">
-            <el-form-item :label="''">
-              <el-time-picker style="width: 80px;"
+            <el-form-item :label="''" style="margin-top: 23px">
+              <el-time-picker style="width: 100px;"
                               v-model="pageData.reportTime"
                               format="HH:mm:ss"
                               value-format="HH:mm:ss"
@@ -26,19 +22,19 @@
               </el-time-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="5" style="margin-left: 10px;">
+          <el-col :span="6">
             <el-form-item label="固定载具">
-              <el-input v-model="pageData.fixture" style="width: 100px;" placeholder="固定载具"></el-input>
+              <el-input v-model="pageData.fixture" style="width: 120px;" placeholder="固定载具"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="3" style="margin-left: 10px;">
+          <el-col :span="3">
             <el-form-item label="排数">
-              <el-input-number :controls="false" :step="0" v-model="pageData.rowCount" @change="handleRowCountChange" style="width: 80px;"></el-input-number>
+              <el-input-number :controls="false" :step="0" v-model="pageData.rowCount" @change="handleRowCountChange" style="width: 60px;"></el-input-number>
             </el-form-item>
           </el-col>
-          <el-col :span="3" style="margin-left: 10px;">
+          <el-col :span="3">
             <el-form-item label="卷数">
-              <el-input-number :controls="false" :step="0" v-model="pageData.rollCount" style="width: 80px;"></el-input-number>
+              <el-input-number :controls="false" :step="0" v-model="pageData.rollCount" style="width: 60px;"></el-input-number>
             </el-form-item>
           </el-col>
         </el-row>
@@ -50,9 +46,9 @@
             border
             style="width: 100%; margin-top: 10px;"
             max-height="350">
-            <el-table-column prop="rowNumber" label="NO." width="60" align="center">
+            <el-table-column prop="rowNumber" label="NO." width="50" align="center">
             </el-table-column>
-            <el-table-column label="良品数" width="200" align="center">
+            <el-table-column label="良品数" width="150" align="center">
               <template slot-scope="scope">
                 <el-input-number
                   :controls="false" :step="0"
@@ -63,7 +59,7 @@
                 </el-input-number>
               </template>
             </el-table-column>
-            <el-table-column label="不良数" width="200" align="center">
+            <el-table-column label="不良数" width="150" align="center">
               <template slot-scope="scope">
                 <el-input-number
                   :controls="false" :step="0"
@@ -164,7 +160,8 @@ export default {
         // 新增字段
         fixture: '',      // 固定载具
         rowCount: 0,      // 排数
-        rollCount: 0      // 卷数
+        rollCount: 0,      // 卷数
+        carrierNo: ''
       },
       rowDataList: [],    // 排数据列表
       operatorData: {
@@ -311,9 +308,9 @@ export default {
       this.pageData.rollQty = 0;
       this.pageData.rollNums = 1;
       // 初始化新增字段
-      this.pageData.fixture = '';
       this.pageData.rowCount = scheduleData.rowCount;
       this.pageData.rollCount = scheduleData.rollCount;
+      this.pageData.fixture = scheduleData.carrierNo;
        //判断是否启用多语言
       // this.getMultiLanguageList();  //刷新多语言的信息
       //获取焦点