aytaidja

config/index.js

@@ -67,7 +67,7 @@ let proxyTable = {
   "/api/v1": {
     target: "http://172.16.33.166:80",
     // target: "http://localhost:8080",
-    // target: "http://192.168.1.109:8080",
+    // target: "http://192.168.1.101:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

src/views/ADMINISTRATORS/components/ADMINISTRATORS1.vue

@@ -322,7 +322,7 @@ export default {
     allowEnfactoryClick() {},
     queueClick() {
       this.axios
-        .post("/api/v1/qms/addQueueResult?vno=" + this.capacityName)
+        .post("/api/v1/qms/addQueueResult?vno=" + this.capacityName + "_")
         .then(res => {
           if (res.data.code == 200) {
             this.$message.success("操作成功");

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

@@ -2,18 +2,36 @@
 <template>
   <div id="detailsStatement">
     <div class="top">
-      <el-form inline="true">
+      <el-form :inline="true">
         <el-form-item>
           <el-input v-model="shipName" placeholder="请输入船名"></el-input>
         </el-form-item>
         <el-form-item>
           <span class="demonstration">结算日期</span>
-          <el-date-picker v-model="value1" type="date" placeholder="选择日期">
+          <el-date-picker
+            v-model="startTime"
+            type="date"
+            placeholder="选择日期"
+            style="width:200px"
+          >
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker
+            v-model="endTime"
+            type="date"
+            placeholder="选择日期"
+            style="width:200px"
+          >
           </el-date-picker>
         </el-form-item>
         <el-form-item>
           <el-button @click="onClick">查询</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="exportAllReportToExcel"
+            ><i class="el-icon-download"></i>Excel</el-button
+          >
+        </el-form-item>
         <el-form-item>
           <span class="totalWillTonage">合计已预开票吨位</span>
           <el-input
@@ -57,12 +75,11 @@
             border
             stripe
             style="width: 100%; margin-top: 20px"
-            max-height="800px"
+            max-height="600px"
             :row-style="{ height: '30px' }"
             :cell-style="{ fontWeight: '700' }"
-            :summary-method="getSummaries"
-            show-summary
             class="table"
+            :span-method="objectSpanMethod"
           >
             <el-table-column
               prop="index"
@@ -74,122 +91,138 @@
               <template slot-scope="scope">{{ scope.row.group + 1 }}</template>
             </el-table-column>
             <el-table-column
-              prop="materialTypeName"
+              prop="materialName"
               label="品种"
-              width="200px"
+              width="150px"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="shipName"
+              prop="resultForeignShipName"
               label="船名"
-              width="200px"
+              width="150px"
               align="center"
             >
             </el-table-column>
             <el-table-column
               prop="portName"
               label="放货港口"
-              width="200px"
+              width="150px"
               align="center"
             >
             </el-table-column>
             <el-table-column
               prop="carrierName"
               label="承运单位"
-              width="200px"
+              width="100px"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="leavePortDate"
+              prop="resultOutPortTime"
               label="离港日期"
               width="200px"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="loadShipTon"
+              prop="loadTonnage"
               label="装船吨位"
-              width="200px"
+              width="100px"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="loadShipPer"
+              prop="loadingProportion"
               label="装船比例"
-              width="200px"
+              width="100px"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="billTon"
+              prop="realTonnage"
               label="结算吨位"
-              width="200px"
+              width="100px"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="enFatoryTon"
+              prop="totalEnTonnage"
               label="到厂湿吨"
-              width="200px"
+              width="100px"
               align="center"
             >
               <template slot-scope="scope">
-                <el-input v-model="scope.row.enFatoryTon"></el-input>
+                <el-input v-model="scope.row.totalEnTonnage"></el-input>
               </template>
             </el-table-column>
             <el-table-column
-              prop="contractPrice"
+              prop="unitPrice"
               label="合同单价"
-              width="200px"
+              width="100px"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="statementAmount"
+              prop="fee"
               label="金额(元)"
-              width="200px"
+              width="100px"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="willTonanged"
+              prop="previewTonnage"
               label="已预开票吨位"
-              width="200px"
+              width="100px"
               align="center"
             >
               <template slot-scope="scope">
-                <el-input v-model="scope.row.willTonanged"></el-input>
+                <el-input v-model="scope.row.previewTonnage"></el-input>
               </template>
             </el-table-column>
             <el-table-column
-              prop="willMoneyed"
+              prop="previewFee"
               label="已预开票金额"
-              width="200px"
+              width="100px"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="actuallyMoney"
+              prop="makeTonnage"
               label="本次实际开票吨位"
-              width="200px"
+              width="100px"
               align="center"
             >
             </el-table-column>
             <el-table-column
               prop="actuallyMoney"
-              label="本次实际开票吨位"
-              width="200px"
+              label="本次实际开票金额"
+              width="100px"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="actuallyMonthMoney"
+              prop="feeMake"
               label="本月实际开票金额"
-              width="200px"
+              width="100px"
+              align="center"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="operate"
+              label="操作"
+              width="100px"
               align="center"
+              fixed="right"
             >
+              <template slot-scope="scope">
+                <el-button type="text" @click="operate(scope.row)"
+                  >保存</el-button
+                >
+                <el-button type="text" @click="settlement(scope.row)"
+                  >结算</el-button
+                >
+              </template>
             </el-table-column>
           </el-table>
         </el-tab-pane>
@@ -199,13 +232,11 @@
             ref="tableRef1"
             border
             stripe
-            style="width: 100%; margin-top: 20px"
-            max-height="800px"
+            max-height="600px"
             :row-style="{ height: '30px' }"
             :cell-style="{ fontWeight: '700' }"
-            :summary-method="getSummaries"
-            show-summary
             class="table"
+            :span-method="objectSpanMethod1"
           >
             <el-table-column
               prop="index"
@@ -217,89 +248,89 @@
               <template slot-scope="scope">{{ scope.row.group + 1 }}</template>
             </el-table-column>
             <el-table-column
-              prop="materialTypeName"
+              prop="materialName"
               label="品种"
-              width="200px"
+              width="150px"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="shipName"
+              prop="resultForeignShipName"
               label="船名"
-              width="200px"
+              width="150px"
               align="center"
             >
             </el-table-column>
             <el-table-column
               prop="portName"
               label="放货港口"
-              width="200px"
+              width="150px"
               align="center"
             >
             </el-table-column>
             <el-table-column
               prop="carrierName"
               label="承运单位"
-              width="200px"
+              width="100px"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="leavePortDate"
+              prop="resultOutPortTime"
               label="离港日期"
               width="200px"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="loadShipTon"
+              prop="loadTonnage"
               label="装船吨位"
-              width="200px"
+              width="100px"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="loadShipPer"
+              prop="loadingProportion"
               label="装船比例"
-              width="200px"
+              width="100px"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="billTon"
+              prop="realTonnage"
               label="结算吨位"
-              width="200px"
+              width="100px"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="enFatoryTon"
+              prop="totalEnTonnage"
               label="到厂湿吨"
-              width="200px"
+              width="100px"
               align="center"
             >
               <template slot-scope="scope">
-                <el-input v-model="scope.row.enFatoryTon"></el-input>
+                <el-input v-model="scope.row.totalEnTonnage"></el-input>
               </template>
             </el-table-column>
             <el-table-column
-              prop="contractPrice"
+              prop="unitPrice"
               label="合同单价"
-              width="200px"
+              width="100px"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="statementAmount"
+              prop="fee"
               label="金额(元)"
-              width="200px"
+              width="100px"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="willTonanged"
+              prop="previewTonnage"
               label="已预开票吨位"
-              width="200px"
+              width="100px"
               align="center"
             >
               <template slot-scope="scope">
@@ -307,30 +338,30 @@
               </template>
             </el-table-column>
             <el-table-column
-              prop="willMoneyed"
+              prop="previewFee"
               label="已预开票金额"
-              width="200px"
+              width="100px"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="actuallyMoney"
+              prop="makeTonnage"
               label="本次实际开票吨位"
-              width="200px"
+              width="100px"
               align="center"
             >
             </el-table-column>
             <el-table-column
               prop="actuallyMoney"
-              label="本次实际开票吨位"
-              width="200px"
+              label="本次实际开票金额"
+              width="100px"
               align="center"
             >
             </el-table-column>
             <el-table-column
-              prop="actuallyMonthMoney"
+              prop="feeMake"
               label="本月实际开票金额"
-              width="200px"
+              width="100px"
               align="center"
             >
             </el-table-column>
@@ -341,6 +372,7 @@
   </div>
 </template>
 <script>
+import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
@@ -349,21 +381,98 @@ export default {
       totalActuallyTonageedMoney: 0,
       totalActuallyTonageedValue: 0,
       shipName: null,
-      tableData: null,
+      tableData: [],
+      tableData1: [],
       spanArr: [],
+      spanArr1: [],
+      pos: null,
       mergeList: [
         "index",
         "carrierName",
         "portName",
-        "shipName",
-        "materialTypeName",
-        "enFatoryTon"
+        "resultForeignShipName",
+        "materialName",
+        "totalEnTonnage",
+        "operate"
       ],
       activeName: "first",
-      tableTitle: "结算账单报表"
+      tableTitle: "结算账单报表",
+      startTime: null,
+      endTime: null
     };
   },
+  watch: {
+    tableData: {
+      handler(newVal) {
+        console.log("执行一次汇总函数");
+        this.computedTableData(newVal);
+      },
+      deep: true,
+      immediate: false
+    },
+    tableData1: {
+      handler(newVal) {
+        console.log("执行一次汇总函数");
+        this.computedTableData(newVal);
+      },
+      deep: true,
+      immediate: false
+    }
+  },
   methods: {
+    //结算
+    settlement(row) {},
+    //保存
+    operate(row) {
+      console.log(row);
+      //遍历tableData,找出相同批次的行数
+      let arr = this.tableData.filter(e => {
+        return e.batchId == row.batchId;
+      });
+      let stateMentTotalAmount = this.tableData.reduce((pre, item) => {
+        return pre + item.fee;
+      }, 0);
+      let map = {
+        list: arr,
+        statementType: 3,
+        totalEnTonnage: row.totalEnTonnage,
+        stateMentTotalAmount: stateMentTotalAmount,
+        userID: getCookie("userId")
+      };
+      this.axios
+        .post("/api/v1/bms/addShipFeeStatement", map)
+        .then(res => {
+          if (res.data.code == "200") {
+            this.getNoDetailsStament();
+            this.$message.success("保存成功");
+          }
+        })
+        .catch(() => {
+          this.$message.error("保存失败");
+        });
+    },
+    //处理表格数据
+    computedTableData(data) {
+      data.forEach((item, index) => {
+        if (index == 0) {
+        } else if (item.batchId == data[index - 1].batchId) {
+          item.totalEnTonnage = data[index - 1].totalEnTonnage;
+        }
+        //预开金额
+        item.previewFee = (item.unitPrice * item.previewTonnage).toFixed(2);
+        //金额
+        item.fee = (item.realTonnage * item.unitPrice).toFixed(2);
+        //结算吨位
+        item.realTonnage = (
+          item.totalEnTonnage * item.loadingProportion
+        ).toFixed(2);
+        //开票吨位
+        item.makeTonnage = (item.realTonnage - item.previewTonnage).toFixed(2);
+        //实际开票金额
+        item.actuallyMoney = (item.makeTonnage * item.unitPrice).toFixed(2);
+      });
+      this.getSpanArr(this.tableData);
+    },
     //根据表格据汇总顶部展示
     getTotalArr(data) {
       this.totalWillTonageedValue = data.reduce((pre, item) => {
@@ -379,9 +488,18 @@ export default {
         return pre + item.actuallyMonthMoney;
       });
     },
+    handleClick() {
+      console.log("我正在进行账单");
+    },
     onClick() {},
     //获取未结算账单数据
-    getNoDetailsStament() {},
+    getNoDetailsStament() {
+      this.axios.post("/api/v1/bms/getShipFeeStatement").then(res => {
+        console.log(res.data.data);
+        this.tableData = res.data.data;
+        this.computedTableData(this.tableData);
+      });
+    },
     getDetailsStamented() {},
     //合并表格数据
     getSpanArr(data) {
@@ -394,7 +512,7 @@ export default {
           this.pos = 0;
         } else {
           // 判断当前元素与上一个元素是否相同
-          if (data[i].saleOrderId === data[i - 1].saleOrderId) {
+          if (data[i].batchId === data[i - 1].batchId) {
             this.spanArr[this.pos] += 1;
             data[i].group = data[i - 1].group;
             this.spanArr.push(0);
@@ -416,6 +534,16 @@ export default {
         };
       }
     },
+    objectSpanMethod1({ row, column, rowIndex, columnIndex }) {
+      if (this.mergeList.includes(column.property)) {
+        const _row = this.spanArr[rowIndex];
+        const _col = _row > 0 ? 1 : 0;
+        return {
+          rowspan: _row,
+          colspan: _col
+        };
+      }
+    },
     //导出账单数据
     exportAllReportToExcel() {
       console.log(this.$refs.tableRef);
@@ -467,5 +595,14 @@ export default {
     margin-left: 10px;
     margin-top: 30px;
   }
+  .main {
+    margin-left: 10px;
+    margin-top: 30px;
+    ::-webkit-scrollbar {
+      // width: 20px;
+      height: 20px;
+      background-color: transparent;
+    }
+  }
 }
 </style>

src/views/inward/components/offsetSteel/saleSteelTruckOrder/kucunList.vue

@@ -149,6 +149,34 @@
             </el-autocomplete>
           </template>
         </el-table-column>
+        <el-table-column
+          prop="sendStation"
+          label="车皮装车地点"
+          width="120px"
+          align="center"
+          column-key="sendStation"
+          :filters="[
+            { text: '专用线', value: '专用线' },
+            { text: '达州站', value: '达州站' }
+          ]"
+          :filter-method="filterSend"
+        >
+          <template slot-scope="scope">
+            <el-select
+              size="mini"
+              v-model="scope.row.sendStationId"
+              @change="changesendStation(scope.row)"
+            >
+              <el-option
+                v-for="item in sendStationList"
+                :key="item.sendStationId"
+                :label="item.sendStation"
+                :value="item.sendStationId"
+              >
+              </el-option>
+            </el-select>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="transInDep"
           label="调入部门"
@@ -202,28 +230,11 @@
         >
         </el-table-column>
         <el-table-column
-          prop="sendStation"
-          label="发站"
-          width="120px"
+          prop="isPoundSale"
+          label="重量"
           align="center"
-          column-key="sendStation"
-          :filters="[
-            { text: '专用线', value: '专用线' },
-            { text: '达州站', value: '达州站' }
-          ]"
-          :filter-method="filterSend"
+          width="150px"
         >
-          <template slot-scope="scope">
-            <el-select size="mini" v-model="scope.row.sendStationId">
-              <el-option
-                v-for="item in sendStationList"
-                :key="item.sendStationId"
-                :label="item.sendStation"
-                :value="item.sendStationId"
-              >
-              </el-option>
-            </el-select>
-          </template>
         </el-table-column>
         <el-table-column
           prop="operate"
@@ -386,6 +397,14 @@ export default {
         };
       }
     },
+    //修改发站
+    changesendStation(row) {
+      this.axios.post("/api/v1/ams/updateInwardConsignee", row).then(res => {
+        if (res.data.code == "200") {
+          this.$message.success("保存成功");
+        }
+      });
+    },
     operate(row) {
       this.axios
         .post("/api/v1/ams/updateInwardConsignee", row)

src/views/inward/components/offsetSteel/saleSteelTruckOrder/saleTruckPreview.vue

@@ -142,6 +142,13 @@
             >
           </template>
         </el-table-column>
+        <el-table-column
+          prop="toTheStation"
+          label="到站"
+          align="center"
+          width="150px"
+        >
+        </el-table-column>
         <el-table-column
           prop="materialName"
           label="物资名称"
@@ -193,14 +200,6 @@
           column-key="transInDep"
         >
         </el-table-column>
-        <el-table-column
-          prop="transOutDep"
-          label="调出部门"
-          width="120px"
-          align="center"
-          column-key="transOutDep"
-        >
-        </el-table-column>
         <el-table-column
           prop="transInWarehouse"
           label="调入仓库"
@@ -209,8 +208,7 @@
           column-key="transInWarehouse"
         >
         </el-table-column>
-        <el-table-column prop="netWeight" label="净重"> </el-table-column>
-        <el-table-column prop="entryGateTime" label="进厂时间" width="130px">
+        <el-table-column prop="netWeight" label="净重" align="center"></el-table-column>
         </el-table-column>
         <el-table-column
           prop="carrierName"
@@ -237,12 +235,20 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="orderNo"
+          prop="orderNumber"
           label="运输订单号"
           width="180px"
           align="center"
         >
         </el-table-column>
+        <el-table-column
+          prop="transOutDep"
+          label="调出部门"
+          width="120px"
+          align="center"
+          column-key="transOutDep"
+        >
+        </el-table-column>
         <el-table-column
           prop="capacityTel"
           label="司机电话"
@@ -1151,8 +1157,6 @@ export default {
     },
     //获取钢材订单报表
     getSteelReport() {
-      let carrierSsoId = null;
-      let saler = null;
       this.axios
         .post(
           "/api/v1/tms/getInwardSaleSteelOrder?startTime=" +

src/views/queue/components/qmsEnFacotory/queueFStart.vue

@@ -119,7 +119,6 @@
             <el-table-column
               type="selection"
               width="55"
-              :selectable="selectInit"
               reserve-selection
             ></el-table-column>
             <el-table-column type="index" width="50"> </el-table-column>
@@ -331,23 +330,24 @@ export default {
       return row.ROW_ID;
     },
     selectInit(row) {
-      if (this.maplist.length == 0) {
-        if (row.ROW_ID == 1) {
-          return true;
-        } else {
-          return false;
-        }
-      } else {
-        if (
-          this.maplist.some(e => {
-            return e.ROW_ID == row.ROW_ID || e.ROW_ID + 1 == row.ROW_ID;
-          })
-        ) {
-          return true;
-        } else {
-          return false;
-        }
-      }
+      return true;
+      // if (this.maplist.length == 0) {
+      //   if (row.ROW_ID == 1) {
+      //     return true;
+      //   } else {
+      //     return false;
+      //   }
+      // } else {
+      //   if (
+      //     this.maplist.some(e => {
+      //       return e.ROW_ID == row.ROW_ID || e.ROW_ID + 1 == row.ROW_ID;
+      //     })
+      //   ) {
+      //     return true;
+      //   } else {
+      //     return false;
+      //   }
+      // }
     },
     rowDbClick(row) {
       this.materialList = [];

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelAllReport.vue

@@ -85,7 +85,7 @@
         border
         stripe
         style="width: 100%; margin-top: 20px"
-        max-height="800px"
+        max-height="600px"
         @cell-click="cellClik"
         :row-style="{ height: '30px' }"
         :cell-style="{ fontWeight: '700' }"
@@ -1336,6 +1336,11 @@ export default {
   .table {
     margin-left: 20px;
     margin-top: 20px;
+    ::-webkit-scrollbar {
+      // width: 20px;
+      height: 30px;
+      background-color: transparent;
+    }
   }
   .address {
     .button-box {