bug修改

featFunction
anthonywj 3 years ago
parent ca14317d66
commit 54b6d39f16

@ -1,6 +1,6 @@
{
"BASE_URL": "http://192.168.0.66:8500/SPMS_SERVER",
"SERVER_IP": "http://192.168.0.66:8500/SPMS_SERVER",
"BASE_URL": "http://192.168.0.109:9906",
"SERVER_IP": "http://192.168.0.109:9906",
"hosp_name": "诏安县总医院(测试)"
}

@ -693,6 +693,7 @@
size="small"
splaceholder="请输入内容"
type='number'
step="0.01"
v-model="editQuery.price"
></el-input>
</div>

@ -338,7 +338,7 @@
style="width: 100%">
<el-table-column
type="selection"
:reserve-selection="false"
:reserve-selection="true"
width="55">
</el-table-column>
<el-table-column label="单据类型编码" prop="action" fixed></el-table-column>
@ -894,7 +894,7 @@ export default {
bussinessTypeQuery: {
enabled: true,
page: 1,
limit: 10
limit: 100
},
bussinessTypeTotal: 0,
curSeleUser: null,

@ -122,8 +122,11 @@ export default {
},
handleSelectionChange(val) {
this.multipleSelection = val;
}
},
getRowKeys(row) {
return row.id
},
},
created() {

@ -20,7 +20,6 @@
style="width: 500px"
@keypress.enter.native="enterKey($event)"
></el-input>
<el-checkbox v-model="sitcomScan" style="margin-left: 15px"></el-checkbox>
</el-form-item>
</el-row>
@ -487,12 +486,8 @@ export default {
},
enterKey(event) {
if (this.sitcomScan) {
return;
} else {
this.$refs.inputRef.select();
this.onSubmit();
}
},
onSubmit() {
this.getList();
@ -584,7 +579,7 @@ export default {
this.filterQuery.customerId = store.getters.customerId;
if (!this.$isBlank(this.filterQuery.code)) {
let code = this.filterQuery.code;
this.filterQuery.code = code.replace("\r","")
this.filterQuery.code = code.replace("\r", "")
}
filterOrderTrace(this.filterQuery)
.then((response) => {
@ -976,9 +971,8 @@ export default {
};
var that = this;
var inputer = document.getElementById("inputer");
window.sc = new A.KeyScaner(inputer);//DOM
window.sc = new A.KeyScaner(inputer);
sc.onInput = function (text) {
//onInput500ms
if (text.includes("delete")) {
that.formData.code = "";
return;
@ -1009,7 +1003,30 @@ export default {
</script>
<style>
<style scoped>
#inputer {
width: 100%;
min-height: 30px;
background-color: white;
border: #d0d0d0;
border-style: solid;
border-width: 0.1px;
color: #4a4a4a;
}
#inputer:focus {
width: 100%;
min-height: 30px;
background-color: white;
border: #0080FF;
border-style: solid;
border-width: 0.1px;
color: #4a4a4a;
}
.el-table .warning-row {
background: #ffb5b5;
}

@ -702,7 +702,6 @@ export default {
},
findSubStorageMethod() {
let cQuery = {
pcode: this.formData.corpId,
@ -793,9 +792,7 @@ export default {
},
selectProductFunction(event) {
if (event == null) {
// this.$refs.inputRef.focus();
} else {
if (event != null) {
event.target.select();
}
if (this.$isBlank(event)) {

@ -76,24 +76,6 @@
<span>{{ scope.row.actDate }}</span>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- label="审核时间"-->
<!-- prop="actDate"-->
<!-- width="150"-->
<!-- show-overflow-tooltip="true"-->
<!-- >-->
<!-- <template slot-scope="scope">-->
<!-- <i class="el-icon-time"></i>-->
<!-- <span>{{ scope.row.auditTime }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="校验状态" prop="contrastStatus" width="120">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag :type="(scope.row.contrastStatus === 1) | statusFilterType">-->
<!-- {{ erpCheckStatus[scope.row.contrastStatus] }}-->
<!-- </el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button
@ -243,13 +225,13 @@
</template>
<script>
import {filterOrderForDelete, orderDetail, deleteByOrderId, updateOrderInfo} from "../../api/warehouse/order";
import store from "../../store";
import {getBussinessType} from "../../api/basic/bussinessType";
import {filterAllByUser} from "@/api/basic/invWarehouse";
import codeReplace from "./codeReplace";
import {filterOrderForDelete, orderDetail, deleteByOrderId, updateOrderInfo} from "../../api/warehouse/order";
import store from "../../store";
import {getBussinessType} from "../../api/basic/bussinessType";
import {filterAllByUser} from "@/api/basic/invWarehouse";
import codeReplace from "./codeReplace";
export default {
export default {
name: "stockOrderDelete",
data() {
return {
@ -579,12 +561,12 @@
this.getBusType();
this.getStorage();
}
}
}
</script>
<style scoped>
.el-dialog {
.el-dialog {
display: flex;
flex-direction: column;
margin: 0 !important;
@ -592,17 +574,17 @@
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
}
.el-dialog .el-dialog__body {
.el-dialog .el-dialog__body {
flex: 1;
overflow: auto;
}
}
.el-table /deep/ .highlight-row {
.el-table /deep/ .highlight-row {
background: #cae3f9;
}
}
</style>

@ -372,9 +372,6 @@ export default {
invWarehouseCode: [
{required: true, message: "请选择当前分库", trigger: "blur"}
],
// type: [
// {required: true, message: "", trigger: "blur"}
// ],
},
codeArray: [],
total: 0,
@ -559,10 +556,9 @@ export default {
});
},
selectProductFunction(event) {
if (event == null) {
} else event.target.select();
if (event != null)
event.target.select();
if (this.$isBlank(event)) {
if (this.$isBlank(this.formData.billType)) {
this.$message.error("单据类型不能为空!")
return;
@ -580,6 +576,7 @@ export default {
this.thisData.code = "";
this.thisData.orderEditor = this.orderEditor;
this.thisData.orderId = "";
this.thisData.billType = this.formData.billType;
this.thisData.stockOrderLists = this.codeArray;
if (this.orderEditor) {
this.thisData.orderId = this.formData.id
@ -605,7 +602,6 @@ export default {
};
stockOrderDetailQueryProduct(tQuery).then((response) => {
this.loading = false;
console.log(response)
if (response.code === 20000) {
if (response.data.getType === "1") {
this.loading = true;
@ -673,20 +669,15 @@ export default {
},
iCountChange() {
// console.log(this.iCount)
// this.currentRow.count = this.iCount;
// this.currentRow.reCount = this.iCount;
},
iCountEnterFunction() {
if (this.$isNotBlank(this.currentRow)) {
this.currentRow.count = this.iCount;
// this.currentRow.reCount = this.iCount;
}
this.focusNext('inputRef');
},
tableCountChange(row) {
if (this.$isNotBlank(row)) {
// row.count = row.reCount;
}
},
tableRowClassName({row, rowIndex}) {
@ -816,7 +807,6 @@ export default {
this.iCount = 0;
this.detailLoading = true;
// row.count = row.reCount;
let tQuery = row;
uploadStockOrderDetail(tQuery).then((response) => {
this.detailLoading = false;
@ -875,21 +865,6 @@ export default {
cancelButtonText: "取消",
type: "warning",
}).then(() => {
// let tQuery = {
// id: row.id
// }
// this.detailLoading = true;
// copyStockOrderDetail(tQuery)
// .then((response) => {
// this.detailLoading = false;
// if (response.code === 20000) {
// this.$message.success("");
// this.getStockOrderDetailList();
// } else {
// this.$message.error(response.message);
// }
// });
let rData = JSON.parse(JSON.stringify(row));
rData.id = null;
if (this.codeArray.length === 0) {

@ -125,7 +125,7 @@
append-to-body
v-if="udiRlDetailVisible"
>
<udiRlDetailDialog :editQuery="currentRow" ></udiRlDetailDialog>
<udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
</el-dialog>
</div>
</template>
@ -137,8 +137,9 @@ import {
} from "../../api/warehouse/stockOrder";
import store from "../../store";
import udiRlDetailDialog from "./../basic/UdiRlDetailDialog";
export default {
name: "closeDialog",
name: "stockOrderNewSelectProduct",
props: {
data: {
type: Object,
@ -168,7 +169,7 @@ export default {
total: 1,
currentRow: null,
loading: false,
udiRlDetailVisible:false,
udiRlDetailVisible: false,
multipleUdiSelection: [],
thirdSys: [],
thirdSysFk: null,
@ -321,6 +322,8 @@ export default {
this.multipleUdiSelection = val;
},
},
components: {udiRlDetailDialog},
created() {
if (this.$isNotBlank(this.data)) {
this.listQuery.nameCode = this.data.udi;
@ -328,13 +331,15 @@ export default {
this.listQuery.billType = this.data.billType;
} else
this.listQuery.billType = this.data.formData.billType;
if (this.data.formData != null) {
this.listQuery.corpId = this.data.formData.corpId;
}
this.orderEditor = this.data.orderEditor;
this.orderId = this.data.orderId;
this.getList();
}
this.getList();
},
components: {udiRlDetailDialog},
};
</script>

Loading…
Cancel
Save