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

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

@@ -0,0 +1,144 @@
+// 倒库作业
+<template>
+  <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>
+          </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: ""
+      },
+      startTime: null,
+      endTime: null,
+      drawer: false,
+      direction: "rtl",
+      tableTitle: "倒库统计"
+    };
+  },
+  created() {
+    if (
+      getCookie("orgCode") == "dagangadmin" ||
+      getCookie("orgCode") == "zidonghuabu" ||
+      getCookie("orgCode") == "wuliuchuyunzhongxin"
+    ) {
+      this.option.requestUrl = "/api/v1/tms/getAllReverseResult?apiId=516";
+    } else {
+      this.option.requestUrl =
+        "/api/v1/tms/getAllReverseResult?apiId=516&userId=" +
+        getCookie("orgCode");
+    }
+  },
+  methods: {
+    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/getAllReverseResult?apiId=516&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i=" +
+              new Date();
+          } else {
+            this.option.requestUrl =
+              "/api/v1/tms/getAllReverseResult?apiId=516&userId=" +
+              getCookie("orgCode") +
+              "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i=" +
+              new Date();
+          }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      } else {
+      }
+    }
+  }
+};
+</script>
+<style lang="scss">
+.sale {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input {
+      width: 20%;
+    }
+  }
+}
+.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/inwardSettlement/countDetailOrder.vue

@@ -98,22 +98,22 @@ export default {
     options1GetRequestUrl(){
     if(getCookie("orgCode") == "chengyunshang"){
       this.ssoId=getCookie('userId');
-      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=0&carrierSsoId="+ getCookie('userId');
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&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=465&orderType=26&detailStatus=0"
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=0"
     }else{
-      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=0&userId=" + getCookie("orgCode");
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=0&userId=" + getCookie("orgCode");
     }
     },
     //已结算数据
     options2GetRequestUrl(){
      if(getCookie("orgCode") == "chengyunshang"){
       this.ssoId=getCookie('userId');
-      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1&carrierSsoId="+ getCookie('userId');
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&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"
+        this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=1"
       }else{
-        this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1&userId=" + getCookie("orgCode");
+        this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=1&userId=" + getCookie("orgCode");
       }
     },
     onclick() {
@@ -133,7 +133,7 @@ export default {
             getCookie("orgCode") == "wuliuchuyunzhongxin"
           ) {
             this.options1.requestUrl =
-              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=0" +
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=0" +
               "&startTime=" +
               startTime +
               "&endTime=" +
@@ -141,7 +141,7 @@ export default {
               "&i" +
               new Date();
             this.options2.requestUrl =
-              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1" +
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=1" +
               "&startTime=" +
               startTime +
               "&endTime=" +
@@ -150,7 +150,7 @@ export default {
               new Date();
           } else if (getCookie("orgCode") == "chengyunshang") {
             this.options1.requestUrl =
-              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=0&carrierSsoId=" +
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=0&carrierSsoId=" +
               getCookie("userId") +
               "&startTime=" +
               startTime +
@@ -159,7 +159,7 @@ export default {
               "&i" +
               new Date();
             this.options2.requestUrl =
-              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1&carrierSsoId=" +
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=1&carrierSsoId=" +
               getCookie("userId") +
               "&startTime=" +
               startTime +
@@ -169,7 +169,7 @@ export default {
               new Date();
           } else {
             this.options1.requestUrl =
-              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=0&userId=" +
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=0&userId=" +
               getCookie("orgCode") +
               "&startTime=" +
               startTime +
@@ -178,7 +178,7 @@ export default {
               "&i" +
               new Date();
             this.options2.requestUrl =
-              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1&userId=" +
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=1&userId=" +
               getCookie("orgCode") +
               "&startTime=" +
               startTime +

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

@@ -128,7 +128,7 @@ export default {
       console.log(this.mapList);
     },
     // 新增
-    makeSure() {
+    async makeSure() {
       console.log(typeof this.planTruckNumber);
       if (this.carrierId == null || this.state2 == "") {
         this.$alert("请输入承运商！");
@@ -142,18 +142,23 @@ export default {
         planTruckNumber: Number(this.planTruckNumber),
         carrierId: this.carrierId
       };
-      this.axios.post("/api/v1/ams/addTruckPlan", plan).then(res => {
-        console.log(res);
-        if (res.data.code == 200) {
-          this.$message({
-            type: "success",
-            message: "新增成功!"
-          });
-          this.$router.go(-1);
-        } else {
-          this.$message.error("新增失败！");
-        }
-      });
+      try {
+        await this.axios.post("/api/v1/ams/addTruckPlan", plan, {timeout: 45000}).then(res => {
+          console.log(res);
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!"
+            });
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败！");
+          }
+        });
+      }catch (e) {
+        console.log(e)
+        Message.error('网络异常，请刷新页面')
+      }
     },
     // 返回
     cancel() {

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

@@ -813,7 +813,7 @@ export default {
       }
     },
     // 新增
-    makeSure() {
+    async makeSure() {
       // console.log(this.form.isMineral);
       // // 判断当前装机是否选择了装机必填
       // console.log("进来了");
@@ -906,8 +906,8 @@ export default {
       }
       if (this.DueTime == null && this.isOpenDueTime == false) {
         //默认选择明天0点
-        var dd=new Date(this.form.requirementTruckTime);
-        dd.setDate(dd.getDate()+1);//获取AddDayCount天后的日期
+        var dd = new Date(this.form.requirementTruckTime);
+        dd.setDate(dd.getDate() + 1);//获取AddDayCount天后的日期
         dd.setHours(null);
         dd.setMinutes(null);
         dd.setSeconds(null);
@@ -934,20 +934,25 @@ export default {
         orgCode: getCookie("orgCode"),
         remark: this.form.Tel + this.capacityTypeName + this.form.typeRemarks
       };
-      this.axios
-        .post("/api/v1/ams/addTruckRequirement", requiremnet)
-        .then(res => {
-          if (res.data.code == 200) {
-            this.$message({
-              type: "success",
-              message: "新增成功!"
-            });
-            this.$router.go(-1);
-          } else {
-            this.$message.error("新增失败！");
-            this.disabled = false;
-          }
-        });
+      try {
+        await this.axios
+          .post("/api/v1/ams/addTruckRequirement", requiremnet,{timeout: 45000})
+          .then(res => {
+            if (res.data.code == 200) {
+              this.$message({
+                type: "success",
+                message: "新增成功!"
+              });
+              this.$router.go(-1);
+            } else {
+              this.$message.error("新增失败！");
+              this.disabled = false;
+            }
+          });
+      } catch (e) {
+        console.log(e)
+        Message.error('网络异常，请刷新页面')
+      }
     },
     func(res) {
       console.log(res);

src/views/inward/router/index.js

@@ -106,7 +106,8 @@ import timeTaskResult from "@/views/inward/components/inwardFactory/timeTaskResu
 import countResult from "@/views/inward/components/inwardFactory/countResult.vue";
 //内转进口矿/国产矿/燃料--内转厂内物资--包月作业
 import monthResult from "@/views/inward/components/inwardFactory/monthResult.vue";
-
+//倒库作业
+import reverseResult from "@/views/inward/components/inwardFactory/reverseResult.vue";
 //**************************************跳转界面**************************************/
 
 //新增采购内转需求
@@ -484,6 +485,12 @@ const constantRouterMap = [
         meta: { code: "xtpzgl-yhgl" },
         component: monthResult
       },
+      {
+        path: "reverseResult",
+        name: "reverseResult",
+        meta: { code: "xtpzgl-yhgl" },
+        component: reverseResult
+      },
       /*****************************************跳转页面*****************************************/
       {
         path: "addRequirement",

src/views/queue/components/qmsEnFacotory/addModel.vue

@@ -3,13 +3,13 @@
   <div style="width:100%">
     <page-title>返回</page-title>
     <!-- 第一部分 -->
-    <el-form style="width:400px;margin-left:40%;margin-top:50px">
+    <el-form style="width:500px;margin-left:35%;margin-top:50px">
         <el-form-item style="display:inline" label="未轧规格">
-            <el-select filterable  v-model="spectionsModel">
-                    <el-option v-for="item in models" :value="item" :key="item" :label="item"></el-option>
+            <el-select filterable  v-model="spectionsModel" style="width:300px">
+                    <el-option v-for="item in models" :value="item.materialId" :key="item.materialId" :label="item.materialName"></el-option>
             </el-select>
         </el-form-item>
-        <el-button type="primary" @click="makeSure" style="margin:20px;margin-left:60px">新增</el-button>
+        <el-button type="primary" @click="makeSure" style="margin:20px;margin-left:100px">新增</el-button>
     </el-form>
   </div>
 </template>

src/views/queue/components/qmsEnFacotory/editModel.vue

@@ -3,13 +3,13 @@
   <div style="width:100%">
     <page-title>返回</page-title>
     <!-- 第一部分 -->
-    <el-form style="width:400px;margin-left:40%;margin-top:50px">
+    <el-form style="width:500px;margin-left:35%;margin-top:50px">
         <el-form-item style="display:inline" label="未轧规格">
-            <el-select filterable  v-model="spectionsModel">
-                    <el-option v-for="item in models" :value="item" :key="item" :label="item"></el-option>
+            <el-select filterable  v-model="spectionsModel" style="width:300px">
+                   <el-option v-for="item in models" :value="item.materialId" :key="item.materialId" :label="item.materialName"></el-option>
             </el-select>
         </el-form-item>
-        <el-button type="primary" @click="makeSure" style="margin:20px;margin-left:60px">修改</el-button>
+        <el-button type="primary" @click="makeSure" style="margin:20px;margin-left:100px">修改</el-button>
     </el-form>
   </div>
 </template>
@@ -35,7 +35,7 @@ export default {
         console.log("resultId："+this.$route.params.resultId);
         console.log("spectionsModel："+this.$route.params.spectionsModel);
         this.resultId=this.$route.params.resultId;
-        this.spectionsModel=this.$route.params.spectionsModel;
+        this.spectionsModel=parseInt(this.$route.params.spectionsModel);
     },
     getAllModel(){
       this.axios

src/views/queue/components/qmsEnFacotory/model.vue

@@ -39,6 +39,11 @@
           :row-style="{height:'40px'}"
           style="width: 100%;font-size: 18px">
           <el-table-column
+          align="center"
+            prop="materialName"
+            label="物资名称">
+          </el-table-column>
+          <el-table-column
           align="center"
             prop="spectionsModel"
             label="未轧规格">
@@ -121,7 +126,7 @@ export default {
     },
     updateclick(row) {
       console.log(row);
-      this.$router.push("/editModel/" + row.resultId+"/"+row.spectionsModel);
+      this.$router.push("/editModel/" + row.resultId+"/"+row.materialId);
     },
     addclick() {
       this.$router.push("/addModel");

src/views/sale/components/offSiteTransportation/transportationPerformance.vue

@@ -177,12 +177,10 @@ export default {
           console.log(res.data);
           this.isShow2 = true;
           this.srcList2 = [];
-          this.src2 = res.data.resultSignedNotePhoto;
+          this.src2 = res.data.resultReceiveNotePhoto;
+          this.srcList2.push(res.data.resultReceiveNotePhoto);
           this.srcList2.push(res.data.resultSignedNotePhoto);
           this.srcList2.push(res.data.resultEmptyContainerPhoto);
-          if (res.data.resultReceiveNotePhoto != null) {
-            this.srcList2.push(res.data.resultReceiveNotePhoto);
-          }
         });
     },
     toPhotoClick(orderNumber) {

src/views/statisticalReport/components/Ship_dynamic_table.vue

@@ -186,7 +186,7 @@ export default {
     getStockString() {
       let that = this;
       this.axios
-        .post("/api/v1/wmsh/getLoadPortStockList?apiId=158&i=")
+        .post("/api/v1/wmsh/getLoadPortStockList?apiId=158&pageSize=1000&pageNum=1")
         .then(res => {
           console.log(res);
           if (res.status == "200") {

src/views/statisticalReport/components/tableItem.vue

@@ -93,7 +93,7 @@ export default {
     getStockString() {
       let that = this;
       this.axios
-        .post("/api/v1/wmsh/getLoadPortStockList?apiId=158&i=")
+        .post("/api/v1/wmsh/getLoadPortStockList?apiId=158&pageSize=1000&pageNum=1")
         .then(res => {
           console.log(res);
           if (res.status == "200") {