海川开心-修改仓储物流

周宾

2025-12-10 20364b7cf413ea69a31602f52280d8030f1face7

海川开心-修改仓储物流

 src/views/inventoryManagement/dispatchLog/index.vue

@@ -69,9 +69,9 @@
                </div>
            </el-tab-pane>

<!--            <el-tab-pane label="采购出库" name="purchase">-->
<!--                <div class="search_form">-->
<!--                    <div>-->
            <el-tab-pane label="原料出库" name="purchase">
                <div class="search_form">
                    <div>
<!--&lt;!&ndash;                        <span class="search_title">供应商名称：</span>&ndash;&gt;-->
<!--&lt;!&ndash;                        <el-input&ndash;&gt;-->
<!--&lt;!&ndash;                            v-model="searchForm.supplierName"&ndash;&gt;-->
@@ -81,61 +81,61 @@
<!--&lt;!&ndash;                            clearable&ndash;&gt;-->
<!--&lt;!&ndash;                            prefix-icon="Search"&ndash;&gt;-->
<!--&lt;!&ndash;                        />&ndash;&gt;-->
<!--                        <span class="search_title ml10">出库日期：</span>-->
<!--                        <el-date-picker-->
<!--                            v-model="searchForm.timeStr"-->
<!--                            type="date"-->
<!--                            placeholder="请选择日期"-->
<!--                            value-format="YYYY-MM-DD"-->
<!--                            format="YYYY-MM-DD"-->
<!--                            clearable-->
<!--                            @change="handleQuery"-->
<!--                        />-->
<!--                        <el-button type="primary" @click="handleQuery" style="margin-left: 10px">搜索</el-button>-->
<!--                    </div>-->
<!--                    <div>-->
<!--                        <el-button @click="handleOut">导出</el-button>-->
<!--                        <el-button type="danger" plain @click="handleDelete">删除</el-button>-->
<!--                        <el-button type="primary" plain @click="handlePrint">打印</el-button>-->
<!--                    </div>-->
<!--                </div>-->
<!--                <div class="table_list">-->
<!--                    <el-table-->
<!--                        :data="tableData"-->
<!--                        border-->
<!--                        v-loading="tableLoading"-->
<!--                        @selection-change="handleSelectionChange"-->
<!--                        :expand-row-keys="expandedRowKeys"-->
<!--                        :row-key="(row) => row.id"-->
<!--                        show-summary-->
<!--                        style="width: 100%"-->
<!--                        :summary-method="summarizeMainTable"-->
<!--                        height="calc(100vh - 18.5em)"-->
<!--                    >-->
<!--                        <el-table-column align="center" type="selection" width="55" />-->
<!--                        <el-table-column align="center" label="序号" type="index" width="60" />-->
<!--                        <el-table-column label="出库日期" prop="createTime" min-width="120" show-overflow-tooltip />-->
                        <span class="search_title ml10">出库日期：</span>
                        <el-date-picker
                            v-model="searchForm.timeStr"
                            type="date"
                            placeholder="请选择日期"
                            value-format="YYYY-MM-DD"
                            format="YYYY-MM-DD"
                            clearable
                            @change="handleQuery"
                        />
                        <el-button type="primary" @click="handleQuery" style="margin-left: 10px">搜索</el-button>
                    </div>
                    <div>
                        <el-button @click="handleOut">导出</el-button>
                        <el-button type="danger" plain @click="handleDelete">删除</el-button>
                        <el-button type="primary" plain @click="handlePrint">打印</el-button>
                    </div>
                </div>
                <div class="table_list">
                    <el-table
                        :data="tableData"
                        border
                        v-loading="tableLoading"
                        @selection-change="handleSelectionChange"
                        :expand-row-keys="expandedRowKeys"
                        :row-key="(row) => row.id"
                        show-summary
                        style="width: 100%"
                        :summary-method="summarizeMainTable"
                        height="calc(100vh - 18.5em)"
                    >
                        <el-table-column align="center" type="selection" width="55" />
                        <el-table-column align="center" label="序号" type="index" width="60" />
                        <el-table-column label="出库日期" prop="createTime" min-width="120" show-overflow-tooltip />
<!--&lt;!&ndash;                        <el-table-column label="供应商名称" prop="supplierName" width="250" show-overflow-tooltip />&ndash;&gt;-->
<!--                        <el-table-column label="产品大类" prop="productCategory" show-overflow-tooltip />-->
<!--                        <el-table-column label="规格型号" prop="specificationModel" show-overflow-tooltip />-->
<!--                        <el-table-column label="单位" prop="unit" width="80" show-overflow-tooltip />-->
<!--                        <el-table-column label="出库数量" prop="inboundNum" width="100" show-overflow-tooltip />-->
                        <el-table-column label="产品大类" prop="productCategory" show-overflow-tooltip />
                        <el-table-column label="规格型号" prop="specificationModel" show-overflow-tooltip />
                        <el-table-column label="单位" prop="unit" width="80" show-overflow-tooltip />
                        <el-table-column label="出库数量" prop="inboundNum" width="100" show-overflow-tooltip />
<!--&lt;!&ndash;                        <el-table-column label="含税单价(元)" prop="taxInclusiveUnitPrice" width="100" show-overflow-tooltip />&ndash;&gt;-->
<!--&lt;!&ndash;                        <el-table-column label="含税总价(元)" prop="taxInclusiveTotalPrice" width="100" show-overflow-tooltip />&ndash;&gt;-->
<!--&lt;!&ndash;                        <el-table-column label="税率(%)" prop="taxRate" width="100" show-overflow-tooltip />&ndash;&gt;-->
<!--&lt;!&ndash;                        <el-table-column label="不含税总价(元)" prop="taxExclusiveTotalPrice" width="180" show-overflow-tooltip />&ndash;&gt;-->
<!--                        <el-table-column label="出库人" prop="createBy" width="80" show-overflow-tooltip />-->
<!--                    </el-table>-->
<!--                    <pagination-->
<!--                        v-show="total > 0"-->
<!--                        :total="total"-->
<!--                        layout="total, sizes, prev, pager, next, jumper"-->
<!--                        :page="page.current"-->
<!--                        :limit="page.size"-->
<!--                        @pagination="paginationChange"-->
<!--                    />-->
<!--                </div>-->
<!--            </el-tab-pane>-->
                        <el-table-column label="出库人" prop="createBy" width="80" show-overflow-tooltip />
                    </el-table>
                    <pagination
                        v-show="total > 0"
                        :total="total"
                        layout="total, sizes, prev, pager, next, jumper"
                        :page="page.current"
                        :limit="page.size"
                        @pagination="paginationChange"
                    />
                </div>
            </el-tab-pane>

            <el-tab-pane label="成品出库" name="manual">
                <div class="search_form">

 src/views/inventoryManagement/issueManagement/index.vue

@@ -39,7 +39,7 @@
<!--            <el-table-column label="含税总价" prop="taxInclusiveTotalPrice" width="100" show-overflow-tooltip />-->
<!--            <el-table-column label="税率(%)" prop="taxRate" width="80" show-overflow-tooltip />-->
<!--            <el-table-column label="不含税总价" prop="taxExclusiveTotalPrice" width="100" show-overflow-tooltip />-->
            <el-table-column label="入库人" prop="createBy" width="80" show-overflow-tooltip />
            <!-- <el-table-column label="入库人" prop="createBy" width="80" show-overflow-tooltip /> -->
            <el-table-column fixed="right" label="操作" min-width="60" align="center">
              <template #default="scope">
                <el-button link type="primary" size="small" @click="openForm(scope.row);">领用</el-button>
@@ -90,7 +90,7 @@
&lt;!&ndash;            <el-table-column label="含税总价" prop="taxInclusiveTotalPrice" width="100" show-overflow-tooltip />&ndash;&gt;
&lt;!&ndash;            <el-table-column label="税率(%)" prop="taxRate" width="80" show-overflow-tooltip />&ndash;&gt;
&lt;!&ndash;            <el-table-column label="不含税总价" prop="taxExclusiveTotalPrice" width="100" show-overflow-tooltip />&ndash;&gt; -->
           <el-table-column label="入库人" prop="createBy" width="80" show-overflow-tooltip />
           <!-- <el-table-column label="入库人" prop="createBy" width="80" show-overflow-tooltip /> -->
           <el-table-column fixed="right" label="操作" min-width="60" align="center">
             <template #default="scope">
               <el-button link type="primary" size="small" @click="openForm(scope.row);">领用</el-button>
@@ -142,7 +142,7 @@
<!--            <el-table-column label="含税总价" prop="taxInclusiveTotalPrice" width="100" show-overflow-tooltip />-->
<!--            <el-table-column label="税率(%)" prop="taxRate" width="80" show-overflow-tooltip />-->
<!--            <el-table-column label="不含税总价" prop="taxExclusiveTotalPrice" width="100" show-overflow-tooltip />-->
            <el-table-column label="入库人" prop="createBy" show-overflow-tooltip />
            <!-- <el-table-column label="入库人" prop="createBy" show-overflow-tooltip /> -->
            <el-table-column fixed="right" label="操作" width="100" align="center">
              <template #default="scope">
                <el-button link type="primary" size="small" @click="openForm(scope.row);">领用</el-button>

 src/views/inventoryManagement/stockManagement/index.vue

@@ -1,7 +1,7 @@
<template>
  <div class="app-container">
    <el-tabs v-model="activeTab" @tab-change="handleTabChange">
      <el-tab-pane label="生产入库" name="production">
      <el-tab-pane label="材料库存" name="production">
        <div class="search_form">
          <div>
<!--            <span class="search_title">客户名称：</span>-->
@@ -55,54 +55,54 @@
        </div>
      </el-tab-pane>

<!--      <el-tab-pane label="采购入库" name="purchase">-->
<!--        <div class="search_form">-->
<!--          <div>-->
<!--            <span class="search_title ml10">入库日期：</span>-->
<!--            <el-date-picker-->
<!--              v-model="searchForm.timeStr"-->
<!--              type="date"-->
<!--              placeholder="请选择日期"-->
<!--              value-format="YYYY-MM-DD"-->
<!--              format="YYYY-MM-DD"-->
<!--              clearable-->
<!--              @change="handleQuery"-->
<!--            />-->
<!--            <el-button type="primary" @click="handleQuery" style="margin-left: 10px">搜索</el-button>-->
<!--          </div>-->
<!--          <div>-->
<!--            <el-button @click="handleOut">导出</el-button>-->
<!--            <el-button type="danger" plain @click="handleDelete">删除</el-button>-->
<!--          </div>-->
<!--        </div>-->
<!--        <div class="table_list">-->
<!--          <el-table :data="tableData" border v-loading="tableLoading" @selection-change="handleSelectionChange"-->
<!--            :expand-row-keys="expandedRowKeys" :row-key="row => row.id" show-summary style="width: 100%"-->
<!--            :row-class-name="tableRowClassName"-->
<!--            :summary-method="summarizeMainTable" height="calc(100vh - 18.5em)">-->
<!--            <el-table-column align="center" type="selection" width="55" />-->
<!--            <el-table-column align="center" label="序号" type="index" width="60" />-->
<!--            <el-table-column label="入库日期" prop="createTime" width="100" show-overflow-tooltip />-->
<!--            <el-table-column label="产品大类" prop="productCategory" show-overflow-tooltip />-->
<!--            <el-table-column label="规格型号" prop="specificationModel" show-overflow-tooltip />-->
<!--            <el-table-column label="单位" prop="unit" width="80" show-overflow-tooltip />-->
<!--                        <el-table-column label="库存数量" prop="inboundNum" width="100" show-overflow-tooltip />-->
<!--                        <el-table-column label="已出库数量" prop="totalInboundNum" show-overflow-tooltip />-->
<!--                        <el-table-column label="待出库数量" prop="inboundNum0" show-overflow-tooltip />-->
<!--            <el-table-column label="库存预警数量" prop="warnNum" width="130" show-overflow-tooltip />-->
<!--            <el-table-column label="入库人" prop="createBy" width="80" show-overflow-tooltip />-->
<!--            <el-table-column fixed="right" label="操作" min-width="60" align="center">-->
<!--              <template #default="scope">-->
<!--                <el-button link type="primary" size="small" @click="openForm('edit', scope.row);">编辑</el-button>-->
<!--              </template>-->
<!--            </el-table-column>-->
<!--          </el-table>-->
<!--          <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper"-->
<!--            :page="page.current" :limit="page.size" @pagination="paginationChange" />-->
<!--        </div>-->
<!--      </el-tab-pane>-->
     <el-tab-pane label="原料库存" name="purchase">
       <div class="search_form">
         <div>
           <span class="search_title ml10">入库日期：</span>
           <el-date-picker
             v-model="searchForm.timeStr"
             type="date"
             placeholder="请选择日期"
             value-format="YYYY-MM-DD"
             format="YYYY-MM-DD"
             clearable
             @change="handleQuery"
           />
           <el-button type="primary" @click="handleQuery" style="margin-left: 10px">搜索</el-button>
         </div>
         <div>
           <el-button @click="handleOut">导出</el-button>
           <el-button type="danger" plain @click="handleDelete">删除</el-button>
         </div>
       </div>
       <div class="table_list">
         <el-table :data="tableData" border v-loading="tableLoading" @selection-change="handleSelectionChange"
           :expand-row-keys="expandedRowKeys" :row-key="row => row.id" show-summary style="width: 100%"
           :row-class-name="tableRowClassName"
           :summary-method="summarizeMainTable" height="calc(100vh - 18.5em)">
           <el-table-column align="center" type="selection" width="55" />
           <el-table-column align="center" label="序号" type="index" width="60" />
           <el-table-column label="入库日期" prop="createTime" width="100" show-overflow-tooltip />
           <el-table-column label="产品大类" prop="productCategory" show-overflow-tooltip />
           <el-table-column label="规格型号" prop="specificationModel" show-overflow-tooltip />
           <el-table-column label="单位" prop="unit" width="80" show-overflow-tooltip />
                        <el-table-column label="库存数量" prop="inboundNum" width="100" show-overflow-tooltip />
                        <el-table-column label="已出库数量" prop="totalInboundNum" show-overflow-tooltip />
                        <el-table-column label="待出库数量" prop="inboundNum0" show-overflow-tooltip />
           <!-- <el-table-column label="库存预警数量" prop="warnNum" width="130" show-overflow-tooltip />
           <el-table-column label="入库人" prop="createBy" width="80" show-overflow-tooltip /> -->
           <el-table-column fixed="right" label="操作" min-width="60" align="center">
             <template #default="scope">
               <el-button link type="primary" size="small" @click="openForm('edit', scope.row);">编辑</el-button>
             </template>
           </el-table-column>
         </el-table>
         <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper"
           :page="page.current" :limit="page.size" @pagination="paginationChange" />
       </div>
     </el-tab-pane>

      <el-tab-pane label="成品入库" name="manual">
      <el-tab-pane label="成品库存" name="manual">
        <div class="search_form">
          <div>
<!--            <span class="search_title">供应商名称：</span>-->
@@ -161,16 +161,25 @@
      @close="closeDia">
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
        <el-row :gutter="30">
          <el-col :span="12">
          <!-- <el-col :span="12">
            <el-form-item label="供应商名称：" prop="supplierName">
              <el-input disabled v-model="form.supplierName" placeholder="请输入" clearable />
            </el-form-item>
          </el-col>
          </el-col> -->
          <el-col :span="12">
            <el-form-item label="产品大类：" prop="productId">
              <el-select disabled v-model="form.productCategory" placeholder="请选择" clearable filterable>
                <el-option v-for="item in productList" :key="item.id" :label="item.productName"
                           :value="item.productName" />
              </el-select>
            </el-form-item>
          </el-col>
           <el-col :span="12">
            <el-form-item label="出库人：" prop="entryPerson">
              <el-select v-model="form.createUser"                 filterable
                         default-first-option
                         :reserve-keyword="false" placeholder="请选择" clearable>
                <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
              </el-select>
            </el-form-item>
          </el-col>
@@ -230,7 +239,7 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
        <!-- <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="出库人：" prop="entryPerson">
              <el-select v-model="form.createUser"                 filterable
@@ -240,12 +249,12 @@
              </el-select>
            </el-form-item>
          </el-col>
<!--          <el-col :span="12">-->
<!--          <el-form-item label="库存预警数量：" prop="warnNum">-->
<!--            <el-input v-model="form.warnNum" placeholder="请输入最低库存" clearable />-->
<!--          </el-form-item>-->
<!--        </el-col>-->
        </el-row>
         <el-col :span="12">
            <el-form-item label="库存预警数量：" prop="warnNum">
              <el-input v-model="form.warnNum" placeholder="请输入最低库存" clearable />
            </el-form-item>
          </el-col>
        </el-row> -->
      </el-form>
      <template #footer>
        <div class="dialog-footer">
@@ -299,13 +308,13 @@
const activeTab = ref('production')
const data = reactive({
  searchForm: {
    supplierName: '',
    // supplierName: '',
    customerName: '',
    timeStr: getCurrentDate(),
  },
  form: {
    supplierId: null,
    supplierName: '',
    // supplierName: '',
    productId: null,
    productName: '',
    userId: userStore.userId,
@@ -326,7 +335,7 @@
    salesLedgerProductId: null,
  },
  rules: {
    supplierName: [{ required: true, message: '请输入供应商名称', trigger: 'blur' }],
    // supplierName: [{ required: true, message: '请输入供应商名称', trigger: 'blur' }],
    productCategory: [{ required: true, message: '请选择产品大类', trigger: 'change' }],
    specificationModel: [{ required: true, message: '请输入规格型号', trigger: 'blur' }],
    unit: [{ required: true, message: '请输入单位', trigger: 'blur' }],
@@ -362,7 +371,7 @@
  if (activeTab.value === 'production') {
    params.customerName = searchForm.value.customerName
  } else {
    params.supplierName = searchForm.value.supplierName
    // params.supplierName = searchForm.value.supplierName
  }
  return params
}
@@ -392,7 +401,7 @@
// 切换 tab
const handleTabChange = () => {
  page.current = 1
  searchForm.value.supplierName = ''
  // searchForm.value.supplierName = ''
  searchForm.value.customerName = ''
  searchForm.value.timeStr = ''
  selectedRows.value = []