tau

build/utils.js

@@ -15,17 +15,9 @@ 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','statisticalReport']
 // 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','WMS','sale','TMS','inward','SporadicManage']

config/index.js

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

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

@@ -15,14 +15,6 @@
       >
         <i class="el-icon-plus"></i>新增
       </el-button>
-      <el-button
-        type="primary"
-        class="btn"
-        @click="Issue"
-        v-if="activeName == 'first'"
-      >
-        <i class="el-icon-download"></i>下发
-      </el-button>
     </div>
     <template>
       <div>
@@ -62,6 +54,7 @@ export default {
   data() {
     return {
       inputText: "",
+      orgCode:"",
       first: {
         // first请求数据的地址
         requestUrl:
@@ -197,6 +190,7 @@ export default {
         this.$message.warning("请选择需求")
         return
       }
+      // 权限控制，判断用户是否属于轧钢厂下面的车间
       this.$confirm("是否下发", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",

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

@@ -0,0 +1,249 @@
+// 提出需求
+<template>
+  <div class="inwardRequirement">
+    <div class="sache">
+      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+      </el-input>
+      <el-button type="primary" class="btn">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="toInsert2"
+        v-if="activeName == 'first'"
+      >
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="Issue"
+        v-if="activeName == 'first'"
+      >
+        <i class="el-icon-download"></i>下发
+      </el-button>
+    </div>
+    <template>
+      <div>
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+          <el-tab-pane label="未下发" name="first">
+            <dilTable v-bind.sync="first" @selection-change="selectionChange" ref="table1">
+              <el-table-column fixed="right" label="操作" width="120">
+                <template slot-scope="scope">
+                  <el-button
+                    type="text"
+                    size="mini"
+                    @click="deleteRequirement(scope)"
+                  >
+                    删除
+                  </el-button>
+                </template>
+              </el-table-column>
+            </dilTable>
+          </el-tab-pane>
+          <el-tab-pane label="已下发" name="second">
+            <dilTable v-bind.sync="second" ref="table">
+            <el-table-column fixed="right" label="操作" width="80">
+                <template slot-scope="scope">
+                 <el-button type="text" size="mini" @click="getRequirementOrder(scope)">运单</el-button>
+                </template>
+              </el-table-column>
+            </dilTable>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </template>
+  </div>
+</template>
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  data() {
+    return {
+      inputText: "",
+      orgCode:"",
+      first: {
+        // first请求数据的地址
+        requestUrl:
+          "",
+        selectionType: "select",
+        mapList: [],
+      },
+      second: {
+        // second请求数据的地址
+        requestUrl:
+          "",
+      },
+      //记录旧的row对象(未下发)
+      oldRow: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(未下发)
+      oldRowCount: 1,
+      //记录旧的row对象(已下发)
+      oldRow1: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(已下发)
+      oldRowCount1: 1,
+      tableHead: [
+        {
+          prop: "materialName",
+          label: "物资名称",
+          width: 150,
+        },
+        {
+          prop:"loadName",
+          label:"装货点",
+          width:150
+        },
+        {
+          prop:"unloadName",
+          label:"卸货点",
+          width:150
+        },
+        {
+          prop: "materialWeight",
+          label: "物资重量",
+          width: 150,
+        },
+        {
+          prop: "materialCount",
+          label: "物资数量",
+          width: 150,
+        },
+      ],
+      tableData: [],
+      tableData1: [
+        {
+          materialCount : 100
+        }
+      ],
+      activeName: "first",
+    };
+  },
+  created(){
+    if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode") == "zidonghuabu"){
+      this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0"
+      this.second.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1"
+    }else{
+      this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&orgCode=" + getCookie("orgCode")
+      this.second.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&orgCode=" + getCookie("orgCode")
+    }
+  },
+  methods: {
+    //查看需求下面的运单
+    getRequirementOrder(scope){
+      this.$router.push(
+        "/getRequirementOrder/" + scope.row.requirementId
+      );
+    },
+    handleClick(tab, event) {
+      this.getRequestUrl()   
+    },
+    getRequestUrl(){
+      if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode") == "zidonghuabu"){
+      this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&i=" + new Date()
+      this.second.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&i=" + new Date()
+      }else{
+      this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&orgCode=" + getCookie("orgCode") + "&i=" + new Date()
+      this.second.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&orgCode=" + getCookie("orgCode") + "&i=" + new Date()
+      }
+    },
+    selectionChange(selection) {
+      this.first.mapList = selection;
+    },
+    toInsert2() {
+      this.$router.push("/addRequirement2");
+    },
+    updateRequirement(scope) {
+      this.$router.push(
+        "/updateRequirement/" + scope.row.requirementId
+      );
+    },
+    deleteRequirement(scope) {
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post(
+              "/api/v1/ams/deleteTruckRequirement/" + scope.row.requirementId
+            )
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });
+                this.getRequestUrl()
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+    Issue() {
+      console.log(this.first.mapList);
+      if(this.first.mapList.length == 0){
+        this.$message.warning("请选择需求")
+        return
+      }
+      // 权限控制，判断用户是否属于轧钢厂下面的车间
+      this.$confirm("是否下发", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/ams/downRequirement", this.first.mapList)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "下发成功!",
+                });
+              this.getRequestUrl()
+              this.activeName = 'second'
+              } else {
+                this.$message({
+                  message: "下发失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消下发!",
+          });
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+  .inwardRequirement{
+      margin-top: 20px;
+      margin-left: 20px;
+      .sache{
+          margin-top: 30px;
+          padding-bottom: 10px;
+          .el-input {
+            width: 20%;
+            }
+          }
+  }
+</style>

src/views/inward/router/index.js

@@ -8,6 +8,8 @@ import main from '@/components/main.vue'
 // 系统配置管理
 //运输预约--提出需求
 import requirement from '@/views/inward/components/truckAppoint/requirement.vue'
+// 没有提出需求页面
+import requirementOther from '@/views/inward/components/truckAppoint/requirementOther.vue'
 //运输预约--提出采购内转需求
 import purInwardRequirement from '@/views/inward/components/truckAppoint/purInwardRequirement.vue'
 //运输预约--制定计划
@@ -150,14 +152,8 @@ import oldAreaRailScaleAddTruckLoad from '@/views/inward/components/inwardImport
 //内转厂内物资--新增汽车装货
 import inwardFactoryAddTruckLoad from '@/views/inward/components/inwardFactory/addTruckLoad.vue'
 
-//内转结算--纯内转计费详单
-import inwardDetailOrders from '../components/inwardSettlement/detailOrder.vue'
-//内转结算--采购内转计费详单
-import inwardPurDetailsOrders from '../components/inwardSettlement/purInwardDetailsOrder.vue'
-//内转结算--计时计费详单
-import inwardTimeDetailsOrders from '../components/inwardSettlement/timeDetailsWeight.vue'
-//内转结算--计数计费详单
-import inwardCountDetailsOrders from '../components/inwardSettlement/countDetailOrder.vue'
+
+
 
 Vue.use(Router)
 
@@ -173,7 +169,8 @@ const constantRouterMap = [{
     name: 'requirement'
   },
   children: [
-    {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement},
+    {path: 'requirementOther',name: 'requirementOther',meta: {code: 'xtpzgl-yhgl'},component: requirementOther}, 
     {path: 'purInwardRequirement',name: 'purInwardRequirement',meta: {code: 'xtpzgl-yhgl'},component: purInwardRequirement}, 
     {path: 'truckAppointPlan',name: 'truckAppointPlan',meta: {code: 'xtpzgl-yhgl'},component: truckAppointPlan},
     {path: 'purInwardTruckOrder',name: 'purInwardTruckOrder',meta: {code: 'xtpzgl-yhgl'},component: purInwardTruckOrder},
@@ -243,10 +240,6 @@ const constantRouterMap = [{
     {path: 'updateTruckLoad/:resultId',name: 'updateTruckLoad',meta: {code: 'xtpzgl-yhgl'},component: updateTruckLoad}, 
     {path: 'oldAreaRailScaleAddTruckLoad',name: 'oldAreaRailScaleAddTruckLoad',meta: {code: 'xtpzgl-yhgl'},component: oldAreaRailScaleAddTruckLoad}, 
     {path: 'inwardFactoryAddTruckLoad',name: 'inwardFactoryAddTruckLoad',meta: {code: 'xtpzgl-yhgl'},component: inwardFactoryAddTruckLoad},
-    {path: 'inwardDetailOrders',name: 'inwardDetailOrders',meta: {code: 'xtpzgl-yhgl'},component: inwardDetailOrders},
-    {path: 'inwardCountDetailsOrders',name: 'inwardCountDetailsOrders',meta: {code: 'xtpzgl-yhgl'},component: inwardCountDetailsOrders},
-    {path: 'inwardTimeDetailsOrders',name: 'inwardTimeDetailsOrders',meta: {code: 'xtpzgl-yhgl'},component: inwardTimeDetailsOrders},
-    {path: 'inwardPurDetailsOrders',name: 'inwardPurDetailsOrders',meta: {code: 'xtpzgl-yhgl'},component: inwardPurDetailsOrders},
   ]
 }];
 

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(1).js

@@ -0,0 +1,64 @@
+import Vue from 'vue'
+import Router from 'vue-router'
+
+import routerBefore from '@/config/routerBefore.js'
+
+// 主要
+import main from '@/components/main.vue'
+// 系统配置管理
+import ShipDynamicTable from '../components/Ship_dynamic_table.vue'
+import purchaseAccessoriesMonitor from '../components/purchaseAccessoriesMonitor.vue'
+import purchasFuelOldMonitor from '../components/purchasFuelMonitor/purchasFuelOldMonitor.vue'
+import purchasFuelNewMonitor from '../components/purchasFuelMonitor/purchasFuelNewMonitor.vue'
+import sporadicReportEnterFactory from '../components/sporadicReport/sporadicReportEnterFactory.vue'
+import sporadicReportExFactory from '../components/sporadicReport/sporadicReportExFactory.vue'
+import transportationPerformance from '../components/salesLogisticsStatistics/transportationPerformance.vue'
+import purchaseChemicalMaterialsNew from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsNew.vue'
+import purchaseChemicalMaterialsOld from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsOld.vue'
+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'
+
+
+Vue.use(Router)
+
+const constantRouterMap = [
+  {
+    path: '/',
+    name: 'main',
+    meta: {title: '首页', code: 'xtpzgl'},
+    component: main,
+    redirect: {name: 'cargoResult'},
+    children: [
+      {path: 'purchaseChemicalMaterialsNew', name: 'purchaseChemicalMaterialsNew', meta: {code: 'xtpzgl-yhgl'}, component: purchaseChemicalMaterialsNew},
+      {path: 'purchaseChemicalMaterialsOld', name: 'purchaseChemicalMaterialsOld', meta: {code: 'xtpzgl-yhgl'}, component: purchaseChemicalMaterialsOld},
+      {path: 'ShipDynamicTable', name: 'ShipDynamicTable', meta: {code: 'xtpzgl-yhgl'}, component: ShipDynamicTable},
+      {path: 'purchaseAccessoriesMonitor', name: 'purchaseAccessoriesMonitor', meta: {code: 'xtpzgl-yhgl'}, component: purchaseAccessoriesMonitor},
+      {path: 'purchasFuelOldMonitor', name: 'purchasFuelOldMonitor', meta: {code: 'xtpzgl-yhgl'}, component: purchasFuelOldMonitor},
+      {path: 'purchasFuelNewMonitor', name: 'purchasFuelNewMonitor', meta: {code: 'xtpzgl-yhgl'}, component: purchasFuelNewMonitor},
+      {path: 'sporadicReportEnterFactory',name:'sporadicReportEnterFactory',meta:{code:'xtpzgl-yhgl'},component:sporadicReportEnterFactory},
+      {path: 'sporadicReportExFactory',name:'sporadicReportExFactory',meta:{code:'xtpzgl-yhgl'},component:sporadicReportExFactory},
+      {path: 'transportationPerformance', name: 'transportationPerformance', meta: {code: 'xtpzgl-yhgl'}, component: transportationPerformance},
+      {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}
+    ]
+  }
+];
+const router = new Router({
+  routes: constantRouterMap
+})
+//  before
+routerBefore(router, constantRouterMap);
+
+export default router;
+//  constantRouterMap
+export const routes = constantRouterMap;