1.海川开心-仓储物流展示字段修改,及编辑修改

gaoluyang

5 天以前 4d42d32474acd523b23c544596c62185af094d29

 src/views/inventoryManagement/receiptManagement/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>-->
@@ -17,16 +17,25 @@
              clearable
              @change="handleQuery"
            />
            <span class="search_title ml10">产品大类：</span>
            <el-input
              v-model="searchForm.productCategory"
              style="width: 240px"
              placeholder="请输入"
              clearable
            />
            <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"
          <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" show-overflow-tooltip />
            <!-- <el-table-column label="入库批次" prop="inboundBatches" show-overflow-tooltip /> -->
@@ -34,19 +43,27 @@
            <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="70" show-overflow-tooltip />
            <el-table-column label="入库数量" prop="inboundNum" width="90" show-overflow-tooltip />
                  <el-table-column label="入库数量" prop="inboundNum" width="100" show-overflow-tooltip />
<!--                  <el-table-column label="剩余库存" prop="inboundNum0" show-overflow-tooltip />-->
                  <el-table-column label="单价(元)" prop="unitPrice" width="150"></el-table-column>
                  <el-table-column label="总价(元)" prop="totalPrice" width="150"></el-table-column>
<!--            <el-table-column label="含税单价" prop="taxInclusiveUnitPrice" width="100" show-overflow-tooltip />-->
<!--            <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 fixed="right" label="操作" min-width="60" align="center">
              <template #default="scope">
                <el-button link type="primary" size="small" @click="openForm('edit', scope.row, 'production');">编辑</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">
     <el-tab-pane label="原料入库" name="purchase">
       <div class="search_form">
         <div>
<!--&lt;!&ndash;            <span class="search_title">供应商名称：</span>&ndash;&gt;-->
@@ -62,6 +79,13 @@
             clearable
             @change="handleQuery"
           />
            <span class="search_title ml10">产品大类：</span>
            <el-input
              v-model="searchForm.productCategory"
              style="width: 240px"
              placeholder="请输入"
              clearable
            />
           <el-button type="primary" @click="handleQuery" style="margin-left: 10px">搜索</el-button>
         </div>
         <div>
@@ -78,11 +102,14 @@
           <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="inboundBatches" width="160" show-overflow-tooltip /> -->
<!--&lt;!&ndash;            <el-table-column label="供应商名称" prop="supplierName" width="240" show-overflow-tooltip />&ndash;&gt;-->
<el-table-column label="供应商名称" prop="supplierName" width="240" 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="70" show-overflow-tooltip />
           <el-table-column label="入库数量" prop="inboundNum" width="90" show-overflow-tooltip />
                <el-table-column label="入库数量" prop="inboundNum" width="100" show-overflow-tooltip />
<!--                <el-table-column label="剩余库存" prop="inboundNum0" show-overflow-tooltip />-->
                <el-table-column label="含税单价(元)" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
                <el-table-column label="含税总价(元)" prop="taxInclusiveTotalPrice" width="150"></el-table-column>
<!--&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="80" show-overflow-tooltip />&ndash;&gt;-->
@@ -115,6 +142,13 @@
              clearable
              @change="handleQuery"
            />
            <span class="search_title ml10">产品大类：</span>
            <el-input
              v-model="searchForm.productCategory"
              style="width: 240px"
              placeholder="请输入"
              clearable
            />
            <el-button type="primary" @click="handleQuery" style="margin-left: 10px">搜索</el-button>
          </div>
          <div>
@@ -131,12 +165,15 @@
            <el-table-column align="center" label="序号" type="index" width="60" />
            <el-table-column label="入库时间" prop="inboundDate" width="100" show-overflow-tooltip />
            <!-- <el-table-column label="入库批次" prop="inboundBatches" show-overflow-tooltip /> -->
            <!-- <el-table-column label="供应商名称" prop="supplierName" width="240" show-overflow-tooltip /> -->
<!--             <el-table-column label="供应商名称" prop="supplierName" width="240" 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="70" show-overflow-tooltip />
            <el-table-column label="物品类型" prop="itemType" show-overflow-tooltip />
            <el-table-column label="入库数量" prop="inboundNum" show-overflow-tooltip />
                  <el-table-column label="入库数量" prop="inboundNum" width="100" show-overflow-tooltip />
<!--                  <el-table-column label="剩余库存" prop="inboundNum0" show-overflow-tooltip />-->
                  <el-table-column label="单价(元)" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
                  <el-table-column label="总价(元)" prop="taxInclusiveTotalPrice" width="150"></el-table-column>
<!--            <el-table-column label="含税单价" prop="taxInclusiveUnitPrice" width="100" show-overflow-tooltip />-->
<!--            <el-table-column label="含税总价" prop="taxInclusiveTotalPrice" width="100" show-overflow-tooltip />-->
<!--            <el-table-column label="税率(%)" prop="taxRate" width="80" show-overflow-tooltip />-->
@@ -156,6 +193,7 @@

    <form-dia ref="formDia" @close="handleQuery" @success="handleQuery"></form-dia>
    <form-dia-manual ref="formDiaManual" @close="handleQuery" @success="handleQuery"></form-dia-manual>
    <form-dia-product ref="formDiaProduct" @close="handleQuery" @success="handleQuery"></form-dia-product>
  </div>
</template>

@@ -168,19 +206,18 @@
import {
   getStockInPage,
   getStockInPageByProduction,
   getStockInPageByCustom,
   delStockIn,
   delStockInCustom, getInPageByCustom,
} from "@/api/inventoryManagement/stockIn.js";
import FormDia from './components/formDia.vue'
import FormDiaManual from './components/formDiaManual.vue'
import FormDiaProduct from './components/formDiaProduct.vue'

// 获取当前日期
function getCurrentDate() {
  return dayjs().format('YYYY-MM-DD')
}

const userStore = useUserStore()
const { proxy } = getCurrentInstance()

const tableData = ref([])
@@ -188,6 +225,7 @@
const tableLoading = ref(false)
const formDia = ref()
const formDiaManual = ref()
const formDiaProduct = ref()
const activeTab = ref('production') // 当前激活的 tab

const page = reactive({
@@ -200,6 +238,7 @@
  searchForm: {
    supplierName: '',
    customerName: '',
    productCategory:'',
    timeStr: getCurrentDate(),
  },
})
@@ -227,6 +266,7 @@
    params.supplierName = searchForm.value.supplierName
    params.timeStr = searchForm.value.timeStr
  }
  params.productCategory = searchForm.value.productCategory
  
  // 根据不同的 tab 类型调用不同的接口
  const apiCall = activeTab.value === 'production' 
@@ -238,6 +278,26 @@
  apiCall.then(res => {
    tableLoading.value = false
    tableData.value = res.data.records
    
    // 前端计算总价：总价 = unitPrice * inboundNum
    tableData.value = tableData.value.map(item => {
      // 使用入库数量计算总价
      const inboundNum = Number(item.inboundNum) || 0
      const unitPrice = Number(item.unitPrice) || 0
      const taxInclusiveUnitPrice = Number(item.taxInclusiveUnitPrice) || 0
      
      // 根据标签页类型计算不同的总价
      if (activeTab.value === 'production') {
        // 成品库存：总价 = unitPrice * 入库数量
        item.totalPrice = (unitPrice * inboundNum).toFixed(2)
      } else {
        // 原料和材料库存：含税总价 = taxInclusiveUnitPrice * 入库数量
        item.taxInclusiveTotalPrice = (taxInclusiveUnitPrice * inboundNum).toFixed(2)
      }
      
      return item
    })
    
    total.value = res.data.total
  }).catch(() => {
    tableLoading.value = false
@@ -251,6 +311,7 @@
  searchForm.value.supplierName = ''
  searchForm.value.customerName = ''
  searchForm.value.timeStr = ''
  searchForm.value.productCategory = ''
  getList()
}

@@ -260,7 +321,9 @@
  await nextTick(() => {
    if (currentTab === 'manual') {
      formDiaManual.value?.openDialog(type, row)
    } else {
    } else if (currentTab === 'production') {
         formDiaProduct.value?.openDialog(type, row)
      }else {
      formDia.value?.openDialog(type, row)
    }
  })
@@ -304,14 +367,6 @@
    proxy.$modal.msgWarning('请选择数据')
    return
  }

  // 检查是否有他人维护的数据
  const unauthorizedData = selectedRows.value.filter(item => item.createBy !== userStore.nickName)
  if (unauthorizedData.length > 0) {
    proxy.$modal.msgWarning("不可删除他人维护的数据")
    return
  }

  const ids = selectedRows.value.map(item => item.id)
  
  ElMessageBox.confirm('选中的内容将被删除，是否确认删除？', '删除', {
@@ -319,9 +374,24 @@
    cancelButtonText: '取消',
    type: 'warning',
  }).then(() => {
    // 根据当前 tab 类型选择不同的删除接口
    const deleteApi = activeTab.value === 'manual' ? delStockInCustom : delStockIn
    deleteApi({ ids }).then(() => {
    // 根据当前 tab 类型选择不同的删除接口和type参数
    let deleteApi, deleteParams
    
    if (activeTab.value === 'production') {
      // 成品删除，type传2
      deleteApi = delStockIn
      deleteParams = { ids, type: 2 }
    } else if (activeTab.value === 'purchase') {
      // 原料删除，type传1
      deleteApi = delStockIn
      deleteParams = { ids, type: 1 }
    } else {
      // 材料入库
      deleteApi = delStockInCustom
      deleteParams = { ids }
    }
    
    deleteApi(deleteParams).then(() => {
      proxy.$modal.msgSuccess("删除成功")
      getList()
    }).catch(() => {
@@ -338,3 +408,6 @@
</script>

<style scoped lang="scss"></style>