结算修改

build/utils.js

@@ -15,12 +15,9 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // ['index','appoint'，'configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
-
-
-
 //  let devModules = ['all']
-let devModules = ['index','inward','SporadicManage']
-// let devModules = ['index','inward']
+let devModules = ['index','inward','appoint']
+// let devModules = ['index','inward','RMS']
 // let devModules = ['index','SporadicManage','RMS','statisticalReport']
 // let devModules = ['index','inward','statisticalReport']
 //  let devModules = ['index','WMS','sale','TMS','inward','SporadicManage']

config/index.js

@@ -64,8 +64,8 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://172.16.33.166:8080",
-    // target: "http://localhost:8080",
+    // target: "http://172.16.33.166:8080",
+    target: "http://localhost:8080",
     // target: "http://localhost:8019",
     ws: true,
     pathRewrite: {

src/views/RMS/components/addOtherCapacity.vue

@@ -0,0 +1,319 @@
+<template>
+  <!-- 添加运力信息 -->
+  <div class="addCapacity">
+    <PageTitle>返回</PageTitle>
+    <div class="form_box" style="margin-right: 10rem">
+      <dil-form :formId="309" v-model="form1" ref="from1"></dil-form>
+    </div>
+    <div class="elForm">
+      <el-form :inline="true" class="demo-form-inline" label-width="80px">
+        <el-form-item label="选择承运商">
+          <el-autocomplete
+            class="inline-input"
+            v-model="state"
+            :fetch-suggestions="querySearch"
+            placeholder="请输入承运商名称"
+            :trigger-on-focus="false"
+            @select="handleSelect"
+          >
+            <template slot-scope="{ item }">
+              <div class="name" v-if="item.carrierName">
+                {{ item.carrierName }}
+              </div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <div class="button_box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure" :loading="addLoading"
+        >确定</el-button
+      >
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { getCookie } from "@/utils/util.js";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      addLoading: false,
+      form1: {},
+      form1Initialization: {
+        capacityTypeId: 1,
+        capacityNumber: "",
+        capacityCorlor: "黄",
+        capacityOwneris: "否",
+        capacityVip: "否",
+        capacityBlacklist: "否",
+      },
+      value: undefined,
+      carrierIds: null,
+      state: null,
+      userId: null,
+      restaurants: [],
+      accessToken: null,
+      userCode: null,
+      carrierUserId: null,
+      carrierId: null,
+    };
+  },
+  created() {
+    this.carrierUserId = getCookie("userId");
+    this.form1 = this.form1Initialization;
+    // console.log(this.carrierUserId, "carrierUserId");
+  },
+  mounted() {
+    this.axios
+      .post(
+        "/api/v1/rms/getCarrierNameBySSOId?carrierSSOId=" + this.carrierUserId
+      )
+      .then((res) => {
+        if (res.data.code == "200") {
+          // console.log(res.data.data);
+          if (res.data.data) {
+            this.state = res.data.data.carrierName;
+            this.carrierIds = res.data.data.carrierId;
+          }
+        }
+      });
+  },
+  methods: {
+    //承运商弹出层
+    handleSelect(item) {
+      this.carrierIds = item.carrierId;
+      item.carrierName = this.state;
+    },
+    //以下是承运商边输边查搜索
+    querySearch(queryString, cb) {
+      this.axios
+        .post("/api/v1/uc/getCarrierMesByLike?index=" + queryString)
+        .then((res) => {
+          if (res.data.code == "200") {
+            // console.log(res.data.data);
+            var restaurants = res.data.data;
+            // console.log(restaurants, "restaurants");
+            var results = queryString
+              ? restaurants.filter(this.createFilter(queryString))
+              : restaurants;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    createFilter(queryString) {
+      return (restaurants) => {
+        return (
+          restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) >
+          -1
+        );
+      };
+    },
+    //以上是承运商边输边查搜索
+    deleteUser(userId) {
+      this.axios.delete("pass/v1/sysusers/" + userId).then((res) => {
+        this.$message.error("添加失败,车牌可能重复");
+      });
+    },
+    insertRole(userId, userCode) {
+      this.axios
+        .post(
+          "pass/v1/sysuserroles/addUserroles?userId=" +
+            userId +
+            "&userCode=" +
+            userCode +
+            "&roleId=" +
+            "923693668269953024"
+        )
+        .then((res) => {
+          if (res.code === "0") {
+            this.$message.success("操作成功");
+            this.saveLoading = false;
+            this.rolesTree.loading = false;
+          } else {
+            this.$message.error(res.message);
+          }
+        });
+    },
+    // isVehicleNumber(vehicleNumber) {
+    //   // console.log(vehicleNumber);
+    //   var result = false;
+    //   if (vehicleNumber.length == 7) {
+    //     var express =
+    //       /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$/;
+    //     result = express.test(vehicleNumber);
+    //   }
+    //   return result;
+    // },
+    makeSure() {
+      this.addLoading = true;
+      // if (!this.isVehicleNumber(this.form1.capacityNumber.toUpperCase())) {
+      //   this.$message.error("车牌号格式不正确");
+      //   this.addLoading = false;
+      //   return;
+      // }
+      if(this.form1.capacityNumber.length<=2){
+        this.$message.error("车牌号必须大于三位");
+        this.addLoading = false;
+        return;
+
+      }
+      if (this.carrierIds == null) {
+        this.$message.error("请选择承运商");
+        this.addLoading = false;
+        return;
+      }
+      let RmsCapacity = {
+        capacityTypeId: this.form1.capacityTypeId,
+        capacityNumber: this.form1.capacityNumber.toUpperCase(),
+        capacityCorlor: this.form1.capacityCorlor,
+        capacityOwneris: this.form1.capacityOwneris,
+        capacityVip: this.form1.capacityVip,
+        capacityBlacklist: this.form1.capacityBlacklist,
+        remark: this.form1.remark,
+        carrierId: this.carrierIds,
+        state: this.state,
+      };
+      if (
+        RmsCapacity.capacityNumber == null ||
+        RmsCapacity.capacityCorlor == null ||
+        RmsCapacity.capacityOwneris == null ||
+        RmsCapacity.capacityVip == null ||
+        RmsCapacity.capacityBlacklist == null
+      ) {
+        this.$message.error("存在空值！");
+        this.addLoading = false;
+      } else {
+        //新增SSO运力账号
+        var formData = new FormData();
+        formData.append("userCode", this.form1.capacityNumber.toUpperCase());
+        formData.append("orgCode", "yunli");
+        formData.append("orgName", "运力");
+        formData.append("groupId", "506514577756917769");
+        formData.append("companyId", "713710108567277568");
+        formData.append("orgId", "924126716337721344");
+        // console.log(formData.get("userCode"));
+        // console.log(typeof formData);
+        this.$store
+          .dispatch("system/usersManage/addUser", formData)
+          .then((res) => {
+            // console.log(res);
+            if (res.code === "0") {
+              // console.log(res.data.userId);
+              this.userId = res.data.userId;
+              this.userCode = res.data.userCode;
+              RmsCapacity.ssoId = res.data.userId;
+              this.axios
+                .post("/api/v1/rms/insertCapacity", RmsCapacity)
+                .then((res) => {
+                  if (res.data.data == 1) {
+                    this.insertRole(this.userId, this.userCode);
+                    this.$message.success("添加成功");
+                    this.$router.push("capacity");
+                  } else if (res.data.code == "201") {
+                    this.deleteUser(this.userId);
+                  } else {
+                    this.deleteUser(this.userId);
+                  }
+                });
+            } else {
+              // console.log(RmsCapacity, "RmsCapacity");
+              if (res.message == "账号已被注册") {
+                this.$confirm(
+                  "该账号已经被注册, 是否确定新增承运商绑定关系?",
+                  "提示",
+                  {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                  }
+                )
+                  .then(() => {
+                    this.axios
+                      .post("/api/v1/rms/insertCapacity", RmsCapacity)
+                      .then((res) => {
+                        // console.log(res, "res");
+                        if (res.data.data == 0) {
+                          this.$message.success("新增承运商绑定关系成功!");
+                          this.$router.push("capacity");
+                        } else {
+                          this.$message.error("该绑定关系已存在!");
+                        }
+                      });
+                  })
+                  .catch(() => {
+                    this.$message({
+                      type: "info",
+                      message: "已取消删除",
+                    });
+                  });
+              }
+            }
+          });
+        this.addLoading = false;
+      }
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss' >
+.addCapacity {
+  .elForm {
+    margin-left: 40%;
+  }
+  .form_box {
+    width: 100%;
+    margin-top: 30px;
+    margin-left: 50px;
+    display: flex;
+    justify-content: center;
+    .el-form-item {
+      display: flex;
+      justify-content: center;
+      .el-form-item__label {
+        display: flex;
+        align-items: center;
+      }
+      .el-form-item__content {
+        .el-select {
+          width: 250px;
+        }
+        .el-input {
+          width: 250px;
+        }
+      }
+    }
+  }
+  .inputBox {
+    display: flex;
+    justify-content: center;
+    margin-bottom: 30px;
+    .text {
+      text-align: right;
+      display: flex;
+      align-items: center;
+      margin-right: 5px;
+    }
+    .input {
+      width: 250px;
+    }
+  }
+  .button_box {
+    display: flex;
+    justify-content: center;
+    .el-button {
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/RMS/components/capacity.vue

@@ -13,6 +13,9 @@
        <el-button type="primary" class="btn" @click="toInsert">
         <i class="el-icon-plus"></i>新增
       </el-button>
+      <el-button type="primary" class="btn" @click="toInsert1">
+        <i class="el-icon-plus"></i>新增特殊车牌
+      </el-button>
       <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
     </div>
     <div class="table">
@@ -113,6 +116,9 @@ export default {
      toInsert() {
       this.$router.push("/addCapacity");
     },
+    toInsert1() {
+      this.$router.push("/addOtherCapacity");
+    },
     updateCapacity(capacityId){
       this.$router.push("/editCapacity/" + capacityId)
     },

src/views/RMS/router/index.js

@@ -24,6 +24,7 @@ import addTruckCalculate from '../components/addTruckCalculate.vue'
 import capacity from '../components/capacity.vue'
 import carDriver from '../components/carDriver.vue'
 import carrier from '../components/carrier.vue'
+import addOtherCapacity from '../components/addOtherCapacity'
 
 import editCapacity from '../components/editCapacity.vue'
 import editCarDriver from '../components/editCarDriver.vue'
@@ -81,6 +82,7 @@ const constantRouterMap = [
 		{path: 'addRmsShipper', name: 'addRmsShipper', meta: {code: 'xtpzgl-yhgl'}, component: addRmsShipper},
 		{path: 'addSupplier', name: 'addSupplier', meta: {code: 'xtpzgl-yhgl'}, component: addSupplier},
 		{path: 'addTruckCalculate', name: 'addTruckCalculate', meta: {code: 'xtpzgl-yhgl'}, component: addTruckCalculate},
+		{path: 'addOtherCapacity', name: 'addOtherCapacity', meta: {code: 'xtpzgl-yhgl'}, component: addOtherCapacity},
 		{path: 'capacity', name: 'capacity', meta: {code: 'xtpzgl-yhgl'}, component: capacity},
 		{path: 'carDriver', name: 'carDriver', meta: {code: 'xtpzgl-yhgl'}, component: carDriver},
 		{path: 'carrier', name: 'carrier', meta: {code: 'xtpzgl-yhgl'}, component: carrier},

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

@@ -0,0 +1,402 @@
+<template>
+  <!-- 添加汽运单价 111-->
+  <div class="addTransportPrice">
+    <page-title>新增</page-title>
+    <div class="form">
+      <div class="form_box">
+        <dil-form :formId="379" v-model="form1" ref="from1"></dil-form>
+        <el-form>
+          <el-form-item label="承运起止地点">
+            <el-select v-model="rangeId" placeholder="请选择承运起止地点">
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+         </el-form-item>
+         <el-button type="primary" class="btnml" @click="materialDrawer">浏览物资</el-button>
+         </el-form>
+      </div>
+      <div class="liulan">
+        <el-button type="primary" class="btn" @click="oilPriceFormulaClick"
+          >浏览</el-button
+        >
+      </div>
+      <div class="rangeStyle"></div>
+    </div>
+     <!-- 物资表格 -->
+    <div class="selectionTable from">
+      <el-table
+        :data="selectionList"
+        border
+        style="width: 100%"
+        highlight-current-row
+      >
+        <el-table-column type="index" label="序号" width="50">
+        </el-table-column>
+        <el-table-column
+          v-for="(item, i) in tableTop"
+          :key="i"
+          :prop="item.prop"
+          :label="item.label"
+          :width="item.width"
+          align="center"
+          show-overflow-tooltip
+        >
+        </el-table-column>
+        <!-- 操作列 -->
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              @click="deleteRow(scope.$index)"
+              type="text"
+              icon="el-icon-close"
+              size="big"
+            ></el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="button_box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确定</el-button>
+    </div>
+    <!-- 油价联动公式模态框 -->
+    <el-drawer
+      title="请选择油价联动公式"
+      :visible.sync="oilPriceFormulaDrawer"
+      :direction="direction"
+      :before-close="handleClose"
+      close-on-press-escape
+      modal
+      wrapperClosable
+      size="40%"
+    >
+      <div class="selectText">
+        <!-- <span></span> -->
+        <el-input v-model="LineText" placeholder="请输入内容"></el-input>
+        <el-button
+          type="primary"
+          @click="selectLineClick"
+          :loading="selectLineLoading"
+          ><i class="el-icon-search"></i>查询</el-button
+        >
+        <el-button type="primary" @click="addoilPriceFormula">确定</el-button>
+      </div>
+      <div class="LineTable">
+        <vue-scroll :ops="ops" style="width:100%;height:100%">
+          <dilTable
+            v-bind.sync="oilPriceFormula"
+            @radio-change="currentRadioChange"
+            :isKuang="isKuang"
+            :loading="tableLoading"
+            :drawer="oilPriceFormulaDrawer"
+            @func="func"
+          ></dilTable>
+        </vue-scroll>
+      </div>
+    </el-drawer>
+     <!-- 物资模态框 -->
+    <el-drawer
+      title="请选择物资"
+      :visible.sync="drawerMaterial"
+      :direction="direction"
+      close-on-press-escape
+      modal
+      wrapperClosable
+      size="40%"
+    >
+      <div class="selectText">
+        <el-input v-model="materialText" placeholder="请输入内容"></el-input>
+        <el-button
+          type="primary"
+          @click="selectMaterial"
+          :loading="selectLineLoading"
+          ><i class="el-icon-search"></i>查询</el-button
+        >
+        <el-button type="primary" @click="addMaterialList">确定</el-button>
+      </div>
+      <div class="LineTable">
+        <vue-scroll :ops="ops" style="width:100%;height:100%">
+          <dilTable
+            v-bind.sync="materialOptions"
+            @selection-change="selectionChange"
+            :isKuang="isKuang"
+            :loading="tableLoading"
+            :drawer="oilPriceFormulaDrawer"
+            @func="func"
+          ></dilTable>
+        </vue-scroll>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime, isNumber } from "@/utils/sharedJsFile";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      //物资模态框默认隐藏
+      drawerMaterial:false,
+      //物资查询框
+      materialText:null,
+      selectionList:[],
+      rangeId: null,
+      //是否点击查询
+      isKuang: false,
+      //表格加载状态
+      tableLoading: false,
+      //公式内容
+      formulaString: null,
+      //油价联动公式Id
+      oilPriceFormulaId: null,
+      //是否打开油价联动公式的模态窗口
+      oilPriceFormulaDrawer: false,
+      //油价联动公式查询条件
+      LineText: null,
+      //油价联动公式模态框查询按钮状态
+      selectLineLoading: false,
+      //油价联动公式模态窗口的数据
+      oilPriceFormula: {
+        requestUrl: "",
+        selectionType: "radio"
+      },
+      options: [],
+      newsArr:[],
+      //模态窗口的打开的方向
+      direction: "rtl",
+      materialOptions:{
+          requestUrl:"",
+          selectionType: "select",
+      },
+      //表单数据
+      form1: {
+        priceDate: new Date(),
+        oilTypeId: 10,
+        capacityTypeId: 1
+      },
+      tableTop: [
+        {
+          prop: "materialName",
+          label: "物资名称",
+        }
+      ],
+      
+      //提交给后端的数据
+      // map:{},
+      ops: {
+        vuescroll: {},
+        scrollPanel: {},
+        rail: {
+          keepShow: true
+        },
+        bar: {
+          hoverStyle: true,
+          onlyShowBarOnScroll: false, //是否只有滚动的时候才显示滚动条
+          background: "#5f9ea0", //滚动条颜色
+          opacity: 0.8, //滚动条透明度
+          "overflow-x": "hidden"
+        }
+      }
+    };
+  },
+  mounted() {
+    this.axios.get("/api/v1/uc/getTransRange").then(res => {
+      console.log(res.data.data)
+      this.options = res.data.data;
+    });
+  },
+  methods: {
+    func(res) {
+      this.selectLineLoading = false;
+      this.isKuang = false;
+      this.tableLoading = false;
+    },
+    materialDrawer(){
+      this.drawerMaterial = true
+      this.materialOptions.requestUrl = "/api/v1/uc/queryMaterialByLike?apiId=244&i=" + new Date()
+    },
+    selectMaterial(){
+      if(this.materialText == null){
+          this.materialOptions.requestUrl = "/api/v1/uc/queryMaterialByLike?apiId=244&i=" + new Date()
+      }else{
+          this.materialOptions.requestUrl = "/api/v1/uc/queryMaterialByLike?apiId=244&index=" + this.materialText
+      }
+    },
+    addMaterialList(){
+      this.drawerMaterial = false
+      this.newsArr.forEach((e) => {
+          console.log((e.materialName))
+          var addmap = {
+              materialName:e.materialName,
+              materialId:e.materialId
+          }
+          this.selectionList.push(addmap)
+      })
+      console.log(this.selectionList)
+      this.newsArr = []
+    },
+     //点击删除按钮删除当前点击的对象
+    deleteRow(index){
+      this.selectionList.splice(index,1)
+    },
+    selectionChange(selection){
+        console.log(selection)
+        for (let i = 0; i < selection.length; i++) {
+        if(this.newsArr.indexOf(selection[i]) === -1){
+        this.newsArr.push(selection[i]);
+        }
+        }
+    },
+    selectLineClick() {
+      this.tableLoading = true;
+      this.selectLineLoading = true;
+      this.isKuang = true;
+      if (this.LineText) {
+        this.oilPriceFormula.requestUrl =
+          "api/v1/uc/getOilFormula?apiId=444&con=" + this.LineText;
+      } else {
+        this.oilPriceFormula.requestUrl =
+          "api/v1/uc/getOilFormula?apiId=444&i=" + new Date();
+      }
+    },
+    //选定联动公式确定
+    addoilPriceFormula() {
+      let mapvalue = {
+        shipperId: this.form1.shipperId,
+        oilPriceFormula: this.formulaString,
+        cargonameId: this.oilPriceFormulaId,
+        capacityTypeId: this.form1.capacityTypeId,
+        priceValue: this.form1.priceValue,
+        priceDate: this.form1.priceDate,
+        type: this.form1.type,
+        oilpriceBase: this.form1.oilpriceBase,
+        oilTypeId: this.form1.oilTypeId,
+        oilpriceChangeThreshold: this.form1.oilpriceChangeThreshold
+      };
+      this.form1 = mapvalue;
+      this.oilPriceFormulaDrawer = false;
+    },
+    currentRadioChange(val) {
+      this.formulaString = val.formulaString;
+      this.oilPriceFormulaId = val.formulaId;
+    },
+    //打开线路的模态窗口
+    oilPriceFormulaClick() {
+      this.oilPriceFormulaDrawer = true;
+      this.oilPriceFormula.requestUrl = "/api/v1/uc/getOilFormula?apiId=444";
+    },
+    //模态窗口关闭时调用
+    handleClose() {
+      if (this.oilPriceFormulaDrawer) {
+        this.oilPriceFormulaDrawer = false;
+        this.LineText = null;
+      }
+    },
+    makeSure() {
+      let mapValue = {
+        cargonameId: this.oilPriceFormulaId,
+        capacityTypeId: this.form1.capacityTypeId,
+        priceValue: this.form1.priceValue,
+        priceDate: sjTime(this.form1.priceDate),
+        type: this.form1.type,
+        oilpriceBase: this.form1.oilpriceBase,
+        oilTypeId: this.form1.oilTypeId,
+        oilpriceChangeThreshold: this.form1.oilpriceChangeThreshold,
+        rangeId:this.rangeId,
+        mapList:this.selectionList
+      };
+      this.axios
+        .post("/api/v1/ams/insertInwardPrice", mapValue)
+        .then(res => {
+          if (res.data.code == "200") {
+            this.$router.go(-1);
+          }
+          this.$message({
+            type: "success",
+            message: "新增运输单价成功!"
+          });
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.push("/inwardTransPrice");
+    }
+  }
+};
+</script>
+<style lang="scss">
+.elForm {
+  margin-left: 30%;
+}
+.addTransportPrice {
+  .form {
+    display: flex;
+    .form_box {
+      width: 320px;
+      margin-left: 30%;
+      margin-top: 30px;
+      margin-right: 20px;
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content {
+              .el-select {
+                width: 250px;
+              }
+              .el-input {
+                width: 250px;
+              }
+            }
+          }
+        }
+      }
+    }
+    .liulan {
+      width: 120px;
+      margin-top: 30px;
+      .el-button {
+        width: 100px !important;
+        margin: auto;
+      }
+      .btn {
+        margin-top: 54px;
+      }
+    }
+  }
+  .button_box {
+    margin-left: 45%;
+  }
+  .selectText {
+    .el-input {
+      width: 250px;
+    }
+  }
+  .LineTable {
+    width: 100%;
+    height: 480px;
+    overflow: hidden;
+    margin-top: 10px;
+  }
+  .btnml {
+      width: 250px;
+      margin-left: 50px;
+  }}
+</style>
+<style lang="scss">
+/deep/.__bar-is-vertical {
+  right: -1px !important;
+}
+/deep/.__bar-is-horizontal {
+  display: none !important;
+}
+</style>

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

@@ -0,0 +1,83 @@
+<template>
+  <!-- 内转汽运单价页面 -->
+  <div class="salePlan">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick" :loading="loading">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="btnclick(0)">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+       <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
+    </div>
+
+<el-tabs v-model="activeName">
+      <!-- 正在启用 -->
+       <el-tab-pane label="正在启用" name="first">
+          <dilTable ref="excelDom" v-bind.sync="option" :loading="loading" :isKuang="isKuang" @func="func">
+        </dilTable>
+      </el-tab-pane>
+      <!-- 历史启用 -->
+      <el-tab-pane label="历史启用" name="second">
+          <dilTable ref="excelDom" v-bind.sync="option2" :loading="loading" :isKuang="isKuang" @func="func">
+          </dilTable>
+      </el-tab-pane>
+      
+    </el-tabs>
+  </div>
+</template>
+<script>
+export default {
+  name: "TransportPrice",
+  data() {
+    return {
+      activeName: "first",
+      isKuang:false,
+      loading:false,
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl:
+          "/api/v1/ams/getInwardContractPrice?apiId=464&deleted=0",
+      },
+      option2: {
+        // 表格请求数据的地址
+        requestUrl:
+          "/api/v1/ams/getInwardContractPrice?apiId=464&deleted=1",
+      },
+      tableTitle:'汽运单价'
+    };
+  },
+  methods: {
+    func(){
+      this.loading = false;
+      this.isKuang = false;
+    },
+    onclick() {
+      this.loading = true;
+      this.isKuang = true;
+      if(this.input){
+        this.option.requestUrl ="/api/v1/ams/getInwardContractPrice?apiId=464&con=" +this.input;
+      }else{
+        this.option.requestUrl ="/api/v1/ams/getInwardContractPrice?apiId=464&i="+new Date();
+      }
+    },
+    btnclick() {
+      this.$router.push("/inwardAddTransPrice");
+    },
+  },
+  
+};
+</script>
+<style lang='scss' scoped>
+.salePlan {
+  .top{
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
+}
+</style>

src/views/appoint/router/index.js

@@ -57,6 +57,8 @@ import saleOrderMaterial from '../components/saleContract/saleOrderMaterial.vue'
 import saleOrderUpdateLog from '../components/saleContract/saleOrderUpdateLog.vue'
 import salePlan from '../components/saleContract/salePlan.vue'
 import transportPrice from '../components/saleContract/transportPrice.vue'
+import inwardTransPrice from '../components/inward/transPrice.vue'
+import inwardAddTransPrice from '../components/inward/addTransPrice.vue'
 Vue.use(Router)
 
 const constantRouterMap = [
@@ -120,10 +122,11 @@ const constantRouterMap = [
       {path: 'saleOrderUpdateLog/:saleOrderId', name: 'saleOrderUpdateLog', meta: {code: 'xtpzgl-yhgl'}, component: saleOrderUpdateLog},
       {path: 'salePlan', name: 'salePlan', meta: {code: 'xtpzgl-yhgl'}, component: salePlan},
       {path: 'transportPrice', name: 'transportPrice', meta: {code: 'xtpzgl-yhgl'}, component: transportPrice},
+      {path: 'inwardTransPrice', name: 'inwardTransPrice', meta: {code: 'xtpzgl-yhgl'}, component: inwardTransPrice},
+      {path: 'inwardAddTransPrice', name: 'inwardAddTransPrice', meta: {code: 'xtpzgl-yhgl'}, component: inwardAddTransPrice},
     ]
   }
 ];
-
 const router = new Router({
   routes: constantRouterMap
 })

src/views/inward/components/inwardSettlement/countDetailOrder.vue

@@ -0,0 +1,133 @@
+// 计费详单
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <el-tabs v-model="activeName">
+        <!-- 未结算 -->
+        <el-tab-pane label="未结算" name="first">
+        <dilTable v-bind.sync="options1">
+        </dilTable>
+        </el-tab-pane>
+        <!-- 已结算 -->
+        <el-tab-pane label="已结算" name="second">
+        <dilTable v-bind.sync="options2">
+        </dilTable>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  data(){
+    return{
+      //单价
+      Fee:null,
+      //加载
+      selectLineLoading:false,
+      input:"",
+      activeName:"first",
+      ssoId:null,
+      //详单Id
+      detailsId:null,
+      options1:{
+        // first请求数据的地址
+        requestUrl: "",
+      },
+      options2:{
+        // second请求数据的地址
+        requestUrl: "",
+      },
+      //是否打开修改详单地址弹出框
+      dialogFormVisible:false,
+      //原详单单价
+      originalPriceValue:null,
+      //新详单单价
+      newPriceValue:null,
+      //原详单地址
+      originalAddress:null,
+      //新详单地址
+      newAddress:null,
+      //新单价Id
+      priceId:null,
+      //是否打开运输单价的模态框
+      addressDrawer:false,
+      //运输单价的表格
+      Address: {
+        requestUrl: "/api/v1/ams/getAddressDeliveryAddress?apiId=255",
+        selectionType: "radio",
+      },
+      // addressText:null,
+      //缓存当前选中的运输单价
+      priceMap:{},
+      formLabelWidth: '125px'
+    }
+  },
+  created(){
+     this.options1GetRequestUrl();
+     this.options2GetRequestUrl();
+  },
+  methods:{
+    //未结算数据
+    options1GetRequestUrl(){
+    if(getCookie("orgCode") == "chengyunshang"){
+      this.ssoId=getCookie('userId');
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0&carrierSsoId="+ getCookie('userId');
+    }else if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode")=="zidonghuabu"||getCookie("orgCode")=="wuliuchuyunzhongxin"){
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0"
+    }else{
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0&userId=" + getCookie("orgCode");  
+    }
+    },
+    //已结算数据
+    options2GetRequestUrl(){
+     if(getCookie("orgCode") == "chengyunshang"){
+      this.ssoId=getCookie('userId');
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1&carrierSsoId="+ getCookie('userId');
+    }else if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode")=="zidonghuabu"||getCookie("orgCode")=="wuliuchuyunzhongxin"){
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1"
+    }else{
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1&userId=" + getCookie("orgCode");  
+    }
+    },
+     toInsert() {
+      this.$router.push("/insertCheckInventory");
+    },
+
+    onclick(){
+      console.log("查询待定值")
+      // this.options.requestUrl = "/api/v1/bms/getTruckDetailsOrderList?apiId=176&orderType=1&con="+this.input;
+    },
+    //运输订单点击浏览的事件
+    select(){
+      this.addressDrawer = true;
+    },
+    //运输单价模态窗口的框计算
+    selectAddressClick(){
+      this.Price.requestUrl = '/api/v1/ams/getAddressDeliveryAddress?apiId=255&con='+this.addressText;
+    },
+   
+  }
+}
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    padding: 1.25rem 0.375rem;
+			.el-input {
+			width: 20%;
+			margin-right: 1.25rem;
+			}
+  }
+}
+</style>

src/views/inward/components/inwardSettlement/detailOrder.vue

@@ -0,0 +1,133 @@
+// 计费详单
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <el-tabs v-model="activeName">
+        <!-- 未结算 -->
+        <el-tab-pane label="未结算" name="first">
+        <dilTable v-bind.sync="options1">
+        </dilTable>
+        </el-tab-pane>
+        <!-- 已结算 -->
+        <el-tab-pane label="已结算" name="second">
+        <dilTable v-bind.sync="options2">
+        </dilTable>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  data(){
+    return{
+      //单价
+      Fee:null,
+      //加载
+      selectLineLoading:false,
+      input:"",
+      activeName:"first",
+      ssoId:null,
+      //详单Id
+      detailsId:null,
+      options1:{
+        // first请求数据的地址
+        requestUrl: "",
+      },
+      options2:{
+        // second请求数据的地址
+        requestUrl: "",
+      },
+      //是否打开修改详单地址弹出框
+      dialogFormVisible:false,
+      //原详单单价
+      originalPriceValue:null,
+      //新详单单价
+      newPriceValue:null,
+      //原详单地址
+      originalAddress:null,
+      //新详单地址
+      newAddress:null,
+      //新单价Id
+      priceId:null,
+      //是否打开运输单价的模态框
+      addressDrawer:false,
+      //运输单价的表格
+      Address: {
+        requestUrl: "/api/v1/ams/getAddressDeliveryAddress?apiId=255",
+        selectionType: "radio",
+      },
+      // addressText:null,
+      //缓存当前选中的运输单价
+      priceMap:{},
+      formLabelWidth: '125px'
+    }
+  },
+  created(){
+     this.options1GetRequestUrl();
+     this.options2GetRequestUrl();
+  },
+  methods:{
+    //未结算数据
+    options1GetRequestUrl(){
+    if(getCookie("orgCode") == "chengyunshang"){
+      this.ssoId=getCookie('userId');
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0&carrierSsoId="+ getCookie('userId');
+    }else if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode")=="zidonghuabu"||getCookie("orgCode")=="wuliuchuyunzhongxin"){
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0"
+    }else{
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0&userId=" + getCookie("orgCode");  
+    }
+    },
+    //已结算数据
+    options2GetRequestUrl(){
+     if(getCookie("orgCode") == "chengyunshang"){
+      this.ssoId=getCookie('userId');
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1&carrierSsoId="+ getCookie('userId');
+    }else if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode")=="zidonghuabu"||getCookie("orgCode")=="wuliuchuyunzhongxin"){
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1"
+    }else{
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1&userId=" + getCookie("orgCode");  
+    }
+    },
+     toInsert() {
+      this.$router.push("/insertCheckInventory");
+    },
+
+    onclick(){
+      console.log("查询待定值")
+      // this.options.requestUrl = "/api/v1/bms/getTruckDetailsOrderList?apiId=176&orderType=1&con="+this.input;
+    },
+    //运输订单点击浏览的事件
+    select(){
+      this.addressDrawer = true;
+    },
+    //运输单价模态窗口的框计算
+    selectAddressClick(){
+      this.Price.requestUrl = '/api/v1/ams/getAddressDeliveryAddress?apiId=255&con='+this.addressText;
+    },
+   
+  }
+}
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    padding: 1.25rem 0.375rem;
+			.el-input {
+			width: 20%;
+			margin-right: 1.25rem;
+			}
+  }
+}
+</style>

src/views/inward/components/inwardSettlement/purInwardDetailsOrder.vue

@@ -0,0 +1,133 @@
+// 计费详单
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <el-tabs v-model="activeName">
+        <!-- 未结算 -->
+        <el-tab-pane label="未结算" name="first">
+        <dilTable v-bind.sync="options1">
+        </dilTable>
+        </el-tab-pane>
+        <!-- 已结算 -->
+        <el-tab-pane label="已结算" name="second">
+        <dilTable v-bind.sync="options2">
+        </dilTable>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  data(){
+    return{
+      //单价
+      Fee:null,
+      //加载
+      selectLineLoading:false,
+      input:"",
+      activeName:"first",
+      ssoId:null,
+      //详单Id
+      detailsId:null,
+      options1:{
+        // first请求数据的地址
+        requestUrl: "",
+      },
+      options2:{
+        // second请求数据的地址
+        requestUrl: "",
+      },
+      //是否打开修改详单地址弹出框
+      dialogFormVisible:false,
+      //原详单单价
+      originalPriceValue:null,
+      //新详单单价
+      newPriceValue:null,
+      //原详单地址
+      originalAddress:null,
+      //新详单地址
+      newAddress:null,
+      //新单价Id
+      priceId:null,
+      //是否打开运输单价的模态框
+      addressDrawer:false,
+      //运输单价的表格
+      Address: {
+        requestUrl: "/api/v1/ams/getAddressDeliveryAddress?apiId=255",
+        selectionType: "radio",
+      },
+      // addressText:null,
+      //缓存当前选中的运输单价
+      priceMap:{},
+      formLabelWidth: '125px'
+    }
+  },
+  created(){
+     this.options1GetRequestUrl();
+     this.options2GetRequestUrl();
+  },
+  methods:{
+    //未结算数据
+    options1GetRequestUrl(){
+    if(getCookie("orgCode") == "chengyunshang"){
+      this.ssoId=getCookie('userId');
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=462&orderType=10&detailStatus=0&carrierSsoId="+ getCookie('userId');
+    }else if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode")=="zidonghuabu"||getCookie("orgCode")=="wuliuchuyunzhongxin"){
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=462&orderType=10&detailStatus=0"
+    }else{
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=462&orderType=10&detailStatus=0&userId=" + getCookie("orgCode");  
+    }
+    },
+    //已结算数据
+    options2GetRequestUrl(){
+     if(getCookie("orgCode") == "chengyunshang"){
+      this.ssoId=getCookie('userId');
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=462&orderType=10&detailStatus=1&carrierSsoId="+ getCookie('userId');
+    }else if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode")=="zidonghuabu"||getCookie("orgCode")=="wuliuchuyunzhongxin"){
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=462&orderType=10&detailStatus=1"
+    }else{
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=462&orderType=10&detailStatus=1&userId=" + getCookie("orgCode");  
+    }
+    },
+     toInsert() {
+      this.$router.push("/insertCheckInventory");
+    },
+
+    onclick(){
+      console.log("查询待定值")
+      // this.options.requestUrl = "/api/v1/bms/getTruckDetailsOrderList?apiId=176&orderType=1&con="+this.input;
+    },
+    //运输订单点击浏览的事件
+    select(){
+      this.addressDrawer = true;
+    },
+    //运输单价模态窗口的框计算
+    selectAddressClick(){
+      this.Price.requestUrl = '/api/v1/ams/getAddressDeliveryAddress?apiId=255&con='+this.addressText;
+    },
+   
+  }
+}
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    padding: 1.25rem 0.375rem;
+			.el-input {
+			width: 20%;
+			margin-right: 1.25rem;
+			}
+  }
+}
+</style>

src/views/inward/components/inwardSettlement/timeDetailsWeight.vue

@@ -0,0 +1,133 @@
+// 计费详单
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <el-tabs v-model="activeName">
+        <!-- 未结算 -->
+        <el-tab-pane label="未结算" name="first">
+        <dilTable v-bind.sync="options1">
+        </dilTable>
+        </el-tab-pane>
+        <!-- 已结算 -->
+        <el-tab-pane label="已结算" name="second">
+        <dilTable v-bind.sync="options2">
+        </dilTable>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  data(){
+    return{
+      //单价
+      Fee:null,
+      //加载
+      selectLineLoading:false,
+      input:"",
+      activeName:"first",
+      ssoId:null,
+      //详单Id
+      detailsId:null,
+      options1:{
+        // first请求数据的地址
+        requestUrl: "",
+      },
+      options2:{
+        // second请求数据的地址
+        requestUrl: "",
+      },
+      //是否打开修改详单地址弹出框
+      dialogFormVisible:false,
+      //原详单单价
+      originalPriceValue:null,
+      //新详单单价
+      newPriceValue:null,
+      //原详单地址
+      originalAddress:null,
+      //新详单地址
+      newAddress:null,
+      //新单价Id
+      priceId:null,
+      //是否打开运输单价的模态框
+      addressDrawer:false,
+      //运输单价的表格
+      Address: {
+        requestUrl: "/api/v1/ams/getAddressDeliveryAddress?apiId=255",
+        selectionType: "radio",
+      },
+      // addressText:null,
+      //缓存当前选中的运输单价
+      priceMap:{},
+      formLabelWidth: '125px'
+    }
+  },
+  created(){
+     this.options1GetRequestUrl();
+     this.options2GetRequestUrl();
+  },
+  methods:{
+    //未结算数据
+    options1GetRequestUrl(){
+    if(getCookie("orgCode") == "chengyunshang"){
+      this.ssoId=getCookie('userId');
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0&carrierSsoId="+ getCookie('userId');
+    }else if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode")=="zidonghuabu"||getCookie("orgCode")=="wuliuchuyunzhongxin"){
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0"
+    }else{
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0&userId=" + getCookie("orgCode");  
+    }
+    },
+    //已结算数据
+    options2GetRequestUrl(){
+     if(getCookie("orgCode") == "chengyunshang"){
+      this.ssoId=getCookie('userId');
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1&carrierSsoId="+ getCookie('userId');
+    }else if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode")=="zidonghuabu"||getCookie("orgCode")=="wuliuchuyunzhongxin"){
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1"
+    }else{
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=1&userId=" + getCookie("orgCode");  
+    }
+    },
+     toInsert() {
+      this.$router.push("/insertCheckInventory");
+    },
+
+    onclick(){
+      console.log("查询待定值")
+      // this.options.requestUrl = "/api/v1/bms/getTruckDetailsOrderList?apiId=176&orderType=1&con="+this.input;
+    },
+    //运输订单点击浏览的事件
+    select(){
+      this.addressDrawer = true;
+    },
+    //运输单价模态窗口的框计算
+    selectAddressClick(){
+      this.Price.requestUrl = '/api/v1/ams/getAddressDeliveryAddress?apiId=255&con='+this.addressText;
+    },
+   
+  }
+}
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    padding: 1.25rem 0.375rem;
+			.el-input {
+			width: 20%;
+			margin-right: 1.25rem;
+			}
+  }
+}
+</style>

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

@@ -27,7 +27,7 @@
     </el-form>
       </div>
       <div class="form-box">
-        <dil-form :formId="300" v-model="form"></dil-form>
+        <dil-form :formId="377" v-model="form"></dil-form>
       </div>
 
       <div class="DueTime">
@@ -51,6 +51,51 @@
           </div>
           </el-form>
       </div>
+     <!--选择车辆类型--> 
+     <div class="capacity">
+      <div class="capacityName">
+         <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+      >
+        <el-form-item label="选择车辆类型">    
+        </el-form-item>  
+        <el-form-item>
+         <el-input
+          el-input v-model="capacityTypeName" disabled>  
+       </el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="ondrawer(3)" class="truckBtn"
+          >浏览</el-button>
+        </el-form-item>
+        </el-form>
+      </div>
+      <el-drawer
+      title="选择车辆类型"
+      :visible.sync="drawer2"
+      direction="rtl"
+      size="40%"
+      :show-close="false"
+      >
+      <div style="margin-left:-300px">
+        <el-input placeholder="请输入内容" v-model="inputCapacityType" style="margin-left:20px;width: 250px" clearable > </el-input
+      ><el-button type="primary" class="btn" @click="onclickCapacity">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      </div>
+      
+     
+      <!-- <el-button @click="open">取消</el-button> -->
+    
+      <div class="tablecls">
+      
+        <dilTable ref="options3" v-bind.sync="options3" @radio-change="selectionChange1" :drawer="aaadrawer">
+        </dilTable>
+      </div>
+      </el-drawer>
+</div> 
       <div class="materialDrawer">
          <el-form
         :inline="true"
@@ -256,10 +301,12 @@ export default {
       options: [],
       value: '',
       isOpenDueTime : true,
+      inputCapacityType:null,
       DueTime:null,
       // 件数与重量的开关
       value: false,
       //物资模态框开关
+      drawer2:false,
       table: false,
       //物资表格表头
       tableTop: [
@@ -304,11 +351,14 @@ export default {
       materialId: null,
       requireUnitName:null,
       inputMaterial:null,
+      inputCapacityType:null,
       shipperId:null,
       truckPoint1: "",
       drawer: false,
       selectionList1: [],
       form: {},
+      capacityTypeId: "",
+      capacityTypeName:"",
       materialTable: {
         requestUrl: "",
         selectionType: "select",
@@ -319,6 +369,11 @@ export default {
         selectionType: "radio",
         mapList2: []
       },
+      options3:{
+        requestUrl:"",
+        selectionType:"radio",
+        mapList3: []
+      },
       form:{}
     };
   },
@@ -380,6 +435,7 @@ export default {
     selectionChange(selection) {
       this.selectionList1 = [];
       this.selectionList1 = selection;
+      console.log("selection",selection)
     },
     unloadPoint(index) {
       this.getUnloadRequestUrl()
@@ -398,6 +454,9 @@ export default {
       if(num==1){
         this.table = true
         this.materialTable.requestUrl = "/api/v1/uc/queryMaterialByLike?apiId=244&i=" + new Date()
+      }else if(num==3){
+        this.drawer2 = true
+        this.options3.requestUrl = "/api/v1/uc/getCapacityType?apiId=460"
       }else{
         this.drawer = true;
       }  
@@ -414,6 +473,14 @@ export default {
         this.inputMaterial = null
       }
     },
+    onclickCapacity(){
+      if(this.inputCapacityType == null){
+        this.options3.requestUrl = "/api/v1/uc/getCapacityType?apiId=460"
+      }else{
+        this.options3.requestUrl = "/api/v1/uc/getCapacityType?apiId=460&index="+this.inputCapacityType
+        this.inputCapacityType = null
+      }
+    },
     //删除行
     deleteRow(index, rows) {
       // console.log(index)
@@ -490,6 +557,9 @@ export default {
       }
       this.materialId = selection.materialId;
     },
+    selectionChange1(radio){
+      this.capacityTypeName  = radio.capacityTypeName
+    },
     currentRadioChange2(selection) {
       console.log(selection);
       if (this.a == 2) {
@@ -514,11 +584,18 @@ export default {
         this.$message.error("请选择用车单位")
         this.disabled = false
         return
-      }if(typeof(this.form.requirementTruckTime) == 'undefined'){
+      }
+      if(typeof(this.form.requirementTruckTime) == 'undefined'){
         this.$message.error("请输入用车时间")
         this.disabled = false
         return
-      }if(typeof(this.form.requirementType) == 'undefined'){
+      }
+      if(typeof(this.form.transRange) == 'undefined'){
+        this.$message.error("请选择运输起止范围")
+        this.disabled = false
+        return
+      }
+      if(typeof(this.form.requirementType) == 'undefined'){
         this.$message.error("请选择需求类型")
         this.disabled = false
         return
@@ -581,11 +658,12 @@ export default {
         requirementWorkEnvironment: this.form.requirementWorkEnvironment,
         requirementWorkType: this.form.requirementWorkType,
         requirementShipperId: this.shipperId,
+        rangeId:this.form.transRange,
         // 用车截日期
         DueTime:DueTime,
         mapList:this.tableData,
         orgCode:getCookie("orgCode"),
-        remark:this.form.Tel + this.form.capacityType
+        remark:this.form.Tel + this.capacityTypeName+this.form.typeRemarks
       };
       console.log("requirement",requiremnet);
       this.axios
@@ -639,6 +717,15 @@ export default {
       margin-right: 70px;
     }
   }
+.capacity{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 2rem;
+  margin-bottom: 1.25rem;
+  margin-right: 10px;
+}
 .materialDrawer {
   display: flex;
   justify-content: center;

src/views/inward/router/index.js

@@ -150,8 +150,14 @@ import oldAreaRailScaleAddTruckLoad from '@/views/inward/components/inwardImport
 //内转厂内物资--新增汽车装货
 import inwardFactoryAddTruckLoad from '@/views/inward/components/inwardFactory/addTruckLoad.vue'
 
-
-
+//内转结算--纯内转计费详单
+import inwardDetailOrders from '../components/inwardSettlement/detailOrder.vue'
+//内转结算--采购内转计费详单
+import inwardPurDetailsOrders from '../components/inwardSettlement/purInwardDetailsOrder.vue'
+//内转结算--计时计费详单
+import inwardTimeDetailsOrders from '../components/inwardSettlement/timeDetailsWeight.vue'
+//内转结算--计数计费详单
+import inwardCountDetailsOrders from '../components/inwardSettlement/countDetailOrder.vue'
 
 Vue.use(Router)
 
@@ -237,6 +243,10 @@ const constantRouterMap = [{
     {path: 'updateTruckLoad/:resultId',name: 'updateTruckLoad',meta: {code: 'xtpzgl-yhgl'},component: updateTruckLoad}, 
     {path: 'oldAreaRailScaleAddTruckLoad',name: 'oldAreaRailScaleAddTruckLoad',meta: {code: 'xtpzgl-yhgl'},component: oldAreaRailScaleAddTruckLoad}, 
     {path: 'inwardFactoryAddTruckLoad',name: 'inwardFactoryAddTruckLoad',meta: {code: 'xtpzgl-yhgl'},component: inwardFactoryAddTruckLoad},
+    {path: 'inwardDetailOrders',name: 'inwardDetailOrders',meta: {code: 'xtpzgl-yhgl'},component: inwardDetailOrders},
+    {path: 'inwardCountDetailsOrders',name: 'inwardCountDetailsOrders',meta: {code: 'xtpzgl-yhgl'},component: inwardCountDetailsOrders},
+    {path: 'inwardTimeDetailsOrders',name: 'inwardTimeDetailsOrders',meta: {code: 'xtpzgl-yhgl'},component: inwardTimeDetailsOrders},
+    {path: 'inwardPurDetailsOrders',name: 'inwardPurDetailsOrders',meta: {code: 'xtpzgl-yhgl'},component: inwardPurDetailsOrders},
   ]
 }];