结算和副产品上线1

src/views/TMS/components/importedIngredients/transportReserveFuAddIngredients.vue

@@ -29,15 +29,6 @@
       <el-input class="input" v-model="materialName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
     </div>
-<<<<<<< HEAD
-
-    <div class="forwardingUnit from">
-      <span class="text">发货单位：</span>
-      <el-input class="input" v-model="supplierName" disabled> </el-input>
-      <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
-    </div>
-=======
->>>>>>> ccbdd69b9737393f1a251a91f1f1d3e52b8a965e
     <div class="remark from">
       <span class="text">船名：</span>
       <el-input class="input" v-model="remark" @blur="onBlur"> </el-input>
@@ -69,14 +60,6 @@
         >
       </div>
     </div>
-<<<<<<< HEAD
-    <div class="lineId from">
-      <span class="text">该批车辆是否一车多趟：</span>
-      <el-switch v-model="isMoreTrips" active-text="是" inactive-text="否">
-      </el-switch>
-    </div>
-=======
->>>>>>> ccbdd69b9737393f1a251a91f1f1d3e52b8a965e
     <div class="truckListTable">
       <el-table
         :data="selectionList"
@@ -420,11 +403,7 @@ export default {
         if (this.onDrawerNumber == 1) {
           this.frist.requestUrl =
             "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
-<<<<<<< HEAD
-            this.input;
-=======
             this.input + "&supplierId=" + this.supplierId;
->>>>>>> ccbdd69b9737393f1a251a91f1f1d3e52b8a965e
         } else if (this.onDrawerNumber == 2) {
           this.secend.requestUrl =
             "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
@@ -465,11 +444,7 @@ export default {
         if (this.onDrawerNumber == 1) {
           this.frist.requestUrl =
             "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&i=" +
-<<<<<<< HEAD
-            new Date();
-=======
             new Date() + "&supplierId=" + this.supplierId;
->>>>>>> ccbdd69b9737393f1a251a91f1f1d3e52b8a965e
         } else if (this.onDrawerNumber == 2) {
           this.secend.requestUrl =
             "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
@@ -519,15 +494,9 @@ export default {
       this.drawer = true;
       this.onDrawerNumber = num;
       if (num == 1) {
-<<<<<<< HEAD
-        this.frist.requestUrl =
-          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
-          this.input;
-=======
           this.frist.requestUrl =
           "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
           this.input + "&supplierId=" + this.supplierId;   
->>>>>>> ccbdd69b9737393f1a251a91f1f1d3e52b8a965e
       } else if (num == 2) {
         this.secend.requestUrl =
           "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
@@ -752,8 +721,6 @@ export default {
     width: 70px;
     height: 1px;
   }
-<<<<<<< HEAD
-=======
 }
 .supplieUnit {
   display: flex;
@@ -763,7 +730,6 @@ export default {
   .el-input {
     width: 250px;
   }
->>>>>>> ccbdd69b9737393f1a251a91f1f1d3e52b8a965e
 }
 .material {
   display: flex;