From 6083fb0f86004b9a1fd2e78d860afd32912ce658 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Thu, 28 Sep 2023 10:50:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E5=93=81?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/distribution/distributionSignPrint.js |  50 +++
 src/api/distribution/distributionStockList.js |  12 +
 .../distribution/distributionSignPrint.js     |  98 ++++++
 .../inventory/distributionSignPrint.vue       | 300 ++++++++++++++++++
 .../inventory/distributionStockList.vue       |  24 +-
 .../distributionStockListDetails.vue          |  15 +-
 .../distributionStockListDiscuss.vue          |  24 +-
 .../inventory/distributionStockListMarket.vue |  24 +-
 .../inventory/distributionStockListSelf.vue   |  24 +-
 .../warehouseWarehousingEntry.vue             |   4 +
 10 files changed, 520 insertions(+), 55 deletions(-)
 create mode 100644 src/api/distribution/distributionSignPrint.js
 create mode 100644 src/option/distribution/distributionSignPrint.js
 create mode 100644 src/views/distribution/inventory/distributionSignPrint.vue

diff --git a/src/api/distribution/distributionSignPrint.js b/src/api/distribution/distributionSignPrint.js
new file mode 100644
index 00000000..0f2e3090
--- /dev/null
+++ b/src/api/distribution/distributionSignPrint.js
@@ -0,0 +1,50 @@
+import request from '@/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/logpm-distribution/distributionSignPrint/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/logpm-distribution/distributionSignPrint/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/api/logpm-distribution/distributionSignPrint/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/logpm-distribution/distributionSignPrint/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/logpm-distribution/distributionSignPrint/submit',
+    method: 'post',
+    data: row
+  })
+}
+
diff --git a/src/api/distribution/distributionStockList.js b/src/api/distribution/distributionStockList.js
index 99ba2998..7df11aee 100644
--- a/src/api/distribution/distributionStockList.js
+++ b/src/api/distribution/distributionStockList.js
@@ -12,6 +12,18 @@ export const getList = (current, size, params) => {
   })
 }
 
+export const getListAllocation = (current, size, params) => {
+  return request({
+    url: '/api/logpm-distribution/distributionStockList/listAllocation',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
 export const getStockListOwn = (current, size, params) => {
   return request({
     url: '/api/logpm-distribution/distributionStockList/listOwn',
diff --git a/src/option/distribution/distributionSignPrint.js b/src/option/distribution/distributionSignPrint.js
new file mode 100644
index 00000000..9e3c60e8
--- /dev/null
+++ b/src/option/distribution/distributionSignPrint.js
@@ -0,0 +1,98 @@
+export default {
+  expand: false,
+  index: true,
+  border: true,
+  selection: true,
+  column: [
+    {
+      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: "主键",
+      prop: "id",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "预留1",
+      prop: "reserve1",
+    },
+    {
+      label: "预留2",
+      prop: "reserve2",
+    },
+    {
+      label: "预留3",
+      prop: "reserve3",
+    },
+    {
+      label: "预留4",
+      prop: "reserve4",
+    },
+    {
+      label: "预留5",
+      prop: "reserve5",
+    },
+    {
+      label: "类型",
+      prop: "type",
+    },
+    {
+      label: "名称",
+      prop: "name",
+    },
+    {
+      label: "路径",
+      prop: "urlRoute",
+    },
+    {
+      label: "预约id",
+      prop: "reservationId",
+    },
+  ]
+}
diff --git a/src/views/distribution/inventory/distributionSignPrint.vue b/src/views/distribution/inventory/distributionSignPrint.vue
new file mode 100644
index 00000000..a1fb36dd
--- /dev/null
+++ b/src/views/distribution/inventory/distributionSignPrint.vue
@@ -0,0 +1,300 @@
+<template>
+  <basic-container>
+    <div class="avue-crud">
+      <el-row :hidden="!search" style="padding:6px 18px">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="query">
+          <!-- 查询按钮 -->
+          <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>
+          <!-- 操作栏模块 -->
+          <el-table-column prop="menu" label="操作" :width="220" align="center">
+            <template #="{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="预留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-item label="类型" prop="type">
+            <el-input v-model="form.type" placeholder="请输入类型"/>
+          </el-form-item>
+          <el-form-item label="名称" prop="name">
+            <el-input v-model="form.name" placeholder="请输入名称"/>
+          </el-form-item>
+          <el-form-item label="路径" prop="urlRoute">
+            <el-input v-model="form.urlRoute" placeholder="请输入路径"/>
+          </el-form-item>
+          <el-form-item label="预约id" prop="reservationId">
+            <el-input v-model="form.reservationId" placeholder="请输入预约id"/>
+          </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/distribution/distributionSignPrint";
+import option from "@/option/distribution/distributionSignPrint";
+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/src/views/distribution/inventory/distributionStockList.vue b/src/views/distribution/inventory/distributionStockList.vue
index fbbceb76..e41bf920 100644
--- a/src/views/distribution/inventory/distributionStockList.vue
+++ b/src/views/distribution/inventory/distributionStockList.vue
@@ -379,8 +379,8 @@ export default {
           sortable: true,
         },
         // {
-        //   prop: 'warehouse',
-        //   label: '入库时间',
+        //   prop: 'despatch',
+        //   label: '物流车次',
         //   type: 2,
         //   values: '',
         //   width: '130',
@@ -388,16 +388,6 @@ export default {
         //   fixed: false,
         //   sortable: true,
         // },
-        {
-          prop: 'despatch',
-          label: '物流车次',
-          type: 2,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
         {
           prop: 'incomingBatch',
           label: '入库批次',
@@ -538,6 +528,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'packageNum',
+          label: '包装数量',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'unpackingQuantity',
           label: '拆包数量',
diff --git a/src/views/distribution/inventory/distributionStockListDetails.vue b/src/views/distribution/inventory/distributionStockListDetails.vue
index f896f64c..952bd7ff 100644
--- a/src/views/distribution/inventory/distributionStockListDetails.vue
+++ b/src/views/distribution/inventory/distributionStockListDetails.vue
@@ -217,7 +217,7 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove } from "@/api/distribution/distributionStockList";
+import { getList, getDetail, add, update, remove, getListAllocation } from '@/api/distribution/distributionStockList';
 import option from "@/option/distribution/distributionStockList";
 import { mapGetters } from "vuex";
 import { getListStock } from '@/api/distribution/distributionStock';
@@ -317,7 +317,7 @@ export default {
         //   fixed: true,
         // },
         {
-          prop: 'storageLocation',
+          prop: 'allocationTitle',
           label: '货位',
           type: 2,
           values: '',
@@ -328,7 +328,7 @@ export default {
           head: false,
         },
         {
-          prop: 'descriptionGoods',
+          prop: 'marketName',
           label: '货物名称',
           type: 2,
           values: '',
@@ -339,7 +339,7 @@ export default {
           head: false,
         },
         {
-          prop: 'groundingTime',
+          prop: 'createTime',
           label: '上架时间',
           type: 2,
           values: '',
@@ -361,8 +361,8 @@ export default {
           head: false,
         },
         {
-          prop: 'licensePlate',
-          label: '车牌',
+          prop: 'num',
+          label: '货位数',
           type: 2,
           values: '',
           width: '150',
@@ -771,7 +771,8 @@ export default {
       this.query.materialId = this.queryOwn.materialId;
       this.query.warehouseId = this.queryOwn.warehouseId;
       this.query.storeId = !!this.queryOwn.storeId && this.queryOwn.storeId != '-1' ? this.queryOwn.storeId : null;
-      let b =await getList(page.currentPage, page.pageSize, Object.assign(params, this.query));
+      console.log("库存品参数<><><><",this.query);
+      let b =await getListAllocation(page.currentPage, page.pageSize, Object.assign(params, this.query));
       this.data = b.data.data.records;
       console.log("库存品信息",this.data);
       this.page.total = b.data.data.total;
diff --git a/src/views/distribution/inventory/distributionStockListDiscuss.vue b/src/views/distribution/inventory/distributionStockListDiscuss.vue
index 6cb7691c..995a060c 100644
--- a/src/views/distribution/inventory/distributionStockListDiscuss.vue
+++ b/src/views/distribution/inventory/distributionStockListDiscuss.vue
@@ -410,8 +410,8 @@ export default {
           sortable: true,
         },
         // {
-        //   prop: 'warehouse',
-        //   label: '入库时间',
+        //   prop: 'despatch',
+        //   label: '物流车次',
         //   type: 2,
         //   values: '',
         //   width: '130',
@@ -419,16 +419,6 @@ export default {
         //   fixed: false,
         //   sortable: true,
         // },
-        {
-          prop: 'despatch',
-          label: '物流车次',
-          type: 2,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
         {
           prop: 'incomingBatch',
           label: '入库批次',
@@ -579,6 +569,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'packageNum',
+          label: '包装数量',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'unpackingQuantity',
           label: '拆包数量',
diff --git a/src/views/distribution/inventory/distributionStockListMarket.vue b/src/views/distribution/inventory/distributionStockListMarket.vue
index 1e00683b..c63a598d 100644
--- a/src/views/distribution/inventory/distributionStockListMarket.vue
+++ b/src/views/distribution/inventory/distributionStockListMarket.vue
@@ -391,8 +391,8 @@ export default {
           sortable: true,
         },
         // {
-        //   prop: 'warehouse',
-        //   label: '入库时间',
+        //   prop: 'despatch',
+        //   label: '物流车次',
         //   type: 2,
         //   values: '',
         //   width: '130',
@@ -400,16 +400,6 @@ export default {
         //   fixed: false,
         //   sortable: true,
         // },
-        {
-          prop: 'despatch',
-          label: '物流车次',
-          type: 2,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
         {
           prop: 'incomingBatch',
           label: '入库批次',
@@ -560,6 +550,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'packageNum',
+          label: '包装数量',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'unpackingQuantity',
           label: '拆包数量',
diff --git a/src/views/distribution/inventory/distributionStockListSelf.vue b/src/views/distribution/inventory/distributionStockListSelf.vue
index 05e8c270..4c8b86f9 100644
--- a/src/views/distribution/inventory/distributionStockListSelf.vue
+++ b/src/views/distribution/inventory/distributionStockListSelf.vue
@@ -362,8 +362,8 @@ export default {
           sortable: true,
         },
         // {
-        //   prop: 'warehouse',
-        //   label: '入库时间',
+        //   prop: 'despatch',
+        //   label: '物流车次',
         //   type: 2,
         //   values: '',
         //   width: '130',
@@ -371,16 +371,6 @@ export default {
         //   fixed: false,
         //   sortable: true,
         // },
-        {
-          prop: 'despatch',
-          label: '物流车次',
-          type: 2,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
         {
           prop: 'incomingBatch',
           label: '入库批次',
@@ -530,6 +520,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'packageNum',
+          label: '包装数量',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'unpackingQuantity',
           label: '拆包数量',
diff --git a/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue b/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue
index e44b5de2..cd001094 100644
--- a/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue
+++ b/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue
@@ -659,6 +659,10 @@ export default {
     },
     // 文件上传后的回调
     uploadAfter(res, done, loading, column) {
+      if(!res){
+        this.$message.success("导入成功！！！");
+      }
+      // window.console.log("执行看了",res,column);
       window.console.log("column",column);
       this.excelBox = false;
       this.refreshChange();