yangzifeng/shzg_projectManage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.100.212.83:3000/yangzifeng/shzg_projectManage

Browse Source
This commit is contained in:
zx
2026-02-13 10:21:25 +08:00
parent 30f82750a5 e3ee4f8b3e
commit bfab2eea96
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/wisdom/outbound/index.vue
View File

@@ -113,8 +113,9 @@
>否</span >否</span
> >
<span v-else-if="scope.row.isDelivery === '1'">是</span> <span v-else-if="scope.row.isDelivery === '1'">是</span>
<span v-else-if="scope.row.isDelivery === '2'">配送中</span> <span v-else-if="scope.row.isDelivery === '2'">待配送</span>
<span v-else-if="scope.row.isDelivery === '3'">配送完成</span> <span v-else-if="scope.row.isDelivery === '3'">配送中</span>
<span v-else-if="scope.row.isDelivery === '4'">配送完成</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column

20
src/views/wisdom/stock/index.vue
View File

@@ -114,6 +114,7 @@
ref="infoTableRef" ref="infoTableRef"
highlight-current-row highlight-current-row
@row-click="(row) => tableInfoRowClick(row, infoTableRef)" @row-click="(row) => tableInfoRowClick(row, infoTableRef)"
@selection-change="printSelectionChange"
border> border>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" type="index" width="70" /> <el-table-column label="序号" align="center" type="index" width="70" />
@@ -347,7 +348,7 @@ const showSearch = ref(true);
const warehouseCode = ref(''); //所属仓库下拉数据 const warehouseCode = ref(''); //所属仓库下拉数据
const printList = ref([]) //要打印的数据列表
const optionTime = ref([]) //入库时间 const optionTime = ref([]) //入库时间
@@ -416,6 +417,11 @@ function getList() {
} }
getList(); getList();
const printList = ref([]) //要打印的数据列表
const printSelectionChange = (selection) => {
printList.value = selection
}
// 获取总计 // 获取总计
const totalMoney = ref(null) const totalMoney = ref(null)
const pcodeCount = ref(null) const pcodeCount = ref(null)
@@ -560,12 +566,12 @@ function submitMoveForm() {
proxy.$modal.msgError("仓库不能为空"); proxy.$modal.msgError("仓库不能为空");
return; return;
} }
if (checkStockList.value[0].pcode == checkStockList.value[0].toPcode) { // if (checkStockList.value[0].pcode == checkStockList.value[0].toPcode) {
proxy.$modal.msgError( // proxy.$modal.msgError(
"不允许选择原来的库位【" + checkStockList.value[0].pcode + "】" // "不允许选择原来的库位【" + checkStockList.value[0].pcode + "】"
); // );
return; // return;
} // }
if (checkStockList.value[0].realQty > checkStockList.value[0].num) { if (checkStockList.value[0].realQty > checkStockList.value[0].num) {
proxy.$modal.msgError("移库数量不正确"); proxy.$modal.msgError("移库数量不正确");
return; return;