From 78caa769e452f63288743b8997f7b4c21bb06ce5 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 06 十一月 2026 19:00:38 +0800
Subject: [PATCH] feat(crm,mes): 扩展客户字段与重构批次号生成逻辑
---
src/views/mobile/stock.vue | 51 +++++++++++++++++++++++++++------------------------
1 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/src/views/mobile/stock.vue b/src/views/mobile/stock.vue
index 56d6eb8..e0edfd0 100644
--- a/src/views/mobile/stock.vue
+++ b/src/views/mobile/stock.vue
@@ -2,32 +2,29 @@
import { onMounted,ref } from 'vue';
import { requestClient } from '#/api/request';
import type { MesWmMaterialStockApi } from '#/api/mes/wm/materialstock';
+import { getMaterialStockBagDetails, type MaterialStockBagDetail } from '#/api/mes/wm/materialstock';
import { errorText } from '#/mobile/api';
import { getWarehouseSimpleList, type MesWmWarehouseApi } from '#/api/mes/wm/warehouse';
-import { getWarehouseLocationSimpleList, type MesWmWarehouseLocationApi } from '#/api/mes/wm/warehouse/location';
-import { getWarehouseAreaSimpleList, type MesWmWarehouseAreaApi } from '#/api/mes/wm/warehouse/area';
import Picker from './picker.vue';
defineOptions({name:'MobileStock'});
-const positionLoading=ref(false);
-let positionRequest=0;
-const warehouses=ref<MesWmWarehouseApi.Warehouse[]>([]),locations=ref<MesWmWarehouseLocationApi.WarehouseLocation[]>([]),areas=ref<MesWmWarehouseAreaApi.WarehouseArea[]>([]);
-const warehouseId=ref<number>(),locationId=ref<number>(),areaId=ref<number>();
-async function changeWarehouse(){
- const ticket=++positionRequest,id=warehouseId.value;locationId.value=undefined;areaId.value=undefined;locations.value=[];areas.value=[];positionLoading.value=!!id;
- try{if(id){const list=await getWarehouseLocationSimpleList(id);if(ticket===positionRequest)locations.value=list;}}
- catch(e){if(ticket===positionRequest)error.value=errorText(e);}finally{if(ticket===positionRequest)positionLoading.value=false;}
-}
-async function changeLocation(){
- const ticket=++positionRequest,id=locationId.value;areaId.value=undefined;areas.value=[];positionLoading.value=!!id;
- try{if(id){const list=await getWarehouseAreaSimpleList(id);if(ticket===positionRequest)areas.value=list;}}
- catch(e){if(ticket===positionRequest)error.value=errorText(e);}finally{if(ticket===positionRequest)positionLoading.value=false;}
-}
-const keyword=ref(''),batch=ref(''),page=ref(1),busy=ref(false),error=ref(''),total=ref(0),rows=ref<MesWmMaterialStockApi.MaterialStock[]>([]),expanded=ref<number>();
-type Filters={itemName?:string;batchCode?:string;warehouseId?:number;locationId?:number;areaId?:number};
+const warehouses=ref<MesWmWarehouseApi.Warehouse[]>([]);
+const warehouseId=ref<number>();
+const keyword=ref(''),batch=ref(''),includeZero=ref(false),page=ref(1),busy=ref(false),error=ref(''),total=ref(0),rows=ref<MesWmMaterialStockApi.MaterialStock[]>([]),expanded=ref<number>();
+type Filters={itemName?:string;batchCode?:string;warehouseId?:number;includeZero?:boolean};
let applied:Filters={};
+const bags=ref<MaterialStockBagDetail[]>([]), bagTotal=ref(0), bagPage=ref(0), bagBusy=ref(false), bagStockId=ref<number>();
+async function loadBags(id:number, reset=false){
+ if(bagBusy.value)return;
+ bagBusy.value=true; error.value='';
+ try{
+ const next=reset?1:bagPage.value+1;
+ const result=await getMaterialStockBagDetails({materialStockId:id,includeHistory:true,pageNo:next,pageSize:20});
+ bags.value=reset?result.list:[...bags.value,...result.list]; bagTotal.value=result.total; bagPage.value=next; bagStockId.value=id;
+ }catch(e){error.value=errorText(e);}finally{bagBusy.value=false;}
+}
async function load(reset=false){
if(busy.value)return;busy.value=true;error.value='';const nextPage=reset?1:page.value+1;
- const filters=reset?{itemName:keyword.value.trim()||undefined,batchCode:batch.value.trim()||undefined,warehouseId:warehouseId.value,locationId:locationId.value,areaId:areaId.value}:applied;
+ const filters=reset?{itemName:keyword.value.trim()||undefined,batchCode:batch.value.trim()||undefined,warehouseId:warehouseId.value,includeZero:includeZero.value}:applied;
try{
const r=await requestClient.get<{list:MesWmMaterialStockApi.MaterialStock[];total:number}>('/mes/wm/material-stock/page',{params:{pageNo:nextPage,pageSize:20,...filters}});
rows.value=reset?r.list:[...rows.value,...r.list];total.value=r.total;page.value=nextPage;
@@ -40,10 +37,9 @@
<form class="m-panel" @submit.prevent="load(true)">
<label class="m-field"><span>鍝佺鍚嶇О</span><input v-model="keyword" placeholder="鎼滅储鍝佺"/></label>
<label class="m-field"><span>鎵规鍙�</span><input v-model="batch" placeholder="鍙�夛紝杈撳叆鎵规鍙�"/></label>
-<details><summary class="m-link">鎸変粨搴� / 搴撲綅绛涢��</summary>
-<Picker v-model="warehouseId" label="浠撳簱" :options="warehouses" :disabled="busy" allow-empty placeholder="鍏ㄩ儴浠撳簱" @update:model-value="changeWarehouse"/>
-<Picker v-model="locationId" label="搴撳尯" :options="locations" :disabled="busy||!warehouseId" :loading="positionLoading" allow-empty placeholder="鍏ㄩ儴搴撳尯" @update:model-value="changeLocation"/>
-<Picker v-model="areaId" label="搴撲綅" :options="areas" :disabled="busy||!locationId" :loading="positionLoading" allow-empty placeholder="鍏ㄩ儴搴撲綅"/>
+<label><input v-model="includeZero" type="checkbox" :disabled="busy" /> 鍖呭惈闆跺簱瀛樿褰�</label>
+<details><summary class="m-link">鎸変粨搴撶瓫閫�</summary>
+<Picker v-model="warehouseId" label="浠撳簱" :options="warehouses" :disabled="busy" allow-empty placeholder="鍏ㄩ儴浠撳簱"/>
</details>
<button class="m-primary" :disabled="busy">{{busy?'姝e湪鏌ヨ鈥�':'鏌ヨ搴撳瓨'}}</button>
</form>
@@ -51,9 +47,16 @@
<p v-if="!rows.length&&!busy" class="m-empty">鏆傛棤鍖归厤搴撳瓨</p>
<article v-for="row in rows" :key="row.id" class="m-panel">
<h2 class="m-title">{{row.itemName}}</h2><p><strong>{{row.availableQuantity??row.quantity??0}}</strong> {{row.unitMeasureName}} <span class="m-muted">{{row.availableQuantity!=null?'鍙敤':'鍦ㄥ簱'}}</span></p>
-<p class="m-muted">{{row.warehouseName}} / {{row.locationName}} / {{row.areaName}}</p><p class="m-muted">鎵规锛歿{row.batchCode||'鏈綍鍏�'}}</p>
+<p class="m-muted">{{row.warehouseName}}</p><p class="m-muted">鎵规锛歿{row.batchCode||'鏈綍鍏�'}}</p>
<button class="m-detail-toggle" :aria-expanded="expanded===row.id" @click="expanded=expanded===row.id?undefined:row.id"> {{expanded===row.id?'鏀惰捣鏄庣粏':'鏌ョ湅鏁伴噺鏄庣粏'}}</button>
<dl v-if="expanded===row.id"><div class="m-row"><dt>鍦ㄥ簱鏁伴噺</dt><dd>{{row.quantity}} {{row.unitMeasureName}}</dd></div><div class="m-row"><dt>鍐荤粨鏁伴噺</dt><dd>{{row.frozenQuantity??0}}</dd></div><div class="m-row"><dt>鍗犵敤鏁伴噺</dt><dd>{{row.reservedQuantity??0}}</dd></div><div class="m-row"><dt>鍏ュ簱鏃堕棿</dt><dd>{{row.receiptTime||'鏈綍鍏�'}}</dd></div></dl>
+<template v-if="expanded===row.id && row.bagDetailSupported">
+<button class="m-secondary" :disabled="bagBusy" @click="loadBags(row.id!,true)">鏌ョ湅琚嬬爜鐘舵��</button>
+<template v-if="bagStockId===row.id">
+<p v-if="!bags.length" class="m-muted">鏆傛棤琚嬬爜鏄庣粏</p>
+<div v-for="bag in bags" :key="bag.id" class="m-record"><p style="overflow-wrap:anywhere">{{bag.bagCode}}</p><p>{{bag.status===1?(bag.pickingStatus==='RESERVED'?'宸插崰鐢�':bag.pickingStatus==='PICKED'?'宸叉嫞閫�':'鍦ㄥ簱'):bag.status===2?(bag.outboundBizType===119?'閿�鍞凡鍑哄簱':'宸插嚭搴�'):bag.status===3?'宸叉姤搴�':'鏈煡鐘舵��'}}<span v-if="bag.outboundTime"> 路 {{bag.outboundTime}}</span></p></div>
+<button v-if="bags.length<bagTotal" class="m-secondary" :disabled="bagBusy" @click="loadBags(row.id!)">鍔犺浇鏇村琚嬬爜</button>
+</template></template>
</article>
<button v-if="rows.length<total" class="m-secondary" :disabled="busy" @click="load()">鍔犺浇鏇村</button>
</template>
--
Gitblit v1.9.3