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

src/views/TMS/components/bmsship/detailsStatement.vue

@@ -6,7 +6,7 @@
         <el-form-item>
           <el-input v-model="shipName" placeholder="请输入船名"></el-input>
         </el-form-item>
-        <el-form-item>
+        <!-- <el-form-item>
           <span class="demonstration">离港日期</span>
           <el-date-picker
             v-model="startTime"
@@ -23,7 +23,7 @@
             style="width:200px"
           >
           </el-date-picker>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item>
           <el-button @click="onClick" type="primary" icon="el-icon-search">查询</el-button>
         </el-form-item>
@@ -74,7 +74,6 @@
             ref="tableRef"
             border
             style="width: 100%; margin-top: 0px"
-            fit
             max-height="500px"
             :row-style="{ height: '30px' }"
             :cell-style="{ fontWeight: '700' }"
@@ -93,61 +92,77 @@
             <el-table-column
               prop="materialName"
               label="品种"
-              width="150px"
+              width="120px"
               align="center"
             >
             </el-table-column>
             <el-table-column
               prop="resultForeignShipName"
               label="船名"
-              width="150px"
+              width="100px"
               align="center"
             >
             </el-table-column>
             <el-table-column
               prop="portName"
               label="放货港口"
-              width="150px"
+              width="120px"
               align="center"
             >
             </el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               prop="carrierName"
               label="承运单位"
               width="100px"
               align="center"
             >
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column
               prop="resultOutPortTime"
               label="离港日期"
-              width="200px"
+              width="100px"
               align="center"
             >
             </el-table-column>
-            <el-table-column
-              prop="loadTonnage"
-              label="装船吨位"
+             <el-table-column
+              prop="monthLoadTonnage"
+              label="月份装船吨位"
               width="100px"
               align="center"
             >
+             <template slot-scope="scope" v-if="scope.row.unitPriceId">
+                {{(scope.row.monthLoadTonnage).toFixed(2)}}
+              </template>
             </el-table-column>
             <el-table-column
-              prop="loadingProportion"
-              label="装船比例"
+              prop="monthLoadingProportion"
+              label="月份装船比例"
               width="70px"
               align="center"
+            >
+             <template slot-scope="scope" v-if="scope.row.unitPriceId">
+                {{(scope.row.monthLoadingProportion*100).toFixed(2)}}%
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="monthRealTonnage"
+              label="月份结算吨位"
+              width="100px"
+              align="center"
             >
              <template slot-scope="scope">
-                {{(scope.row.loadingProportion*100).toFixed(2)}}%
+                {{(scope.row.monthRealTonnage).toFixed(2)}}
               </template>
             </el-table-column>
             <el-table-column
-              prop="realTonnage"
-              label="结算吨位"
+              prop="monthMakeTonnage"
+              label="月份开票吨位"
               width="100px"
               align="center"
             >
+             <template slot-scope="scope">
+                {{(scope.row.monthMakeTonnage).toFixed(2)}}
+              </template>
             </el-table-column>
             <el-table-column
               prop="totalEnTonnage"
@@ -175,6 +190,26 @@
               <template slot-scope="scope">
                   <el-input type="number" v-model="scope.row.inspectionFees"></el-input>
               </template>
+            </el-table-column>
+             <el-table-column
+              prop="totalPreviewTonnage"
+              label="已预开总吨位"
+              width="120px"
+              align="center"
+            >
+              <template slot-scope="scope">
+                <el-input type="number" v-model="scope.row.totalPreviewTonnage"></el-input>
+              </template>
+            </el-table-column>
+             <el-table-column
+              prop="totalPreviewFee"
+              label="已预开总金额"
+              width="120px"
+              align="center"
+            >
+              <template slot-scope="scope" v-if="scope.row.totalPreviewFee">
+                {{(scope.row.totalPreviewFee).toFixed(2)}}
+              </template>
             </el-table-column>
              <el-table-column
               prop="statementTotalAmount"
@@ -182,6 +217,40 @@
               width="100px"
               align="center"
             >
+            </el-table-column>
+             <el-table-column
+              prop="capacityNumber"
+              label="江船"
+              width="100px"
+              align="center"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="loadTonnage"
+              label="装船吨位"
+              width="100px"
+              align="center"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="loadingProportion"
+              label="装船比例"
+              width="70px"
+              align="center"
+            >
+             <template slot-scope="scope">
+                {{(scope.row.loadingProportion*100).toFixed(2)}}%
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="realTonnage"
+              label="结算吨位"
+              width="100px"
+              align="center"
+            >
+             <template slot-scope="scope" v-if="scope.row.realTonnage">
+                {{(scope.row.realTonnage).toFixed(2)}}
+              </template>
             </el-table-column>
             <el-table-column
               prop="fee"
@@ -189,6 +258,9 @@
               width="100px"
               align="center"
             >
+             <template slot-scope="scope" v-if="scope.row.fee">
+                {{(scope.row.fee).toFixed(2)}}
+              </template>
             </el-table-column>
             <el-table-column
               prop="previewTonnage"
@@ -196,8 +268,8 @@
               width="120px"
               align="center"
             >
-              <template slot-scope="scope">
-                <el-input type="number" v-model="scope.row.previewTonnage"></el-input>
+             <template slot-scope="scope" v-if="scope.row.previewTonnage">
+                {{(scope.row.previewTonnage).toFixed(2)}}
               </template>
             </el-table-column>
             <el-table-column
@@ -206,6 +278,9 @@
               width="100px"
               align="center"
             >
+            <template slot-scope="scope" v-if="scope.row.previewFee">
+                {{(scope.row.previewFee).toFixed(2)}}
+              </template>
             </el-table-column>
             <el-table-column
               prop="makeTonnage"
@@ -213,6 +288,9 @@
               width="100px"
               align="center"
             >
+            <template slot-scope="scope" v-if="scope.row.makeTonnage">
+                {{(scope.row.makeTonnage).toFixed(2)}}
+              </template>
             </el-table-column>
             <el-table-column
               prop="actuallyMoney"
@@ -220,6 +298,9 @@
               width="100px"
               align="center"
             >
+             <template slot-scope="scope" v-if="scope.row.actuallyMoney">
+                {{(scope.row.actuallyMoney).toFixed(2)}}
+              </template>
             </el-table-column>
             <!-- <el-table-column
               prop="feeMake"
@@ -237,7 +318,7 @@
             >
               <template slot-scope="scope">
                 <el-button type="text" @click="operate(scope.row)"
-                  >保存</el-button
+                  >预开票</el-button
                 >
                 <el-button type="text" @click="settlement(scope.row)"
                   >结算</el-button
@@ -288,26 +369,39 @@
             >
             </el-table-column>
             <el-table-column
-              prop="carrierName"
-              label="承运单位"
-              width="100px"
+              prop="totalPreviewTonnage"
+              label="已预开总吨位"
+              width="120px"
               align="center"
             >
+             <template slot-scope="scope" v-if="scope.row.totalPreviewTonnage">
+                {{(scope.row.totalPreviewTonnage).toFixed(2)}}
+              </template>
             </el-table-column>
-            <el-table-column
-              prop="statementTotalAmount"
-              label="开票总金额"
-              width="100px"
+             <el-table-column
+              prop="totalPreviewFee"
+              label="已预开总金额"
+              width="120px"
               align="center"
             >
+              <template slot-scope="scope" v-if="scope.row.totalPreviewFee">
+                {{(scope.row.totalPreviewFee).toFixed(2)}}
+              </template>
             </el-table-column>
-             <el-table-column
+            <el-table-column
               prop="makeTonnageTotal"
               label="开票总吨位"
               width="100px"
               align="center"
             >
             </el-table-column>
+            <el-table-column
+              prop="statementTotalAmount"
+              label="开票总金额"
+              width="100px"
+              align="center"
+            >
+            </el-table-column>
             <el-table-column
               prop="resultOutPortTime"
               label="离港日期"
@@ -346,13 +440,6 @@
               align="center"
             >
             </el-table-column>
-            <el-table-column
-              prop="totalEnTonnage"
-              label="到厂湿吨"
-              width="100px"
-              align="center"
-            >
-            </el-table-column>
             <el-table-column
               prop="unitPrice"
               label="合同单价"
@@ -427,7 +514,13 @@ export default {
         "totalEnTonnage",
         "operate",
         "statementTotalAmount",
-        "makeTonnageTotal"
+        "makeTonnageTotal",
+        "monthLoadTonnage",
+        "monthLoadingProportion",
+        "monthRealTonnage",
+        "totalPreviewTonnage",
+        "monthMakeTonnage",
+        "totalPreviewFee"
       ],
       activeName: "first",
       tableTitle: "结算账单报表",
@@ -459,13 +552,15 @@ export default {
       console.log("row:",row);
       //遍历tableData,找出相同批次的行数
       let arr = this.tableData.filter(e => {
-        return e.batchId == row.batchId && e.noticeTime==row.noticeTime;
+        return e.batchId == row.batchId && e.noticeTime==row.noticeTime && row.unitPriceId == e.unitPriceId;
       });
       let map = {
         list: arr,
         statementType: 3,
-        totalEnTonnage: row.totalEnTonnage,
+        totalEnTonnage: row.monthMakeTonnage,
         statementTotalAmount: row.statementTotalAmount,
+        totalPreviewFee:row.totalPreviewFee,
+        totalPreviewTonnage:row.totalPreviewTonnage,
         userID: getCookie("userId"),
         statementStatus:1
       };
@@ -475,26 +570,29 @@ export default {
         .then(res => {
           if (res.data.code == "200") {
             this.getNoDetailsStament();
-            this.$message.success("保存成功");
+            this.$message.success("结算成功");
           }
         })
         .catch(() => {
-          this.$message.error("保存失败");
+          this.$message.error("结算失败");
         });
     },
-    //保存
+    //预开保存
     operate(row) {
       console.log("row:",row);
       //遍历tableData,找出相同批次的行数
       let arr = this.tableData.filter(e => {
-        return e.batchId == row.batchId && e.noticeTime==row.noticeTime;
+        return e.batchId == row.batchId && e.noticeTime==row.noticeTime && row.unitPriceId == e.unitPriceId;
       });
       let map = {
         list: arr,
         statementType: 3,
-        totalEnTonnage: row.totalEnTonnage,
+        totalEnTonnage: row.monthMakeTonnage,
         statementTotalAmount: row.statementTotalAmount,
-        userID: getCookie("userId")
+        totalPreviewFee:row.totalPreviewFee,
+        totalPreviewTonnage:row.totalPreviewTonnage,
+        userID: getCookie("userId"),
+        statementStatus:0
       };
       console.log("map:",map);
       this.axios
@@ -502,32 +600,41 @@ export default {
         .then(res => {
           if (res.data.code == "200") {
             this.getNoDetailsStament();
-            this.$message.success("保存成功");
+            this.$message.success("预开成功");
           }
         })
         .catch(() => {
-          this.$message.error("保存失败");
+          this.$message.error("预开失败");
         });
     },
     //处理表格数据
     computedTableData(data) {
       data.forEach((item, index) => {
         if (index == 0) {
-        } else if (item.batchId == data[index - 1].batchId && item.noticeTime == data[index - 1].noticeTime) {
+        } else if (item.batchId == data[index - 1].batchId && item.noticeTime == data[index - 1].noticeTime && item.unitPriceId == data[index - 1].unitPriceId) {
           item.totalEnTonnage = data[index - 1].totalEnTonnage;
+          item.totalPreviewTonnage= data[index - 1].totalPreviewTonnage;
         }
+        //总计预开票金额
+        item.totalPreviewFee=item.totalPreviewTonnage*item.unitPrice;
+        //预开吨位
+        item.previewTonnage=item.totalPreviewTonnage*(item.loadTonnage/item.monthLoadTonnage);
         //预开金额
-        item.previewFee = (item.unitPrice * item.previewTonnage).toFixed(2);
+        item.previewFee = (item.unitPrice * item.previewTonnage);
         //结算吨位
         item.realTonnage = (
           item.totalEnTonnage * item.loadingProportion
-        ).toFixed(2);
+        );
          //金额
-        item.fee = (item.realTonnage * item.unitPrice).toFixed(2);
+        item.fee = (item.realTonnage * item.unitPrice);
         //开票吨位
-        item.makeTonnage = (item.realTonnage - item.previewTonnage).toFixed(2);
+        item.makeTonnage = (item.realTonnage - item.previewTonnage);
         //实际开票金额
-        item.actuallyMoney = (item.makeTonnage * item.unitPrice-item.inspectionFees).toFixed(2);
+        item.actuallyMoney = (item.makeTonnage * item.unitPrice-item.inspectionFees);
+        //月份结算吨位/
+        item.monthRealTonnage = item.totalEnTonnage*item.monthLoadingProportion;
+        //月份开票吨位
+        item.monthMakeTonnage = item.monthRealTonnage-item.totalPreviewTonnage;
       });
       this.computedTotal(data);
       this.getSpanArr(this.tableData);
@@ -536,17 +643,18 @@ export default {
     computedTotal(data){
       data.forEach((item, index) => {
         let arr = data.filter(e => {
-          return e.batchId == item.batchId && e.noticeTime==item.noticeTime;
+          return e.batchId == item.batchId && e.noticeTime==item.noticeTime && e.unitPriceId==item.unitPriceId;
         });
         let inspectionFees=arr.reduce((pre, item1) => {
-          console.log("parseFloat(item1.inspectionFees).toFixed(2)",parseFloat(item1.inspectionFees).toFixed(2));
           if(item1.inspectionFees)
             return pre.plus(new BigNumber(item1.inspectionFees));
           else
             return pre.plus(0.0);
         }, new BigNumber(0.0));
         console.log("inspectionFees:",inspectionFees.toNumber());
-        item.statementTotalAmount=((item.totalEnTonnage-item.previewTonnage)*item.unitPrice-inspectionFees.toNumber()).toFixed(2);
+        if(item.monthMakeTonnage){
+          item.statementTotalAmount=(item.monthMakeTonnage.toFixed(2)*item.unitPrice-inspectionFees.toNumber()).toFixed(2);
+        }
       });
     },
     //根据表格据汇总顶部展示
@@ -579,16 +687,16 @@ export default {
       let startTime = null;
       let endTime = null;
       let map={con:this.shipName};
-      if (this.startTime) {
-        startTime = sjTime(this.startTime);
-      }
-      if (this.endTime) {
-        endTime = sjTime(this.endTime);
-      }
-      if(startTime && endTime && startTime < endTime){
-          map.startTime=startTime;
-          map.endTime=endTime;
-      }
+      // if (this.startTime) {
+      //   startTime = sjTime(this.startTime);
+      // }
+      // if (this.endTime) {
+      //   endTime = sjTime(this.endTime);
+      // }
+      // if(startTime && endTime && startTime < endTime){
+      //     map.startTime=startTime;
+      //     map.endTime=endTime;
+      // }
       this.axios.post("/api/v1/bms/getShipFeeStatement",map).then(res => {
         console.log(res.data.data);
         this.tableData = res.data.data;
@@ -627,7 +735,7 @@ export default {
           this.pos = 0;
         } else {
           // 判断当前元素与上一个元素是否相同
-          if (data[i].batchId === data[i - 1].batchId) {
+          if (data[i].batchId === data[i - 1].batchId && data[i].unitPriceId==data[i-1].unitPriceId) {
             this.spanArr[this.pos] += 1;
             data[i].group = data[i - 1].group;
             this.spanArr.push(0);
@@ -722,7 +830,7 @@ export default {
     }
   },
   mounted() {
-    //this.getNoDetailsStament();
+    this.getNoDetailsStament();
     this.getDetailsStamented();
   }
 };
@@ -731,11 +839,10 @@ export default {
 #detailsStatement {
   .top {
     margin-left: 10px;
-    margin-top: 30px;
+    margin-top: 10px;
   }
   .main {
     margin-left: 10px;
-    margin-top: 30px;
     ::-webkit-scrollbar {
       // width: 20px;
       height: 20px;

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>