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

Merge remote-tracking branch 'origin/busUser' into busUser

Browse Source
purchase
anthonyywj2 3 years ago
parent 5419240811 e062765db5
commit e40e1f5a25
17 changed files with 234 additions and 222 deletions
Show Stats Download Patch File Download Diff File

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

@ -55,6 +55,7 @@
<span>{{ enableMap[scope.row.spUse] }}</span> <span>{{ enableMap[scope.row.spUse] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" prop="remark" fixed></el-table-column>
<el-table-column label="操作" fixed="right"> <el-table-column label="操作" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button

37
src/views/basic/CorpMaintain.vue
Unescape Escape View File

@ -303,7 +303,9 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click.native="hideForm">取消</el-button> <el-button @click.native="hideForm">取消</el-button>
<el-button type="primary" @click.native="formSubmit()" :loading="formLoading" :disabled="!configParms.basicCorp">提交</el-button> <el-button type="primary" @click.native="formSubmit()" :loading="formLoading"
:disabled="!configParms.basicCorp">提交
</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
@ -464,29 +466,18 @@ export default {
this.editQuery = row; this.editQuery = row;
} else { } else {
this.editQuery = this.editQuery = {
{
id: "", id: "",
thirdId: thirdId: "",
"", erpId: "",
erpId: name: "",
"", spell: "",
name: addr: "",
"", status: "",
spell: type: "",
"", creditNo: "",
addr: contact: "",
"", mobile: ""
status:
"",
type:
"",
creditNo:
"",
contact:
"",
mobile:
""
}; };
} }

11
src/views/basic/CorpSingleRelevance.vue
Unescape Escape View File

@ -77,6 +77,7 @@
</el-form-item> </el-form-item>
<el-form-item style="display: flex"> <el-form-item style="display: flex">
<el-button-group> <el-button-group>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="searchList">查询</el-button> <el-button type="primary" icon="search" @click="searchList">查询</el-button>
<el-button type="primary" size="mini" icon="search" @click="combine" <el-button type="primary" size="mini" icon="search" @click="combine"
:loading="combineLoading" :loading="combineLoading"
@ -177,6 +178,16 @@ export default {
this.unitQuery.page = 1; this.unitQuery.page = 1;
this.getList(); this.getList();
}, },
onReset() {
this.unitQuery = {
page: 1,
limit: 10,
key: "",
thirdSys: null,
}
this.total = 0;
this.getList();
},
getList() { getList() {
this.loading = true; this.loading = true;
this.unitQuery.thirdSys = this.thirdSysFk; this.unitQuery.thirdSys = this.thirdSysFk;

6
src/views/basic/UdiInfoManageSp.vue
Unescape Escape View File

@ -67,7 +67,7 @@
<el-form-item> <el-form-item>
<el-button-group> <el-button-group>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="getList">查询</el-button> <el-button type="primary" icon="search" @click="search">查询</el-button>
<el-button <el-button
type="primary" type="primary"
icon="search" icon="search"
@ -850,6 +850,10 @@ export default {
limit: 20, limit: 20,
addType: 1, addType: 1,
}; };
this.total = 0;
},
search() {
this.filterQuery.page = 1;
this.getList(); this.getList();
}, },
getList() { getList() {

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

@ -1610,7 +1610,7 @@ export default {
}, },
intentSelect(row) { intentSelect(row) {
if (row != null) if (row != null && row.sysId != undefined)
this.currentSysId = row.sysId; this.currentSysId = row.sysId;
//加载第三方仓库数据 //加载第三方仓库数据
this.thirdQuery.thirdSysFk = this.currentSysId; this.thirdQuery.thirdSysFk = this.currentSysId;

2
src/views/business/stockOrder.vue
Unescape Escape View File

@ -504,7 +504,7 @@ export default {
this.getList(); this.getList();
}, },
detailHandleCurrentChange(val) { detailHandleCurrentChange(val) {
this.query.page = val; this.detailQuery.page = val;
this.getStockOrderDetailList(); this.getStockOrderDetailList();
}, },
// 刷新表单 // 刷新表单

3
src/views/business/stockOrderEditor.vue
Unescape Escape View File

@ -634,6 +634,7 @@ export default {
}; };
this.getList(); this.getList();
this.detailList = []; this.detailList = [];
this.detailTotal = 0;
this.haveDistributionVisible = false; this.haveDistributionVisible = false;
this.actDateRange = []; this.actDateRange = [];
}, },
@ -658,7 +659,7 @@ export default {
this.getList(); this.getList();
}, },
detailHandleCurrentChange(val) { detailHandleCurrentChange(val) {
this.query.page = val; this.detailQuery.page = val;
this.getStockOrderDetailList(); this.getStockOrderDetailList();
}, },
// 刷新表单 // 刷新表单

2
src/views/business/stockOrderNew.vue
Unescape Escape View File

@ -613,7 +613,7 @@ export default {
this.getList(); this.getList();
}, },
detailHandleCurrentChange(val) { detailHandleCurrentChange(val) {
this.query.page = val; this.detailQuery.page = val;
this.getStockOrderDetailList(); this.getStockOrderDetailList();
}, },
// 刷新表单 // 刷新表单

4
src/views/business/stockOrderNewDistribution.vue
Unescape Escape View File

@ -164,7 +164,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" style="margin-top: -10px"> <el-row :gutter="20" style="margin-top: 0px">
<el-col :span="3"> <el-col :span="3">
<div class="ao-text"> <div class="ao-text">
<span>当前仓库：</span> <span>当前仓库：</span>
@ -247,7 +247,7 @@
</el-row> </el-row>
<el-row :gutter="20" style="margin-top: -10px;"> <el-row :gutter="20" style="margin-top: -5px;">
<el-col :span="3"> <el-col :span="3">
<div class="ao-text"> <div class="ao-text">
<span></span> <span></span>

2
src/views/business/stockOrderSearch.vue
Unescape Escape View File

@ -699,7 +699,7 @@ export default {
} }
}, },
detailHandleCurrentChange(val) { detailHandleCurrentChange(val) {
this.query.page = val; this.detailQuery.page = val;
this.getStockOrderDetailList(); this.getStockOrderDetailList();
}, },
// 刷新表单 // 刷新表单

2
src/views/business/stockOrderWaitCheck.vue
Unescape Escape View File

@ -504,7 +504,7 @@ export default {
this.getList(); this.getList();
}, },
detailHandleCurrentChange(val) { detailHandleCurrentChange(val) {
this.query.page = val; this.detailQuery.page = val;
this.getStockOrderDetailList(); this.getStockOrderDetailList();
}, },
// 刷新表单 // 刷新表单

7
src/views/inout/IOAddOrder.vue
Unescape Escape View File

@ -424,6 +424,8 @@
<el-dialog <el-dialog
:title="editTitle" :title="editTitle"
:visible.sync="editCodeVisible" :visible.sync="editCodeVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
append-to-body width="70%" append-to-body width="70%"
v-if="editCodeVisible" v-if="editCodeVisible"
> >
@ -462,13 +464,12 @@ import {filterSubByInv} from "../../api/basic/invSubWarehouse";
import draggable from "vuedraggable"; import draggable from "vuedraggable";
import {parseTime} from "../../filtres/index"; import {parseTime} from "../../filtres/index";
import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain" import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
import {deleteWarehouse, filterAllByLoc, filterAllByUser} from "@/api/basic/invWarehouse"; import {filterAllByLoc, filterAllByUser} from "@/api/basic/invWarehouse";
import {getLocalBusType, getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType"; import {getLocalJoinByUser} from "../../api/basic/busLocalType";
import DialogSelectUnit from "./DialogSelectUnit"; import DialogSelectUnit from "./DialogSelectUnit";
import selectRlDialog from "./DialogSelectRl"; import selectRlDialog from "./DialogSelectRl";
import editCodeDialog from "./editCode"; import editCodeDialog from "./editCode";
import A from "../../plugin/KeyScaner" import A from "../../plugin/KeyScaner"
import {deleteLog} from "@/api/basic/udiinfolog";
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";

14
src/views/inout/IONewCode.vue
Unescape Escape View File

@ -8,10 +8,12 @@
<el-form-item> <el-form-item>
<el-button-group> <el-button-group>
<el-button type="primary" icon="search" @click="onSubmit" <el-button type="primary" icon="search" @click="onSubmit"
>查询</el-button >查询
</el-button
> >
<el-button type="primary" icon="search" @click="deleteDialog" <el-button type="primary" icon="search" @click="deleteDialog"
>删除</el-button >删除
</el-button
> >
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
@ -126,6 +128,10 @@ export default {
}, },
deleteDialog() { deleteDialog() {
if (this.multipleSelection.length < 1) {
this.$message.error("请选择需要删除的条码！")
return;
}
this.$confirm("是否删除所选条码?", "提示", { this.$confirm("是否删除所选条码?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
@ -134,12 +140,12 @@ export default {
.then(() => { .then(() => {
this.onDelete(); this.onDelete();
}) })
.catch(() => {}); .catch(() => {
});
}, },
onDelete() { onDelete() {
var selectData = this.multipleSelection; var selectData = this.multipleSelection;
var codeList = []; var codeList = [];
selectData.forEach((obj, index) => { selectData.forEach((obj, index) => {
codeList.push(obj.id); codeList.push(obj.id);

1
src/views/inventory/InvPreInProductsDetail.vue
Unescape Escape View File

@ -170,6 +170,7 @@ export default {
path: "", path: "",
query: this.query, query: this.query,
}); });
this.query.page = 1;
this.getCodeList(); this.getCodeList();
}, },
handleSizeChange(val) { handleSizeChange(val) {

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

@ -123,6 +123,8 @@
:close-on-press-escape="false" :close-on-press-escape="false"
width="85%" width="85%"
v-if="codeDetailVisible" v-if="codeDetailVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
> >
<codeDetail <codeDetail
:idQuery="idQuery" :idQuery="idQuery"

2
src/views/thrsys/ThrInvWarehouse.vue
Unescape Escape View File

@ -481,6 +481,7 @@ export default {
// 显示表单 // 显示表单
handleForm(node, data, formName) { handleForm(node, data, formName) {
this.formVisible = true; this.formVisible = true;
this.resetForm();
let no = Math.floor(Math.random() * 10000000) let no = Math.floor(Math.random() * 10000000)
this.pidData = data || null; this.pidData = data || null;
formJson.pid = (data && parseInt(data.id)) || ""; formJson.pid = (data && parseInt(data.id)) || "";
@ -689,7 +690,6 @@ export default {
getBasicThirdSys(query) getBasicThirdSys(query)
.then((response) => { .then((response) => {
this.thirdSys = response.data.list || []; this.thirdSys = response.data.list || [];
this.query.thirdSysFk = this.thirdSys[0].thirdId;
this.getThirdSysDetail(); this.getThirdSysDetail();
}) })
.catch(() => { .catch(() => {

8
src/views/thrsys/thrOrderNew.vue
Unescape Escape View File

@ -517,7 +517,6 @@ export default {
}); });
}, },
storageChange(row) { storageChange(row) {
console.log(row);
this.formData.corpId = row.code; this.formData.corpId = row.code;
this.formData.corpName = row.name; this.formData.corpName = row.name;
}, },
@ -526,7 +525,6 @@ export default {
filterAllByUser() filterAllByUser()
.then((response) => { .then((response) => {
this.storageList = response.data || []; this.storageList = response.data || [];
this.findSubInvs();
}) })
.catch(() => { .catch(() => {
}); });
@ -566,7 +564,6 @@ export default {
tQuery.editStatus = status; tQuery.editStatus = status;
tQuery.subErpOrders = this.codeArray; tQuery.subErpOrders = this.codeArray;
// tQuery.billType = this.formData.bi; // tQuery.billType = this.formData.bi;
console.log(tQuery);
inserThrOrderWeb(tQuery) inserThrOrderWeb(tQuery)
.then(response => { .then(response => {
this.loading = false; this.loading = false;
@ -632,7 +629,6 @@ export default {
rData.forEach((obj, index) => { rData.forEach((obj, index) => {
this.codeArray.unshift(obj); this.codeArray.unshift(obj);
}); });
console.log(this.codeArray);
this.$refs.multipleTable.setCurrentRow(this.codeArray[0]); this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
this.currentRow = this.codeArray[0]; this.currentRow = this.codeArray[0];
this.selectedIndex = 0; this.selectedIndex = 0;
@ -856,7 +852,6 @@ export default {
this.loading = true; this.loading = true;
getThrOrderDetails(this.query) //查找该单号下的所有条码 getThrOrderDetails(this.query) //查找该单号下的所有条码
.then((response) => { .then((response) => {
console.log(response)
this.codeArray = response.data.list || []; this.codeArray = response.data.list || [];
this.total = response.data.total || 0; this.total = response.data.total || 0;
this.loading = false; this.loading = false;
@ -890,7 +885,6 @@ export default {
this.formData.unitIdFk = event.erpId; this.formData.unitIdFk = event.erpId;
}, },
findMethod(query) { findMethod(query) {
console.log(query);
this.fromOptions = []; this.fromOptions = [];
let cQuery = { let cQuery = {
key: query, key: query,
@ -933,7 +927,6 @@ export default {
} }
}, },
actionChange(item) { actionChange(item) {
console.log(item);
this.curAction = this.getActionItem(item); this.curAction = this.getActionItem(item);
this.locInChange(); this.locInChange();
this.findMethod(); this.findMethod();
@ -947,6 +940,7 @@ export default {
this.$forceUpdate(); this.$forceUpdate();
this.getBusType(item); this.getBusType(item);
this.findStorageMethod(); this.findStorageMethod();
this.findSubInvs();
}, },
findSubInvs() { findSubInvs() {
this.subInvList = []; this.subInvList = [];

Write Preview
Loading…
Cancel
Save