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

bug修改

Browse Source
featFunction
anthonywj 3 years ago
parent ca14317d66
commit 54b6d39f16
10 changed files with 1869 additions and 1889 deletions
Show Stats Download Patch File Download Diff File

4
public/config.json
Unescape Escape View File

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

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

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

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

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

5
src/views/basic/invWarehouseRelBusTypes.vue
Unescape Escape View File

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

606
src/views/inventory/DialogInvProduct.vue
Unescape Escape View File

@ -1,82 +1,82 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-form :inline="true" :model="filterQuery" class="query-form" size="mini"> <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
<el-row> <el-row>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"></el-input> <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"></el-input> <el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.batchNo" placeholder="批次号"></el-input> <el-input v-model="filterQuery.batchNo" placeholder="批次号"></el-input>
</el-form-item> </el-form-item>
<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="combine">确定</el-button> <el-button type="primary" icon="search" @click="combine">确定</el-button>
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-row> </el-row>
</el-form> </el-form>
<el-table v-loading="loading" :data="list" style="width: 100%" <el-table v-loading="loading" :data="list" style="width: 100%"
highlight-current-row="false" highlight-current-row="false"
ref="multipleTable"> ref="multipleTable">
<el-table-column <el-table-column
type="selection" type="selection"
width="55"> width="55">
</el-table-column> </el-table-column>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="产品标识" prop="nameCode"></el-table-column> <el-table-column label="产品标识" prop="nameCode"></el-table-column>
<el-table-column label="产品名称" prop="cpmctymc"> <el-table-column label="产品名称" prop="cpmctymc">
</el-table-column> </el-table-column>
<el-table-column label="规格型号" prop="ggxh"></el-table-column> <el-table-column label="规格型号" prop="ggxh"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column> <el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" prop="productionDate"></el-table-column> <el-table-column label="生产日期" prop="productionDate"></el-table-column>
<el-table-column label="失效日期" prop="expireDate"></el-table-column> <el-table-column label="失效日期" prop="expireDate"></el-table-column>
<el-table-column label="入库数量" prop="inCount"></el-table-column> <el-table-column label="入库数量" prop="inCount"></el-table-column>
<el-table-column label="出库数量" prop="outCount"></el-table-column> <el-table-column label="出库数量" prop="outCount"></el-table-column>
<el-table-column label="结余数量" prop="reCount"> <el-table-column label="结余数量" prop="reCount">
<template slot-scope="scope"> <template slot-scope="scope">
{{ (scope.row.inCount - scope.row.outCount) }} {{ (scope.row.inCount - scope.row.outCount) }}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
<el-dialog <el-dialog
title="库存码详情" title="库存码详情"
:visible.sync="codeDetailVisible" :visible.sync="codeDetailVisible"
width="85%" width="85%"
v-if="codeDetailVisible" v-if="codeDetailVisible"
> >
<codeDetail <codeDetail
:idQuery="idQuery" :idQuery="idQuery"
v-on:closeDetailDialog="closeDetailDialog" v-on:closeDetailDialog="closeDetailDialog"
></codeDetail> ></codeDetail>
</el-dialog> </el-dialog>
<el-pagination <el-pagination
:page-size="filterQuery.limit" :page-size="filterQuery.limit"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
layout="prev, pager, next" layout="prev, pager, next"
:total="total" :total="total"
:current-page="filterQuery.page" :current-page="filterQuery.page"
></el-pagination> ></el-pagination>
</div> </div>
</template> </template>
<script> <script>
import { import {
filterProducts, filterProducts,
filterDetailProducts, filterDetailProducts,
deleteProducts, deleteProducts,
} from "../../api/inventory/InvProducts"; } from "../../api/inventory/InvProducts";
import draggable from "vuedraggable"; import draggable from "vuedraggable";
import codeDetail from "./InvProductsDetail"; import codeDetail from "./InvProductsDetail";
@ -87,255 +87,255 @@ import {getStockOrderDetailInstrumentById} from "@/api/warehouse/stockOrder";
export default { export default {
name: "DialogInvProduct", name: "DialogInvProduct",
props: { props: {
data: { data: {
type: Object, type: Object,
required: true, required: true,
}, },
closeDialog: { closeDialog: {
type: Function, type: Function,
required: true, required: true,
}, },
invQueryData: { invQueryData: {
type: Object, type: Object,
required: true, required: true,
} }
},
data() {
return {
filterQuery: {
cpmctymc: null,
nameCode: null,
relIdFk: null,
batchNo: null,
page: 1,
limit: 10,
customerId: null,
supId: null,
unitFk: null,
invStorageCode: null,
invWarehouseCode: null,
},
detailQuery: {
code: null,
productIdFk: null,
page: 1,
limit: 20,
},
list: [],
codeDetailVisible: false,
total: 0,
loading: true,
index: null,
dialogTableVisible: false,
formLoading: false,
dialogVisible: false,
deleteLoading: false,
busTypes: [],
idQuery: null,
showSup: false,
fromOptions: [],
};
},
components: {
draggable,
codeDetail,
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
cpmctymc: null,
nameCode: null,
relIdFk: null,
batchNo: null,
customerId: null,
unitFk: null,
supId: null,
page: 1,
limit: 10,
};
this.getList();
},
onSubmit() {
this.loading = true;
this.filterQuery.page = 1;
this.getList();
},
handleSizeChange(val) {
this.filterQuery.limit = val;
this.getList();
}, },
data() { handleCurrentChange(val) {
return { this.filterQuery.page = val;
filterQuery: { this.getList();
cpmctymc: null,
nameCode: null,
relIdFk: null,
batchNo: null,
page: 1,
limit: 10,
customerId: null,
supId: null,
unitFk: null,
invStorageCode: null,
invWarehouseCode: null,
},
detailQuery: {
code: null,
productIdFk: null,
page: 1,
limit: 20,
},
list: [],
codeDetailVisible: false,
total: 0,
loading: true,
index: null,
dialogTableVisible: false,
formLoading: false,
dialogVisible: false,
deleteLoading: false,
busTypes: [],
idQuery: null,
showSup: false,
fromOptions: [],
};
}, },
components: { handleUnitClick(row) {
draggable, this.curIndex = row.id;
codeDetail, this.dialogTableVisible = true;
},
closeDetailDialog(val) {
this.codeDetailVisible = false;
}, },
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
cpmctymc: null,
nameCode: null,
relIdFk: null,
batchNo: null,
customerId: null,
unitFk: null,
supId: null,
page: 1,
limit: 10,
};
this.getList();
},
onSubmit() {
this.loading = true;
this.filterQuery.page = 1;
this.getList();
},
handleSizeChange(val) {
this.filterQuery.limit = val;
this.getList();
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
handleUnitClick(row) {
this.curIndex = row.id;
this.dialogTableVisible = true;
},
closeDetailDialog(val) {
this.codeDetailVisible = false;
},
getList() { getList() {
this.loading = true; this.loading = true;
this.filterQuery.customerId = store.getters.customerId; this.filterQuery.customerId = store.getters.customerId;
filterProducts(this.filterQuery) filterProducts(this.filterQuery)
.then((response) => { .then((response) => {
this.showSup = response.data.showSup; this.showSup = response.data.showSup;
this.loading = false; this.loading = false;
this.list = response.data.list || []; this.list = response.data.list || [];
this.total = response.data.total || 0; this.total = response.data.total || 0;
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
this.list = []; this.list = [];
this.total = 0; this.total = 0;
}); });
}, },
deleteOrders(data) { deleteOrders(data) {
this.loading = true; this.loading = true;
let query = { let query = {
id: data, id: data,
}
deleteProducts(query)
.then((response) => {
if (response.code == 20000) {
this.getList();
this.$message({
type: "success",
message: "删除成功！",
});
} else {
this.$message.error(response.message);
} }
deleteProducts(query)
.then((response) => {
if (response.code == 20000) {
this.getList();
this.$message({
type: "success",
message: "删除成功！",
});
} else {
this.$message.error(response.message);
}
})
.catch(() => {
});
},
deleteDialog(rowId) { })
this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", { .catch(() => {
confirmButtonText: "确定", });
cancelButtonText: "取消", },
type: "warning",
})
.then(() => {
this.deleteOrders(rowId);
})
.catch(() => {
});
},
findMethod(query) {
this.fromOptions = [];
let cQuery = {
key: query,
};
getBasicUnitMaintains(cQuery)
.then((response) => {
this.loading = false;
this.fromOptions = response.data.page.list || [];
})
.catch(() => {
this.loading = false;
});
},
intentDetail(row) { deleteDialog(rowId) {
this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.deleteOrders(rowId);
})
.catch(() => {
});
},
findMethod(query) {
this.fromOptions = [];
let cQuery = {
key: query,
};
getBasicUnitMaintains(cQuery)
.then((response) => {
this.loading = false;
this.fromOptions = response.data.page.list || [];
})
.catch(() => {
this.loading = false;
});
},
this.idQuery = row; intentDetail(row) {
// this.idQuery.supId = null;
this.idQuery.customerId = null;
this.codeDetailVisible = true;
},
getBusType() {
let query = {
enabled: true,
};
getBussinessType(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action;
// this.getList();
})
.catch(() => {
});
},
getActionName(action) {
for (let i = 0; i < this.busTypes.length; i++) {
if (this.busTypes[i].action === action) {
return this.busTypes[i].name;
}
}
},
combine() {
let selection = this.$refs.multipleTable.selection;
if (selection.length < 1) {
this.$message.error('未选择产品');
return;
}
let ids = [];
selection.forEach((obj, index) => {
let data = {
relId: obj.relIdFk,
batchNo: obj.batchNo,
productDate: obj.productionDate,
expireDate: obj.expireDate,
}
ids.push(data);
});
this.loading = true; this.idQuery = row;
let tQuery = { // this.idQuery.supId = null;
datas: ids, this.idQuery.customerId = null;
stockOrderLists: this.data.stockOrderLists, this.codeDetailVisible = true;
}; },
getStockOrderDetailInstrumentById(tQuery).then((response) => { getBusType() {
this.loading = false; let query = {
if (response.code === 20000) { enabled: true,
this.closeDialog(response.data); };
} else { getBussinessType(query)
this.$message.error(response.message); .then((response) => {
} this.busTypes = response.data.list || [];
}).catch(() => { this.filterQuery.billAction = this.busTypes[0].action;
this.loading = false; // this.getList();
}); })
}, .catch(() => {
});
},
getActionName(action) {
for (let i = 0; i < this.busTypes.length; i++) {
if (this.busTypes[i].action === action) {
return this.busTypes[i].name;
}
}
}, },
filters: { combine() {
statusFilterType(status) { let selection = this.$refs.multipleTable.selection;
const statusMap = { if (selection.length < 1) {
false: "success", this.$message.error('未选择产品');
true: "danger", return;
}; }
return statusMap[status]; let ids = [];
}, selection.forEach((obj, index) => {
let data = {
relId: obj.relIdFk,
batchNo: obj.batchNo,
productDate: obj.productionDate,
expireDate: obj.expireDate,
}
ids.push(data);
});
this.loading = true;
let tQuery = {
datas: ids,
stockOrderLists: this.data.stockOrderLists,
};
getStockOrderDetailInstrumentById(tQuery).then((response) => {
this.loading = false;
if (response.code === 20000) {
this.closeDialog(response.data);
} else {
this.$message.error(response.message);
}
}).catch(() => {
this.loading = false;
});
}, },
mounted() { },
document.body.ondrop = function (event) { filters: {
event.preventDefault(); statusFilterType(status) {
event.stopPropagation(); const statusMap = {
}; false: "success",
true: "danger",
};
return statusMap[status];
}, },
created() { },
this.getBusType(); mounted() {
let query = this.$route.query; document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
},
created() {
this.getBusType();
let query = this.$route.query;
this.filterQuery = Object.assign(this.filterQuery, query); this.filterQuery = Object.assign(this.filterQuery, query);
this.filterQuery.invStorageCode = this.invQueryData.locStorageCode; this.filterQuery.invStorageCode = this.invQueryData.locStorageCode;
this.filterQuery.invWarehouseCode = this.invQueryData.invWarehouseCode; this.filterQuery.invWarehouseCode = this.invQueryData.invWarehouseCode;
this.filterQuery.limit = parseInt(this.filterQuery.limit); this.filterQuery.limit = parseInt(this.filterQuery.limit);
// 加载表格数据 // 加载表格数据
this.getList(); this.getList();
}, },
}; };
</script> </script>

39
src/views/inventory/invUdiTraceOrder.vue
Unescape Escape View File

@ -20,7 +20,6 @@
style="width: 500px" style="width: 500px"
@keypress.enter.native="enterKey($event)" @keypress.enter.native="enterKey($event)"
></el-input> ></el-input>
<el-checkbox v-model="sitcomScan" style="margin-left: 15px">分段扫码</el-checkbox>
</el-form-item> </el-form-item>
</el-row> </el-row>
@ -487,12 +486,8 @@ export default {
}, },
enterKey(event) { enterKey(event) {
if (this.sitcomScan) { this.$refs.inputRef.select();
return; this.onSubmit();
} else {
this.$refs.inputRef.select();
this.onSubmit();
}
}, },
onSubmit() { onSubmit() {
this.getList(); this.getList();
@ -584,7 +579,7 @@ export default {
this.filterQuery.customerId = store.getters.customerId; this.filterQuery.customerId = store.getters.customerId;
if (!this.$isBlank(this.filterQuery.code)) { if (!this.$isBlank(this.filterQuery.code)) {
let code = this.filterQuery.code; let code = this.filterQuery.code;
this.filterQuery.code = code.replace("\r","") this.filterQuery.code = code.replace("\r", "")
} }
filterOrderTrace(this.filterQuery) filterOrderTrace(this.filterQuery)
.then((response) => { .then((response) => {
@ -976,9 +971,8 @@ export default {
}; };
var that = this; var that = this;
var inputer = document.getElementById("inputer"); var inputer = document.getElementById("inputer");
window.sc = new A.KeyScaner(inputer);//传入要监听的DOM节点 window.sc = new A.KeyScaner(inputer);
sc.onInput = function (text) { sc.onInput = function (text) {
//onInput事件在检测到回车键按下或在连续输入后超过500ms没有继续输入时触发
if (text.includes("delete")) { if (text.includes("delete")) {
that.formData.code = ""; that.formData.code = "";
return; return;
@ -1009,7 +1003,30 @@ export default {
</script> </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 { .el-table .warning-row {
background: #ffb5b5; background: #ffb5b5;
} }

5
src/views/warehouse/stockHospOrderNew.vue
Unescape Escape View File

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

1126
src/views/warehouse/stockOrderDelete.vue
View File

File diff suppressed because it is too large Load Diff

1951
src/views/warehouse/stockOrderNewDistribution.vue
View File

File diff suppressed because it is too large Load Diff

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

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

Write Preview
Loading…
Cancel
Save