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

src/views/RMS/components/addOilPrice.vue

@@ -132,6 +132,7 @@ export default {
 };
 </script>
 <style lang='scss'>
+
 .addWagonLoad{
   .form_you{
     margin-left: 35%;
@@ -142,6 +143,7 @@ export default {
     }
     .el-select{
       width: 250px;
+      margin-left: 54px;
       margin-right: 20px;
     }
   }
@@ -158,9 +160,6 @@ export default {
           .el-input{
             width: 250px;
           }
-          .el-switch{
-            margin-left: -250px;
-          }
         }
       }
     }

src/views/RMS/components/oilPrice.vue

@@ -32,14 +32,6 @@
             >
               启用
             </el-button>
-            <el-button
-              type="text"
-              size="small"
-              @click="onDeactivate(scope)"
-              v-else
-            >
-              停用
-            </el-button>
             <el-button
               type="text"
               size="mini"
@@ -121,7 +113,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.axios.post("/api/v1/rms/updateOilPrice/"+scope.row.priceId).then((res) => {
+        this.axios.post("/api/v1/rms/updateOilPrice",{"priceId":scope.row.priceId}).then((res) => {
           if (res.data.code == "200") {
             this.$message({ type: "success", message: "启用成功!",});
             this.options.requestUrl = "/api/v1/rms/getOilPriceResultList?apiId=380&i="+ new Date();

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

@@ -265,10 +265,10 @@ export default {
       this.isKuang = true;
       if (this.LineText) {
         this.oilPriceFormula.requestUrl =
-          "api/v1/uc/getOilFormula?apiId=444&con=" + this.LineText;
+          "/api/v1/uc/getOilFormula?apiId=444&con=" + this.LineText;
       } else {
         this.oilPriceFormula.requestUrl =
-          "api/v1/uc/getOilFormula?apiId=444&i=" + new Date();
+          "/api/v1/uc/getOilFormula?apiId=444&i=" + new Date();
       }
     },
     //选定联动公式确定

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

@@ -4,47 +4,27 @@
     <page-title>编辑</page-title>
     <div class="form">
       <div class="form_box">
-        <el-form
-          :model="obj"
-          :rules="batchFormRules"
-          label-width="100px"
-          label-position="left"
-        >
+        <el-form :model="obj" :rules="batchFormRules" label-width="100px" label-position="left">
           <div class="preview-group">
             <el-form-item label="运价" prop="priceValue">
-              <el-input
-                v-model="obj.priceValue"
-                placeholder="请输入内容"
-                type="number"
-              ></el-input>
+              <el-input v-model="obj.priceValue" placeholder="请输入内容" type="number"></el-input>
             </el-form-item>
             <el-form-item label="物资" prop="materialNames">
               <el-input v-model="obj.materialNames" readonly></el-input>
               <el-button type="primary" class="btnml" @click="materialDrawer"
-                >浏览物资</el-button
-              >
+              >浏览物资</el-button>
             </el-form-item>
             <el-form-item label="执行日期" prop="priceDate">
               <el-date-picker
                 v-model="obj.priceDate"
                 type="date"
-                placeholder="选择日期"
-              >
+                placeholder="选择日期">
               </el-date-picker>
             </el-form-item>
             <el-form-item label="联动公式" prop="oilPriceFormula">
-              <el-input
-                v-model="obj.oilPriceFormula"
-                placeholder="请选择油价联动公式"
-                readonly
-                disabled
-              ></el-input>
-              <el-button
-                type="primary"
-                class="btn"
-                @click="oilPriceFormulaClick"
-                >浏览</el-button
-              >
+              <el-input v-model="obj.oilPriceFormula" placeholder="请选择油价联动公式" readonly disabled></el-input>
+              <el-button type="primary" class="btn" @click="oilPriceFormulaClick"
+              >浏览</el-button>
             </el-form-item>
             <el-form-item label="运力类型" prop="capacityTypeName">
               <el-input v-model="obj.capacityTypeName" readonly></el-input>
@@ -56,10 +36,7 @@
               <el-input v-model="obj.oilTypeName" readonly></el-input>
             </el-form-item>
             <el-form-item label="油价变化率阈值" prop="oilpriceChangeThreshold">
-              <el-input
-                v-model="obj.oilpriceChangeThreshold"
-                readonly
-              ></el-input>
+              <el-input v-model="obj.oilpriceChangeThreshold" readonly></el-input>
             </el-form-item>
             <el-form-item label="计价单位" prop="type">
               <el-input v-model="obj.type" readonly></el-input>
@@ -119,7 +96,7 @@
           type="primary"
           @click="selectLineClick"
           :loading="selectLineLoading"
-          ><i class="el-icon-search"></i>查询</el-button
+        ><i class="el-icon-search"></i>查询</el-button
         >
         <el-button type="primary" @click="addoilPriceFormula">确定</el-button>
       </div>
@@ -152,7 +129,7 @@
           type="primary"
           @click="selectMaterial"
           :loading="selectLineLoading"
-          ><i class="el-icon-search"></i>查询</el-button
+        ><i class="el-icon-search"></i>查询</el-button
         >
         <el-button type="primary" @click="addMaterialList">确定</el-button>
       </div>
@@ -218,16 +195,10 @@ export default {
         capacityTypeId: 1
       },
       batchFormRules: {
-        priceValue: [
-          { required: true, message: "运价不能为空", trigger: "blur" }
-        ],
-        priceDate: [
-          { required: true, message: "执行日期不能为空", trigger: "blur" }
-        ],
-        oilpriceBase: [
-          { required: true, message: "油价基准不能为空", trigger: "blur" }
-        ]
-      },
+        priceValue: [{ required: true, message: '运价不能为空', trigger: 'blur' }],
+        priceDate: [{ required: true, message: '执行日期不能为空', trigger: 'blur' }],
+        oilpriceBase: [{ required: true, message: '油价基准不能为空', trigger: 'blur' }]
+  },
       tableTop: [
         {
           prop: "materialName",
@@ -258,21 +229,17 @@ export default {
     this.axios.get("/api/v1/uc/getTransRange").then(res => {
       this.options = res.data.data;
     });
-    this.obj = this.$route.query.row;
-    this.axios
-      .post("/api/v1/ams/getwz", { priceId: this.obj.priceId })
-      .then(res => {
-        this.selectionList = res.data.data;
-      });
+    this.obj=this.$route.query.row;
+    this.axios.post("/api/v1/ams/getwz",{"priceId":this.obj.priceId}).then(res => {
+      this.selectionList = res.data.data;
+    });
     //根据price_id查询联动公式和列表传过去
-    this.axios
-      .post("/api/v1/ams/getcargonameId", { priceId: this.obj.priceId })
-      .then(res => {
-        (this.obj.oilPriceFormula = res.data.data.formulaString),
-          (this.obj.cargonameId = res.data.data.formulaId);
-        this.oilPriceFormulaId = this.obj.cargonameId;
-      });
-    this.rangeId = this.obj.rangeId;
+    this.axios.post("/api/v1/ams/getcargonameId",{"priceId":this.obj.priceId}).then(res => {
+      this.obj.oilPriceFormula = res.data.data.formulaString,
+      this.obj.cargonameId = res.data.data.formulaId;
+      this.oilPriceFormulaId=this.obj.cargonameId;
+    });
+    this.rangeId=this.obj.rangeId
   },
   methods: {
     //打开线路的模态窗口
@@ -286,11 +253,10 @@ export default {
     },
     //选定联动公式确定
     addoilPriceFormula() {
-      (this.obj.oilPriceFormula = this.formulaString),
-        (this.obj.cargonameId = this.oilPriceFormulaId);
+      this.obj.oilPriceFormula=this.formulaString,
+      this.obj.cargonameId = this.oilPriceFormulaId;
       this.obj.capacityTypeId = this.form1.capacityTypeId;
-      (this.obj.priceDate = this.form1.priceDate),
-        (this.obj.oilTypeId = this.form1.oilTypeId);
+      this.obj.oilTypeId=this.form1.oilTypeId
 
       this.oilPriceFormulaDrawer = false;
     },
@@ -364,9 +330,9 @@ export default {
     },
     // 修改
     onClickConfirm() {
-      if (this.obj.priceValue == "" || this.obj.priceValue == undefined) {
-        this.$message.info("修改前请填写运价！");
-        return;
+      if (this.obj.priceValue==''|| this.obj.priceValue == undefined){
+        this.$message.info("修改前请填写运价！")
+          return;
       }
       let mapValue = {
         cargonameId: this.oilPriceFormulaId,
@@ -381,15 +347,20 @@ export default {
         mapList: this.selectionList,
         priceId: this.obj.priceId
       };
-      this.axios.post("/api/v1/ams/updateTransPrice", mapValue).then(res => {
-        if (res.data.data >= 1) {
-          this.$message.success("修改成功！");
-          this.$router.go(-1);
-        }
-      });
+        this.axios
+          .post(
+            "/api/v1/ams/updateTransPrice",
+            mapValue
+          )
+          .then((res) => {
+            if (res.data.data >=1) {
+              this.$message.success("修改成功！")
+              this.$router.go(-1);
+            }
+          });
     }
   }
-};
+}
 </script>
 
 <style lang="scss" scoped>
@@ -421,12 +392,12 @@ export default {
         }
       }
     }
-  }
-  .txt1 {
-    display: inline-block;
-    width: 150px;
-    text-align: right;
-  }
+  };
+  .txt1{
+  display: inline-block;
+  width: 150px;
+  text-align: right;
+};
 }
 .elForm {
   margin-left: 30%;

src/views/inward/components/inwardFactory/countResult.vue

@@ -1,51 +1,267 @@
-// 计数作业
+// 计次作业
 <template>
-    <div class="sale">
-        <div class="top">
-            <!-- 框计算 -->
-            <el-input
-                placeholder="请输入内容"
-                v-model="inputText"
-                clearable>
-            </el-input>
-            <el-button type="primary" class="btn" @click="onclick">
-                <i class="el-icon-search"></i>查询
-            </el-button>
-        </div>
-        <div class="tab">
-            <dilTable v-bind.sync="option"></dilTable>
-        </div>
+  <div class="sale">
+    <div class="top">
+      <!-- 框计算 -->
+      <span class="text">计次时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <!-- excel导出 -->
+      <el-button type="primary" @click="exportData()">
+        <i class="el-icon-download"></i>导出(Excel)
+      </el-button>
     </div>
+    <div class="tab">
+      <dilTable v-bind.sync="option" ref="excelDom">
+        <el-table-column fixed="right" label="操作" width="180">
+          <template slot-scope="scope">
+            <div class="step">
+              <el-button
+                @click="detailclick1(scope.row)"
+                type="text"
+                size="small"
+              >运输详情</el-button
+              >
+            </div>
+            <!-- <el-button @click="" type="primary" style="margin-left: 16px;">
+                    运输详情
+                  </el-button> -->
+          </template>
+        </el-table-column>
+        <!-- 运输进程详情 -->
+        <el-table-column type="expand" width="1">
+          <template slot-scope="props">
+            <el-form label-position="center" inline class="demo-table-expand">
+              <div v-if="false">{{ props }}</div>
+              <div>
+                <el-table :data="tableData1" border>
+                  <el-table-column
+                    v-for="(item, i) in tableHead"
+                    :key="i"
+                    :prop="item.prop"
+                    :label="item.label"
+                    :width="item.width"
+                  ></el-table-column>
+                </el-table>
+              </div>
+            </el-form>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
 </template>
 <script>
+import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
-    data(){
-        return{
-            inputText:'',
-            option: {       
-                // 表格请求数据的地址
-                requestUrl: "",
-            },
+  data() {
+    return {
+      inputText: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: ""
+      },
+      tableHead: [
+        {
+          prop: "linkName",
+          label: "计次状态",
+          width: 150
+        },
+        {
+          prop: "pointDate",
+          label: "时间",
+          width: 150
+        }
+      ],
+      tableData1: [],
+      tableData: [],
+      startTime: null,
+      endTime: null,
+      oldRow1: "",
+      oldRowCount1: 1,
+      drawer: false,
+      direction: "rtl",
+      orderId: 0,
+      stepList: [],
+      tableTitle: "计次统计"
+    };
+  },
+  created() {
+    if (
+      getCookie("orgCode") == "dagangadmin" ||
+      getCookie("orgCode") == "zidonghuabu" ||
+      getCookie("orgCode") == "wuliuchuyunzhongxin"
+    ) {
+      this.option.requestUrl = "/api/v1/tms/getAllTimeTaskResult?apiId=458&orderType=26";
+    } else {
+      this.option.requestUrl =
+        "/api/v1/tms/getAllTimeTaskResult?apiId=458&orderType=26&userId=" +
+        getCookie("orgCode");
+    }
+  },
+  methods: {
+    // -------查看物资详情(已拒绝)
+    detailclick1(row) {
+      // 记录重复点击次数
+      if (this.oldRow1 === row) {
+        this.oldRowCount1 += 1;
+      }
+      this.orderId = row.orderId;
+      let map = {
+        orderId: this.orderId
+      };
+      // 切换当前详情表
+      this.$refs.excelDom.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow1 != "") {
+        if (this.oldRow1 != row) {
+          if (this.oldRowCount1 % 2 === 1) {
+            this.$refs.excelDom.toggleRowExpansion(this.oldRow1);
+          } else {
+            this.oldRowCount1 = 1;
+          }
+        } else {
+          this.oldRow1 = null;
+          return;
         }
+      }
+      // 重置上一个点击对象
+      this.oldRow1 = row;
+      // 根据销售订单物资中间表id查询物资信息
+      this.axios.post("/api/v1/oms/getOrderResult?orderId=", map).then(res => {
+        console.log("res", res);
+        this.tableData1 = res.data;
+      });
     },
-    created(){
-        this.option.requestUrl = "/api/v1/tms/selectCountList?apiId=364"
+    getStepsList(row) {
+      console.log(row.orderId);
+      this.orderId = row.orderId;
+      this.drawer = true;
+      let map = {
+        orderId: this.orderId
+      };
+      this.axios.post("/api/v1/oms/getOrderResult", map).then(res => {
+        console.log(res);
+        if (res.status == 200) {
+          this.stepList = res.data;
+        } else {
+          this.$message.error("展示失败！");
+        }
+      });
+      console.log(this.stepList);
+    },
+    getRequirementMaterial1(row) {
+      // 记录重复点击次数
+      if (this.oldRow1 === row) {
+        this.oldRowCount1 += 1;
+      }
+      // 切换当前详情表
+      this.$refs.excelDom.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow1 != "") {
+        if (this.oldRow1 != row) {
+          if (this.oldRowCount1 % 2 === 1) {
+            this.$refs.excelDom.toggleRowExpansion(this.oldRow1);
+          } else {
+            this.oldRowCount1 = 1;
+          }
+        } else {
+          this.oldRow1 = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow1 = row;
+      this.getMaterial(row.orderId);
     },
-    methods:{
-
-        onclick(){
-            this.option.requestUrl = "/api/v1/tms/selectCountList?apiId=364&con="+this.inputText;
+    onclick() {
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          console.log(startTime);
+          console.log(endTime);
+          if (
+            getCookie("orgCode") == "dagangadmin" ||
+            getCookie("orgCode") == "zidonghuabu" ||
+            getCookie("orgCode") == "wuliuchuyunzhongxin"
+          ) {
+            this.option.requestUrl =
+              "/api/v1/tms/getAllTimeTaskResult?apiId=458&orderType=26&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i=" +
+              new Date();
+          } else {
+            this.option.requestUrl =
+              "/api/v1/tms/getAllTimeTaskResult?apiId=458&orderType=26&userId=" +
+              getCookie("orgCode") +
+              "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i=" +
+              new Date();
+          }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
         }
+      } else {
+      }
+    },
+    getMaterial(orderId) {
+      console.log(orderId);
+      this.axios
+        .post("/api/v1/oms/getPauseTimeTaskDetail/" + orderId)
+        .then(res => {
+          console.log(res);
+          this.tableData = res.data.data;
+        });
     }
-}
+  }
+};
 </script>
 <style lang="scss">
-    .sale{
-        .top {
-            padding: 1.25rem 1.875rem;
-            .el-input{
-            width: 20%;
-            }
-        }
+.sale {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input {
+      width: 20%;
     }
-</style>
+  }
+}
+.el-table th.el-table__cell > .cell {
+  display: inline-block;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  position: relative;
+  vertical-align: middle;
+  padding-left: 10px;
+  padding-right: 10px;
+  width: 100%;
+  text-align: center;
+}
+.step {
+  text-align: center;
+}
+</style>

src/views/inward/components/inwardFactory/timeTaskResult.vue

@@ -126,10 +126,10 @@ export default {
       getCookie("orgCode") == "zidonghuabu" ||
       getCookie("orgCode") == "wuliuchuyunzhongxin"
     ) {
-      this.option.requestUrl = "/api/v1/tms/getAllTimeTaskResult?apiId=458";
+      this.option.requestUrl = "/api/v1/tms/getAllTimeTaskResult?apiId=458&orderType=21";
     } else {
       this.option.requestUrl =
-        "/api/v1/tms/getAllTimeTaskResult?apiId=458&userId=" +
+        "/api/v1/tms/getAllTimeTaskResult?apiId=458&orderType=21&userId=" +
         getCookie("orgCode");
     }
   },
@@ -227,7 +227,7 @@ export default {
             getCookie("orgCode") == "wuliuchuyunzhongxin"
           ) {
             this.option.requestUrl =
-              "/api/v1/tms/getAllTimeTaskResult?apiId=458&startTime=" +
+              "/api/v1/tms/getAllTimeTaskResult?apiId=458&orderType=21&startTime=" +
               startTime +
               "&endTime=" +
               endTime +
@@ -235,7 +235,7 @@ export default {
               new Date();
           } else {
             this.option.requestUrl =
-              "/api/v1/tms/getAllTimeTaskResult?apiId=458&userId=" +
+              "/api/v1/tms/getAllTimeTaskResult?apiId=458&orderType=21&userId=" +
               getCookie("orgCode") +
               "&startTime=" +
               startTime +

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

@@ -2,10 +2,22 @@
 <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>
+      <span>详单时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="exportData()"
+      ><i class="el-icon-download"></i>导出(Excel)</el-button
+      >
     </div>
     <div class="table">
       <el-tabs v-model="activeName">
@@ -24,53 +36,58 @@
 
   </div>
 </template>
-
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 import { getCookie } from "@/utils/util.js";
 export default {
-  data(){
-    return{
+  data() {
+    return {
+      startTime: null,
+      endTime: null,
+      totalMoney: null,
+      totalTime: null,
       //单价
-      Fee:null,
+      Fee: null,
       //加载
-      selectLineLoading:false,
-      input:"",
-      activeName:"first",
-      ssoId:null,
+      selectLineLoading: false,
+      input: "",
+      activeName: "first",
+      ssoId: null,
       //详单Id
-      detailsId:null,
-      options1:{
+      detailsId: null,
+      options1: {
         // first请求数据的地址
-        requestUrl: "",
+        requestUrl: ""
       },
-      options2:{
+      options2: {
         // second请求数据的地址
-        requestUrl: "",
+        requestUrl: ""
       },
       //是否打开修改详单地址弹出框
-      dialogFormVisible:false,
+      dialogFormVisible: false,
       //原详单单价
-      originalPriceValue:null,
+      originalPriceValue: null,
       //新详单单价
-      newPriceValue:null,
+      newPriceValue: null,
       //原详单地址
-      originalAddress:null,
+      originalAddress: null,
       //新详单地址
-      newAddress:null,
+      newAddress: null,
       //新单价Id
-      priceId:null,
+      priceId: null,
       //是否打开运输单价的模态框
-      addressDrawer:false,
+      addressDrawer: false,
       //运输单价的表格
       Address: {
         requestUrl: "/api/v1/ams/getAddressDeliveryAddress?apiId=255",
-        selectionType: "radio",
+        selectionType: "radio"
       },
       // addressText:null,
       //缓存当前选中的运输单价
-      priceMap:{},
-      formLabelWidth: '125px'
-    }
+      priceMap: {},
+      formLabelWidth: "125px",
+      tableTitle: "内转计次计费详单"
+    };
   },
   created(){
      this.options1GetRequestUrl();
@@ -81,41 +98,106 @@ export default {
     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');
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&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"
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=0"
     }else{
-      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0&userId=" + getCookie("orgCode");  
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&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");  
-    }
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1&carrierSsoId="+ getCookie('userId');
+      }else if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode")=="zidonghuabu"||getCookie("orgCode")=="wuliuchuyunzhongxin"){
+        this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1"
+      }else{
+        this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&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;
+    onclick() {
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          if (
+            getCookie("orgCode") == "dagangadmin" ||
+            getCookie("orgCode") == "zidonghuabu" ||
+            getCookie("orgCode") == "wuliuchuyunzhongxin"
+          ) {
+            this.options1.requestUrl =
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=0" +
+              "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i" +
+              new Date();
+            this.options2.requestUrl =
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1" +
+              "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i" +
+              new Date();
+          } else if (getCookie("orgCode") == "chengyunshang") {
+            this.options1.requestUrl =
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=0&carrierSsoId=" +
+              getCookie("userId") +
+              "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i" +
+              new Date();
+            this.options2.requestUrl =
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1&carrierSsoId=" +
+              getCookie("userId") +
+              "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i" +
+              new Date();
+          } else {
+            this.options1.requestUrl =
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=0&userId=" +
+              getCookie("orgCode") +
+              "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i" +
+              new Date();
+            this.options2.requestUrl =
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1&userId=" +
+              getCookie("orgCode") +
+              "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i" +
+              new Date();
+          }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      }
     },
     //运输订单点击浏览的事件
     select(){
       this.addressDrawer = true;
-    },
-    //运输单价模态窗口的框计算
-    selectAddressClick(){
-      this.Price.requestUrl = '/api/v1/ams/getAddressDeliveryAddress?apiId=255&con='+this.addressText;
-    },
-   
+    }
   }
 }
 </script>
@@ -130,4 +212,4 @@ export default {
 			}
   }
 }
-</style>
+</style>