tijiao

build/utils.js

@@ -16,11 +16,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 // let devModules = ['all'];
-<<<<<<< HEAD
-let devModules = ['index','statisticalReport','appoint','RMS'];
-=======
-let devModules = ['index','queue','RMS'];
->>>>>>> dev
+let devModules = ['index','statisticalReport','inward','SporadicManage'];
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

config/index.js

@@ -56,17 +56,17 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    // target: "http://172.16.33.166:8080",
-    // target: "http://172.16.33.162:8019",
-    target: "http://192.168.1.102:8019",
+    // target: "http://:8087",
+    // target: "http://172.16.33.162:8080",
+    target: "http://192.168.1.114:8019",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"
     }
   },
   "/views/api/v1": {
-    // target: "http://172.16.33.166:8080",
-    target: "http://192.168.1.102:8019",
+    target: "http://172.16.33.166:8080",
+    // target: "http://192.168.1.102:8019",
     ws: true,
     pathRewrite: {
       "^/views/api/v1": "/api/v1"

src/components/DilCommonUI/packages/table/src/table.js

@@ -36,6 +36,27 @@ export default {
     this.columnDrop();
   },
   methods: {
+    //计算合计列
+    getSummaries(columns,data) {
+      const sums = [];
+      columns.forEach((column, index) => {
+       const values = data.map(item => Number(item[column.property]));
+           if (column.property =='resultNetWeight' ) {
+            sums[index] = values.reduce((prev, curr) => {
+             const value = Number(curr);
+             if (!isNaN(value)) {
+               return prev + curr;
+             } else {
+               return prev;
+             }
+            }, 0);
+            console.log(sums )
+            sums[index];
+           }
+      });
+      console.log("净重：" + sums)
+      return sums
+      },
     // 通过请求获取数据
     requestData(options) {
       let pageNum = undefined;
@@ -106,11 +127,13 @@ export default {
               this.$emit('func',response.data.data);
               this.refreshColumnData(d.columnData);
               this.isShow = true;
+              
               //若父组件存在要合计的值
               if(this.$parent.totalNumber>=0){
                 //将筛选的字段传给父组件
                 this.$parent.calculationTotalNumber(this.dataRequestQuery);
               }
+              return d.columnData
             });
         }
       } else {
@@ -122,6 +145,7 @@ export default {
       // 表头只赋值一次(在查出全部数据的情况下才只赋值一次)
       // if (this.dataColumnData.length > 0) return;
       // 如果前端有写表头，则加在后端表头前面
+      
       const d = this.columnData.concat(columnData);
       // 把操作列拼接到最后一列
       this.dataColumnData = d;

src/components/DilCommonUI/packages/table/src/table.vue

@@ -19,6 +19,7 @@
       v-loading="loading"
       element-loading-text="玩命加载中"
       element-loading-spinner="el-icon-loading"
+      :show-summary="summary"
     >
       <!-- 多选列 -->
       <el-table-column
@@ -119,6 +120,9 @@ export default {
   name: "DilTable",
   extends: table,
   props: {
+    summary:{
+      default:false,
+    },
     drawer:{
       default:false,
     },
@@ -249,6 +253,7 @@ export default {
     toggleRowExpansion(row, expanded) {
       this.$refs.mainTable.toggleRowExpansion(row, expanded);
     },
+
   },
 };
 </script>

src/views/RMS/components/editCapacity.vue

@@ -160,7 +160,7 @@ export default {
          capacityOwneris:this.form1.capacityOwneris,
          capacityVip:this.form1.capacityVip,
          capacityBlacklist:this.form1.capacityBlacklist,
-          carrierId:this.carrierIds,
+         carrierId:this.carrierIds,
        };if(
          RmsCapacity.capacityNumber==null ||
          RmsCapacity.capacityCorlor==null ||

src/views/SporadicManage/components/moreThanMaterialTruck/transportOrder/addTransportOrder.vue

@@ -257,6 +257,12 @@ export default {
 
 <style lang='scss'>
 .addSaleOrderSend {
+  .el-drawer__body {
+   overflow: auto;
+}
+.el-drawer__container ::-webkit-scrollbar{
+    display: none;
+}
   .from {
     margin-top: 20px;
     .line {

src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/outFactory.vue

@@ -27,7 +27,7 @@ export default {
     };
   },
   created(){
-      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=13"
       }else{
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=13&userId=" + getCookie("orgCode")

src/views/SporadicManage/components/sporadicMaterial/transportAppoint/addSporadicTransportAppoint.vue

@@ -94,7 +94,7 @@
         </el-autocomplete>
         </el-form-item>
         </el-form>
-        <el-form
+        <!-- <el-form
         :inline="true"
         class="demo-form-inline"
         label-width="80px"
@@ -109,7 +109,7 @@
         >
         </el-input>
         </el-form-item>
-        </el-form>
+        </el-form> -->
         <el-form
         :inline="true"
         class="demo-form-inline"
@@ -228,7 +228,7 @@
       <el-button type="primary" @click="makeSure1">确定</el-button>
       <div class="tablecls">
         <!-- 查询所有的物资 -->
-        <dilTable ref="materialTable" v-bind.sync="materialOptions" @radio-change="selectionChange">
+        <dilTable ref="materialTable" v-bind.sync="materialOptions" @radio-change="selectionChange" :drawer="aaadrawer">
         </dilTable>
       </div>
     </el-drawer>
@@ -270,6 +270,7 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      aaadrawer:false,
       disabled:false,
       materialTimes:null,
       options: [],
@@ -312,7 +313,7 @@ export default {
           width: "140",
         },
         {
-          prop: "Specification",
+          prop: "materialSpecification",
           label: "规格型号",
           width: "140",
         },
@@ -382,6 +383,13 @@ export default {
         });
       }
     },
+    table(val){
+      if(val){
+        this.aaadrawer = false;
+      }else{
+        this.aaadrawer = true;
+      }
+    }
   },
   methods: {
     //关闭运输线路
@@ -392,7 +400,7 @@ export default {
     },
     onclickMaterial(){
         if(this.inputMaterial != null){
-          this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395"+ "&index=" + this.inputMaterial
+          this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395&index=" + this.inputMaterial
         }
         else{
           this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395"
@@ -419,7 +427,7 @@ export default {
       }
     },
     drawTable(){
-      this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395&test=" + new Date()
+      this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395" +"&test=" + new Date()
       this.selectionList1 = []
       this.table = true
     },
@@ -497,14 +505,20 @@ export default {
     },
     // 返回主界面
     makeSure1() {
-      console.log(this.selectionList1)
-        this.selectionList1.materialPriority = 1
-        this.tableData.push(this.selectionList1);  
-        console.log(this.tableData)
-        console.log(this.tableData)  
-        this.selectionList1 = [];
-        this.table = false;
-        console.log(this.selectionList1)
+        if(this.tableData.length != 0){
+          this.$message.error("物资已选择，请删除后重试")
+          return
+        }
+        console.log(JSON.stringify(this.selectionList1).length)
+        if(JSON.stringify(this.selectionList1).length != 2){
+            this.selectionList1.materialPriority = 1
+            console.log(JSON.stringify(this.selectionList1))
+            this.tableData.push(this.selectionList1);  
+            this.selectionList1 = [];
+            this.table = false;
+        }else{
+          this.$message.error("请选择物资！")
+        }     
     },
     //取消模态框多选
     open() {
@@ -537,7 +551,7 @@ export default {
     },
     ondrawer(num) {
       this.line.requestUrl =
-          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&test=1";
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3" + "&t=" + new Date();
       this.drawer = true;
       this.a = num;
     },
@@ -589,7 +603,7 @@ export default {
           orderType:this.orderType,
           carrierId: this.carrierId,
           receiveId: this.consigneeId,
-          orderTime:this.materialTimes,
+          // orderTime:this.materialTimes,
           userId:getCookie("orgCode"),
           mapList: this.tableData,
         };

src/views/SporadicManage/components/sporadicMaterial/transportAppoint/transportAppoint.vue

@@ -96,24 +96,24 @@ export default {
   },
   created(){
       if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=0&orderType=12&dispatchStatus=0",
-            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=12",
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&orderType=12&dispatchStatus=0",
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12",
             this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1"       
       }else{
-            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=0&orderType=12&dispatchStatus=0&userId=" + getCookie("orgCode"),
-            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=12&userId=" + getCookie("orgCode"),
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&orderType=12&dispatchStatus=0&userId=" + getCookie("orgCode"),
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&userId=" + getCookie("orgCode"),
             this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&userId=" + getCookie("orgCode")
-      }
+      } 
   },
   methods: {
     getRequestUrl(){
       if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=0&orderType=12&dispatchStatus=0&test=" + new Date(),
-            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=12&test=" + new Date(),
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&orderType=12&dispatchStatus=0&test=" + new Date(),
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&test=" + new Date(),
             this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&test=" + new Date()
       }else{
-            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=0&orderType=12&dispatchStatus=0&userId=" + getCookie("orgCode") + "&test=" + new Date(),
-            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=12&userId=" + getCookie("orgCode") + "&test=" + new Date(),
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&orderType=12&dispatchStatus=0&userId=" + getCookie("orgCode") + "&test=" + new Date(),
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&userId=" + getCookie("orgCode") + "&test=" + new Date(),
             this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&userId=" + getCookie("orgCode") + "&test=" + new Date()
      }
     },
@@ -160,18 +160,18 @@ export default {
         if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu")
         {
           if(this.activeName == "first"){
-            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=0&orderType=12&dispatchStatus=0&con=" + this.input
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&orderType=12&dispatchStatus=0&con=" + this.input
           }else if(this.activeName == "second"){
-            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=12&con=" + this.input
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&con=" + this.input
           }else{
             this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=11&con=" + this.input
           }                
         }else
         {
           if(this.activeName == "first"){
-            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=0&orderType=12&dispatchStatus=0&userId=" + getCookie("orgCode") + "&con=" + this.input
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&orderType=12&dispatchStatus=0&userId=" + getCookie("orgCode") + "&con=" + this.input
           }else if(this.activeName == "second"){
-            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=12&userId=" + getCookie("orgCode") + "&con=" + this.input
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&userId=" + getCookie("orgCode") + "&con=" + this.input
           }else{
             this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=11&userId=" + getCookie("orgCode") + "&con=" + this.input
           }       

src/views/SporadicManage/components/sporadicMaterial/transportOrder/addTransportOrder.vue

@@ -153,23 +153,18 @@ export default {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
         getCookie("userId");
-        this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=12&dispatchStatus=0&carrierSsoId=" + getCookie("userId");
+        this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&dispatchStatus=0&carrierSsoId=" + getCookie("userId");
     } else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "wuliuchuyunzhongxin"){
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
-        this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=12&dispatchStatus=0&sporadicStatus=0";
+        this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&dispatchStatus=0&sporadicStatus=0";
     } else{
         this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
-        this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=12&dispatchStatus=0&sporadicStatus=0&userId=" + getCookie("orgCode");
+        this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&dispatchStatus=0&sporadicStatus=0&userId=" + getCookie("orgCode");
     }
   },
   methods: {
-    onInput(val){
-      if(!isNumber(val)){
-        this.$message.warning('重量请输入数字')
-      }
-    },
     //点击确定按钮的事件
     makeSure(){
        console.log(this.selectionList)
@@ -216,14 +211,27 @@ export default {
     },
     //车辆模态框框计算
     selectTruckClick(){
-      if (getCookie("orgCode") == "chengyunshang") {
+      if(this.truckText != null){
+        if (getCookie("orgCode") == "chengyunshang") {
         this.truck.requestUrl =
-          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
           getCookie("userId") + "&index="+this.truckText;
       } else {
         this.truck.requestUrl =
-          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null + "&index="+this.truckText;
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&index="+this.truckText;
+      }
+        this.truckText = null
+      }else{
+         if (getCookie("orgCode") == "chengyunshang") {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+          getCookie("userId") + "&i=" + new Date()
+      } else {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&i=" + new Date()
+      }
       }
+    
     },
     //车辆表格
     currentRadioChange1(select){
@@ -252,6 +260,12 @@ export default {
 </script>
 <style lang='scss'>
 .addSaleOrderSend {
+  .el-drawer__body {
+   overflow: auto;
+  }
+  .el-drawer__container ::-webkit-scrollbar{
+    display: none;
+  }
   .from {
     margin-top: 20px;
     .line {

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

@@ -149,7 +149,7 @@ export default {
         mapList3: [],
       },
       unloadPoint: {
-        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
+        requestUrl: "",
         selectionType: "radio",
       },
     };
@@ -162,7 +162,7 @@ export default {
     },
   },
   created() {
-   
+      this.unloadPoint.requestUrl = "/api/v1/uc/getUnloadingMesByLike?apiId=374"
   },
   methods: {
     onClick(index) {
@@ -215,7 +215,7 @@ export default {
           this.input;
       } else if (a == 4) {
         this.unloadPoint.requestUrl =
-          "/api/v1/uc/getUnloadingMesByLike?apiId=347&index=" + this.input;
+          "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.input + "&i=" + new Date();
       }
     },
     ondrawer(num) {

src/views/statisticalReport/components/sporadicReport/sporadicReportEnterFactory.vue

@@ -2,10 +2,10 @@
   <div class="purchasFuelNewMonitor">
     <div class="frameCalculation">
       <span>进厂时间：</span>
-      <el-date-picker v-model="startTime" type="date" placeholder="选择日期">
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
       <span>至</span>
-      <el-date-picker v-model="endTime" type="date" placeholder="选择日期">
+      <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>查询
@@ -13,9 +13,13 @@
       <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="totalNumber" :disabled="true" style="width: 100px;"></el-input>
+      <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"></dilTable>
+      <dilTable ref="excelDom" v-bind.sync="option" @func="func"></dilTable>
     </div>
   </div>
 </template>
@@ -26,6 +30,8 @@ import { getCookie } from '@/utils/util.js';
 export default {
   data() {
     return {
+      totalNumber:null,
+      totalCapacity:null,
       option: {
         requestUrl:'',
       },
@@ -55,6 +61,15 @@ export default {
     }
   },
   methods: {
+     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;
+    },
     getRequestUrl(){
         if (
       getCookie("orgCode") == "dagangadmin" ||

src/views/statisticalReport/components/sporadicReport/sporadicReportExFactory.vue

@@ -4,14 +4,14 @@
       <span>进厂时间：</span>
       <el-date-picker
         v-model="startTime"
-        type="date"
+        type="datetime"
         placeholder="选择日期"
       >
       </el-date-picker>
       <span>至</span>
       <el-date-picker
         v-model="endTime"
-        type="date"
+        type="datetime"
         placeholder="选择日期"
       >
       </el-date-picker>
@@ -19,9 +19,13 @@
         <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="totalNumber" :disabled="true" style="width: 100px;"></el-input>
+      <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"></dilTable>
+      <dilTable ref="excelDom" v-bind.sync="option" @func="func"></dilTable>
     </div>
   </div>
 </template>
@@ -32,6 +36,8 @@ import { getCookie } from '@/utils/util.js';
 export default {
   data() {
     return {
+      totalNumber:null,
+      totalCapacity:null,
       option: {
         requestUrl: "",
       },
@@ -50,6 +56,15 @@ export default {
       }
   },
   methods: {
+    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;
+    },
     getRequestUrl(){
         if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
           this.option.requestUrl = '/api/v1/tms/getSporadicSuppliesReport2?apiId=425&startTime=null&endTime=null&i=' +new Date();