fix:修正未合并的文件

zkqy-ui/src/views/amichi/print/rkadyPrint.vue

@@ -262,11 +262,7 @@ export default {
   }
   .erweima{
     width: 100px;
-<<<<<<< HEAD
-    height: 80px;;
-    background-color: red;
-    margin-top: 8px;
-=======
+
     height: 100px;;
     background-color: red;
     margin-top: 8px;
@@ -276,7 +272,6 @@ export default {
   .xh{
     text-align: center;
     width: 100%;
->>>>>>> yl111
   }
   .titleBox{
     display: flex;

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

@@ -643,10 +643,8 @@ export default {
     },
     // 重置
     reset(){
-<<<<<<< HEAD
-=======
+
       this.formData.planStatus='';
->>>>>>> yl111
       getPlanSpinningInfo({"macId":this.macId}).then(response => {
         //得到生产中，停产的，待产的
         response.data.forEach(item => {

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

@@ -153,20 +153,15 @@
         <el-dialog title="修改计划"  :visible.sync="nanUpdateDialogTableVisible" width="1400px">
           <!--查询条件-->
           <el-form ref="form"  :model="formData" label-width="80px" :inline="true">
-<<<<<<< HEAD
-             <el-form-item label="产品类别:">
-=======
+
              <el-form-item label="产品类别:" prop="productType">
->>>>>>> yl111
+
                 <el-select v-model="formData.productType" placeholder="请选择产品类别">
                   <el-option v-for="product in productTypeList" :key="product.value" :label="product.lable" :value="product.value" ></el-option>
                 </el-select>
              </el-form-item>
-<<<<<<< HEAD
-              <el-form-item label="计划状态:">
-=======
+
               <el-form-item label="计划状态:" prop="planStatus">
->>>>>>> yl111
                 <el-select v-model="formData.planStatus" placeholder="请选择计划状态">
                   <el-option v-for="stateListItem in stateList2" :key="product.id" :label="stateListItem.name" :value="stateListItem.id" ></el-option>
                 </el-select>
@@ -439,21 +434,14 @@
         <el-dialog title="北车间修改计划"  :visible.sync="beiUpdateDialogTableVisible" width="1200px">
           <!--查询条件-->
           <el-form ref="form"  :model="formData" label-width="80px" :inline="true">
-<<<<<<< HEAD
-            <el-form-item label="产品类别:">
-=======
+
             <el-form-item label="产品类别:" prop="productType">
->>>>>>> yl111
+
               <el-select v-model="formData.productType" placeholder="请选择产品类别">
                 <el-option v-for="(product,index) in productTypeList" :key="index" :label="product.lable" :value="product.value" ></el-option>
               </el-select>
             </el-form-item>
-
-<<<<<<< HEAD
-            <el-form-item label="计划状态:">
-=======
             <el-form-item label="计划状态:" prop="planStatus">
->>>>>>> yl111
               <el-select v-model="formData.planStatus" placeholder="请选择计划状态">
                 <el-option v-for="stateListItem in stateList2" :key="product.id" :label="stateListItem.name" :value="stateListItem.id" ></el-option>
               </el-select>
@@ -1261,11 +1249,10 @@ export default {
     },
     //重置按钮
     reset(){
-<<<<<<< HEAD
-=======
+
       this.formData.productType="";
       this.formData.planStatus="";
->>>>>>> yl111
+
       this.tableData2=[];
       //弹窗
       if(this.selectedWorkshop=="南车间"){
@@ -1273,13 +1260,9 @@ export default {
       }else{
         this.beiUpdateDialogTableVisible = true
       }
-<<<<<<< HEAD
-      console.log(this.machineId,"dddd")
-      getAllPlanListByMachineId(this.machineId).then((response) => {
-=======
+
       console.log(this.macId,"dddd")
       getAllPlanListByMachineId(this.macId).then((response) => {
->>>>>>> yl111
         //得到生产中，停产的，待产的
         response.data.forEach(item => {
           item.isEditing=false;
@@ -1289,21 +1272,7 @@ export default {
         this.tableData2=response.data;
         // console.log( this.tableData2)
         // 在数据加载完成后，手动触发每个行的第一个下拉框的 change 事件
-<<<<<<< HEAD
-        this.$nextTick(() => {
-          // 获取第一个业务员选择框（假设表格只有一行）
-          for (let i = 0; i < this.tableData2.length; i++) {
-            const firstSalesmanSelect = this.$refs['salesmanSelect'+i];
-            // 触发 change 事件
-            if (firstSalesmanSelect) {
-              firstSalesmanSelect.$emit('change', {
-                target: {value: "ddd"},
-              });
-            }
-          }
 
-        });
-=======
         // this.$nextTick(() => {
         //   // 获取第一个业务员选择框（假设表格只有一行）
         //   for (let i = 0; i < this.tableData2.length; i++) {
@@ -1316,7 +1285,6 @@ export default {
         //     }
         //   }
         // });
->>>>>>> yl111
       })
     },
     //弹窗里边的点击查询