From a5303d49c8e8604492a18f9ed2d816d2c4a6dfbe Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Tue, 11 Jul 2023 10:35:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=BA=93=E8=BF=90=E5=8D=95=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/warehouse/warehouseWaybill.js    |  50 +++
 src/option/warehouse/warehouseWaybill.js | 232 +++++++++++++
 src/views/warehouse/warehouseWaybill.vue | 397 +++++++++++++++++++++++
 vite.config.js                           |   2 +-
 4 files changed, 680 insertions(+), 1 deletion(-)
 create mode 100644 src/api/warehouse/warehouseWaybill.js
 create mode 100644 src/option/warehouse/warehouseWaybill.js
 create mode 100644 src/views/warehouse/warehouseWaybill.vue

diff --git a/src/api/warehouse/warehouseWaybill.js b/src/api/warehouse/warehouseWaybill.js
new file mode 100644
index 00000000..3ce5cc39
--- /dev/null
+++ b/src/api/warehouse/warehouseWaybill.js
@@ -0,0 +1,50 @@
+import request from '@/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/logpm-warehouse/warehouseWaybill/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/logpm-warehouse/warehouseWaybill/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/logpm-warehouse/warehouseWaybill/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/logpm-warehouse/warehouseWaybill/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/logpm-warehouse/warehouseWaybill/submit',
+    method: 'post',
+    data: row
+  })
+}
+
diff --git a/src/option/warehouse/warehouseWaybill.js b/src/option/warehouse/warehouseWaybill.js
new file mode 100644
index 00000000..8f7be5f7
--- /dev/null
+++ b/src/option/warehouse/warehouseWaybill.js
@@ -0,0 +1,232 @@
+export default {
+  expand: false,
+  index: true,
+  border: true,
+  selection: true,
+  column: [
+    {
+      label: "主键ID",
+      prop: "id",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "运单号",
+      prop: "waybillNo",
+    },
+    {
+      label: "订单自编号",
+      prop: "orderNo",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "目的仓",
+      prop: "destinationWarehouse",
+    },
+    {
+      label: "发站仓",
+      prop: "departureWarehouse",
+    },
+    {
+      label: "客户车次",
+      prop: "customerTrain",
+    },
+    {
+      label: "品牌",
+      prop: "brand",
+    },
+    {
+      label: "发货单位",
+      prop: "shipper",
+    },
+    {
+      label: "发货人",
+      prop: "shipperName",
+    },
+    {
+      label: "发货方手机号",
+      prop: "shipperMobile",
+    },
+    {
+      label: "发货方地址",
+      prop: "shipperAddress",
+    },
+    {
+      label: "收货单位",
+      prop: "consignee",
+    },
+    {
+      label: "收货人",
+      prop: "consigneeName",
+    },
+    {
+      label: "收货方手机号",
+      prop: "consigneeMobile",
+    },
+    {
+      label: "收货方地址",
+      prop: "consigneeAddress",
+    },
+    {
+      label: "到站",
+      prop: "destination",
+    },
+    {
+      label: "货物名称",
+      prop: "goodsName",
+    },
+    {
+      label: "总数",
+      prop: "totalCount",
+    },
+    {
+      label: "在库数",
+      prop: "stockCount",
+    },
+    {
+      label: "总重量",
+      prop: "totalWeight",
+    },
+    {
+      label: "总体积",
+      prop: "totalVolume",
+    },
+    {
+      label: "送货方式",
+      prop: "deliveryMethod",
+    },
+    {
+      label: "紧急度",
+      prop: "urgency",
+    },
+    {
+      label: "回单数",
+      prop: "receiptCount",
+    },
+    {
+      label: "回单要求",
+      prop: "receiptRequirement",
+    },
+    {
+      label: "经办人",
+      prop: "agent",
+    },
+    {
+      label: "经办人id",
+      prop: "agentId",
+    },
+    {
+      label: "收货单位id",
+      prop: "consigneeId",
+    },
+    {
+      label: "发货单位id",
+      prop: "shipperId",
+    },
+    {
+      label: "发展仓id",
+      prop: "departureWarehouseId",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "目的仓id",
+      prop: "destinationWarehouseId",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "制单时间",
+      prop: "documentMakingTime",
+    },
+    {
+      label: "备注",
+      prop: "remark",
+    },
+    {
+      label: "批次号",
+      prop: "batchNo",
+    },
+    {
+      label: "服务类型",
+      prop: "serviceType",
+    },
+    {
+      label: "服务号",
+      prop: "serviceNo",
+    },
+    {
+      label: "冻结状态",
+      prop: "freezeStatus",
+    },
+    {
+      label: "租户号",
+      prop: "tenantId",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "创建人",
+      prop: "createUser",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "创建时间",
+      prop: "createTime",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "更新人",
+      prop: "updateUser",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "更新时间",
+      prop: "updateTime",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "状态",
+      prop: "status",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "是否已删除",
+      prop: "isDeleted",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "创建部门",
+      prop: "createDept",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "预留1",
+      prop: "reserve1",
+    },
+    {
+      label: "预留2",
+      prop: "reserve2",
+    },
+    {
+      label: "预留3",
+      prop: "reserve3",
+    },
+    {
+      label: "预留4",
+      prop: "reserve4",
+    },
+    {
+      label: "预留5",
+      prop: "reserve5",
+    },
+  ]
+}
diff --git a/src/views/warehouse/warehouseWaybill.vue b/src/views/warehouse/warehouseWaybill.vue
new file mode 100644
index 00000000..e4f93d56
--- /dev/null
+++ b/src/views/warehouse/warehouseWaybill.vue
@@ -0,0 +1,397 @@
+<template>
+  <basic-container>
+    <div class="avue-crud">
+      <el-row :hidden="!search" style="padding:6px 18px">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="query">
+          <el-form-item label="运单号:">
+            <el-input v-model="query.waybillNo" placeholder="请输入运单号"></el-input>
+          </el-form-item>
+          <el-form-item label="客户车次号:">
+            <el-input v-model="query.customerTrain" placeholder="请输入客户车次号"></el-input>
+          </el-form-item>
+          <!-- 查询按钮 -->
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
+          </el-form-item>
+        </el-form>
+      </el-row>
+      <el-row>
+        <div class="avue-crud__header">
+          <!-- 头部左侧按钮模块 -->
+          <!-- <div class="avue-crud__left">
+            <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
+            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>
+          </div> -->
+          <!-- 头部右侧按钮模块 -->
+          <div class="avue-crud__right">
+            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
+          </div>
+        </div>
+      </el-row>
+      <el-row>
+        <!-- 列表模块 -->
+        <el-table ref="table" v-loading="loading"
+                  @selection-change="selectionChange"
+                  :data="data"
+                  :height="height"
+                  style="width: 100%"
+                  :border="option.border">
+          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>
+          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
+          <el-table-column v-if="option.index" label="#" type="index" width="50" align="center">
+          </el-table-column>
+          <template v-for="(item,index) in option.column">
+            <!-- table字段 -->
+            <el-table-column v-if="item.hide!==true"
+                             :prop="item.prop"
+                             :label="item.label"
+                             :width="item.width"
+                             :key="index">
+            </el-table-column>
+          </template>
+          <template #menu="{size,row,index}">
+            <el-button type="primary" text icon="el-icon-view" @click="editDeline(row)">编 辑</el-button>
+            <el-button type="primary" text icon="el-icon-view" @click="viewDeline(row)">查 看</el-button>
+          </template>
+          <!-- 操作栏模块 -->
+          <el-table-column prop="menu" label="操作" :width="220" align="center">
+            <template #defualt="{row}">
+              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
+              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
+              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-row>
+      <el-row>
+        <div class="avue-crud__pagination" style="width:100%">
+          <!-- 分页模块 -->
+          <el-pagination align="right"
+                         background
+                         @size-change="sizeChange"
+                         @current-change="currentChange"
+                         :current-page="page.currentPage"
+                         :page-sizes="[10, 20, 30, 40, 50, 100]"
+                         :page-size="page.pageSize"
+                         layout="total, sizes, prev, pager, next, jumper"
+                         :total="page.total">
+          </el-pagination>
+        </div>
+      </el-row>
+      <!-- 表单模块 -->
+      <el-dialog :title="title"
+                 v-model="box"
+                 width="50%"
+                 :before-close="beforeClose"
+                 append-to-body>
+        <el-form :disabled="view" ref="form" :model="form" label-width="80px">
+          <!-- 表单字段 -->
+          <el-form-item label="运单号" prop="waybillNo">
+            <el-input v-model="form.waybillNo" placeholder="请输入运单号"/>
+          </el-form-item>
+          <el-form-item label="目的仓" prop="destinationWarehouse">
+            <el-input v-model="form.destinationWarehouse" placeholder="请输入目的仓"/>
+          </el-form-item>
+          <el-form-item label="发站仓" prop="departureWarehouse">
+            <el-input v-model="form.departureWarehouse" placeholder="请输入发站仓"/>
+          </el-form-item>
+          <el-form-item label="客户车次" prop="customerTrain">
+            <el-input v-model="form.customerTrain" placeholder="请输入客户车次"/>
+          </el-form-item>
+          <el-form-item label="品牌" prop="brand">
+            <el-input v-model="form.brand" placeholder="请输入品牌"/>
+          </el-form-item>
+          <el-form-item label="发货单位" prop="shipper">
+            <el-input v-model="form.shipper" placeholder="请输入发货单位"/>
+          </el-form-item>
+          <el-form-item label="发货人" prop="shipperName">
+            <el-input v-model="form.shipperName" placeholder="请输入发货人"/>
+          </el-form-item>
+          <el-form-item label="发货方手机号" prop="shipperMobile">
+            <el-input v-model="form.shipperMobile" placeholder="请输入发货方手机号"/>
+          </el-form-item>
+          <el-form-item label="发货方地址" prop="shipperAddress">
+            <el-input v-model="form.shipperAddress" placeholder="请输入发货方地址"/>
+          </el-form-item>
+          <el-form-item label="收货单位" prop="consignee">
+            <el-input v-model="form.consignee" placeholder="请输入收货单位"/>
+          </el-form-item>
+          <el-form-item label="收货人" prop="consigneeName">
+            <el-input v-model="form.consigneeName" placeholder="请输入收货人"/>
+          </el-form-item>
+          <el-form-item label="收货方手机号" prop="consigneeMobile">
+            <el-input v-model="form.consigneeMobile" placeholder="请输入收货方手机号"/>
+          </el-form-item>
+          <el-form-item label="收货方地址" prop="consigneeAddress">
+            <el-input v-model="form.consigneeAddress" placeholder="请输入收货方地址"/>
+          </el-form-item>
+          <el-form-item label="到站" prop="destination">
+            <el-input v-model="form.destination" placeholder="请输入到站"/>
+          </el-form-item>
+          <el-form-item label="货物名称" prop="goodsName">
+            <el-input v-model="form.goodsName" placeholder="请输入货物名称"/>
+          </el-form-item>
+          <el-form-item label="总数" prop="totalCount">
+            <el-input v-model="form.totalCount" placeholder="请输入总数"/>
+          </el-form-item>
+          <el-form-item label="在库数" prop="stockCount">
+            <el-input v-model="form.stockCount" placeholder="请输入在库数"/>
+          </el-form-item>
+          <el-form-item label="总重量" prop="totalWeight">
+            <el-input v-model="form.totalWeight" placeholder="请输入总重量"/>
+          </el-form-item>
+          <el-form-item label="总体积" prop="totalVolume">
+            <el-input v-model="form.totalVolume" placeholder="请输入总体积"/>
+          </el-form-item>
+          <el-form-item label="送货方式" prop="deliveryMethod">
+            <el-input v-model="form.deliveryMethod" placeholder="请输入送货方式"/>
+          </el-form-item>
+          <el-form-item label="紧急度" prop="urgency">
+            <el-input v-model="form.urgency" placeholder="请输入紧急度"/>
+          </el-form-item>
+          <el-form-item label="回单数" prop="receiptCount">
+            <el-input v-model="form.receiptCount" placeholder="请输入回单数"/>
+          </el-form-item>
+          <el-form-item label="回单要求" prop="receiptRequirement">
+            <el-input v-model="form.receiptRequirement" placeholder="请输入回单要求"/>
+          </el-form-item>
+          <el-form-item label="经办人" prop="agent">
+            <el-input v-model="form.agent" placeholder="请输入经办人"/>
+          </el-form-item>
+          <el-form-item label="经办人id" prop="agentId">
+            <el-input v-model="form.agentId" placeholder="请输入经办人id"/>
+          </el-form-item>
+          <el-form-item label="收货单位id" prop="consigneeId">
+            <el-input v-model="form.consigneeId" placeholder="请输入收货单位id"/>
+          </el-form-item>
+          <el-form-item label="发货单位id" prop="shipperId">
+            <el-input v-model="form.shipperId" placeholder="请输入发货单位id"/>
+          </el-form-item>
+          <el-form-item label="制单时间" prop="documentMakingTime">
+            <el-input v-model="form.documentMakingTime" placeholder="请输入制单时间"/>
+          </el-form-item>
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="form.remark" placeholder="请输入备注"/>
+          </el-form-item>
+          <el-form-item label="批次号" prop="batchNo">
+            <el-input v-model="form.batchNo" placeholder="请输入批次号"/>
+          </el-form-item>
+          <el-form-item label="服务类型" prop="serviceType">
+            <el-input v-model="form.serviceType" placeholder="请输入服务类型"/>
+          </el-form-item>
+          <el-form-item label="服务号" prop="serviceNo">
+            <el-input v-model="form.serviceNo" placeholder="请输入服务号"/>
+          </el-form-item>
+          <el-form-item label="冻结状态" prop="freezeStatus">
+            <el-input v-model="form.freezeStatus" placeholder="请输入冻结状态"/>
+          </el-form-item>
+          <el-form-item label="预留1" prop="reserve1">
+            <el-input v-model="form.reserve1" placeholder="请输入预留1"/>
+          </el-form-item>
+          <el-form-item label="预留2" prop="reserve2">
+            <el-input v-model="form.reserve2" placeholder="请输入预留2"/>
+          </el-form-item>
+          <el-form-item label="预留3" prop="reserve3">
+            <el-input v-model="form.reserve3" placeholder="请输入预留3"/>
+          </el-form-item>
+          <el-form-item label="预留4" prop="reserve4">
+            <el-input v-model="form.reserve4" placeholder="请输入预留4"/>
+          </el-form-item>
+          <el-form-item label="预留5" prop="reserve5">
+            <el-input v-model="form.reserve5" placeholder="请输入预留5"/>
+          </el-form-item>
+        </el-form>
+        <!-- 表单按钮 -->
+        <template #footer>
+          <span v-if="!view" class="dialog-footer">
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button>
+            <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
+          </span>
+        </template>
+      </el-dialog>
+    </div>
+  </basic-container>
+</template>
+
+<script>
+import { getList, getDetail, add, update, remove } from "@/api/warehouse/warehouseWaybill";
+import option from "@/option/warehouse/warehouseWaybill";
+import { mapGetters } from "vuex";
+
+export default {
+  data () {
+    return {
+      height: 0,
+      // 弹框标题
+      title: '',
+      // 是否展示弹框
+      box: false,
+      // 是否显示查询
+      search: true,
+      // 加载中
+      loading: true,
+      // 是否为查看模式
+      view: false,
+      // 查询信息
+      query: {},
+      // 分页信息
+      page: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
+      // 表单数据
+      form: {},
+      // 选择行
+      selectionList: [],
+      // 表单配置
+      option: option,
+      // 表单列表
+      data: [],
+    }
+  },
+  mounted () {
+    this.init();
+    this.onLoad(this.page);
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    ids () {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  methods: {
+    init () {
+      this.height = this.setPx(document.body.clientHeight - 340);
+    },
+    searchHide () {
+      this.search = !this.search;
+    },
+    searchChange () {
+      this.onLoad(this.page);
+    },
+    searchReset () {
+      this.query = {};
+      this.page.currentPage = 1;
+      this.onLoad(this.page);
+    },
+    handleSubmit () {
+      if (!this.form.id) {
+        add(this.form).then(() => {
+          this.box = false;
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+      } else {
+        update(this.form).then(() => {
+          this.box = false;
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        })
+      }
+    },
+    handleAdd () {
+      this.title = '新增'
+      this.form = {}
+      this.box = true
+    },
+    handleEdit (row) {
+      this.title = '编辑'
+      this.box = true
+      getDetail(row.id).then(res => {
+        this.form = res.data.data;
+      });
+    },
+    handleView (row) {
+      this.title = '查看'
+      this.view = true;
+      this.box = true;
+      getDetail(row.id).then(res => {
+        this.form = res.data.data;
+      });
+    },
+    handleDelete () {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
+          this.selectionClear();
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    rowDel (row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    beforeClose (done) {
+      done()
+      this.form = {};
+      this.view = false;
+    },
+    selectionChange (list) {
+      this.selectionList = list;
+    },
+    selectionClear () {
+      this.selectionList = [];
+      this.$refs.table.clearSelection();
+    },
+    currentChange (currentPage) {
+      this.page.currentPage = currentPage;
+      this.onLoad(this.page);
+    },
+    sizeChange (pageSize) {
+      this.page.pageSize = pageSize;
+      this.onLoad(this.page);
+    },
+    onLoad (page, params = {}) {
+      this.loading = true;
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    }
+  }
+};
+</script>
diff --git a/vite.config.js b/vite.config.js
index d19e7956..a4671845 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -12,7 +12,7 @@ export default ({ mode, command }) => {
       port: 2888,
       proxy: {
         '/api': {
-          target: 'http://192.168.2.29:13000',
+          target: 'http://192.168.2.97:9999',
           //target: 'http://test3.javablade.com',
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),