1.修复新建业务单据无法选入产品bug

2.修改全局样式,修复固定操作列导致表格变形问题
prod
x_z 2 years ago
parent f6b5688491
commit 053debea7c

@ -189,3 +189,8 @@ aside {
.multiselect--active { .multiselect--active {
z-index: 1000 !important; z-index: 1000 !important;
} }
.el-table--mini .el-table__cell {
padding:0px!important;
}

@ -793,27 +793,29 @@ export default {
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
}; };
var that = this; if (this.viewType !== 1) {
var inputer = document.getElementById("inputer"); var that = this;
window.sc = new A.KeyScaner(inputer);//DOM var inputer = document.getElementById("inputer");
sc.onInput = function (text) { window.sc = new A.KeyScaner(inputer);//DOM
if (text.includes("delete")) { sc.onInput = function (text) {
that.codeFormData.code = ""; if (text.includes("delete")) {
that.sictomText = ""; that.codeFormData.code = "";
that.originCode = ""; that.sictomText = "";
return; that.originCode = "";
} return;
if (that.sitcomScan) { }
let tempTxt = text; if (that.sitcomScan) {
let str = tempTxt.replace(/[\r]/g, ""); let tempTxt = text;
that.sictomText = that.sictomText + str; let str = tempTxt.replace(/[\r]/g, "");
that.codeFormData.code = that.sictomText; that.sictomText = that.sictomText + str;
} else { that.codeFormData.code = that.sictomText;
} else {
that.codeFormData.code = text;
} that.codeFormData.code = text;
}; }
inputer.focus(); };
inputer.focus();
}
}, },
created() { created() {

@ -87,7 +87,7 @@
</el-button-group> </el-button-group>
</div> </div>
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row <el-table v-loading="loading" :data="list" style="width: 100%;" highlight-current-row class="table-fixed"
border border
@current-change="handleSelectionChange"> @current-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
@ -122,7 +122,7 @@
<!-- </el-tag>--> <!-- </el-tag>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="操作" width="150"> <el-table-column label="操作" width="200" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@ -340,7 +340,7 @@ import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {getResultDetailList} from "@/api/inout/orderDetailResult"; import {getResultDetailList} from "@/api/inout/orderDetailResult";
import {getCodeDetailList} from "@/api/inout/orderDetailCode"; import {getCodeDetailList} from "@/api/inout/orderDetailCode";
import {getCodeList} from "@/api/inout/code"; import {getCodeList} from "@/api/inout/code";
import {inspectionOrderPDFFromTemplateFile,orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint" import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
const formJson = { const formJson = {
@ -814,5 +814,6 @@ export default {
}; };
</script> </script>
<style type="text/scss" lang="scss"> <style lang="scss" scoped>
</style> </style>

@ -122,7 +122,7 @@
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="160"> <el-table-column label="操作" width="160" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button

@ -367,17 +367,19 @@ export default {
if (this.curBustype.corpType == 3) {// if (this.curBustype.corpType == 3) {//
this.invQueryData.invCode = this.idQuery.invCode; this.invQueryData.invCode = this.idQuery.invCode;
this.selectInvProductVisible = true; this.selectInvProductVisible = true;
} else if (this.curBustype.corpType == 2)// } else if (this.curBustype.corpType == 2) { //
{
this.selectProductVisible = true; this.selectProductVisible = true;
} else if (this.curBustype.corpType === 1) {//
this.invQueryData.invCode = this.idQuery.invCode;
this.selectInvProductVisible = true;
} }
}, },
saveChange(row) { saveChange(row) {
if(row.batchNo ==''){ if (row.batchNo == '') {
row.batchNo =null; row.batchNo = null;
} }
updateBizProduct(row) updateBizProduct(row)
.then((response) => { .then((response) => {

Loading…
Cancel
Save