Parcourir la source

采购进口矿修改

luobang il y a 3 ans
Parent
commit
9bf504932d

+ 1 - 1
build/utils.js

@@ -19,7 +19,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 
 
  let devModules = ['all']
-// let devModules = ['index','TMS','inward']
+// let devModules = ['index','TMS','RMS']
 //  let devModules = ['index','WMS','sale','TMS','inward','SporadicManage']
 // let devModules = ['index','SporadicManage','TMS','statisticalReport','RMS'];
 // let devModules = ['index','RMS'];

+ 1 - 1
src/views/ADMINISTRATORS/app.js

@@ -58,7 +58,7 @@ export function sjTime(orderPlanInTime) {
 }
 //验证电话号码
 export function VerifyPhoneNumber(Phone) {
-  var myreg=/^(13[0-9]|14[5|7]|15[0|1|2|3|4|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9])\d{8}$/;
+  var myreg=/^(13[0-9]|14[5|7]|15[0|1|2|3|4|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9]|19[0|1|2|3|5|6|7|8|9])\d{8}$/;
   if (!myreg.test(Phone)) {
       return false;
   } else {

+ 5 - 0
src/views/TMS/components/importedIngredients/transportReserveFuAddIngredients.vue

@@ -62,6 +62,11 @@
           >浏览</el-button
         >
       </div>
+    </div>
+    <div class="lineId from">
+      <span class="text">该批车辆是否一车多趟:</span>
+      <el-switch v-model="isMoreTrips" active-text="是" inactive-text="否">
+      </el-switch>
     </div>
       <!-- 物资和装卸点以及装卸货次序 -->
     <div class="swtichTop">

+ 6 - 6
src/views/TMS/components/importedMineral/addTransportAppoint.vue

@@ -62,6 +62,11 @@
           >浏览</el-button
         >
       </div>
+    </div>
+    <div class="lineId from">
+      <span class="text">该批车辆是否一车多趟:</span>
+      <el-switch v-model="isMoreTrips" active-text="是" inactive-text="否">
+      </el-switch>
     </div>
       <!-- 物资和装卸点以及装卸货次序 -->
     <div class="swtichTop">
@@ -423,11 +428,6 @@ export default {
               this.remark = res.data.data.remark;
               this.purchaseOrderId = res.data.data.purchaseOrderId;
               this.purchaseOrderNo = res.data.data.purchaseOrderNo;
-              // if (res.data.data.receiveUnitId == 1) {
-              //   this.orderType = 6;
-              // } else {
-              //   this.orderType = 7;
-              // }
             }
           } else {
             this.$message.error("请求失败");
@@ -566,7 +566,7 @@ export default {
           "/api/v1/uc/getUnloadingMesByLike?apiId=374&i=" + new Date();
       } else if (num == 5) {
         this.line.requestUrl =
-          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=辅料&i=" + new Date();
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=进口矿&i=" + new Date();
       } else if (num == 6) {
         this.purchaseOrder.requestUrl =
           "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId=" +

+ 108 - 0
src/views/statisticalReport/components/purachaseMineral.vue

@@ -0,0 +1,108 @@
+// 采购进口矿汽运监控
+<template>
+  <div class="purchasFuelOldMonitor">
+    <div class="frameCalculation">
+      <span>计毛时间:</span>
+      <el-date-picker
+        v-model="startTime"
+        type="date"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="date"
+        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>
+      <el-button type="primary" @click="refresh">
+        <i class="el-icon-refresh"></i>刷新
+      </el-button>
+      <span style="margin-left: 1rem;">合计净重:</span>
+      <el-input v-model="totalNumber" :disabled="true" style="width: 150px;"></el-input>
+      <span style="margin-left: 1rem;">合计车数:</span>
+      <el-input v-model="totalCapacity" :disabled="true" style="width: 150px;"></el-input>
+    </div>
+    <div class="table">
+      <dilTable ref="excelDom" v-bind.sync="option" @func="func"></dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+import { sjTime } from '@/utils/sharedJsFile'
+export default {
+  data() {
+    return {
+      option: {
+        requestUrl: "/api/v1/tms/getRLFLReport?apiId=382&orderType=8&startTime=null&endTime=null&i=" +new Date(),
+      },
+      startTime: null,
+      endTime: null,
+      //合计净重
+      totalNumber: 0,
+      //合计车数
+      totalCapacity: 0,
+      tableTitle:'采购燃料老区统计报表'
+    };
+  },
+  methods: {
+    refresh(){
+      this.$router.go(0);
+    },
+    func(res){
+      console.log(res)
+      var resultNetWeightTotal = 0
+      res.list.forEach(e => {
+        resultNetWeightTotal = resultNetWeightTotal+e.resultNetWeight
+      });
+      this.totalNumber = resultNetWeightTotal.toFixed(2) + " t"
+      this.totalCapacity = res.total;
+      //获取总记录条数作为合计车数
+      // this.totalCapacity = res.total;
+      this.isKuang = false;
+    },
+    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){
+          this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=8&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+        }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+        this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=8&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.purchasFuelOldMonitor {
+  .frameCalculation {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+    .el-date-editor{
+      margin: 20px;
+    }
+  }
+}
+</style>

+ 3 - 1
src/views/statisticalReport/router/index.js

@@ -19,6 +19,7 @@ import purInwardReport from '../components/inwardReport/putInwardReport.vue'
 import inwardFactory from '../components/inwardReport/inwardFactory.vue'
 import getLoading from '../components/inwardReport/getLoading.vue'
 import getUnLoading from '../components/inwardReport/getUnLoading.vue'
+import purchaseMineral from '../components/purachaseMineral.vue'
 
 
 Vue.use(Router)
@@ -43,7 +44,8 @@ const constantRouterMap = [
       {path: 'purInwardReport', name: 'purInwardReport', meta: {code: 'xtpzgl-yhgl'}, component: purInwardReport},
       {path: 'inwardFactory', name: 'inwardFactory', meta: {code: 'xtpzgl-yhgl'}, component: inwardFactory},
       {path: 'getLoading', name: 'getLoading', meta: {code: 'xtpzgl-yhgl'}, component: getLoading},
-      {path: 'getUnLoading', name: 'getUnLoading', meta: {code: 'xtpzgl-yhgl'}, component: getUnLoading}
+      {path: 'getUnLoading', name: 'getUnLoading', meta: {code: 'xtpzgl-yhgl'}, component: getUnLoading},
+      {path: 'purchaseMineral', name: 'purchaseMineral', meta: {code: 'xtpzgl-yhgl'}, component: purchaseMineral}
     ]
   }
 ];