Browse Source

添加车队台账、修改仓储入库细节

阿伏兔 4 years ago
parent
commit
e33d63b574

+ 18 - 0
src/api/fleet/fleetStatistics.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 查询陆运台账列表信息
+export function queryLedgerList(query) {
+  return request({
+    url: '/fleet/ftmsorderbillscars/queryLedgerList',
+    method: 'get',
+    params: query
+  })
+}
+// 导出陆运台账列表信息
+export function ledgerListExport(query) {
+  return request({
+    url: '/fleet/ftmsorderbillscars/ledgerListExport',
+    method: 'get',
+    params: query
+  })
+}

+ 3 - 1
src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -4682,7 +4682,9 @@ export default {
         .then(() => {
           this.saveForm("goBack");
         })
-        .catch(() => {});
+        .catch(() => {
+          this.cancel();
+        });
     },
   },
   watch: {

+ 716 - 0
src/views/fleet/fleetStatistics/index.vue

@@ -0,0 +1,716 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      label-width="100px"
+      size="mini"
+    >
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label-width="100px" label="结算状态" prop="mblno">
+            <el-select
+              v-model="queryParams.stlStatus"
+              placeholder="请选择对账状态"
+              clearable
+              size="small"
+              filterable
+              @keyup.enter.native="handleQuery"
+            >
+              <el-option
+                v-for="(dict, index) in stlStatusOptions"
+                :key="index.id"
+                :label="dict.name"
+                :value="dict.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="对账状态" prop="corpId">
+            <el-select
+              v-model="queryParams.accchkStatus"
+              placeholder="请选择对账状态"
+              clearable
+              size="small"
+              filterable
+            >
+              <el-option
+                v-for="(dict, index) in accchkOptions"
+                :key="index.id"
+                :label="dict.name"
+                :value="dict.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label-width="100px" label="开票状态" prop="billType">
+            <el-select
+              v-model="queryParams.invStatus"
+              placeholder="请选择开票状态"
+              clearable
+              size="small"
+            >
+              <el-option
+                v-for="(dict, index) in invOptions"
+                :key="index.id"
+                :label="dict.name"
+                :value="dict.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['fleet:ftmsorderbills:export']"
+          >导出</el-button
+        >
+      </el-col>
+      <div class="tabSetting">
+        <div style="margin-right: 20px">
+          <el-button
+            type="cyan"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            >重置</el-button
+          >
+        </div>
+        <right-toolbar
+          @queryTable="getList"
+        ></right-toolbar>
+        <div style="margin: 0 12px">
+          <el-tooltip
+            class="item"
+            effect="dark"
+            content="列设置"
+            placement="top"
+          >
+            <el-button
+              icon="el-icon-setting"
+              size="mini"
+              circle
+              @click="showSetting = !showSetting"
+            ></el-button>
+          </el-tooltip>
+        </div>
+      </div>
+    </el-row>
+    <el-dialog title="自定义列显示" :visible.sync="showSetting" width="700px">
+      <div>配置排序列数据(拖动调整顺序)</div>
+      <div style="margin-left: 17px">
+        <el-checkbox
+          v-model="allCheck"
+          label="全选"
+          @change="allChecked"
+        ></el-checkbox>
+      </div>
+      <div style="padding: 4px; display: flex; justify-content: center">
+        <draggable
+          v-model="setRowList"
+          group="site"
+          animation="300"
+          @start="onStart"
+          @end="onEnd"
+          handle=".indraggable"
+        >
+          <transition-group>
+            <div
+              v-for="item in setRowList"
+              :key="item.surface"
+              class="listStyle"
+            >
+              <div style="width: 500px" class="indraggable">
+                <div class="progress" :style="{ width: item.width + 'px' }">
+                  <el-checkbox
+                    :label="item.name"
+                    v-model="item.checked"
+                    :true-label="0"
+                    :false-label="1"
+                    >{{ item.name }}
+                  </el-checkbox>
+                </div>
+              </div>
+              <el-input-number
+                v-model.number="item.width"
+                controls-position="right"
+                :min="1"
+                :max="500"
+                size="mini"
+              ></el-input-number>
+            </div>
+          </transition-group>
+        </draggable>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="showSetting = false">取 消</el-button>
+        <el-button @click="delRow" type="danger">重 置</el-button>
+        <el-button type="primary" @click="save">确 定</el-button>
+      </span>
+    </el-dialog>
+    <el-table
+      v-loading="loading"
+      :data="tabularData"
+      id="out-table"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="提单号"
+        width="180"
+        align="center"
+        :show-overflow-tooltip="true"
+        sortable
+        fixed="left"
+      >
+        <template slot-scope="scope">
+          <el-link :underline="false" type="primary"
+            ><div @click="handleUpdate(scope.row)">
+              {{ scope.row.mblno }}
+            </div></el-link
+          >
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-for="(item, index) in getRowList"
+        :key="index"
+        :label="item.name"
+        :width="item.width"
+        :prop="item.label"
+        align="center"
+        :show-overflow-tooltip="true"
+        sortable
+        :fixed="item.fixed"
+      />
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+  import { addSet, select, resetModule } from "@/api/system/set";
+  import { queryLedgerList, ledgerListExport } from "@/api/fleet/fleetStatistics";
+  import Cookies from "js-cookie";
+  import draggable from "vuedraggable";
+  import AddOrUpdate from "../scheduling/AddOrUpdate";
+
+  export default {
+  name: "plans",
+  data() {
+    return {
+      // 总条数
+      total: 0,
+      show: false,
+      allCheck: false,
+      stlStatusOptions: [{
+        id: 'T',
+        name: '已结算'
+      }, {
+        id: 'F',
+        name: '未结算'
+      }],
+      accchkOptions: [{
+        id: 'T',
+        name: '已对账'
+      }, {
+        id: 'F',
+        name: '未对账'
+      }],
+      invOptions: [{
+        id: 'T',
+        name: '已开票'
+      }, {
+        id: 'F',
+        name: '未开票'
+      }],
+      drag: false,
+      loading: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        stlStatus: null,
+        accchkStatus: null,
+        invStatus: null
+      },
+      tableDate: [
+        {
+          surface: "1",
+          label: "mdLoadDate",
+          name: "装卸日期",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "2",
+          label: "billType",
+          name: "贸易方式",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "3",
+          label: "transType",
+          name: "运输方式",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "4",
+          label: "corpId",
+          name: "托运人",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "5",
+          label: "ysl",
+          name: "船名",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "6",
+          label: "voy",
+          name: "航次",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "8",
+          label: "cntrQty",
+          name: "柜量",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "9",
+          label: "cntrId",
+          name: "柜型",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "10",
+          label: "goodsId",
+          name: "品名",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "11",
+          label: "cntrWeight",
+          name: "重量",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "12",
+          label: "polId",
+          name: "起运港",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "13",
+          label: "podId",
+          name: "目的港",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "14",
+          label: "loadAddr",
+          name: "提箱场站",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "15",
+          label: "mdLoadAddr",
+          name: "装货地",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "16",
+          label: "unLoadAddr",
+          name: "卸货地",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "17",
+          label: "carregNo",
+          name: "车号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "18",
+          label: "driverName",
+          name: "司机",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "19",
+          label: "orderNo",
+          name: "运单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "20",
+          label: "driverTel",
+          name: "司机电话",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "21",
+          label: "orderName",
+          name: "状态",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "22",
+          label: "acceptDate",
+          name: "接单日期",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "23",
+          label: "loadDate",
+          name: "提箱日期",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "24",
+          label: "unLoadDate",
+          name: "还柜日期",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "25",
+          label: "oilAmt",
+          name: "油气费",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "26",
+          label: "driverbonus",
+          name: "单趟提成",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "27",
+          label: "costOth",
+          name: "其他费用",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "28",
+          label: "costRemarks",
+          name: "备注",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "29",
+          label: "costomAmt05",
+          name: "港杂费",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "30",
+          label: "costomAmt06",
+          name: "提箱费",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "31",
+          label: "costomAmt03",
+          name: "修洗费",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "32",
+          label: "costomAmt04",
+          name: "吊装费",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "33",
+          label: "costomAmt01",
+          name: "出口其他费用",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "34",
+          label: "costomStr01",
+          name: "出口费用备注",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "35",
+          label: "costomAmt02",
+          name: "进口其他费用",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "36",
+          label: "costomStr02",
+          name: "进口费用备注",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "37",
+          label: "mBillNo",
+          name: "主单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "38",
+          label: "billKind",
+          name: "单据类型",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "39",
+          label: "amtDr",
+          name: "应收结算金额",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "40",
+          label: "amtCr",
+          name: "应付结算金额",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "41",
+          label: "stlAmtDr",
+          name: "已收结算金额",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "42",
+          label: "stlAmtCr",
+          name: "已付结算金额",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "43",
+          label: "profitBill",
+          name: "业务利润",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "44",
+          label: "profitCar",
+          name: "车利润",
+          checked: 0,
+          width: 100,
+        },
+      ],
+      setRowList: [],
+      getRowList: [],
+      tabularData: [],
+      showSetting: false,
+    };
+  },
+    // 使用子组件
+    components: {
+      AddOrUpdate,
+      draggable,
+    },
+  created() {
+    this.setRowList = this.tableDate;
+    this.getRowList = this.tableDate;
+    this.getList();
+    this.getRow();
+  },
+  methods: {
+    //列设置全选
+    allChecked() {
+      if (this.allCheck == true) {
+        this.setRowList.map((e) => {
+          return (e.checked = 0);
+        });
+      } else {
+        this.setRowList.map((e) => {
+          return (e.checked = 1);
+        });
+      }
+    },
+    //查询列数据
+    getRow() {
+      let that = this;
+      this.data = {
+        tableName: "陆运台账",
+        userId: Cookies.get("userName"),
+      };
+      select(this.data).then((res) => {
+        if (res.data.length != 0) {
+          this.getRowList = res.data.filter((e) => e.checked == 0);
+          this.setRowList = res.data;
+          this.setRowList = this.setRowList.reduce((res, item) => {
+            res.push({
+              surface: item.surface,
+              label: item.label,
+              name: item.name,
+              checked: item.checked,
+              width: item.width,
+              fixed: item.fixed,
+            });
+            return res;
+          }, []);
+        }
+      });
+    },
+    //重置列表
+    delRow() {
+      this.data = {
+        tableName: "计划下达",
+        userId: Cookies.get("userName"),
+      };
+      resetModule(this.data).then((res) => {
+        if (res.code == 200) {
+          this.showSetting = false;
+          this.setRowList = this.tableDate;
+          this.getRowList = this.tableDate;
+        }
+      });
+    },
+    //保存列设置
+    save() {
+      this.showSetting = false;
+      this.data = {
+        tableName: "计划下达",
+        userId: Cookies.get("userName"),
+        sysTableSetList: this.setRowList,
+      };
+      addSet(this.data).then((res) => {
+        if (res.code == 200) {
+          this.showSetting = false;
+          this.getRowList = this.setRowList.filter((e) => e.checked == 0);
+        }
+      });
+    },
+    //开始拖拽事件
+    onStart() {
+      this.drag = true;
+    },
+    //拖拽结束事件
+    onEnd() {
+      this.drag = false;
+    },
+    /** 查询订单主列表 */
+    getList() {
+      this.loading = true;
+      queryLedgerList(this.queryParams).then((response) => {
+        this.tabularData = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 表单重置
+    reset() {
+      this.resetForm("form");
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm("是否确认导出所有订单主数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
+          return ledgerListExport(queryParams);
+        })
+        .then((response) => {
+          this.download(response.msg);
+        });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.queryParams = {
+        pageNum: 1,
+          pageSize: 10,
+          stlStatus: null,
+          accchkStatus: null,
+          invStatus: null
+      }
+      this.handleQuery();
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.tabSetting {
+  display: flex;
+  justify-content: flex-end;
+}
+.listStyle {
+  display: flex;
+  border-top: 1px solid #dcdfe6;
+  border-left: 1px solid #dcdfe6;
+  border-right: 1px solid #dcdfe6;
+}
+.listStyle:last-child {
+  border-bottom: 1px solid #dcdfe6;
+}
+.progress {
+  display: flex;
+  align-items: center;
+  padding: 2px;
+  background-color: rgba(0, 0, 0, 0.05);
+  height: 100%;
+}
+</style>

+ 2 - 2
src/views/jiGang/index.vue

@@ -703,7 +703,7 @@ export default {
       if (name == null || name === '') {
         return false
       }
-      let queryParams = {pageNum: 1, fName: name, type: 1}
+      let queryParams = {pageNum: 1, fName: name, fTypeid: 1}
       listCorps(queryParams).then((response) => {
         console.log(response)
         this.fMblnoOptions = response.rows
@@ -713,7 +713,7 @@ export default {
       if (name == null || name === '') {
         return false
       }
-      let queryParams = {pageNum: 1, fName: name, type: 2}
+      let queryParams = {pageNum: 1, fName: name, fTypeid: 2}
       listCorps(queryParams).then((response) => {
         console.log(response)
         this.blnoOptions = response.rows