diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js
index 03e9428..c268155 100644
--- a/build/webpack.dev.conf.js
+++ b/build/webpack.dev.conf.js
@@ -26,7 +26,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     compress: true,
     host: HOST || config.dev.host,
     port: PORT || config.dev.port,
-    open: config.dev.autoOpenBrowser,
+    open: false,//config.dev.autoOpenBrowser,
     overlay: config.dev.errorOverlay
       ? { warnings: false, errors: true }
       : false,
@@ -67,7 +67,8 @@ module.exports = new Promise((resolve, reject) => {
       // Add FriendlyErrorsPlugin
       devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({
         compilationSuccessInfo: {
-          messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`],
+          messages: [ `Local: http://localhost:${port}`,
+            `Network: http://${require('ip').address()}:${port}`,],
         },
         onErrors: config.dev.notifyOnErrors
         ? utils.createNotifierCallback()
diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue
index 721ae8b..bba8315 100644
--- a/src/views/modules/yieldReport/produce_order.vue
+++ b/src/views/modules/yieldReport/produce_order.vue
@@ -185,7 +185,10 @@
     <fqcSplitRollReport :close-on-click-modal="false"
                         :visible.sync="fqcRollShowReportFlag" ref="fqcSplitRollReport"></fqcSplitRollReport>
     <!-- 创建重检派工单   -->
-    <createRecheck ref="createRecheck" ></createRecheck>
+    <createRecheck ref="createRecheck"></createRecheck>
+    <!-- 换包装   -->
+    <changePackaging :close-on-click-modal="false"
+                     :visible.sync="changePackagingFlag" ref="changePackaging"></changePackaging>
   </div>
 </template>
 
@@ -210,6 +213,7 @@ import comFinishSchedule from "./com_finish_schedule";/*结束派工的组件*/
 import fqcProduceReportNormal from "./otherReport/fqc_produce_report_normal";/*结束派工的组件*/
 import reworkInspectReport from "./otherReport/rework_inspect_report";/*结束派工的组件*/
 import fqcSplitRollReport from "./otherReport/fqc_split_roll_report";/*结束派工的组件*/
+import changePackaging from "./otherReport/change_packaging";/*结束派工的组件*/
 import createRecheck from './com_create_recheck'
 
 export default {
@@ -222,6 +226,7 @@ export default {
       reworkShowReportFlag: false,
       fqcRollShowReportFlag: false,
       showFinishScheduleFlag: false,
+      changePackagingFlag: false,
       searchData: {
         site: this.$store.state.user.site,
         resourceId: '',
@@ -1048,7 +1053,9 @@ export default {
     fqcProduceReportNormal, /*FQC报工*/
     reworkInspectReport, /*返工重建*/
     fqcSplitRollReport, /*FQC分卷*/
-    createRecheck /*创建重检派工单*/
+    createRecheck,/*创建重检派工单*/
+    changePackaging, /*换包装*/
+
   },
   mounted() {
     this.$nextTick(() => {
@@ -1072,6 +1079,17 @@ export default {
         this.menuButton.canceledAllPrdButton = true
         this.menuButton.createRecheckButton = true
       } else {
+        // 获取订单信息
+        let searchOrder = {
+          orderNo: this.currentRow.orderNo,
+          seqNo: this.currentRow.seqNo,
+          site: this.currentRow.site,
+          searchFlag:true
+        }
+        getProduceScheduleList(searchOrder).then(({data}) => {
+          //设置查询数据
+          this.currentRow = data.rows[0];
+        });
         this.menuButton.canceledAllPrdButton = false
         this.menuButton.createRecheckButton = false
         // 前往生产订单按钮
@@ -1176,7 +1194,7 @@ export default {
             userSpecialSecurityNo: 259,
             username: this.$store.state.user.name,
           }
-          getUserSpecialSecurity(data).then(({data}) => {
+          getUserSpecialSecurity(canceledAllPrdData).then(({data}) => {
             if (data.userSpecialSecurity == 'Y') {
               this.menuButton.canceledManualFlagButton = false
             } else {
@@ -1557,7 +1575,16 @@ export default {
     },
     // 换包装
     changePackaging() {
-
+      //首先判断是否选择好派工单
+      if (JSON.stringify(this.currentRow) == '{}') {
+        this.$message.error('请先选择派工单!');
+        return false;
+      }
+      //打开操作员切换功能
+      this.changePackagingFlag = true;
+      this.$nextTick(() => {
+        this.$refs.changePackaging.init(this.currentRow.seqNo, this.operatorData);
+      });
     },
     /*查询派工单*/
     getProduceScheduleList() {
@@ -1601,6 +1628,10 @@ export default {
         //切换到fqc分卷组件
         this.fqcSplitRollModal();
       }
+      if (operatorData.reportType == 4) {
+        // 换包装
+        this.changePackaging();
+      }
     },
 
     notInitOperatorData(val) {
@@ -1627,9 +1658,11 @@ export default {
         //切换到fqc分卷组件
         this.fqcSplitRollModal();
       }
-
+      if (val == 4) {
+        //切换到fqc分卷组件
+        this.changePackaging();
+      }
     },
-
     //切换员工modal
     switchOperatorModal(val) {
 
@@ -1680,7 +1713,6 @@ export default {
       }
 
     },
-
     //切换报工modal
     switchProduceReportModal() {
       //首先判断是否选择好派工单
@@ -1850,6 +1882,5 @@ hr {
 }
 
 
-
 /*控制上下间距*/
 </style>