来自单据明细的台账

klp-ui/src/views/wms/ledger/index.vue

@@ -0,0 +1,379 @@
+<template>
+  <div class="app-container">
+    <el-row>
+      <el-form :form="queryParams" inline>
+        <el-form-item prop="itemType" label="物料类型">
+          <el-select v-model="queryParams.itemType" placeholder="物料类型" clearable style="width: 150px"
+            @change="getList">
+            <el-option v-for="(item, index) in dict.type.stock_item_type" :key="index" :label="item.label"
+              :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <RawMaterialSelect v-if="queryParams.itemType == 'raw_material'" v-model="queryParams.itemId" :item-type="queryParams.itemType" placeholder="物料信息"
+            style="width: 300px" clearable @change="getList" />
+          <ProductSelect v-if="queryParams.itemType == 'product'" v-model="queryParams.itemId" :item-type="queryParams.itemType" placeholder="物料信息"
+            style="width: 300px" clearable @change="getList" />
+        </el-form-item>
+        <el-button type="primary" @click="getList">查询</el-button>
+      </el-form>
+    </el-row>
+    <!-- 明细表格 -->
+    <el-table v-loading="loading" :data="stockIoDetailList" @selection-change="handleSelectionChange">
+      <el-table-column label="库区/库位" align="center" prop="warehouseName" />
+      <el-table-column label="源库区/库位" align="center" prop="fromWarehouseName" />
+      <el-table-column label="操作来源" align="center" prop="recordType" />
+      <el-table-column label="物品类型" align="center" prop="itemType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.stock_item_type" :value="scope.row.itemType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="物品信息" align="center" prop="itemId">
+        <template slot-scope="scope">
+          <raw-material-info v-if="scope.row.itemType === ITEM_TYPE.RAW_MATERIAL" :material-id="scope.row.itemId" />
+          <product-info v-else-if="scope.row.itemType === ITEM_TYPE.PRODUCT" :product-id="scope.row.itemId" />
+          <span v-else>{{ scope.row.itemId }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="BOM" align="center">
+        <template slot-scope="scope">
+          <BomInfoMini :item-type="scope.row.itemType" :item-id="scope.row.itemId" />
+        </template>
+      </el-table-column>
+      <el-table-column label="数量" align="center" prop="quantity" />
+      <el-table-column label="单位" align="center" prop="unit" />
+      <el-table-column label="批次号" align="center" prop="batchNo" />
+      <el-table-column label="备注" align="center" prop="remark" />
+    </el-table>
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+  </div>
+</template>
+
+<script>
+import { listStockIoDetail } from "@/api/wms/stockIoDetail";
+import WarehouseSelect from '@/components/WarehouseSelect';
+import RawMaterialSelect from '@/components/KLPService/RawMaterialSelect';
+import ProductSelect from '@/components/KLPService/ProductSelect';
+import { ITEM_TYPE } from '@/utils/enums';
+import { RawMaterialInfo, ProductInfo } from "@/components/KLPService";
+import BomInfoMini from '@/components/KLPService/Renderer/BomInfoMini.vue';
+
+export default {
+  name: "StockIoDetailPanel",
+  components: {
+    WarehouseSelect,
+    RawMaterialSelect,
+    ProductSelect,
+    RawMaterialInfo,
+    ProductInfo,
+    BomInfoMini
+  },
+  dicts: ['stock_item_type'],
+  data() {
+    return {
+      ITEM_TYPE,
+      loading: true,
+      stockIoDetailList: [],
+      total: 0,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        stockIoId: undefined
+      },
+      auditLoading: false,
+      open: false,
+      title: '',
+      form: {},
+      buttonLoading: false,
+      rules: {
+        warehouseId: [
+          { required: true, message: "库区/库位不能为空", trigger: "blur" }
+        ],
+        itemType: [
+          { required: true, message: "物品类型不能为空", trigger: "blur" }
+        ],
+        itemId: [
+          { required: true, message: "物品ID不能为空", trigger: "blur" }
+        ],
+        quantity: [
+          { required: true, message: "数量不能为空", trigger: "blur" }
+        ],
+        unit: [
+          { required: true, message: "单位不能为空", trigger: "blur" }
+        ]
+      },
+      ids: [],
+      single: true,
+      multiple: true,
+      statusLoading: false, // 新增状态修改按钮加载状态
+      cancelLoading: false, // 撤回按钮加载状态
+      unitDisabled: false, // 新增：单位输入框是否禁用
+      activeTab: 'manual' // 新增：当前激活的标签页
+    };
+  },
+  mounted() {
+    const itemId = this.$route.query.itemId;
+    const itemType = this.$route.query.itemType;
+    this.queryParams.itemId = itemId;
+    this.queryParams.itemType = itemType;
+    this.getList();
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      listStockIoDetail(this.queryParams).then(response => {
+        this.stockIoDetailList = response.rows;
+        this.total = response.total;
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    handleAudit() {
+      // 检查是否有明细数据
+      if (!this.stockIoDetailList || this.stockIoDetailList.length === 0) {
+        this.$modal.msgError('请先添加明细数据');
+        return;
+      }
+
+      // 确认审核
+      this.$modal.confirm('确认要审核此出入库单吗？审核后将影响库存数据。').then(() => {
+        this.auditLoading = true;
+        auditStockIo(this.stockIo.stockIoId).then(response => {
+          this.$modal.msgSuccess('审核成功');
+          // 更新主表状态
+          this.$set(this.stockIo, 'status', 2);
+          // 刷新明细列表
+          this.getList();
+          // 通知父组件状态已更新
+          this.$emit('status-changed', this.stockIo);
+        }).catch(error => {
+          console.error('审核失败:', error);
+          this.$modal.msgError('审核失败：' + (error.message || '未知错误'));
+        }).finally(() => {
+          this.auditLoading = false;
+        });
+      }).catch(() => {
+        // 用户取消审核
+      });
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.detailId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    handleAdd() {
+      this.reset();
+      this.form.stockIoId = this.stockIo.stockIoId;
+      this.form.recordType = 0; // 新增时设为手动录入
+      this.open = true;
+      this.title = "添加出入库单明细";
+    },
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const detailId = row.detailId || this.ids
+      getStockIoDetail(detailId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.form.recordType = 0; // 修改时强制设为手动录入
+        this.open = true;
+        this.title = "修改出入库单明细";
+      });
+    },
+    submitForm() {
+      // 动态添加源库位验证规则
+      if (this.stockIo.ioType === 'transfer') {
+        this.$set(this.rules, 'fromWarehouseId', [
+          { required: true, message: "源库区/库位不能为空", trigger: "blur" }
+        ]);
+      } else {
+        this.$delete(this.rules, 'fromWarehouseId');
+      }
+
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.detailId != null) {
+            updateStockIoDetail(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addStockIoDetail(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+              // 新增明细后刷新主表状态
+              this.refreshStockIoStatus();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    handleDelete(row) {
+      const detailIds = row.detailId || this.ids;
+      this.$modal.confirm('是否确认删除出入库单明细编号为"' + detailIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delStockIoDetail(detailIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+        // 删除明细后刷新主表状态
+        this.refreshStockIoStatus();
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    reset() {
+      this.form = {
+        detailId: undefined,
+        stockIoId: undefined,
+        warehouseId: undefined,
+        fromWarehouseId: undefined,
+        itemType: undefined,
+        itemId: undefined,
+        quantity: undefined,
+        unit: undefined,
+        batchNo: undefined,
+        remark: undefined
+      };
+      this.unitDisabled = false; // 新增：重置单位输入框为可编辑
+      this.resetForm("form");
+    },
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    handleExport() {
+      this.download('wms/stockIoDetail/export', {
+        ...this.queryParams
+      }, `stockIoDetail_${new Date().getTime()}.xlsx`)
+    },
+    getAuditButtonText() {
+      if (this.stockIo.ioType === 'in') {
+        return '审核入库';
+      } else if (this.stockIo.ioType === 'out') {
+        return '审核出库';
+      } else if (this.stockIo.ioType === 'transfer') {
+        return '审核移库';
+      } else {
+        return '审核';
+      }
+    },
+    getStatusButtonText() {
+      if (this.stockIo.ioType === 'in') {
+        return '提交入库';
+      } else if (this.stockIo.ioType === 'out') {
+        return '提交出库';
+      } else if (this.stockIo.ioType === 'transfer') {
+        return '提交移库';
+      } else {
+        return '提交';
+      }
+    },
+    handleUpdateStatus() {
+      // 检查是否有明细数据
+      if (!this.stockIoDetailList || this.stockIoDetailList.length === 0) {
+        this.$modal.msgError('请先添加明细数据');
+        return;
+      }
+
+      this.$modal.confirm('确认要提交此出入库单吗？提交后将无法修改明细。').then(() => {
+        this.statusLoading = true;
+        updateStockIoStatus(this.stockIo.stockIoId, 1).then(response => {
+          this.$modal.msgSuccess('状态更新成功');
+          // 更新主表状态
+          this.$set(this.stockIo, 'status', 1);
+          // 通知父组件状态已更新
+          this.$emit('status-changed', this.stockIo);
+        }).catch(error => {
+          console.error('状态更新失败:', error);
+          this.$modal.msgError('状态更新失败：' + (error.message || '未知错误'));
+        }).finally(() => {
+          this.statusLoading = false;
+        });
+      }).catch(() => {
+        // 用户取消状态更新
+      });
+    },
+    handleCancel() {
+      this.$modal.confirm('确认要撤回此出入库单吗？撤回后将回滚库存数据。').then(() => {
+        this.cancelLoading = true;
+        cancelStockIo(this.stockIo.stockIoId).then(response => {
+          this.$modal.msgSuccess('撤回成功');
+          // 更新主表状态
+          this.$set(this.stockIo, 'status', 1);
+          // 刷新明细列表
+          this.getList();
+          // 通知父组件状态已更新
+          this.$emit('status-changed', this.stockIo);
+        }).catch(error => {
+          console.error('撤回失败:', error);
+          this.$modal.msgError('撤回失败：' + (error.message || '未知错误'));
+        }).finally(() => {
+          this.cancelLoading = false;
+        });
+      }).catch(() => {
+        // 用户取消撤回
+      });
+    },
+    refreshStockIoStatus() {
+      // 刷新主表状态
+      if (this.stockIo && this.stockIo.stockIoId) {
+        getStockIo(this.stockIo.stockIoId).then(response => {
+          const updatedStockIo = response.data;
+          // 更新主表状态
+          this.$set(this.stockIo, 'status', updatedStockIo.status);
+          // 通知父组件状态已更新
+          this.$emit('status-changed', this.stockIo);
+        }).catch(error => {
+          console.error('刷新主表状态失败:', error);
+        });
+      }
+    },
+    getIoTypeTagType(type) {
+      if (type === 'in') return 'success';
+      if (type === 'out') return 'primary';
+      if (type === 'transfer') return 'warning';
+      return '';
+    },
+    getIoTypeLabel(type) {
+      if (type === 'in') return '入库';
+      if (type === 'out') return '出库';
+      if (type === 'transfer') return '移库';
+      return type;
+    },
+    getBizTypeLabel(type) {
+      const map = {
+        purchase: '采购',
+        sales: '销售',
+        return: '退货',
+        relocation: '调拨',
+        other: '其他'
+      };
+      return map[type] || type;
+    },
+    getBizTypeTagType(type) {
+      if (type === 'purchase') return 'success';
+      if (type === 'sales') return 'primary';
+      if (type === 'return') return 'warning';
+      if (type === 'relocation') return 'info';
+      return 'default';
+    },
+    onItemChange(e) {
+      if (e && e.unit) {
+        this.form.unit = e.unit;
+        this.unitDisabled = true;
+      }
+    }
+  }
+}
+</script>

klp-ui/src/views/wms/order/index.vue

@@ -74,7 +74,7 @@
         >导出</el-button>
         
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -82,7 +82,7 @@
           @click="goDashboard"
           
         >订单分析</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -94,7 +94,10 @@
       <el-table-column label="销售经理" align="center" prop="salesManager" />
       <el-table-column label="订单状态" align="center" prop="orderStatus">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.order_status" :value="scope.row.orderStatus"/>
+          <el-select v-model="scope.row.orderStatus" @change="handleOrderStatusChange(scope.row)">
+            <el-option v-for="item in dict.type.order_status" :key="item.value" :label="item.label" :value="parseInt(item.value)" />
+          </el-select>
+          <!-- <dict-tag :options="dict.type.order_status" :value="scope.row.orderStatus"/> -->
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
@@ -120,13 +123,13 @@
             icon="el-icon-document"
             @click="showDetail(scope.row)"
           >明细</el-button>
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-s-operation"
             @click="showClac(scope.row)"
             v-if="scope.row.orderStatus === EOrderStatus.NEW"
-          >初次采购推荐</el-button>
+          >初次采购推荐</el-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -250,6 +253,13 @@ export default {
     //   this.clacDialogVisible = false;
     //   this.getList();
     // },
+    handleOrderStatusChange(row) {
+      // console.log(row);
+      updateOrder(row).then(response => {
+        this.$modal.msgSuccess("修改成功");
+        this.getList();
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;

klp-ui/src/views/wms/product/index.vue

@@ -147,6 +147,12 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
           >删除</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-document"
+            @click="goLedger(scope.row)"
+          >台账</el-button>
           <el-button
             size="mini"
             type="text"
@@ -391,6 +397,15 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    goLedger(row) {
+      this.$router.push({
+        path: '/wms/ledger',
+        query: {
+          itemId: row.productId,
+          itemType: 'product'
+        }
+      })
+    },
     handleBom(row) {
       this.bomDialogVisible = true;
       this.bomId = row.bomId;

klp-ui/src/views/wms/purchasePlan/index.vue

@@ -65,15 +65,6 @@
           @click="handleExport"
         >导出</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-magic-stick"
-          size="mini"
-          @click="handleRecommend"
-        >推荐采购计划</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

klp-ui/src/views/wms/rawMaterial/index.vue

@@ -155,6 +155,12 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
           >删除</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-document"
+            @click="goLedger(scope.row)"
+          >台账</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -392,6 +398,15 @@ export default {
         this.loading = false;
       });
     },
+    goLedger(row) {
+      this.$router.push({
+        path: '/wms/ledger',
+        query: {
+          itemId: row.rawMaterialId,
+          itemType: 'raw_material'
+        }
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false;