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

扫码监听，输入框修改，仓库，领用，拆分产品等bug修改

Browse Source
master
anthonywj 3 years ago
parent 29f94afbbd
commit 3fee4c1152
8 changed files with 1099 additions and 1053 deletions
Show Stats Download Patch File Download Diff File

13
src/views/basic/UdiInfoselectErpUdi.vue
Unescape Escape View File

@ -343,7 +343,12 @@ export default {
supEnable: { supEnable: {
type: Object, type: Object,
required: true, required: true,
},
intentThirdId: {
type: Object,
required: true,
} }
}, },
data() { data() {
@ -522,13 +527,13 @@ export default {
}) })
.catch(() => { .catch(() => {
this.combineLoading = false; this.combineLoading = false;
this.combineQuery.thirdIds=[]; this.combineQuery.thirdIds = [];
this.$emit("closeUdi", false); this.$emit("closeUdi", false);
}); });
}) })
.catch(() => { .catch(() => {
this.combineQuery.thirdIds=[]; this.combineQuery.thirdIds = [];
}); });
} else { } else {
addErp(this.combineQuery) addErp(this.combineQuery)
@ -620,6 +625,8 @@ export default {
if (this.defaultSys != null) { if (this.defaultSys != null) {
this.thirdSysFk = this.defaultSys; this.thirdSysFk = this.defaultSys;
} }
this.searchErpList();
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
@ -630,6 +637,8 @@ export default {
created() { created() {
console.log("-------------" + this.uuid); console.log("-------------" + this.uuid);
this.getBasicThirdSys(); this.getBasicThirdSys();
this.erpQuery.code = this.intentThirdId;
}, },
}; };
</script> </script>

28
src/views/basic/basicCompanyProducts.vue
Unescape Escape View File

@ -75,11 +75,11 @@
>选入产品 >选入产品
</el-button </el-button
> >
<el-button type="primary" icon="search" @click="intentImportErp" <!-- <el-button type="primary" icon="search" @click="intentImportErp"-->
>添加产品信息 <!-- >添加产品信息-->
</el-button <!-- </el-button-->
> <!-- >-->
<!-- <el-button type="primary" @click="addProductVisible=true">新增产品信息</el-button>--> <!-- <el-button type="primary" @click="addProductVisible=true">新增产品信息</el-button>-->
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-row> </el-row>
@ -137,7 +137,7 @@
{{ lockStatusMap[scope.row.lockStatus] }} {{ lockStatusMap[scope.row.lockStatus] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" label="操作" fixed="right"> <el-table-column width="180" label="操作" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -181,7 +181,14 @@
@click.native.stop="sumitLockStatus(scope.row)" @click.native.stop="sumitLockStatus(scope.row)"
>提交审核 >提交审核
</el-button> </el-button>
<el-button
v-if="isSpCombine"
type="text"
size="small"
:disabled="scope.row.thirdId==scope.row.nameCode"
@click.native.stop="intentImportErp(scope.row)"
>拆分产品
</el-button>
<el-button type="text" size="small" <el-button type="text" size="small"
@click.native.stop="deleteCompanyProductRelevance(scope.row)" @click.native.stop="deleteCompanyProductRelevance(scope.row)"
@ -1276,6 +1283,7 @@
:closeDialog="closeDialog" :closeDialog="closeDialog"
:uuid="uuid" :uuid="uuid"
:relId="relId" :relId="relId"
:intentThirdId="intentThirdId"
:isImport="isImport" :isImport="isImport"
:data="thisData" :data="thisData"
:defaultSys="defaultSys" :defaultSys="defaultSys"
@ -1391,6 +1399,7 @@ export default {
productType: null, productType: null,
defaultSys: null, defaultSys: null,
isImport: false, isImport: false,
intentThirdId: null,
isSpCombine: false, isSpCombine: false,
isImportUdi: false, isImportUdi: false,
isUploadSmp: false, isUploadSmp: false,
@ -1611,11 +1620,12 @@ export default {
}, },
intentImportErp(val) { intentImportErp(val) {
this.defaultSys = null, this.defaultSys = null;
this.uuid = val.uuid; this.uuid = val.uuid;
this.relId = val.rlId; this.relId = val.rlId;
this.isImport = true; this.isImport = true;
this.thisData = val; this.thisData = val;
this.intentThirdId = val.thirdId;
this.selectErpDialogVisible = true; this.selectErpDialogVisible = true;
}, },
uploadSMP() { uploadSMP() {

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

@ -104,14 +104,14 @@
<el-table-column label="操作" fixed="right"> <el-table-column label="操作" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-button--> <!-- <el-button-->
<!-- type="text"--> <!-- type="text"-->
<!-- size="small"--> <!-- size="small"-->
<!-- :disabled="scope.row.pid!=0"--> <!-- :disabled="scope.row.pid!=0"-->
<!-- @click.native.stop="handleSubForm(node, scope.row, 'add')"--> <!-- @click.native.stop="handleSubForm(node, scope.row, 'add')"-->
<!-- >添加货位--> <!-- >添加货位-->
<!-- </el-button--> <!-- </el-button-->
<!-- >--> <!-- >-->
<el-button <el-button
type="text" type="text"
size="small" size="small"
@ -181,7 +181,8 @@
type="text" type="text"
size="small" size="small"
@click.native="updateDirector(scope.row)"> @click.native="updateDirector(scope.row)">
设为主管
{{ directorMap[scope.row.director] }}
</el-button> </el-button>
<el-button <el-button
type="text" type="text"
@ -479,7 +480,8 @@
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<div class="text item"> <div class="text item">
<el-checkbox v-model="formData.spUse" :disabled="formData.level!='1'">是否允许供应商使用</el-checkbox> <el-checkbox v-model="formData.spUse" :disabled="formData.level!='1'">是否允许供应商使用
</el-checkbox>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
@ -609,6 +611,7 @@ export default {
children: "children", children: "children",
label: "name" label: "name"
}, },
setDictor: "设为主管",
treeList: [], treeList: [],
fileList: [], fileList: [],
pCodes: [], pCodes: [],
@ -629,6 +632,10 @@ export default {
true: "是", true: "是",
false: "否", false: "否",
}, },
directorMap: {
true: "取消主管",
false: "设为主管",
},
formLoading: false, formLoading: false,
subFormVisible: false, subFormVisible: false,
formVisible: false, formVisible: false,
@ -937,7 +944,7 @@ export default {
const eleLink = document.createElement('a'); const eleLink = document.createElement('a');
var timestamp = formatDate(new Date(), "yyyyMMddhhmmss") var timestamp = formatDate(new Date(), "yyyyMMddhhmmss")
// eleLink.download = "仓库信息导出" + timestamp + ".udi"; // eleLink.download = "仓库信息导出" + timestamp + ".udi";
eleLink.download = "BaseWarehouse_" + timestamp + ".LowerIn"; eleLink.download = "BaseWarehouse_" + timestamp + ".LowerIn";
eleLink.style.display = 'none'; eleLink.style.display = 'none';
eleLink.href = url; eleLink.href = url;
document.body.appendChild(eleLink) document.body.appendChild(eleLink)
@ -1136,8 +1143,8 @@ export default {
} }
}, },
updateDirector(row) { updateDirector(row) {
let params = {id: row.id}; row.director = !row.director;
updateDirector(params).then((res) => { updateDirector(row).then((res) => {
this.$message.success("设置成功"); this.$message.success("设置成功");
//重新加载表格数据 //重新加载表格数据
let loadParam = { let loadParam = {

1
src/views/thrsys/ThrOrdedrReceiveAdd.vue
Unescape Escape View File

@ -412,6 +412,7 @@ export default {
getBusType() { getBusType() {
let query = { let query = {
enabled: true, enabled: true,
corpType:1,
}; };
getLocalJoinBusType(query) getLocalJoinBusType(query)
.then((response) => { .then((response) => {

2040
src/views/thrsys/thrOrderNew.vue
View File

File diff suppressed because it is too large Load Diff

17
src/views/warehouse/addHosOrder.vue
Unescape Escape View File

@ -181,11 +181,10 @@
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="3"> <el-col :span="2">
<div class="ao-text"> <div class="ao-text">
<el-link <el-link
@click.native.stop="scanChange()" @current-change="scanChange()"
target="_blank">{{ scanText }} target="_blank">{{ scanText }}
</el-link> </el-link>
@ -224,10 +223,13 @@
<!-- </div>--> <!-- </div>-->
<!-- <div id="inputer" tabindex="0"></div>--> <!-- <div id="inputer" tabindex="0"></div>-->
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="16" style="margin-left: 40px"> <el-col :span="14" style="margin-left: 40px">
</el-col>
<el-col :span="2">
<el-checkbox v-model="sitcomScan">分段扫码</el-checkbox> <el-checkbox v-model="sitcomScan">分段扫码</el-checkbox>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="3">
<div class="text item" style="margin-left: 30px"> 条码数量：{{ total }} <div class="text item" style="margin-left: 30px"> 条码数量：{{ total }}
</div> </div>
</el-col> </el-col>
@ -623,13 +625,14 @@ export default {
}); });
}, },
scanChange() { scanChange(event) {
this.isScan = !this.isScan; this.isScan = !this.isScan;
if (this.isScan) { if (this.isScan) {
this.scanText = "扫码录入："; this.scanText = "扫码录入：";
document.getElementById("inputer").focus();
} else { } else {
this.scanText = "手动录入："; this.scanText = "手动录入：";
// this.$refs.inputRef.focus();
} }
}, },

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

@ -474,7 +474,7 @@ export default {
}); });
} }
this.corpOrderIdDisabled = true; this.corpOrderIdDisabled = true;
this.$refs.inputRef.focus(); // this.$refs.inputRef.focus();
this.getCodeList(); this.getCodeList();
} else { } else {
this.corpOrderIdDisabled = true; this.corpOrderIdDisabled = true;

18
src/views/warehouse/stockOrderEdit.vue
Unescape Escape View File

@ -92,7 +92,7 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog v-bind:width="'25%'" :visible.sync="firstSalesInvNoFormVisible" append-to-body> <el-dialog v-bind:width="'25%'" :visible.sync="firstSalesInvNoFormVisible" append-to-body>
<el-form :model="batchForm"> <el-form :model="batchForm">
<label></label> <label></label>
<el-form-item label="销售发票第一票：" :label-width="formLabelWidth"> <el-form-item label="销售发票第一票：" :label-width="formLabelWidth">
@ -105,7 +105,7 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog v-bind:width="'25%'" :visible.sync="secSalesInvNoFormVisible" append-to-body> <el-dialog v-bind:width="'25%'" :visible.sync="secSalesInvNoFormVisible" append-to-body>
<el-form :model="batchForm"> <el-form :model="batchForm">
<label></label> <label></label>
<el-form-item label="销售发票第二票：" :label-width="formLabelWidth"> <el-form-item label="销售发票第二票：" :label-width="formLabelWidth">
@ -182,6 +182,12 @@ export default {
}, },
batchSetParams(flag, type) { batchSetParams(flag, type) {
if (flag == '1' && type == 'salesListNo') { if (flag == '1' && type == 'salesListNo') {
if (this.$isBlank(this.batchForm.secSalesListNo)) {
this.$message.warning("请输入销售清单");
return;
}
this.salesListNoFormVisible = false; this.salesListNoFormVisible = false;
this.detailList.forEach(data => { this.detailList.forEach(data => {
this.multipId.forEach(id => { this.multipId.forEach(id => {
@ -195,6 +201,10 @@ export default {
//置空批量设置表单 //置空批量设置表单
Object.keys(this.batchForm).forEach(key => this.batchForm[key] = ''); Object.keys(this.batchForm).forEach(key => this.batchForm[key] = '');
} else if (flag == '1' && type == 'firstSalesInvNo') { } else if (flag == '1' && type == 'firstSalesInvNo') {
if (this.$isBlank(this.batchForm.firstSalesInvNo)) {
this.$message.warning("请输入销售发票第一票");
return;
}
this.firstSalesInvNoFormVisible = false; this.firstSalesInvNoFormVisible = false;
this.detailList.forEach(data => { this.detailList.forEach(data => {
this.multipId.forEach(id => { this.multipId.forEach(id => {
@ -207,6 +217,10 @@ export default {
}); });
Object.keys(this.batchForm).forEach(key => this.batchForm[key] = ''); Object.keys(this.batchForm).forEach(key => this.batchForm[key] = '');
} else if (flag == '1' && type == 'secSalesInvNo') { } else if (flag == '1' && type == 'secSalesInvNo') {
if (this.$isBlank(this.batchForm.secSalesInvNo)) {
this.$message.warning("请输入销售发票第二票");
return;
}
this.secSalesInvNoFormVisible = false; this.secSalesInvNoFormVisible = false;
this.detailList.forEach(data => { this.detailList.forEach(data => {
this.multipId.forEach(id => { this.multipId.forEach(id => {

Write Preview
Loading…
Cancel
Save