Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

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

@@ -12,8 +12,7 @@
         </div>
         <div class="searchSelect">
             <span class="text">单价</span>
-            <el-input class="input" v-model="form.unitPrice" disabled  @change="calculate"> </el-input>
-            <el-button class="button" type="primary" @click="ondrawer(6)">浏览</el-button>
+            <el-input class="input" v-model="form.unitPrice"   @change="calculate"> </el-input>
         </div>
         <div class="preview-group">
           <el-form-item label="实装吨位">
@@ -205,7 +204,6 @@ export default {
       if(map.batchId==null ||
        map.purchaseOrderId==null ||
        map.unitPrice==null ||
-       map.unitPriceId==null ||
        map.realTonnage==null ||
        map.fee==null ||
        map.makeTime==null ||

src/views/TMS/components/importedMine/addWagonLoad.vue

@@ -370,10 +370,14 @@ export default {
       }
       let date=this.form1.resultLoadingDate;
       let month=(date.getMonth()+1);
+      let day=date.getDate();
       if(month>=1 && month <=9){
         month="0"+month;
       }
-      let dateStr=date.getFullYear()+"年"+month+"月"+date.getDate()+"日";
+      if(day>=1 && day<=9){
+        day="0"+day;
+      }
+      let dateStr=date.getFullYear()+"年"+month+"月"+day+"日";
       this.selectionRow.forEach((item)=>{
         if(!item.sendDate || !item.arrivalDate){
           item.sendDate=dateStr;

src/views/appoint/components/ship/modifyDeliveryNotice.vue

@@ -411,7 +411,7 @@ export default {
         map.silicaContent == null ||
         map.aluminaContent == null ||
         map.phosphorusContent == null ||
-        map.manganeseContent == null ||
+        // map.manganeseContent == null ||
         map.resultContactPerson == null ||
         map.resultTelephoneFax == null ||
         map.resultNumberOfLoans == null ||

src/views/statisticalReport/components/ShipWorkReport.vue

@@ -0,0 +1,161 @@
+<template>
+  <!-- 万州港作业报表 -->
+  <div class="ShipWorkReport">
+    <div style="height:100%;width:100%">
+      <div class="search" style="display:flex;margin: 10px;">
+        <el-input
+          placeholder="请输入"
+          v-model="map.input"
+          style="margin: 10px; width:10%"
+          clearable
+        ></el-input>
+       <el-date-picker style="margin: 10px;" v-model="map.startTime" type="datetime" placeholder="起始日期"></el-date-picker>
+      <el-date-picker style="margin: 10px;" v-model="map.endTime" type="datetime" placeholder="结束日期"></el-date-picker>
+        <el-button
+          type="primary"
+          class="btn"
+          @click="searchLoadData"
+          style="margin: 10px;"
+        >
+          <i class="el-icon-search"></i>查询
+        </el-button>
+      </div>
+      <!-- 装车出库详情 -->
+      <div class="loadData" style="height:500px;float:left;margin-left:5px">
+        <div style="font-size:16px;color:red">港口装车数据:共{{count}}车</div>
+        <div class="loadTable" style="height:500px;overflow:scroll;">
+             <el-table
+          ref="loadTable"
+          highlight-current-row
+          :data="loadTable"
+          :row-style="{height:'40px'}"
+          style="width: 100%;font-size: 18px">
+          <el-table-column
+          type="index"
+          width="50"
+          label="编号"
+          align="center"
+          fixed="left"
+          :resizable="false">
+          </el-table-column>
+          <el-table-column
+          align="center"
+            prop="materialName"
+            label="物资名"
+            width="300px">
+          </el-table-column>
+          <el-table-column
+          align="center"
+            prop="resultForeignShipName"
+            label="船号"
+            width="150px">
+          </el-table-column>
+           <el-table-column
+          align="center"
+            prop="num"
+            label="装车量"
+            width="150px">
+          </el-table-column>
+        </el-table>
+        </div >
+      </div>
+      <!-- 卸船作业 -->
+      <div class="right" style="margin-right=10px:10px;float:right;">
+        <div style="font-size:16px;color:red">港口卸船数据</div>
+           <el-table
+          ref="unLoadTable"
+          highlight-current-row
+          :data="unLoadTable"
+          :row-style="{height:'40px'}"
+          style="width: 100%;font-size: 18px">
+          <el-table-column
+          type="index"
+          width="50"
+          label="编号"
+          align="center"
+          fixed="left"
+          :resizable="false">
+          </el-table-column>
+          <el-table-column
+          align="center"
+            prop="status"
+            label="状态"
+            width="240px">
+          </el-table-column>
+          <el-table-column
+          align="center"
+            prop="num"
+            label="数量"
+            width="100px">
+          </el-table-column>
+        </el-table>
+    </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/utils/sharedJsFile";
+import {getCookie} from "@/utils/util.js";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+        count:0,
+        loadTable:[],
+        unLoadTable:[],
+        map:{
+            input:"",
+            startTime:null,
+            endTime:null
+        },
+      
+    };
+  },
+  mounted(){
+    this.searchLoadData();
+    this.searchUnLoadData();
+  },
+  methods: {
+    //查询装车数据
+    searchLoadData(){
+      if(this.map.startTime && this.map.endTime){
+        this.map.startTime=sjTime(this.map.startTime);
+        this.map.endTime=sjTime(this.map.endTime);
+      }
+      this.axios.post('/api/v1/tms/getLoadData',this.map).then((res)=>{
+        if(res.data.code == "200"){
+          this.loadTable=res.data.data;
+          this.count=0;
+          this.loadTable.forEach((item)=>{
+            this.count+=item.num;
+          });
+        }else {
+          this.$message({
+              type: "error", 
+              message: res.data.data,
+          });
+        }
+      })
+    },
+    //查询卸船
+    searchUnLoadData(){
+      this.axios.post('/api/v1/tms/getUnloadData').then((res)=>{
+        if(res.data.code == "200"){
+          this.unLoadTable=res.data.data;
+        }else {
+          this.$message({
+              type: "error", 
+              message: res.data.data,
+          });
+        }
+      })
+    }
+  },
+};
+</script>
+<style lang='scss'>
+
+</style>
+

src/views/statisticalReport/router/index.js

@@ -7,6 +7,7 @@ import routerBefore from "@/config/routerBefore.js";
 import main from "@/components/main.vue";
 // 系统配置管理
 import ShipDynamicTable from "../components/Ship_dynamic_table.vue";
+import ShipWorkReport from "../components/ShipWorkReport.vue";
 import purchaseAccessoriesMonitor from "../components/purchaseAccessoriesMonitor.vue";
 import purchasFuelOldMonitor from "../components/purchasFuelMonitor/purchasFuelOldMonitor.vue";
 import purchasFuelNewMonitor from "../components/purchasFuelMonitor/purchasFuelNewMonitor.vue";
@@ -58,6 +59,12 @@ const constantRouterMap = [
         meta: { code: "xtpzgl-yhgl" },
         component: ShipDynamicTable
       },
+      {
+        path: "ShipWorkReport",
+        name: "ShipWorkReport",
+        meta: { code: "xtpzgl-yhgl" },
+        component: ShipWorkReport
+      },
       {
         path: "purchaseAccessoriesMonitor",
         name: "purchaseAccessoriesMonitor",