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

业务单据类型，扫码单据类型bug修复，新增用户bug修复，

Browse Source 
单据打印bug修复；
仓库，添加用户，添加单据类型界面优化；
master
anthonywj 3 years ago
parent 9f795c9661
commit 4e7a6ae099
12 changed files with 571 additions and 469 deletions
Show Stats Download Patch File Download Diff File

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

@ -87,7 +87,7 @@
</el-table> </el-table>
<el-dialog <el-dialog
title="新增业务类型关联" title="新增扫码单据类型"
:visible.sync="addDialogVisible" :visible.sync="addDialogVisible"
width="70%" width="70%"
:close-on-click-modal="false" :close-on-click-modal="false"
@ -210,6 +210,7 @@ export default {
path: "", path: "",
}); });
this.filterQuery = { this.filterQuery = {
enable: null,
udiwmsType: "", udiwmsType: "",
thirdType: "", thirdType: "",
page: 1, page: 1,

4
src/views/basic/BussinessTypeLocl.vue
Unescape Escape View File

@ -201,8 +201,12 @@ export default {
addLocalBusType(this.inputQuery) addLocalBusType(this.inputQuery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;
if (response.code == 20000) {
this.cancelDialog(); this.cancelDialog();
this.getList(); this.getList();
} else {
this.$message.error(response.message);
}
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;

14
src/views/basic/BussinessTypeLoclModify.vue
Unescape Escape View File

@ -84,7 +84,7 @@
<el-col :span="4" class="el-col"> <el-col :span="4" class="el-col">
<div class="text item"> <div class="text item">
<el-checkbox v-model="inputQuery.changeEnable" @change="isChangeOrder" <el-checkbox v-model="inputQuery.changeEnable" @change="isChangeOrder"
:disabled="!changeEnable || inputQuery.mainAction"> :disabled="!changeEnable || inputQuery.mainAction=='WareHouseIn'">
缺量自动补单 缺量自动补单
</el-checkbox> </el-checkbox>
</div> </div>
@ -98,7 +98,6 @@
<div v-if="visibleChange"> <div v-if="visibleChange">
<!-- <div style="float:right;margin-bottom: 10px">--> <!-- <div style="float:right;margin-bottom: 10px">-->
<!-- <el-button--> <!-- <el-button-->
<!-- type="primary"--> <!-- type="primary"-->
@ -266,10 +265,12 @@ export default {
if (this.inputQuery.changeEnable) { if (this.inputQuery.changeEnable) {
this.visibleChange = true; this.visibleChange = true;
} }
if (this.changeList.length == 0)
this.changeEnable = false;
else
this.changeEnable = true; this.changeEnable = true;
// if (this.changeList.length == 0)
// this.changeEnable = false;
// else
// this.changeEnable = true;
} else { } else {
// this.$message.error(response.message); // this.$message.error(response.message);
@ -289,8 +290,7 @@ export default {
}) })
.catch(() => { .catch(() => {
}); });
this.getBusTypes(null); this.getBusTypes();
}, },
getBusTypes() { getBusTypes() {

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

@ -36,7 +36,6 @@
<div class="itemTag"> <div class="itemTag">
<span>出入库类型:&nbsp;</span> <span>出入库类型:&nbsp;</span>
</div> </div>
<el-select v-model="inputQuery.mainAction" placeholder="出入库类型" @change="getOrderType"> <el-select v-model="inputQuery.mainAction" placeholder="出入库类型" @change="getOrderType">
<el-option label="入库" value="WareHouseIn"></el-option> <el-option label="入库" value="WareHouseIn"></el-option>
<el-option label="出库" value="WareHouseOut"></el-option> <el-option label="出库" value="WareHouseOut"></el-option>
@ -268,13 +267,13 @@
</el-col> </el-col>
<el-col :span="4" class="el-col"> <el-col :span="4" class="el-col">
<div class="text item"> <div class="text item">
<el-checkbox v-model="inputQuery.secCheckPdaEd" :disabled="!inputQuery.secCheckEnable">手持终端未校验单据 <el-checkbox v-model="inputQuery.secCheckPdaUn" :disabled="!inputQuery.secCheckEnable">手持终端未校验单据
</el-checkbox> </el-checkbox>
</div> </div>
</el-col> </el-col>
<el-col :span="4" class="el-col"> <el-col :span="4" class="el-col">
<div class="text item"> <div class="text item">
<el-checkbox v-model="inputQuery.secCheckPdaUn" :disabled="!inputQuery.secCheckEnable">手持终端已校验单据 <el-checkbox v-model="inputQuery.secCheckPdaEd" :disabled="!inputQuery.secCheckEnable">手持终端已校验单据
</el-checkbox> </el-checkbox>
</div> </div>
</el-col> </el-col>
@ -309,10 +308,9 @@ import {
} from "../../api/basic/basicThirdSys"; } from "../../api/basic/basicThirdSys";
import { import {
getLocalBusType, getLocalJoinNoUse getLocalJoinNoUse
} from "../../api/basic/busLocalType"; } from "../../api/basic/busLocalType";
import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse"; import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
import {getJoinBussinessType} from "../../api/basic/bussinessType";
import {getCandidateBussinessType} from "../../api/receipts/bussinessType"; import {getCandidateBussinessType} from "../../api/receipts/bussinessType";
export default { export default {
@ -329,6 +327,7 @@ export default {
filterQuery: { filterQuery: {
enabled: true, enabled: true,
isBuType: true, isBuType: true,
isFilterBind: true,
}, },
storageList: [], storageList: [],
orderTypeList: [], orderTypeList: [],

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

@ -116,7 +116,17 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- <el-tree-->
<!-- :data="mergeList"-->
<!-- :props="defaultProps"-->
<!-- node-key="id"-->
<!-- style="width: 50%"-->
<!-- default-expand-all-->
<!-- :expand-on-click-node="false"-->
<!-- :render-content="renderContent"-->
<!-- >-->
<!-- </el-tree>-->
</el-card>
<div> <div>
<el-card style="width: 49%; float: left; margin-right: 0px;"> <el-card style="width: 49%; float: left; margin-right: 0px;">
<div slot="header" class="clearfix" style="margin-bottom: 20px;"> <div slot="header" class="clearfix" style="margin-bottom: 20px;">
@ -127,14 +137,14 @@
stripe stripe
style="width: 100%"> style="width: 100%">
<el-table-column <el-table-column
prop="userid" prop="username"
label="用户ID" label="账号"
min-width="20%"> min-width="20%">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="username" prop="employeeName"
label="用户名" label="用户名"
min-width="40%"> min-width="30%">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="isDirector" prop="isDirector"
@ -182,27 +192,12 @@
</el-card> </el-card>
</div> </div>
<!-- <el-tree-->
<!-- :data="mergeList"-->
<!-- :props="defaultProps"-->
<!-- node-key="id"-->
<!-- style="width: 50%"-->
<!-- default-expand-all-->
<!-- :expand-on-click-node="false"-->
<!-- :render-content="renderContent"-->
<!-- >-->
<!-- </el-tree>-->
</el-card>
<!--添加用户弹窗--> <!--添加用户弹窗-->
<el-dialog <el-dialog
title="用户列表" title="用户列表"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
:visible.sync="userFormVisible" :visible.sync="userFormVisible"
class="dialog"
> >
<el-table v-loading="loading" :data="userList" ref="checkUserList" <el-table v-loading="loading" :data="userList" ref="checkUserList"
@selection-change="handleUserSelectionChange" @selection-change="handleUserSelectionChange"
@ -212,8 +207,8 @@
:reserve-selection="false" :reserve-selection="false"
width="55"> width="55">
</el-table-column> </el-table-column>
<el-table-column label="用户ID" prop="id" fixed></el-table-column> <el-table-column label="账号" prop="userName" fixed></el-table-column>
<el-table-column label="用户名" prop="userName" fixed></el-table-column> <el-table-column label="用户名" prop="employeeName" fixed></el-table-column>
</el-table> </el-table>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -236,7 +231,6 @@
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
:visible.sync="bussinessTypeFormVisible" :visible.sync="bussinessTypeFormVisible"
class="dialog"
> >
<el-table v-loading="loading" :data="bussinessTypeList" ref="typeList" <el-table v-loading="loading" :data="bussinessTypeList" ref="typeList"
@selection-change="handleBussinessTypeSelectionChange" @selection-change="handleBussinessTypeSelectionChange"

25
src/views/warehouse/IOCheckErrOrder.vue
Unescape Escape View File

@ -46,7 +46,18 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
size="mini">
<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>
</el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<span style="color: #000; margin-left: 10px; margin-right: 6px" <span style="color: #000; margin-left: 10px; margin-right: 6px"
>创建日期:</span >创建日期:</span
@ -473,6 +484,7 @@ import {downloadInoutOrderSuccessPDF} from "../../api/itextpdf/itextpdf";
import selectErpOrder from "./DialogSelectErpOrder"; import selectErpOrder from "./DialogSelectErpOrder";
import selectRlDialog from "./DialogSelectRl"; import selectRlDialog from "./DialogSelectRl";
import {getBussinessType} from "../../api/basic/bussinessType"; import {getBussinessType} from "../../api/basic/bussinessType";
import {filterAllByUser} from "@/api/basic/invWarehouse";
const formJson = { const formJson = {
site_id: "", site_id: "",
@ -551,6 +563,7 @@ export default {
idQuery: { idQuery: {
id: "", id: "",
}, },
storageList: [],
curIndex: "", curIndex: "",
adListNoDataText: "无数据", adListNoDataText: "无数据",
queryAdIdAsyncLoading: false, queryAdIdAsyncLoading: false,
@ -1022,6 +1035,15 @@ export default {
} }
} }
}, },
getStorage() {
this.storageList = [];
filterAllByUser()
.then((response) => {
this.storageList = response.data || [];
})
.catch(() => {
});
},
getBusType() { getBusType() {
let query = { let query = {
enabled: true, enabled: true,
@ -1190,6 +1212,7 @@ export default {
}, },
created() { created() {
this.getStorage();
this.getBusType(); this.getBusType();
let query = this.$route.query; let query = this.$route.query;
this.query = Object.assign(this.query, query); this.query = Object.assign(this.query, query);

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

@ -25,6 +25,17 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true" size="mini">
<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>
</el-form-item>
<el-form-item> <el-form-item>
<el-button-group> <el-button-group>
<el-button <el-button
@ -295,6 +306,7 @@ import addOrder from "./addOrder";
import addHosOrder from "./addHosOrder"; import addHosOrder from "./addHosOrder";
import store from "../../store"; import store from "../../store";
import {getBussinessType} from "../../api/basic/bussinessType"; import {getBussinessType} from "../../api/basic/bussinessType";
import {filterAllByUser} from "@/api/basic/invWarehouse";
const formJson = { const formJson = {
site_id: "", site_id: "",
@ -334,6 +346,7 @@ export default {
idQuery: { idQuery: {
id: "", id: "",
}, },
storageList: [],
errOrderVisible: false, errOrderVisible: false,
list: [], list: [],
adId: [], adId: [],
@ -431,6 +444,15 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
getStorage() {
this.storageList = [];
filterAllByUser()
.then((response) => {
this.storageList = response.data || [];
})
.catch(() => {
});
},
addOrders(row) { addOrders(row) {
console.log(row) console.log(row)
this.idQuery.id = ''; this.idQuery.id = '';
@ -638,6 +660,7 @@ export default {
}; };
}, },
created() { created() {
this.getStorage();
this.getBusType(); this.getBusType();
let query = this.$route.query; let query = this.$route.query;
this.filterQuery = Object.assign(this.filterQuery, query); this.filterQuery = Object.assign(this.filterQuery, query);

30
src/views/warehouse/IOSearchOrder.vue
Unescape Escape View File

@ -35,6 +35,18 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
size="mini">
<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>
</el-form-item>
<el-form-item class="query-form-item">
<span style="color: #000; margin-left: 10px; margin-right: 6px;font-size: small" <span style="color: #000; margin-left: 10px; margin-right: 6px;font-size: small"
>创建日期:</span >创建日期:</span
> >
@ -401,6 +413,8 @@ import {downloadInoutOrderSuccessPDF} from "../../api/itextpdf/itextpdf";
import selectErpOrder from "./DialogSelectErpOrder"; import selectErpOrder from "./DialogSelectErpOrder";
import {getBussinessType} from "../../api/basic/bussinessType"; import {getBussinessType} from "../../api/basic/bussinessType";
import {formatDate} from "../../utils/date"; import {formatDate} from "../../utils/date";
import {filterAllByUser} from "@/api/basic/invWarehouse";
const formJson = { const formJson = {
site_id: "", site_id: "",
site_name: "", site_name: "",
@ -448,6 +462,7 @@ export default {
unitlist: [], unitlist: [],
list: [], list: [],
detailList: [], detailList: [],
storageList: [],
unitUpdateQuery: { unitUpdateQuery: {
id: "", id: "",
fromCorpId: "", fromCorpId: "",
@ -589,7 +604,15 @@ export default {
console.log(val); console.log(val);
this.multipleSelection = val; this.multipleSelection = val;
}, },
getStorage() {
this.storageList = [];
filterAllByUser()
.then((response) => {
this.storageList = response.data || [];
})
.catch(() => {
});
},
handleErrorDetail(poistion) { handleErrorDetail(poistion) {
var mOrder = this.list[poistion]; var mOrder = this.list[poistion];
this.errorDetail = mOrder.remark; this.errorDetail = mOrder.remark;
@ -670,8 +693,8 @@ export default {
// window.open(url); // window.open(url);
this.loading = false; this.loading = false;
const eleLink = document.createElement('a'); const eleLink = document.createElement('a');
var timestamp=formatDate(new Date(),"yyyy-MM-dd_hh:mm") var timestamp = formatDate(new Date(), "yyyy-MM-dd_hh:mm")
eleLink.download = "已完成单据导出"+timestamp+".json"; eleLink.download = "已完成单据导出" + timestamp + ".json";
eleLink.style.display = 'none'; eleLink.style.display = 'none';
eleLink.href = url; eleLink.href = url;
document.body.appendChild(eleLink) document.body.appendChild(eleLink)
@ -924,6 +947,7 @@ export default {
, ,
created() { created() {
this.getStorage();
this.getBusType(); this.getBusType();
let query = this.$route.query; let query = this.$route.query;
this.query = Object.assign(this.query, query); this.query = Object.assign(this.query, query);

24
src/views/warehouse/IOWaitOrder.vue
Unescape Escape View File

@ -34,6 +34,18 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
size="mini">
<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>
</el-form-item>
<el-form-item class="query-form-item">
<span style="color: #000; margin-left: 10px; margin-right: 6px" <span style="color: #000; margin-left: 10px; margin-right: 6px"
>创建日期:</span >创建日期:</span
> >
@ -397,6 +409,7 @@ import successOrderExportPDFSetting from "./successOrderExportPDF";
import {downloadInoutOrderSuccessPDF} from "../../api/itextpdf/itextpdf"; import {downloadInoutOrderSuccessPDF} from "../../api/itextpdf/itextpdf";
import selectErpOrder from "./DialogSelectErpOrder"; import selectErpOrder from "./DialogSelectErpOrder";
import {getBussinessType} from "../../api/basic/bussinessType"; import {getBussinessType} from "../../api/basic/bussinessType";
import {filterAllByUser} from "@/api/basic/invWarehouse";
const formJson = { const formJson = {
site_id: "", site_id: "",
@ -497,6 +510,7 @@ export default {
orderId: "", orderId: "",
}, },
busTypes: [], busTypes: [],
storageList: [],
multipleSelection: [], multipleSelection: [],
dialogTableVisible: false, dialogTableVisible: false,
formLoading: false, formLoading: false,
@ -932,6 +946,15 @@ export default {
} }
} }
}, },
getStorage() {
this.storageList = [];
filterAllByUser()
.then((response) => {
this.storageList = response.data || [];
})
.catch(() => {
});
},
}, },
filters: { filters: {
statusFilterType(status) { statusFilterType(status) {
@ -950,6 +973,7 @@ export default {
}, },
created() { created() {
this.getStorage();
this.getBusType(); this.getBusType();
let query = this.$route.query; let query = this.$route.query;
this.query = Object.assign(this.query, query); this.query = Object.assign(this.query, query);

12
src/views/warehouse/addOrder.vue
Unescape Escape View File

@ -71,7 +71,8 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="formData.billType" placeholder="请选择单据类型" @change="actionChange"> <el-select v-model="formData.billType" placeholder="请选择单据类型" @change="actionChange"
clearable>
<el-option <el-option
v-for="item in busTypes" v-for="item in busTypes"
:key="item.name" :key="item.name"
@ -98,7 +99,7 @@
<!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">--> <!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">-->
<!--<el-option label="送货单" value="deliveryNote"></el-option>--> <!--<el-option label="送货单" value="deliveryNote"></el-option>-->
<!--</el-select>--> <!--</el-select>-->
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息"> <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" clearable>
<el-option <el-option
v-for="item in storageList" v-for="item in storageList"
:key="item.name" :key="item.name"
@ -435,12 +436,13 @@ export default {
this.$router.go(-1); this.$router.go(-1);
}, },
getStorage(event) { getStorage(event) {
// let query = { let query = {
// advanceType: this.getActionName(event), // advanceType: this.getActionName(event),
// }; isDefault: true,
};
this.storageList = []; this.storageList = [];
// this.formData.locStorageCode = null; // this.formData.locStorageCode = null;
filterAllByUser() filterAll(query)
.then((response) => { .then((response) => {
this.storageList = response.data || []; this.storageList = response.data || [];
}) })

120
src/views/warehouse/stockHospOrderNew.vue
Unescape Escape View File

@ -64,18 +64,20 @@
<el-row :gutter="20" style="margin-top: -10px"> <el-row :gutter="20" style="margin-top: -10px">
<el-col :span="3"> <el-col :span="3">
<div class="ao-text"> <div class="ao-text">
<span>业务类型：</span> <span>当前仓库：</span>
</div> </div>
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="billType"> <el-form-item prop="locStorageCode">
<el-select v-model="formData.billType" placeholder="请选择业务类型" @change="actionChange"> <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locInChange"
clearable>
<el-option <el-option
v-for="item in busTypes" v-for="item in storageList"
:key="item.localAction" :key="item.name"
:label="item.localName" :label="item.name"
:value="item.localAction"> :value="item.code">
<span style="float: left">{{ item.localName }}</span> <span style="float: left">{{ item.name }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -147,23 +149,25 @@
<el-col :span="3"> <el-col :span="3">
<div class="ao-text"> <div class="ao-text">
<span>当前仓库：</span> <span>业务类型：</span>
</div> </div>
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="locStorageCode"> <el-form-item prop="billType">
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locInChange"> <el-select v-model="formData.billType" placeholder="请选择业务类型" @change="actionChange"
clearable>
<el-option <el-option
v-for="item in storageList" v-for="item in busTypes"
:key="item.name" :key="item.localAction"
:label="item.name" :label="item.localName"
:value="item.code"> :value="item.localAction">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.localName }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
<div class="ao-text"> <div class="ao-text">
<span></span> <span></span>
@ -248,44 +252,44 @@
> >
</el-button-group> </el-button-group>
<!-- <el-row :gutter="20">--> <!-- <el-row :gutter="20">-->
<!-- <el-col :span="3">--> <!-- <el-col :span="3">-->
<!-- <div class="ao-text">--> <!-- <div class="ao-text">-->
<!-- <span>扫码录入：</span>--> <!-- <span>扫码录入：</span>-->
<!-- </div>--> <!-- </div>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- <el-col :span="10">--> <!-- <el-col :span="10">-->
<!-- <el-form-item prop="code">--> <!-- <el-form-item prop="code">-->
<!-- &lt;!&ndash; @keyup.native.enter="focusNext('iCount')" @focus="getInputFocus($event)"--> <!-- &lt;!&ndash; @keyup.native.enter="focusNext('iCount')" @focus="getInputFocus($event)"-->
<!-- @keypress.enter.native="selectProductFunction($event)"--> <!-- @keypress.enter.native="selectProductFunction($event)"-->
<!-- &ndash;&gt;--> <!-- &ndash;&gt;-->
<!-- <el-input--> <!-- <el-input-->
<!-- @keyup.enter.native="selectProductFunction($event)"--> <!-- @keyup.enter.native="selectProductFunction($event)"-->
<!-- v-model="code"--> <!-- v-model="code"-->
<!-- auto-complete="off"--> <!-- auto-complete="off"-->
<!-- ref='inputRef'--> <!-- ref='inputRef'-->
<!-- @focus="getInputFocus($event)"--> <!-- @focus="getInputFocus($event)"-->
<!-- ></el-input>--> <!-- ></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- &lt;!&ndash; <el-col :span="3">&ndash;&gt;--> <!-- &lt;!&ndash; <el-col :span="3">&ndash;&gt;-->
<!-- &lt;!&ndash; <div class="ao-text">&ndash;&gt;--> <!-- &lt;!&ndash; <div class="ao-text">&ndash;&gt;-->
<!-- &lt;!&ndash; <span>数量：</span>&ndash;&gt;--> <!-- &lt;!&ndash; <span>数量：</span>&ndash;&gt;-->
<!-- &lt;!&ndash; </div>&ndash;&gt;--> <!-- &lt;!&ndash; </div>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-col>&ndash;&gt;--> <!-- &lt;!&ndash; </el-col>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-col :span="4">&ndash;&gt;--> <!-- &lt;!&ndash; <el-col :span="4">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-form-item prop="iCount">&ndash;&gt;--> <!-- &lt;!&ndash; <el-form-item prop="iCount">&ndash;&gt;-->
<!-- &lt;!&ndash; &lt;!&ndash; @keypress.enter.native="addCode()"&ndash;&gt;&ndash;&gt;--> <!-- &lt;!&ndash; &lt;!&ndash; @keypress.enter.native="addCode()"&ndash;&gt;&ndash;&gt;-->
<!-- &lt;!&ndash; <el-input v-model="iCount" auto-complete="off" ref="iCount"&ndash;&gt;--> <!-- &lt;!&ndash; <el-input v-model="iCount" auto-complete="off" ref="iCount"&ndash;&gt;-->
<!-- &lt;!&ndash; @keypress.enter.native="iCountEnterFunction()"&ndash;&gt;--> <!-- &lt;!&ndash; @keypress.enter.native="iCountEnterFunction()"&ndash;&gt;-->
<!-- &lt;!&ndash; @focus="getInputFocus($event)"&ndash;&gt;--> <!-- &lt;!&ndash; @focus="getInputFocus($event)"&ndash;&gt;-->
<!-- &lt;!&ndash; @input="iCountChange"&ndash;&gt;--> <!-- &lt;!&ndash; @input="iCountChange"&ndash;&gt;-->
<!-- &lt;!&ndash; oninput="value=value.replace(/[^\d]/g,'')"></el-input>&ndash;&gt;--> <!-- &lt;!&ndash; oninput="value=value.replace(/[^\d]/g,'')"></el-input>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-form-item>&ndash;&gt;--> <!-- &lt;!&ndash; </el-form-item>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-col>&ndash;&gt;--> <!-- &lt;!&ndash; </el-col>&ndash;&gt;-->
<!-- </el-row>--> <!-- </el-row>-->
<!-- highlight-current-row--> <!-- highlight-current-row-->
<!-- @current-change="rowChange"--> <!-- @current-change="rowChange"-->
@ -1198,9 +1202,10 @@ export default {
} }
}); });
}, },
getBusType() { getBusType(invCode) {
let query = { let query = {
enabled: true, enabled: true,
code: invCode,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
.then((response) => { .then((response) => {
@ -1248,6 +1253,7 @@ export default {
console.log(item); console.log(item);
this.formData.locStorageCode = item; this.formData.locStorageCode = item;
this.$forceUpdate(); this.$forceUpdate();
this.getBusType(item);
} }
}, },
filters: {}, filters: {},
@ -1258,7 +1264,7 @@ export default {
}; };
}, },
created() { created() {
this.getBusType(); this.getBusType("NOCODE");
this.getStorage(); this.getStorage();
this.formData = {}; this.formData = {};
this.codeArray = []; this.codeArray = [];

84
src/views/warehouse/stockOrderNewDistribution.vue
Unescape Escape View File

@ -74,7 +74,7 @@
<!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">--> <!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">-->
<!--<el-option label="送货单" value="deliveryNote"></el-option>--> <!--<el-option label="送货单" value="deliveryNote"></el-option>-->
<!--</el-select>--> <!--</el-select>-->
<el-select v-model="formData.billType" placeholder="请选择业务类型" @change="getStorage"> <el-select v-model="formData.billType" placeholder="请选择业务类型" @change="getStorage" clearable>
<el-option <el-option
v-for="item in busTypes" v-for="item in busTypes"
:key="item.localName" :key="item.localName"
@ -129,7 +129,7 @@
<!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">--> <!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">-->
<!--<el-option label="送货单" value="deliveryNote"></el-option>--> <!--<el-option label="送货单" value="deliveryNote"></el-option>-->
<!--</el-select>--> <!--</el-select>-->
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息"> <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" clearable>
<el-option <el-option
v-for="item in storageList" v-for="item in storageList"
:key="item.name" :key="item.name"
@ -158,44 +158,44 @@
> >
</el-button-group> </el-button-group>
<!-- <el-row :gutter="20">--> <!-- <el-row :gutter="20">-->
<!-- <el-col :span="3">--> <!-- <el-col :span="3">-->
<!-- <div class="ao-text">--> <!-- <div class="ao-text">-->
<!-- <span>扫码录入：</span>--> <!-- <span>扫码录入：</span>-->
<!-- </div>--> <!-- </div>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- <el-col :span="10">--> <!-- <el-col :span="10">-->
<!-- <el-form-item prop="code">--> <!-- <el-form-item prop="code">-->
<!-- &lt;!&ndash; @keyup.native.enter="focusNext('iCount')" @focus="getInputFocus($event)"--> <!-- &lt;!&ndash; @keyup.native.enter="focusNext('iCount')" @focus="getInputFocus($event)"-->
<!-- @keypress.enter.native="selectProductFunction($event)"--> <!-- @keypress.enter.native="selectProductFunction($event)"-->
<!-- &ndash;&gt;--> <!-- &ndash;&gt;-->
<!-- <el-input--> <!-- <el-input-->
<!-- @keyup.enter.native="selectProductFunction($event)"--> <!-- @keyup.enter.native="selectProductFunction($event)"-->
<!-- v-model="code"--> <!-- v-model="code"-->
<!-- auto-complete="off"--> <!-- auto-complete="off"-->
<!-- ref='inputRef'--> <!-- ref='inputRef'-->
<!-- @focus="getInputFocus($event)"--> <!-- @focus="getInputFocus($event)"-->
<!-- ></el-input>--> <!-- ></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- &lt;!&ndash; <el-col :span="3">&ndash;&gt;--> <!-- &lt;!&ndash; <el-col :span="3">&ndash;&gt;-->
<!-- &lt;!&ndash; <div class="ao-text">&ndash;&gt;--> <!-- &lt;!&ndash; <div class="ao-text">&ndash;&gt;-->
<!-- &lt;!&ndash; <span>数量：</span>&ndash;&gt;--> <!-- &lt;!&ndash; <span>数量：</span>&ndash;&gt;-->
<!-- &lt;!&ndash; </div>&ndash;&gt;--> <!-- &lt;!&ndash; </div>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-col>&ndash;&gt;--> <!-- &lt;!&ndash; </el-col>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-col :span="4">&ndash;&gt;--> <!-- &lt;!&ndash; <el-col :span="4">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-form-item prop="iCount">&ndash;&gt;--> <!-- &lt;!&ndash; <el-form-item prop="iCount">&ndash;&gt;-->
<!-- &lt;!&ndash; &lt;!&ndash; @keypress.enter.native="addCode()"&ndash;&gt;&ndash;&gt;--> <!-- &lt;!&ndash; &lt;!&ndash; @keypress.enter.native="addCode()"&ndash;&gt;&ndash;&gt;-->
<!-- &lt;!&ndash; <el-input v-model="iCount" auto-complete="off" ref="iCount"&ndash;&gt;--> <!-- &lt;!&ndash; <el-input v-model="iCount" auto-complete="off" ref="iCount"&ndash;&gt;-->
<!-- &lt;!&ndash; @keypress.enter.native="iCountEnterFunction()"&ndash;&gt;--> <!-- &lt;!&ndash; @keypress.enter.native="iCountEnterFunction()"&ndash;&gt;-->
<!-- &lt;!&ndash; @focus="getInputFocus($event)"&ndash;&gt;--> <!-- &lt;!&ndash; @focus="getInputFocus($event)"&ndash;&gt;-->
<!-- &lt;!&ndash; @input="iCountChange"&ndash;&gt;--> <!-- &lt;!&ndash; @input="iCountChange"&ndash;&gt;-->
<!-- &lt;!&ndash; oninput="value=value.replace(/[^\d]/g,'')"></el-input>&ndash;&gt;--> <!-- &lt;!&ndash; oninput="value=value.replace(/[^\d]/g,'')"></el-input>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-form-item>&ndash;&gt;--> <!-- &lt;!&ndash; </el-form-item>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-col>&ndash;&gt;--> <!-- &lt;!&ndash; </el-col>&ndash;&gt;-->
<!-- </el-row>--> <!-- </el-row>-->
<!-- highlight-current-row--> <!-- highlight-current-row-->
<!-- @current-change="rowChange"--> <!-- @current-change="rowChange"-->
@ -1082,6 +1082,7 @@ export default {
getBusType() { getBusType() {
let query = { let query = {
enabled: true, enabled: true,
}; };
getLocalJoinBusType(query) getLocalJoinBusType(query)
.then((response) => { .then((response) => {
@ -1095,9 +1096,10 @@ export default {
console.log("-----" + event); console.log("-----" + event);
let query = { let query = {
advanceType: this.getActionName(event), advanceType: this.getActionName(event),
isDefault: true,
}; };
this.storageList = []; this.storageList = [];
filterAllByUser(query) filterAll(query)
.then((response) => { .then((response) => {
this.storageList = response.data || []; this.storageList = response.data || [];
}) })

Write Preview
Loading…
Cancel
Save