Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

src/views/appoint/components/inward/transPrice.vue

@@ -83,7 +83,7 @@ export default {
       this.isKuang = true;
       if (this.input) {
         this.option.requestUrl =
-          "/api/v1/ams/getInwardContractPrice?apiId=464&con=" + this.input;
+          "/api/v1/ams/getInwardContractPrice?apiId=464&deleted=0&con=" + this.input;
       } else {
           this.option.requestUrl =
             "/api/v1/ams/getInwardContractPrice?apiId=464&deleted=0&i=" + new Date();

src/views/appoint/components/saleContract/addTransportPrice.vue

@@ -5,6 +5,7 @@
     <div class="form">
       <div class="form_box">
         <dil-form :formId="287" v-model="form1" ref="from1"></dil-form>
+        <label>运输距离:</label><el-input type="number" v-model="haulDistance" class="el-input"></el-input>
       </div>
       <div id="liulan">
           <el-button type="primary" class="btn" @click="oilPriceFormulaClick">浏览</el-button>
@@ -173,6 +174,7 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      haulDistance:"",
       carrierIdArray:[],
       tableTop: [
         {
@@ -507,6 +509,12 @@ export default {
       }
     },
     makeSure() {
+      if (this.haulDistance=="" || this.haulDistance==null){
+        this.$message({
+          type: "warning",
+          message: "请输入运输距离!",});
+        return;
+      }
       for (let i = 0; i < this.selectionList.length; i++) {
         this.carrierIdArray.push(this.selectionList[i].carrierId)
       }
@@ -522,7 +530,8 @@ export default {
         oilpriceBase : this.form1.oilpriceBase,
         oilTypeId : this.form1.oilTypeId,
         oilpriceChangeThreshold : this.form1.oilpriceChangeThreshold,
-        place: this.place
+        place: this.place,
+        haulDistance: this.haulDistance
       }
       this.axios.post("/api/v1/ams/addAmsContractTransportPrice", mapValue).then((res) => {
           if (res.data.code == "200") {
@@ -542,6 +551,7 @@ export default {
 };
 </script>
 <style lang='scss'>
+
 .elForm {
     margin-left: 38%;
   }
@@ -579,6 +589,13 @@ export default {
           }
         }
       }
+      label{
+        display: inline-block;
+        width: 70px !important;
+      }
+      .el-input{
+        width: 250px;
+      }
     }
     #liulan{
       width: 120px;
@@ -613,6 +630,9 @@ export default {
     overflow: hidden;
     margin-top: 10px;
   }
+  #cysbutton{
+    margin-left: 70px;
+  }
 }
 </style>
 <style lang='scss'>

src/views/inward/components/truckAppoint/addPlan.vue

@@ -39,6 +39,17 @@
         </div>
       </el-form>
     </div>
+    <!--   运输单价按钮   -->
+    <div class="materialDrawer">
+      <el-form :inline="true" class="demo-form-inline" label-width="80px">
+        <el-form-item label="运输单价"> </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="onprice" class="truckBtn"
+          >浏览</el-button
+          >
+        </el-form-item>
+      </el-form>
+    </div>
     <template>
       <div>
         <mergeRowTable
@@ -60,6 +71,35 @@
         </mergeRowTable>
       </div>
     </template>
+    <!--   运输单价模态框   -->
+    <el-drawer
+      :visible.sync="drawerP"
+      :direction="direction"
+      close-on-press-escape
+      modal
+      wrapperClosable
+      size="60%"
+    >
+      <div class="selectText">
+        <el-input v-model="inputP" placeholder="请输入内容" style="width: 240px" clearable></el-input>
+        <el-button
+          type="primary"
+          @click="onpriceSelect"
+        ><i class="el-icon-search"></i>查询</el-button
+        >
+      </div>
+      <div class="LineTable">
+        <vue-scroll :ops="ops" style="width:100%;height:100%">
+          <dilTable
+            v-bind.sync="priceOptions"
+            :isKuang="isKuang"
+            :loading="tableLoading"
+            :drawer="PriceDrawer"
+            @func="funcP"
+          ></dilTable>
+        </vue-scroll>
+      </div>
+    </el-drawer>
     <div class="button-box">
       <el-button type="primary" @click="makeSure">确认新增</el-button>
       <el-button type="primary" @click="cancel">返回</el-button>
@@ -73,6 +113,30 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      ops: {
+        vuescroll: {},
+        scrollPanel: {},
+        rail: {
+          keepShow: true
+        },
+        bar: {
+          hoverStyle: true,
+          onlyShowBarOnScroll: false, //是否只有滚动的时候才显示滚动条
+          background: "#5f9ea0", //滚动条颜色
+          opacity: 0.8, //滚动条透明度
+          "overflow-x": "hidden"
+        }
+      },
+      direction: "rtl",
+      //表格加载状态
+      PriceDrawer:false,
+      tableLoading: false,
+      isKuang:false,
+      priceOptions: {
+        requestUrl: ""
+      },
+      inputP:"",
+      drawerP:false,
       restaurants: [],
       state2: null,
       planTruckNumber: null,
@@ -93,6 +157,33 @@ export default {
     };
   },
   methods: {
+    funcP(){
+      this.isKuang = false;
+      this.tableLoading = false;
+    },
+    handleCloseP(){
+      if (this.drawerP) {
+        this.drawerP = false;
+        this.inputP = null;
+      }
+    },
+    onpriceSelect(){
+      this.loading = true;
+      this.isKuang = true;
+      if (this.inputP) {
+        this.priceOptions.requestUrl =
+          "/api/v1/ams/getInwardContractPrice?apiId=464&deleted=0&con=" +
+          this.inputP;
+      } else {
+        this.priceOptions.requestUrl =
+          "/api/v1/ams/getInwardContractPrice?apiId=464&deleted=0&i=" + new Date();
+      }
+    },
+    onprice(){
+      this.drawerP=true;
+      this.priceOptions.requestUrl =
+        "/api/v1/ams/getInwardContractPrice?apiId=464&deleted=0&i=" + new Date();
+    },
     handleSelect(item) {
       this.carrierId = item.carrierId;
       this.state2 = item.carrierName;
@@ -208,7 +299,7 @@ export default {
 .addInwardPlan {
   .carrier {
     display: inline-block !important;
-    margin-left: 38%;
+    margin-left: 40%;
     .el-input {
       width: 250px;
     }
@@ -229,5 +320,25 @@ export default {
     justify-content: center;
     margin-left: 25px !important;
   }
+  .materialDrawer {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .el-input {
+      width: 320px;
+    }
+    .el-select {
+      width: 320px;
+    }
+    .el-autocomplete {
+      width: 320px;
+    }
+    .el-form {
+      padding: 10px;
+    }
+    .truckBtn {
+      width: 320px;
+    }
+  }
 }
 </style>

src/views/inward/components/truckAppoint/addRequirement2.vue

@@ -121,6 +121,17 @@
           </el-form-item>
         </el-form>
       </div>
+      <!--   运输单价按钮   -->
+      <div class="materialDrawer">
+        <el-form :inline="true" class="demo-form-inline" label-width="80px">
+          <el-form-item label="运输单价"> </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="onprice" class="truckBtn"
+            >浏览</el-button
+            >
+          </el-form-item>
+        </el-form>
+      </div>
       <!-- 物资和装卸点以及装卸货次序 -->
       <div class="swtichTop">
         <span class="titile">点击浏览选择物资之前请选择物资单位！</span>
@@ -266,44 +277,33 @@
           </div>
         </el-drawer>
       </div>
+      <!--   运输单价模态框   -->
       <el-drawer
-        :visible.sync="drawer"
+        :visible.sync="drawerP"
         :direction="direction"
-        :before-close="handleClose"
-        size="30%"
+        close-on-press-escape
+        modal
+        wrapperClosable
+        size="60%"
       >
-        <el-input
-          placeholder="请输入内容"
-          v-model="input"
-          style="width: 250px"
-          clearable
-        >
-        </el-input>
-        <el-button
-          type="primary"
-          class="btn"
-          @click="onclick(a)"
-          style="margin-bottom: 15px"
-        >
-          <i class="el-icon-search"></i>查询
-        </el-button>
-        <div v-show="a == 2">
-          <dilTable
-            v-bind.sync="second1"
-            @radio-change="currentRadioChange2"
-          ></dilTable>
-        </div>
-        <div v-show="a == 3">
-          <dilTable
-            v-bind.sync="second1"
-            @radio-change="currentRadioChange2"
-          ></dilTable>
+        <div class="selectText">
+          <el-input v-model="inputP" placeholder="请输入内容" style="width: 240px"></el-input>
+          <el-button
+            type="primary"
+            @click="onpriceSelect"
+          ><i class="el-icon-search"></i>查询</el-button
+          >
         </div>
-        <div v-show="a == 4">
-          <dilTable
-            v-bind.sync="second1"
-            @radio-change="currentRadioChange2"
-          ></dilTable>
+        <div class="LineTable">
+          <vue-scroll :ops="ops" style="width:100%;height:100%">
+            <dilTable
+              v-bind.sync="priceOptions"
+              :isKuang="isKuang"
+              :loading="tableLoading"
+              :drawer="PriceDrawer"
+              @func="funcP"
+            ></dilTable>
+          </vue-scroll>
         </div>
       </el-drawer>
     </div>
@@ -324,6 +324,15 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      //表格加载状态
+      PriceDrawer:false,
+      tableLoading: false,
+      isKuang:false,
+      priceOptions: {
+        requestUrl: ""
+      },
+      inputP:"",
+      drawerP:false,
       aaadrawer: false,
       disabled: false,
       options6: [
@@ -514,6 +523,33 @@ export default {
     }
   },
   methods: {
+    funcP(){
+      this.isKuang = false;
+      this.tableLoading = false;
+    },
+    handleCloseP(){
+      if (this.drawerP) {
+        this.drawerP = false;
+        this.inputP = null;
+      }
+    },
+    onpriceSelect(){
+      this.loading = true;
+      this.isKuang = true;
+      if (this.inputP) {
+        this.priceOptions.requestUrl =
+          "/api/v1/ams/getInwardContractPrice?apiId=464&deleted=0&con=" +
+          this.inputP;
+      } else {
+        this.priceOptions.requestUrl =
+          "/api/v1/ams/getInwardContractPrice?apiId=464&deleted=0&i=" + new Date();
+      }
+    },
+    onprice(){
+      this.drawerP=true;
+      this.priceOptions.requestUrl =
+        "/api/v1/ams/getInwardContractPrice?apiId=464&deleted=0&i=" + new Date();
+    },
     //用车单位弹出层
     handleSelectCarrier(item) {
       this.shipperId = item.shipperId;
@@ -1088,6 +1124,12 @@ export default {
     margin-top: 20px;
     margin-right: 90px;
   }
+  .LineTable {
+    width: 100%;
+    height: 480px;
+    overflow: hidden;
+    margin-top: 10px;
+  }
 }
 </style>
 <style>