提交

build/utils.js

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

config/index.js

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

package.json

@@ -55,7 +55,7 @@
     "vue-splitpane": "^1.0.2",
     "vuescroll": "^4.17.3",
     "vuex": "^3.0.1",
-    "vxe-table": "^4.2.2-beta.1",
+    "vxe-table": "^3.4.12",
     "x2js": "^3.3.0",
     "xe-utils": "^3.5.4",
     "xlsx": "^0.18.4",

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

@@ -558,7 +558,9 @@ export default {
       this.materialId = selection.materialId;
     },
     selectionChange1(radio){
-      this.capacityTypeName  = radio.capacityTypeName
+      console.log(radio)
+      this.capacityTypeName  = radio.capacityTypeName,
+      this.capacityTypeId = radio.capacityTypeId
     },
     currentRadioChange2(selection) {
       console.log(selection);
@@ -642,6 +644,9 @@ export default {
       if(this.form.capacityType==undefined){
         this.form.capacityType=""
       }
+      if(this.form.typeRemarks==undefined){
+        this.form.typeRemarks=""
+      }
       let requiremnet = {
         requirementEstimatedDuration: this.form.requirementEstimatedDuration,
         requirementOverlimit: this.form.requirementOverlimit + this.form.remark + '米',
@@ -653,6 +658,8 @@ export default {
         requirementShipperId: this.shipperId,
         // 用车截日期
         DueTime:DueTime,
+        // 用车类型Id
+        capacityTypeId:this.capacityTypeId,
         mapList:this.tableData,
         orgCode:getCookie("orgCode"),
         remark:this.form.Tel + this.capacityTypeName+this.form.typeRemarks

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

@@ -62,6 +62,7 @@ export default {
   data() {
     return {
       inputText: "",
+      orgCode:"",
       first: {
         // first请求数据的地址
         requestUrl:
@@ -197,6 +198,12 @@ export default {
         this.$message.warning("请选择需求")
         return
       }
+      // 权限控制，判断用户是否属于轧钢厂下面的车间
+      this.orgCode = getCookie("orgCode");
+      if(this.orgCode=="yunxingchejian"||this.orgCode=="shebeike"||this.orgCode=="zhunbeichejian"||this.orgCode=="zagangshenchan"||this.orgCode=="zagangweijianchejian"||this.orgCode=="zagangzonghe"||this.orgCode=="gaoxianchejian"||this.orgCode=="anquanhuanbao"||this.orgCode=="yibanchejian"||this.orgCode=="zhuanyundui"||this.orgCode=="erbangchejian"){
+        this.$message.warning("您的权限不足，请联系下发负责人")
+        return
+      }
       this.$confirm("是否下发", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",

src/views/statisticalReport/components/inwardReport/getInstall.vue

@@ -0,0 +1,100 @@
+<template>
+  <div class="purchasFuelNewMonitor">
+    <div class="frameCalculation">
+      <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>   
+      <span style="margin-left: 1rem;">合计车数：</span>
+      <el-input v-model="totalCapacity" :disabled="true" style="width: 100px;"></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 {   
+      totalCapacity:null,
+      option: {
+        requestUrl: "",
+      },
+      startTime: null,
+      endTime: null,
+      tableTitle:'达钢装货统计报表'
+    };
+  }, 
+  created(){
+          this.option.requestUrl = '/api/v1/tms/getLoaderResult?apiId=463&startTime=null&endTime=null&i=' +new Date()
+  },
+  methods: {
+    func(res){
+        console.log(res.list)     
+        var currentCapacityTotal = 0
+        res.list.forEach(e => {
+          currentCapacityTotal = currentCapacityTotal+e.number       
+        });
+        this.totalCapacity = currentCapacityTotal;
+    },
+    getRequestUrl(){
+        this.option.requestUrl = '/api/v1/tms/getLoaderResult?apiId=463&startTime=null&endTime=null&i=' +new Date();
+     
+    },
+    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/getLoaderResult?apiId=463' + "&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+        }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+        console.log(startTime && endTime)
+        this.getRequestUrl()
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.purchasFuelNewMonitor {
+  .frameCalculation {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+    .el-date-editor{
+      margin: 20px;
+    }
+  }
+}
+</style>

src/views/statisticalReport/router/index.js

@@ -18,6 +18,7 @@ import purchaseChemicalMaterialsOld from '../components/purchaseChemicalMaterial
 import purInwardReport from '../components/inwardReport/putInwardReport.vue'
 import inwardFactory from '../components/inwardReport/inwardFactory.vue'
 import getLoading from '../components/inwardReport/getLoading.vue'
+import getInstall from '../components/inwardReport/getInstall.vue'
 import getUnLoading from '../components/inwardReport/getUnLoading.vue'
 import purchaseMineral from '../components/purachaseMineral.vue'
 import inwardSporadicReport from '../components/sporadicReport/inwardSporadicReport.vue'
@@ -45,6 +46,7 @@ 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: 'getInstall', name: 'getInstall', meta: {code: 'xtpzgl-yhgl'}, component: getInstall},
       {path: 'getUnLoading', name: 'getUnLoading', meta: {code: 'xtpzgl-yhgl'}, component: getUnLoading},
       {path: 'purchaseMineral', name: 'purchaseMineral', meta: {code: 'xtpzgl-yhgl'}, component: purchaseMineral},
       {path: 'inwardSporadicReport', name: 'inwardSporadicReport', meta: {code: 'xtpzgl-yhgl'}, component: inwardSporadicReport}