tijiao

build/utils.js

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

@@ -65,13 +65,8 @@ let proxyTable = {
   // 所有数据的请求域名地址
   "/api/v1": {
     // target: "http://172.16.33.166:8080",
-<<<<<<< HEAD
+    // target: "http://172.16.33.162:8019", 
     target: "http://localhost:8080",
-=======
-    target: "http://172.16.33.162:8019",
-    // target: "http://localhost:8080",
->>>>>>> 3ff7060574f887089bf8684ceadfa6da43b704ff
-    // target: "http://localhost:8019",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

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/SporadicManage/components/oldAreaSporadic/transportAppoint/transportAppoint.vue

@@ -24,6 +24,7 @@
         <dilTable
           v-bind.sync="option1"
           ref="table"
+          :showIndex="false"
           @selection-change="selectionChange"
         >
           <el-table-column
@@ -147,6 +148,7 @@ export default {
       input: null,
       Time: "",
       activeName: "first",
+
       option1: {
         // 表格请求数据的地址
         requestUrl:

src/views/inward/app.js

@@ -19,6 +19,10 @@ import apollo from '@/config/apolloConfig.js'
 import DilCommonUI from "@/components/DilCommonUI";
 Vue.use(DilCommonUI);
 
+// 导出Excel全局组件
+import tableToExcel from '@/components/exportExcel/exportExcel'
+Vue.use(tableToExcel)
+
 import 'xe-utils' 
 import VXETable from 'vxe-table'
 import 'vxe-table/lib/style.css'

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

@@ -6,13 +6,19 @@
       <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="totalNetWeight" :disabled="true" style="width: 140px;"></el-input>
+      <span style="margin-left: 1rem;">合计金额：</span>
+      <el-input v-model="totalMoney" :disabled="true" style="width: 100px;"></el-input>
     </div>
     <div class="table">
-      <el-tabs v-model="activeName">
+      <el-tabs v-model="activeName" tab-click="handClick">
         <!-- 未结算 -->
         <el-tab-pane label="未结算" name="first">
-        <dilTable v-bind.sync="options1">
-        </dilTable>
+        <div class="table">
+        <dilTable v-bind.sync="options1" ref="excelDom" @func="func"></dilTable>
+        </div>
         </el-tab-pane>
         <!-- 已结算 -->
         <el-tab-pane label="已结算" name="second">
@@ -30,6 +36,10 @@ import { getCookie } from "@/utils/util.js";
 export default {
   data(){
     return{
+      //合计净重
+      totalNetWeight:null,
+      //合计金额
+      totalMoney:null,
       //单价
       Fee:null,
       //加载
@@ -69,7 +79,8 @@ export default {
       // addressText:null,
       //缓存当前选中的运输单价
       priceMap:{},
-      formLabelWidth: '125px'
+      formLabelWidth: '125px',
+      tableTitle:'内转计重详单'
     }
   },
   created(){
@@ -77,6 +88,15 @@ export default {
      this.options2GetRequestUrl();
   },
   methods:{
+    func(res){
+      console.log(res.list)
+      res.list.forEach(e => {
+        console.log(e.resultNetWeight)
+        this.totalNetWeight = this.totalNetWeight + e.resultNetWeight
+        this.totalMoney = this.totalMoney + e.detailsAmount
+        console.log(e.detailsAmount);
+      });
+    },
     //未结算数据
     options1GetRequestUrl(){
     if(getCookie("orgCode") == "chengyunshang"){
@@ -102,7 +122,6 @@ export default {
      toInsert() {
       this.$router.push("/insertCheckInventory");
     },
-
     onclick(){
       console.log("查询待定值")
       // this.options.requestUrl = "/api/v1/bms/getTruckDetailsOrderList?apiId=176&orderType=1&con="+this.input;

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

@@ -6,12 +6,17 @@
       <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="totalNetWeight" :disabled="true" style="width: 140px;"></el-input>
+        <span style="margin-left: 1rem;">合计金额：</span>
+        <el-input v-model="totalMoney" :disabled="true" style="width: 100px;"></el-input>
     </div>
     <div class="table">
       <el-tabs v-model="activeName">
         <!-- 未结算 -->
         <el-tab-pane label="未结算" name="first">
-        <dilTable v-bind.sync="options1">
+        <dilTable v-bind.sync="options1" ref="excelDom" @func="func">
         </dilTable>
         </el-tab-pane>
         <!-- 已结算 -->
@@ -21,7 +26,6 @@
         </el-tab-pane>
       </el-tabs>
     </div>
-
   </div>
 </template>
 
@@ -30,6 +34,8 @@ import { getCookie } from "@/utils/util.js";
 export default {
   data(){
     return{
+      totalNetWeight:null,
+      totalMoney:null,
       //单价
       Fee:null,
       //加载
@@ -77,6 +83,15 @@ export default {
      this.options2GetRequestUrl();
   },
   methods:{
+    func(res){
+      console.log(res.list);
+      res.list.forEach(e => {
+        console.log(e.netWeightSecond)
+        this.totalNetWeight = this.totalNetWeight + e.netWeightSecond
+        this.totalMoney = this.totalMoney + e.secondAmount
+        console.log(e.secondAmount);
+      });
+    },
     //未结算数据
     options1GetRequestUrl(){
     if(getCookie("orgCode") == "chengyunshang"){

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

@@ -6,12 +6,17 @@
       <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="totalTime" :disabled="true" style="width: 140px;"></el-input>
+      <span style="margin-left: 1rem;">合计金额：</span>
+      <el-input v-model="totalMoney" :disabled="true" style="width: 100px;"></el-input>
     </div>
     <div class="table">
       <el-tabs v-model="activeName">
         <!-- 未结算 -->
         <el-tab-pane label="未结算" name="first">
-        <dilTable v-bind.sync="options1">
+        <dilTable v-bind.sync="options1" ref="excelDom" @func="func">
         </dilTable>
         </el-tab-pane>
         <!-- 已结算 -->
@@ -30,6 +35,8 @@ import { getCookie } from "@/utils/util.js";
 export default {
   data(){
     return{
+      totalMoney:null,
+      totalTime:null,
       //单价
       Fee:null,
       //加载
@@ -69,7 +76,8 @@ export default {
       // addressText:null,
       //缓存当前选中的运输单价
       priceMap:{},
-      formLabelWidth: '125px'
+      formLabelWidth: '125px',
+      tableTitle:'内转计时计费详单'
     }
   },
   created(){
@@ -81,28 +89,34 @@ 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=21&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=21&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=21&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');
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=21&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"
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=21&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=21&detailStatus=1&userId=" + getCookie("orgCode");  
     }
     },
      toInsert() {
       this.$router.push("/insertCheckInventory");
     },
-
+    func(res){
+      console.log(res);
+      res.list.forEach(e => {
+        this.totalTime = this.totalTime + e.resultTime
+        this.totalMoney = this.totalMoney + e.detailsAmount
+      });
+    },
     onclick(){
       console.log("查询待定值")
       // this.options.requestUrl = "/api/v1/bms/getTruckDetailsOrderList?apiId=176&orderType=1&con="+this.input;

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

@@ -107,6 +107,8 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      //承运起止范围ID
+      rangeId:null,
       disabled:false,
       //船名
       remark: null,
@@ -193,9 +195,11 @@ export default {
       if(this.purchaseOrgId == 1) {
         this.purchaseOrgLable = "一厂"
         console.log(this.purchaseOrgLable)
+        this.rangeId = 2
       }else{
         this.purchaseOrgLable = "二厂"
         console.log(this.purchaseOrgLable)
+        this.rangeId = 3
       }  
     },
     getPurchaseOrderNo() {
@@ -347,6 +351,7 @@ export default {
           purchaseOrderId: this.purchaseOrderId,
           unloadPointId: this.unloadPointId,
           carrierId:this.carrierId,
+          rangeId:this.rangeId,
           userId:getCookie("orgCode")
         };
         console.log(map, map);

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);
@@ -579,6 +581,7 @@ export default {
     },
     // 新增
     makeSure() {
+      console.log(this.form.isMineral)
       this.disabled = true
       if(this.shipperId == null){
         this.$message.error("请选择用车单位")
@@ -595,6 +598,11 @@ export default {
         this.disabled = false
         return
       }
+      if(typeof(this.form.isMineral) == 'undefined'){
+        this.$message.error("请选择是否矿石")
+        this.disabled = false
+        return
+      }
       if(typeof(this.form.requirementType) == 'undefined'){
         this.$message.error("请选择需求类型")
         this.disabled = false
@@ -649,6 +657,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 + '米',
@@ -659,8 +670,11 @@ export default {
         requirementWorkType: this.form.requirementWorkType,
         requirementShipperId: this.shipperId,
         rangeId:this.form.transRange,
+        isMineral:this.form.isMineral,
         // 用车截日期
         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}