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

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

Browse Source
zhairh
郑明梁 2 years ago
parent 810c60257b 75720e4e43
commit 4d5cdb4501
10 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File

8
src/views/business/selectThrOrderDialog.vue
Unescape Escape View File

@ -161,7 +161,7 @@ export default {
page: 1,
limit: 10,
allocateStatus: 0,
type: 0,
type: null,
customerId: null,
},
detailList: [],
@ -384,9 +384,13 @@ export default {
},
},
created() {
this.getBusType();
this.getStorage();
this.getList();
this.getList();
},
components: {selectInvDialog}

11
src/views/inout/IOAddOrder.vue
Unescape Escape View File

@ -177,11 +177,13 @@
placeholder="请选择科室"
:remote-method="findDeptMethod"
:loading="loading"
:disabled="corpOrderIdDisabled"
@change="ksChange"
@focus="findDeptMethod('')"
>
<el-option
v-for="item in fromDeptOptions"
:key="item.id"
:key="item.code"
:label="item.name"
:value="item.code"
>
@ -821,6 +823,10 @@ export default {
this.formData.fromCorpId = row.parentId;
this.formData.fromCorp = row.name;
},
ksChange(code){
this.formData.deptCode=code;
},
deleteCode(index, row) {
@ -1183,10 +1189,10 @@ export default {
},
created() {
this.formData.code = '';
this.formData.actDate = new Date();
this.codeArray = [];
this.findDeptMethod();
this.getStorage(this.formData.action);
if (this.$isNotBlank(this.idQuery.id)) {
this.formData.actDate = new Date(this.idQuery.actDate);
@ -1194,6 +1200,7 @@ export default {
this.corpOrderIdDisabled = true;
this.formData.action = this.idQuery.action;
this.formData.fromCorp = this.idQuery.fromCorp;
this.formData.deptCode= this.idQuery.deptCode
this.formData.fromCorpId = this.idQuery.fromCorpId;
this.formData.locStorageCode = this.idQuery.locStorageCode;
this.formData.invWarehouseCode = this.idQuery.invWarehouseCode;

2
src/views/inout/IONewOrder.vue
Unescape Escape View File

@ -476,7 +476,7 @@ export default {
this.idQuery.locStorageCode = row.locStorageCode;
this.idQuery.invWarehouseCode = row.invWarehouseCode;
this.idQuery.fromSubInvCode = row.fromSubInvCode;
this.idQuery.deptCode = row.deptCode;
this.idQuery.preCheck = row.preCheck;
}

8
src/views/inventory/InvProducts.vue
Unescape Escape View File

@ -320,10 +320,12 @@ export default {
findMethod(query) {
this.fromOptions = [];
let cQuery = {
key: query,
customerName: query,
key: query,
customerName: query,
corpType:2,
page: 1,
limit: 20
limit: 20,
};
getBasicUnitMaintains(cQuery)

8
src/views/inventory/addDeviceCollectOrder.vue
Unescape Escape View File

@ -450,12 +450,16 @@ export default {
},
addCode() {
if (isBlank(this.formData.deptCode)) {
this.$message.warning("请先选择养护仓库！");
this.$message.warning("请选择领用部门！");
return;
}
if (isBlank(this.formData.collectUser)) {
this.$message.warning("请选择领用人！");
}
if (isBlank(this.formData.code)) {
this.$message.warning("请扫描或输入UDI码")
this.$message.warning("请扫描或输入UDI码");
return;
}

16
src/views/inventory/assetManage.vue
Unescape Escape View File

@ -29,10 +29,16 @@
<el-table v-loading="loading" :data="list" style="width: 100%">
<el-table-column label="序号" type="index" fixed></el-table-column>
<el-table-column label="养护记录号" prop="orderId" width="180"></el-table-column>
<el-table-column label="领用记录号" prop="collOrderId" width="180"></el-table-column>
<el-table-column label="养护日期" prop="createTime" width="180"></el-table-column>
<el-table-column label="养护人" prop="createUser" width="120"></el-table-column>
<el-table-column label="设备名称" prop="productName" width="180"></el-table-column>
<el-table-column label="设备编号" prop="code" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="产品DI" prop="nameCode" width="180"></el-table-column>
<el-table-column label="生产日期" prop="produceDate" width="180"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="180"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="180"></el-table-column>
<el-table-column label="医疗器械注册/备案人名称" prop="ylqxzcrbarmc" width="180"></el-table-column>
<el-table-column label="批准文号" prop="zczbhhzbapzbh" width="180"></el-table-column>
<el-table-column label="所属仓库" prop="invWarehouseName" width="180"></el-table-column>
<el-table-column label="领用部门" prop="deptName" width="180"></el-table-column>
<el-table-column label="操作" width="180" fixed="right">
<template slot-scope="scope">
<el-button
@ -152,7 +158,7 @@ export default {
addMAOrder(row) {
this.deviceMAOrder = {
code: row.code,
createUser: this.$store.getters.employName,
createUser: this.$store.getters.employeeName,
deptName: row.deptName,
deptCode: row.deptCode,
createTime: new Date().toLocaleString()

3
src/views/inventory/deviceCollectOrderAudit.vue
Unescape Escape View File

@ -35,7 +35,7 @@
</el-row>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%" @current-change="handleChange">
<el-table v-loading="loading" :data="list" style="width: 100%" @current-change="handleChange" highlight-current-row>
<el-table-column label="序号" type="index" fixed></el-table-column>
<el-table-column label="设备领用记录号" prop="orderId" width="180"></el-table-column>
<el-table-column label="领用部门" prop="deptName" width="180"></el-table-column>
@ -214,7 +214,6 @@ export default {
}
})
}).catch((error) => {
this.$message.error(error.message);
});
},
getDepts() {

4
src/views/inventory/deviceCollectOrderCompleted.vue
Unescape Escape View File

@ -35,7 +35,7 @@
</el-row>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%" @current-change="handleChange">
<el-table v-loading="loading" :data="list" style="width: 100%" @current-change="handleChange" highlight-current-row>
<el-table-column label="序号" type="index" fixed></el-table-column>
<el-table-column label="设备领用记录号" prop="orderId" width="180"></el-table-column>
<el-table-column label="领用部门" prop="deptName" width="180"></el-table-column>
@ -206,7 +206,7 @@ export default {
})
},
handleChange(row) {
this.detailList = {
this.detailQuery = {
orderIdFk: row.orderId,
page: 1,
limit: 20

1
src/views/inventory/deviceCollectOrderNew.vue
Unescape Escape View File

@ -191,7 +191,6 @@ export default {
});
},
closeDialog() {
debugger
this.formVisible = false;
this.getList();
},

4
src/views/inventory/deviceMAOrderDialog.vue
Unescape Escape View File

@ -136,6 +136,10 @@ export default {
},
methods: {
saveOrder() {
if (this.detailList[0].maintenanceStatus === 0) {
this.$message.error("请完成当前设备养护！");
return;
}
this.formData.remark = this.detailList[0].remark;
this.formData.maintenanceStatus = this.detailList[0].maintenanceStatus;
this.formData.deviceStatus = this.detailList[0].deviceStatus;

Write Preview
Loading…
Cancel
Save