UDI
/
spms-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

分库功能添加往来分库，库存新增分库

Browse Source
fencang
anthonywj 3 years ago
parent a8866a8a7d
commit 6d221b55d2
7 changed files with 1162 additions and 1137 deletions
Show Stats Download Patch File Download Diff File

4
public/config.json
Unescape Escape View File

@ -1,5 +1,5 @@
{
"BASE_URL": "http://192.168.1.2:9996",
"SERVER_IP": "http://192.168.1.2:9996",
"BASE_URL": "http://192.168.0.109:9996",
"SERVER_IP": "http://192.168.0.109:9996",
"hosp_name": "诏安县总医院（测试）"
}

5
src/views/basic/BussinessType.vue
Unescape Escape View File

@ -211,6 +211,7 @@ export default {
scanPreIn: null,
vailInv: null,
codeFillCheck: null,
defaultSubInv: null,
},
enableMap: {
true: "是",
@ -355,8 +356,8 @@ export default {
scanPreIn: row.scanPreIn,
vailInv: row.vailInv,
codeFillCheck: row.codeFillCheck,
changeEnable: row.changeEnable
changeEnable: row.changeEnable,
defaultSubInv: row.defaultSubInv
};
this.modifyDialogVisible = true;

86
src/views/basic/BussinessTypeModify.vue
Unescape Escape View File

@ -43,24 +43,6 @@
</div>
</el-col>
<!-- <el-col :span="10" class="el-col">-->
<!-- <div class="text item">-->
<!-- <div class="itemTag">-->
<!-- <span>第三方系统:&nbsp;</span>-->
<!-- </div>-->
<!-- <el-select v-model="inputQuery.thirdSysFk" placeholder="请选择" clearable="true">-->
<!-- <el-option-->
<!-- v-for="item in thirdSys"-->
<!-- :key="item.value"-->
<!-- :label="item.thirdName"-->
<!-- :value="item.thirdId">-->
<!-- <span style="float: left">{{ item.thirdName }}</span>-->
<!-- <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </div>-->
<!-- </el-col>-->
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
@ -118,25 +100,6 @@
</el-select>
</div>
</el-col>
<!-- <el-col :span="10" class="el-col">-->
<!-- <div class="text item">-->
<!-- <div class="itemTag">-->
<!-- <span>当前仓库:&nbsp;</span>-->
<!-- </div>-->
<!-- <el-select clearable v-model="inputQuery.storageCode" placeholder="当前仓库信息">-->
<!-- <el-option-->
<!-- v-for="item in storageList"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </div>-->
<!-- </el-col>-->
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
@ -145,11 +108,6 @@
<div class="itemTag">
<span>特殊单据往来:&nbsp;</span>
</div>
<!-- <el-input-->
<!-- style="width: 200px"-->
<!-- size="small"-->
<!-- v-model="inputQuery.defaultUnit"-->
<!-- ></el-input>-->
<el-select
v-model="inputQuery.defaultUnit"
@ -192,7 +150,25 @@
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="20" class="el-col">
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>补单默认分库:&nbsp;</span>
</div>
<el-select v-model="inputQuery.defaultSubInv" placeholder="请选择默认分库" clearable="true"
size="small">
<el-option
v-for="item in subInvList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</div>
</el-col>
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>备注:&nbsp;</span>
@ -215,13 +191,10 @@
<div class="text item" style="margin-top: 6px">
<el-checkbox v-model="inputQuery.enable">启用单据类型</el-checkbox>
<!-- <el-checkbox v-model="inputQuery.innerOrder">标记为内部单据</el-checkbox>-->
<el-checkbox v-model="inputQuery.genUnit" :disabled="inputQuery.corpType !=2">允许手动输入客户信息
</el-checkbox>
<el-checkbox v-model="inputQuery.useDyCount" :disabled="true">以使用单元计量出库
</el-checkbox>
<!-- <el-checkbox v-model="inputQuery.expireTip">过期提醒并禁止录入-->
<!-- </el-checkbox>-->
</div>
@ -302,12 +275,6 @@
<el-divider></el-divider>
<el-row :gutter="20" class="el-row" type="flex">
<!-- <el-col :span="5" class="el-col">-->
<!-- <span>单据需要复核的来源类型</span>-->
<!-- &lt;!&ndash; <div class="text item">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-checkbox v-model="inputQuery.checkEnable">必须选择业务单据校验来源</el-checkbox>&ndash;&gt;-->
<!-- &lt;!&ndash; </div>&ndash;&gt;-->
<!-- </el-col>-->
<el-col :span="4" class="el-col">
<div class="text item">
<el-checkbox v-model="inputQuery.secCheckEnable"
@ -382,6 +349,7 @@ import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
import {getCandidateBussinessType} from "../../api/receipts/bussinessType";
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
import {findConfig} from "@/api/thrsys/spsSyncStatus";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
export default {
name: "inputQuery",
@ -400,6 +368,7 @@ export default {
isFilterBind: true,
},
storageList: [],
subInvList: [],
orderTypeList: [],
fromSpecialOptions: [],
thirdSys: [],
@ -501,6 +470,18 @@ export default {
.catch(() => {
});
},
findDefaultSubInv() {
this.subInvList = [];
let query = {
pcode: "1000"
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
})
.catch(() => {
});
},
},
computed: {
corpType() {
@ -526,6 +507,7 @@ export default {
this.getList();
this.getStorage();
this.findSpecialMethod();
this.findDefaultSubInv();
},
};

2
src/views/basic/invWarehouse.vue
Unescape Escape View File

@ -150,7 +150,7 @@
>
</el-table-column>
<el-table-column
prop="name"
prop="parentId"
label="所属仓库"
>
</el-table-column>

2
src/views/inventory/InvProducts.vue
Unescape Escape View File

@ -112,6 +112,8 @@
width="120"></el-table-column>
<el-table-column label="仓库" prop="invStorageName" v-if="showSup"
show-overflow-tooltip width="120"></el-table-column>
<el-table-column label="分库" prop="invSubStorageName" v-if="showSup"
show-overflow-tooltip width="120"></el-table-column>
<el-table-column label="操作" width="120" fixed="right">
<template slot-scope="scope">
<el-button

4
src/views/warehouse/IONewOrder.vue
Unescape Escape View File

@ -469,6 +469,10 @@ export default {
this.idQuery.corpOrderId = row.corpOrderId;
this.idQuery.billType = row.action;
this.idQuery.locStorageCode = row.locStorageCode;
this.idQuery.invWarehouseCode = row.invWarehouseCode;
this.idQuery.fromSubInvCode = row.fromSubInvCode;
this.idQuery.preCheck = row.preCheck;
}

2196
src/views/warehouse/addHosOrder.vue
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save