Merge remote-tracking branch 'origin/master'

build/utils.js

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

src/views/TMS/components/bmsship/DryWetDetails.vue

@@ -6,8 +6,8 @@
       <el-form :inline="true">
         <el-form-item>
           <el-input
-            v-model="shipName"
-            placeholder="请输入船名"
+            v-model="con"
+            placeholder="请输入物资名"
             clearable
           ></el-input>
         </el-form-item>
@@ -52,19 +52,9 @@
         :cell-style="{ fontWeight: '700' }"
         class="table"
         fit
-        :span-method="objectSpanMethod"
         :summary-method="getSummaries"
         show-summary
       >
-        <el-table-column
-          prop="index"
-          width="50"
-          label="序号"
-          align="center"
-          :resizable="false"
-        >
-          <template slot-scope="scope">{{ scope.row.group + 1 }}</template>
-        </el-table-column>
         <el-table-column
           prop="balanceMonth"
           label="结算月"
@@ -73,11 +63,11 @@
           :filters="banlanceMonthList"
         >
         </el-table-column>
-        <el-table-column prop="deliveryPort" label="放货港口">
+        <el-table-column prop="portName" label="放货港口" min-width="80px" align="center">
         </el-table-column>
-        <el-table-column prop="deliveryMonth" label="放货日期">
+        <el-table-column prop="noticeTime" label="放货日期" width="80px" align="center">
         </el-table-column>
-        <el-table-column prop="minerals" label="矿种"></el-table-column>
+        <el-table-column prop="commerceMethod" label="矿种" width="60px" align="center"></el-table-column>
         <el-table-column
           prop="materialName"
           label="品种"
@@ -86,111 +76,123 @@
         >
         </el-table-column>
         <el-table-column
-          prop="resultForeignShipName"
+          prop="foreignShipName"
           label="船名"
           width="100px"
           align="center"
         >
         </el-table-column>
         <el-table-column
-          prop="shipmentTonnage"
+          prop="loadWetTon"
           label="装船吨位"
           width="120px"
           align="center"
         >
         </el-table-column>
         <el-table-column
-          prop="shipmentMoistureTonnage"
+          prop="loadWaterTon"
           label="装船水分吨位"
           width="100px"
           align="center"
         >
         </el-table-column>
         <el-table-column
-          prop="carNum"
+          prop="wagonNumber"
           label="车数"
           width="100px"
           align="center"
         >
         </el-table-column>
         <el-table-column
-          prop="billingTonnage"
+          prop="totalTrainTon"
           label="计费吨位"
           width="70px"
           align="center"
         >
         </el-table-column>
         <el-table-column
-          prop="totalEnTonnage"
+          prop="totalEnTonWet"
           label="到厂湿吨"
           width="120px"
           align="center"
         >
         </el-table-column>
         <el-table-column
-          prop="wetTonnageDiffer"
+          prop="diff"
           label="装船与到厂湿吨差"
           width="120px"
           align="center"
         >
         </el-table-column>
         <el-table-column
-          prop="wetTonnageLoss"
+          prop="lossWet"
           label="湿吨途损"
           width="100px"
           align="center"
         >
+         <template slot-scope="scope" v-if="scope.row.lossWet">
+                {{(scope.row.lossWet*100).toFixed(2)}}%
+        </template>
         </el-table-column>
         <el-table-column
-          prop="shipmentWaterContent"
+          prop="loadWaterRate"
           label="装船含水率"
           width="100px"
           align="center"
         >
+        <template slot-scope="scope" v-if="scope.row.loadWaterRate">
+                {{(scope.row.loadWaterRate*100).toFixed(2)}}%
+        </template>
         </el-table-column>
         <el-table-column
-          prop="enWaterContent"
+          prop="enWaterRate"
           label="到厂含水率"
           width="120px"
           align="center"
         >
+        <template slot-scope="scope" v-if="scope.row.enWaterRate">
+                {{(scope.row.enWaterRate*100).toFixed(2)}}%
+        </template>
         </el-table-column>
         <el-table-column
-          prop="enDeduction"
+          prop="totalDeduct"
           label="到厂扣杂"
           width="120px"
           align="center"
         >
         </el-table-column>
         <el-table-column
-          prop="enWaterTonnage"
+          prop="totalWaterTon"
           label="入厂水分吨位"
           width="120px"
           align="center"
         >
         </el-table-column>
         <el-table-column
-          prop="shipmentDryWeight"
+          prop="loadWaterTon"
           label="装船干基重"
           width="120px"
           align="center"
         >
         </el-table-column>
         <el-table-column
-          prop="enDryWeight"
+          prop="totalEnTonDry"
           label="到厂干基重"
           width="120px"
           align="center"
         >
         </el-table-column>
         <el-table-column
-          prop="dryWeightLoss"
+          prop="lossDry"
           label="干吨途损"
           width="100px"
           align="center"
         >
+        <template slot-scope="scope" v-if="scope.row.lossDry">
+                {{(scope.row.lossDry*100).toFixed(2)}}%
+        </template>
         </el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           prop="reduceEnDry"
           label="还原后到厂干基"
           width="100px"
@@ -203,7 +205,7 @@
           width="100px"
           align="center"
         >
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
     </div>
   </div>
@@ -216,7 +218,7 @@ export default {
   data() {
     return {
       totalWillTonageedValue: 0,
-      shipName: null,
+      con: null,
       tableData: [],
       tableTitle: '干吨明细',
       startTime: null,
@@ -291,17 +293,43 @@ export default {
     tableData: {
       handler(newVal) {
         console.log('执行一次汇总函数')
-        this.computedTableData(newVal)
+        //this.computedTableData(newVal)
       },
       deep: true,
       immediate: false
     }
   },
   created() {},
+  mounted(){
+    this.onClick();
+  },
   methods: {
     filterTag(value, row) {
       return row.balanceMonth === value
     },
+    //查询数据
+    onClick(){
+      let map={
+        con:this.con
+      };
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime && startTime < endTime){
+          map.startTime=startTime;
+          map.endTime=endTime;
+      }
+      this.axios  
+        .post("/api/v1/bms/getWetDryDetails",map)
+        .then((res) => {
+         this.tableData=res.data.data;
+        });
+    },
     //处理表格数据
     computedTableData(data) {
       data.forEach((item, index) => {