Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CLIENT

zkqy-ui/src/views/orderMange/planTable/index.vue

@@ -542,7 +542,7 @@
                     </el-form-item>
                     <el-form-item>
                       <el-button type="primary" @click="confirmStopProductionLine">确定</el-button>
-                      <el-button>取消</el-button>
+                      <el-button @click="tjqx">取消</el-button>
                     </el-form-item>
                   </el-form>
       </el-dialog>
@@ -630,6 +630,9 @@ export default {
     this.getAmmunitionPlanInfo();
   },
   methods: {
+    tjqx(){
+      this.modifyMachineStatus=false;
+    },
     getProductChineseName(productId) {
       return  this.productsInfo.find(product => product.id == productId).productName;
     },