功能提交

115a5eaa · zhuzhequan · 7fd9aee0 · 115a5eaa · 115a5eaa · 115a5eaa
Commit 115a5eaa authored Jan 30, 2026 by zhuzhequan
Show whitespace changes
Inline Side-by-side

Showing with 62 additions and 7 deletions

src/types/api/warehouse.ts
+1 -0

src/views/warehouse/issueDoc.vue
+16 -0

src/views/warehouse/receiptDoc.vue
+8 -4

src/views/warehouse/warning.vue
+37 -3

No files found.
--- a/src/types/api/warehouse.ts
+++ b/src/types/api/warehouse.ts
@@ -102,6 +102,7 @@ export interface InterskuList {
  id?: number
  productId?: number
  sku?: string
+  userMark?: string
  skuName?: string
  productName?: string
  skuImage?: string

--- a/src/views/warehouse/issueDoc.vue
+++ b/src/views/warehouse/issueDoc.vue
@@ -272,6 +272,7 @@
                    header-align="center"
                    align="center"
                  ></ElTableColumn>
                  <ElTableColumn
                    v-if="nodeCode === 'PENDING_SUBMIT'"
                    width="100"
@@ -386,6 +387,13 @@
                      prop="remark"
                    />
                    <ElTableColumn
+                      label="所属客户"
+                      show-overflow-tooltip
+                      prop="userMark"
+                      header-align="center"
+                      align="center"
+                    ></ElTableColumn>
+                    <ElTableColumn
                      show-overflow-tooltip
                      align="center"
                      label="创建时间"
@@ -687,6 +695,12 @@
                  prop="locationCode"
                />
                <ElTableColumn
+                  show-overflow-tooltip
+                  align="center"
+                  label="所属客户"
+                  prop="userMark"
+                />
+                <ElTableColumn
                  width="80"
                  align="center"
                  header-align="center"
@@ -1390,6 +1404,7 @@ const skudblclick = (val: InterskuList) => {
    locationCode = '',
    price = null,
    productNo = '',
+    userMark = '',
    warehouseSku = '',
    skuName = '',
    image = '',
@@ -1417,6 +1432,7 @@ const skudblclick = (val: InterskuList) => {
      warehouseSku,
      skuName,
      productNo,
+      userMark,
      locationCode: locationCode ?? '', // 确保空值处理
      locationId: locationId ?? null, // 确保空值处理
      costPrice: price,

--- a/src/views/warehouse/receiptDoc.vue
+++ b/src/views/warehouse/receiptDoc.vue
@@ -331,7 +331,9 @@
                      label="库存SKU"
                      width="180"
                      prop="warehouseSku"
-                    />
+                    >
+                    </ElTableColumn>
                    <ElTableColumn
                      show-overflow-tooltip
@@ -553,7 +555,8 @@
          width="140"
          label="库存SKU"
          prop="warehouseSku"
-        />
+        >
+        </ElTableColumn>
        <ElTableColumn
          show-overflow-tooltip
@@ -875,7 +878,7 @@
        show-word-limit
      />
      <div style="margin-top: 12px; color: #777">
-        {{ '多个字段使用_##_,_##_隔开' }}
+        多个字段使用,隔开
      </div>
    </div>
    <template #footer>
@@ -1481,6 +1484,7 @@ const getUserMark = async () => {
 }
 const addDialog = async (i: number, v: InterWarehousePage | null) => {
+  await getUserMark()
  if (i === 2) {
    if (v) formId.value = v.id
    if (v) getProduct(v.id)
@@ -1488,7 +1492,7 @@ const addDialog = async (i: number, v: InterWarehousePage | null) => {
    // editForm.value = JSON.parse(JSON.stringify(v))
  } else {
    await nextTick()
-    await getUserMark()
    editForm.value = JSON.parse(JSON.stringify(editForm2.value))
    resetEditForm()
    const userJson = localStorage.getItem('user')

--- a/src/views/warehouse/warning.vue
+++ b/src/views/warehouse/warning.vue
@@ -13,7 +13,7 @@ import {
  WarehouseWarning,
  factoryWarehouseInventoryPrint,
  exportWarehouseInfo,
-  loactionData,
+  loactionData, getLocalFactoryList,
 } from '@/api/warehouse.ts'
 import { AnyObject } from '@/types/api/warehouse'
 import { ref, computed } from 'vue'
@@ -21,11 +21,16 @@ import SplitDiv from '@/components/splitDiv/splitDiv.vue'
 import { filePath } from '@/api/axios.ts'
 import { useEnterKeyTrigger } from '@/utils/hooks/useEnterKeyTrigger.ts'
 import { getInventoryLowerLimitApi } from '@/api/externalAuth'
+interface UserMark{
+  userId: number | string
+  userMark: string
+  userName: string
+}
 const searchForm = ref({
  warehouseId: '',
  inventoryStart: '',
  inventoryEnd: '',
+  userMark: '',
  productNo: '',
  skuName: '',
  warehouseSku: '',
@@ -38,6 +43,7 @@ const searchForm = ref({
  occupyInventoryStart: '',
 })
 const warehouseList = ref<warehouseInfo[]>([])
+const userMarkList = ref<UserMark[]>([])
 const logList = ref<LogListData[]>([])
 const selections = ref<WarehouseWarning[]>([])
 const leftData = ref<WarehouseWarning[]>([])
@@ -56,6 +62,13 @@ const isSameWarehouse = computed(() => {
 const modifyLocationDialog = ref(false)
 const modifyProductNoDialog = ref(false)
 const modifyCustomSkuDialog = ref(false)
+const getUserMark = async () => {
+  const {data} =  await getLocalFactoryList()
+  userMarkList.value = [
+    ...[{userMark:'九猫商品', userId: 'JMP',userName:''}],
+    ...data
+  ]
+}
 /** 修改库位 */
 const locationForm = ref({
@@ -351,6 +364,7 @@ const getInventoryLowerLimit = async () => {
 }
 onMounted(async () => {
  getData()
+  getUserMark()
  getWarehouse()
  getInventoryLowerLimit()
 })
@@ -387,6 +401,7 @@ onMounted(async () => {
            prop="productNo"
            label="款号 "
          ></el-table-column>
          <el-table-column align="center" prop="number" label="打印数量">
            <template #default="{ row }">
              <el-input
@@ -409,6 +424,7 @@ onMounted(async () => {
        <el-form
          class="search-form"
          inline
+          label-width="80px"
          :model="searchForm"
          ref="searchFormRef"
        >
@@ -418,7 +434,7 @@ onMounted(async () => {
              clearable
              filterable
              placeholder="请输入仓库"
-              style="width: 140px"
+              style="width: 175px"
            >
              <el-option
                v-for="item in warehouseList"
@@ -497,6 +513,19 @@ onMounted(async () => {
              clearable
            ></el-input>
          </el-form-item>
+          <el-form-item label="所属客户">
+            <el-select
+              v-model="searchForm.userMark"
+              clearable
+              filterable
+              placeholder="请输入所属客户"
+              style="width: 140px"
+            >
+              <el-option
+                v-for="user in userMarkList" :key="user.userMark" :label="user.userMark" :value="user.userMark"
+              ></el-option>
+            </el-select>
+          </el-form-item>
          <el-form-item style="margin-top: 5px">
            <el-button type="primary" @click="getData" ref="searchBtnRef"
              >查询</el-button
@@ -618,6 +647,11 @@ onMounted(async () => {
                  ></el-table-column>
                  <el-table-column
                    align="center"
+                    prop="userMark"
+                    label="所属客户"
+                  ></el-table-column>
+                  <el-table-column
+                    align="center"
                    prop="unit"
                    label="单位"
                    width="60"