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

purchase
anthonyywj2 3 years ago
commit e40e1f5a25

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

@ -173,7 +173,7 @@
<el-button
type="text"
size="small"
@click="intentSelect(scope.row)" :disabled="!configParms.basicCorp"
@click="intentSelect(scope.row)" :disabled="!configParms.basicCorp"
>关联
</el-button
>
@ -303,7 +303,9 @@
</el-form>
<div slot="footer" class="dialog-footer">
<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>
</el-dialog>
</div>
@ -464,30 +466,19 @@ export default {
this.editQuery = row;
} else {
this.editQuery =
{
id: "",
thirdId:
"",
erpId:
"",
name:
"",
spell:
"",
addr:
"",
status:
"",
type:
"",
creditNo:
"",
contact:
"",
mobile:
""
};
this.editQuery = {
id: "",
thirdId: "",
erpId: "",
name: "",
spell: "",
addr: "",
status: "",
type: "",
creditNo: "",
contact: "",
mobile: ""
};
}
this.getThirdSysDetail();

@ -77,6 +77,7 @@
</el-form-item>
<el-form-item style="display: flex">
<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" size="mini" icon="search" @click="combine"
:loading="combineLoading"
@ -177,6 +178,16 @@ export default {
this.unitQuery.page = 1;
this.getList();
},
onReset() {
this.unitQuery = {
page: 1,
limit: 10,
key: "",
thirdSys: null,
}
this.total = 0;
this.getList();
},
getList() {
this.loading = true;
this.unitQuery.thirdSys = this.thirdSysFk;
@ -235,7 +246,7 @@ export default {
this.$message.warning("未选择往来单位!");
return;
}
if( this.combineQuery.erpUnitsResponse.checked == true){
if (this.combineQuery.erpUnitsResponse.checked == true) {
this.$message.warning("该往来单位已被关联,不能重复选入!");
return;
}

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

@ -1610,7 +1610,7 @@ export default {
},
intentSelect(row) {
if (row != null)
if (row != null && row.sysId != undefined)
this.currentSysId = row.sysId;
//
this.thirdQuery.thirdSysFk = this.currentSysId;

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

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

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

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

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

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

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

@ -1,200 +1,206 @@
<template>
<div>
<el-form :inline="true" :model="query" class="query-form" size="mini">
<el-form-item class="query-form-item">
<el-input v-model="query.code" placeholder="搜索"></el-input>
</el-form-item>
<div>
<el-form :inline="true" :model="query" class="query-form" size="mini">
<el-form-item class="query-form-item">
<el-input v-model="query.code" placeholder="搜索"></el-input>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button type="primary" icon="search" @click="onSubmit"
>查询</el-button
>
<el-button type="primary" icon="search" @click="deleteDialog"
>删除</el-button
>
</el-button-group>
</el-form-item>
</el-form>
<el-table
v-loading="loading"
:data="codeArry"
style="width: 100%"
ref="multipleTable"
tooltip-effect="dark"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index" fixed></el-table-column>
<!-- <el-table-column label="ID" prop="id" fixed></el-table-column> -->
<el-table-column label="条码" prop="code" fixed></el-table-column>
<el-table-column
label="扫码数量"
prop="count"
width="220"
show-overflow-tooltip
></el-table-column>
<el-table-column label="创建时间" prop="actDate" >
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.actDate }}</span>
</template>
</el-table-column>
</el-table>
<el-form-item>
<el-button-group>
<el-button type="primary" icon="search" @click="onSubmit"
>查询
</el-button
>
<el-button type="primary" icon="search" @click="deleteDialog"
>删除
</el-button
>
</el-button-group>
</el-form-item>
</el-form>
<el-table
v-loading="loading"
:data="codeArry"
style="width: 100%"
ref="multipleTable"
tooltip-effect="dark"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index" fixed></el-table-column>
<!-- <el-table-column label="ID" prop="id" fixed></el-table-column> -->
<el-table-column label="条码" prop="code" fixed></el-table-column>
<el-table-column
label="扫码数量"
prop="count"
width="220"
show-overflow-tooltip
></el-table-column>
<el-table-column label="创建时间" prop="actDate">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.actDate }}</span>
</template>
</el-table-column>
</el-table>
<el-pagination
:page-size="query.limit"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
:current-page="query.page"
></el-pagination>
</div>
<el-pagination
:page-size="query.limit"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
:current-page="query.page"
></el-pagination>
</div>
</template>
<script>
import {
orderList,
errorCodeList,
deleteCodes,
orderList,
errorCodeList,
deleteCodes,
} from "../../api/inout/order";
import draggable from "vuedraggable";
import { saveAs } from "file-saver";
import {saveAs} from "file-saver";
export default {
name: "idQuery",
props: {
idQuery: {
type: Object,
required: true,
name: "idQuery",
props: {
idQuery: {
type: Object,
required: true,
},
},
},
data() {
return {
query: {
code: "",
corpOrderId: "",
page: 1,
limit: 20,
},
codeArry: [],
total: 0,
loading: true,
index: null,
formLoading: false,
formVisible: false,
deleteLoading: false,
orderNo: null,
multipleSelection: [],
};
},
components: {
draggable,
},
methods: {
handleSelectionChange(val) {
console.log(val);
this.multipleSelection = val;
data() {
return {
query: {
code: "",
corpOrderId: "",
page: 1,
limit: 20,
},
codeArry: [],
total: 0,
loading: true,
index: null,
formLoading: false,
formVisible: false,
deleteLoading: false,
orderNo: null,
multipleSelection: [],
};
},
onReset() {
this.$router.push({
path: "",
});
this.query = {
code: "",
corpOrderId: "",
page: 1,
limit: 20,
};
this.getCodeList();
},
onSubmit() {
this.$router.push({
path: "",
query: this.query,
});
this.getCodeList();
},
handleSizeChange(val) {
this.query.limit = val;
this.getCodeList();
},
handleCurrentChange(val) {
this.query.page = val;
this.getCodeList();
components: {
draggable,
},
methods: {
handleSelectionChange(val) {
console.log(val);
this.multipleSelection = val;
},
deleteDialog() {
this.$confirm("是否删除所选条码?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.onDelete();
})
.catch(() => {});
},
onReset() {
this.$router.push({
path: "",
});
this.query = {
code: "",
corpOrderId: "",
page: 1,
limit: 20,
};
this.getCodeList();
},
onSubmit() {
this.$router.push({
path: "",
query: this.query,
});
this.getCodeList();
},
handleSizeChange(val) {
this.query.limit = val;
this.getCodeList();
},
handleCurrentChange(val) {
this.query.page = val;
this.getCodeList();
},
onDelete() {
var selectData = this.multipleSelection;
deleteDialog() {
if (this.multipleSelection.length < 1) {
this.$message.error("请选择需要删除的条码!")
return;
}
this.$confirm("是否删除所选条码?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.onDelete();
})
.catch(() => {
});
},
var codeList = [];
selectData.forEach((obj, index) => {
codeList.push(obj.id);
});
var tquery = {
codes: codeList,
};
deleteCodes(tquery).then((response) => {
this.getCodeList();
this.$message({
type: "success",
message: "删除成功!",
});
});
},
onDelete() {
var selectData = this.multipleSelection;
var codeList = [];
selectData.forEach((obj, index) => {
codeList.push(obj.id);
});
var tquery = {
codes: codeList,
};
deleteCodes(tquery).then((response) => {
this.getCodeList();
this.$message({
type: "success",
message: "删除成功!",
});
});
},
getCodeList() {
this.loading = true;
this.query.orderId = this.idQuery.id;
errorCodeList(this.query) //
.then((response) => {
this.loading = false;
this.codeArry = response.data.list || [];
this.total = response.data.total || 0;
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
getCodeList() {
this.loading = true;
this.query.orderId = this.idQuery.id;
errorCodeList(this.query) //
.then((response) => {
this.loading = false;
this.codeArry = response.data.list || [];
this.total = response.data.total || 0;
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
intentBack() {
// this.$router.push({path:'../readme/detail',query:{id:row.corpOrderId}});
this.$router.go(-1);
},
},
intentBack() {
// this.$router.push({path:'../readme/detail',query:{id:row.corpOrderId}});
this.$router.go(-1);
filters: {},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
},
},
filters: {},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
},
created() {
//
let query = this.$route.query;
this.orderNo = query.id;
created() {
//
let query = this.$route.query;
this.orderNo = query.id;
this.query = Object.assign(this.query, query);
this.query.limit = parseInt(this.query.limit);
this.query.corpOrderId = query.id;
this.query = Object.assign(this.query, query);
this.query.limit = parseInt(this.query.limit);
this.query.corpOrderId = query.id;
//
this.getCodeList();
},
//
this.getCodeList();
},
};
</script>

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

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

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

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

Loading…
Cancel
Save