|
|
@ -32,7 +32,7 @@
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="7">
|
|
|
|
<el-col :span="7">
|
|
|
|
<el-form-item prop="billDate">
|
|
|
|
<el-form-item prop="createTime">
|
|
|
|
<el-input v-model="formData.createTime" auto-complete="off" :disabled="true"></el-input>
|
|
|
|
<el-input v-model="formData.createTime" auto-complete="off" :disabled="true"></el-input>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
@ -46,7 +46,7 @@
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
|
|
<el-col :span="7">
|
|
|
|
<el-col :span="7">
|
|
|
|
<el-form-item prop="billDate">
|
|
|
|
<el-form-item prop="collOrderId">
|
|
|
|
<el-input v-model="formData.collOrderId" auto-complete="off" :disabled="true"></el-input>
|
|
|
|
<el-input v-model="formData.collOrderId" auto-complete="off" :disabled="true"></el-input>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
@ -64,7 +64,6 @@
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
<el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
|
|
|
|
<el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
|
|
|
|
<el-table-column width="150" label="批次号" prop="batchNo"></el-table-column>
|
|
|
|
<el-table-column width="150" label="批次号" prop="batchNo"></el-table-column>
|
|
|
|
<el-table-column width="150" label="养护数量" prop="count"></el-table-column>
|
|
|
|
|
|
|
|
<el-table-column width="150" label="养护状态" prop="maintenanceStatus">
|
|
|
|
<el-table-column width="150" label="养护状态" prop="maintenanceStatus">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.maintenanceStatus"
|
|
|
|
<el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.maintenanceStatus"
|
|
|
@ -133,10 +132,19 @@
|
|
|
|
<el-form :inline="true" :model="filterQuery" size="mini">
|
|
|
|
<el-form :inline="true" :model="filterQuery" 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="领用记录号" clearable></el-input>
|
|
|
|
<el-input v-model="filterQuery.orderId" placeholder="领用记录号" clearable></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.deptCode" placeholder="领用部门" clearable></el-input>
|
|
|
|
<el-select v-model="filterQuery.deptCode" placeholder="请选择领用部门" clearable="true"
|
|
|
|
|
|
|
|
size="mini">
|
|
|
|
|
|
|
|
<el-option
|
|
|
|
|
|
|
|
v-for="item in deptList"
|
|
|
|
|
|
|
|
:key="item.name"
|
|
|
|
|
|
|
|
:label="item.name"
|
|
|
|
|
|
|
|
:value="item.code">
|
|
|
|
|
|
|
|
<span style="float: left">{{ item.name }}</span>
|
|
|
|
|
|
|
|
</el-option>
|
|
|
|
|
|
|
|
</el-select>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item>
|
|
|
|
<el-form-item>
|
|
|
|
<el-button-group>
|
|
|
|
<el-button-group>
|
|
|
@ -145,7 +153,6 @@
|
|
|
|
>查询
|
|
|
|
>查询
|
|
|
|
</el-button
|
|
|
|
</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>
|
|
|
@ -153,8 +160,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
<el-table v-loading="collOrderLoading" :data="collectOrderList" style="width: 100%"
|
|
|
|
<el-table v-loading="collOrderLoading" :data="collectOrderList" style="width: 100%"
|
|
|
|
highlight-current-row="false"
|
|
|
|
highlight-current-row="false"
|
|
|
|
@current-change="combine"
|
|
|
|
@current-change="combine">
|
|
|
|
ref="multipleTable">
|
|
|
|
|
|
|
|
<el-table-column label="序号" type="index"></el-table-column>
|
|
|
|
<el-table-column label="序号" type="index"></el-table-column>
|
|
|
|
<el-table-column label="领用记录号" prop="orderId"></el-table-column>
|
|
|
|
<el-table-column label="领用记录号" prop="orderId"></el-table-column>
|
|
|
|
<el-table-column label="领用部门" prop="deptName"></el-table-column>
|
|
|
|
<el-table-column label="领用部门" prop="deptName"></el-table-column>
|
|
|
@ -196,21 +202,12 @@
|
|
|
|
@current-change="combine"
|
|
|
|
@current-change="combine"
|
|
|
|
ref="multipleTable">
|
|
|
|
ref="multipleTable">
|
|
|
|
<el-table-column label="序号" type="index"></el-table-column>
|
|
|
|
<el-table-column label="序号" type="index"></el-table-column>
|
|
|
|
<el-table-column label="领用记录号" prop="orderId"></el-table-column>
|
|
|
|
<el-table-column label="产品名称" prop="productName"></el-table-column>
|
|
|
|
<el-table-column label="领用部门" prop="deptName"></el-table-column>
|
|
|
|
<el-table-column label="规格型号" prop="ggxh"></el-table-column>
|
|
|
|
<el-table-column label="领用人" prop="createUser"></el-table-column>
|
|
|
|
<el-table-column label="批次号" prop="batchNo"></el-table-column>
|
|
|
|
<el-table-column label="操作" fixed="right" width="150">
|
|
|
|
<el-table-column label="生产厂家" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
|
|
|
|
<el-button
|
|
|
|
<el-table-column label="条码" prop="code" show-overflow-tooltip></el-table-column>
|
|
|
|
type="text"
|
|
|
|
|
|
|
|
size="small"
|
|
|
|
|
|
|
|
@click.stop="true"
|
|
|
|
|
|
|
|
@click.native="showCollectOrderDetail(scope.row)"
|
|
|
|
|
|
|
|
>详情
|
|
|
|
|
|
|
|
</el-button
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
</el-table>
|
|
|
|
</el-table>
|
|
|
|
|
|
|
|
|
|
|
|
<el-pagination
|
|
|
|
<el-pagination
|
|
|
@ -234,6 +231,7 @@ import {
|
|
|
|
} from "@/api/inventory/deviceMAOrder";
|
|
|
|
} from "@/api/inventory/deviceMAOrder";
|
|
|
|
import {getCollectOrderList, getCollectOrderDetailList} from "@/api/inventory/deviceCollectOrder";
|
|
|
|
import {getCollectOrderList, getCollectOrderDetailList} from "@/api/inventory/deviceCollectOrder";
|
|
|
|
import {isBlank} from "@/utils/strUtil";
|
|
|
|
import {isBlank} from "@/utils/strUtil";
|
|
|
|
|
|
|
|
import {filterDepts} from "@/api/auth/authDept";
|
|
|
|
|
|
|
|
|
|
|
|
export default {
|
|
|
|
export default {
|
|
|
|
props: {
|
|
|
|
props: {
|
|
|
@ -258,17 +256,16 @@ export default {
|
|
|
|
collectOrderList: [],
|
|
|
|
collectOrderList: [],
|
|
|
|
collectOrderTotal: 0,
|
|
|
|
collectOrderTotal: 0,
|
|
|
|
formData: {
|
|
|
|
formData: {
|
|
|
|
|
|
|
|
id: null,
|
|
|
|
orderId: null,
|
|
|
|
orderId: null,
|
|
|
|
collOrderId: null,
|
|
|
|
collOrderId: null,
|
|
|
|
createTime: null,
|
|
|
|
createTime: null,
|
|
|
|
status: 0,
|
|
|
|
status: 0,
|
|
|
|
code: null,
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
detailList: [],
|
|
|
|
detailList: [],
|
|
|
|
loading: false,
|
|
|
|
loading: false,
|
|
|
|
currentIndex: -1,
|
|
|
|
currentIndex: -1,
|
|
|
|
selectCollectOrderVisible: false,
|
|
|
|
selectCollectOrderVisible: false,
|
|
|
|
multiProduct: [],
|
|
|
|
|
|
|
|
collOrderDetailVisible: false,
|
|
|
|
collOrderDetailVisible: false,
|
|
|
|
collOrderDetailList: [],
|
|
|
|
collOrderDetailList: [],
|
|
|
|
collOrderDetailLoading: false,
|
|
|
|
collOrderDetailLoading: false,
|
|
|
@ -278,7 +275,8 @@ export default {
|
|
|
|
page: 1,
|
|
|
|
page: 1,
|
|
|
|
limit: 10
|
|
|
|
limit: 10
|
|
|
|
},
|
|
|
|
},
|
|
|
|
collOrderDetailTotal: 0
|
|
|
|
collOrderDetailTotal: 0,
|
|
|
|
|
|
|
|
deptList: []
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
methods: {
|
|
|
|
methods: {
|
|
|
@ -288,13 +286,20 @@ export default {
|
|
|
|
this.selectCollectOrderVisible = true;
|
|
|
|
this.selectCollectOrderVisible = true;
|
|
|
|
},
|
|
|
|
},
|
|
|
|
saveMAOrder() {
|
|
|
|
saveMAOrder() {
|
|
|
|
this.saveOrder();
|
|
|
|
if (!isBlank(this.formData.orderId)) {
|
|
|
|
this.closeDialog();
|
|
|
|
this.saveOrder();
|
|
|
|
|
|
|
|
this.closeDialog();
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
this.$message.error("请选择养护设备!");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
saveOrder() {
|
|
|
|
saveOrder() {
|
|
|
|
if (isBlank(this.formData.orderId)) {
|
|
|
|
if (isBlank(this.formData.orderId)) {
|
|
|
|
addDeviceMAOrder(this.formData).then((res) => {
|
|
|
|
addDeviceMAOrder(this.formData).then((res) => {
|
|
|
|
if (res.code === 20000) {
|
|
|
|
if (res.code === 20000) {
|
|
|
|
|
|
|
|
this.formData.id = res.data.id;
|
|
|
|
|
|
|
|
this.formData.orderId = res.data.orderId;
|
|
|
|
this.formData.createTime = res.data.createTime;
|
|
|
|
this.formData.createTime = res.data.createTime;
|
|
|
|
this.getList();
|
|
|
|
this.getList();
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
@ -359,14 +364,7 @@ export default {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
},
|
|
|
|
combine(row) {
|
|
|
|
combine(row) {
|
|
|
|
if (this.multiProduct.length === 0) {
|
|
|
|
this.selectCollectOrderVisible = false;
|
|
|
|
this.$message.error("请选择养护产品!");
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
let invProductIds = [];
|
|
|
|
|
|
|
|
this.multiProduct.forEach(item => {
|
|
|
|
|
|
|
|
invProductIds.push(item.id);
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
this.formData.collOrderId = row.orderId;
|
|
|
|
this.formData.collOrderId = row.orderId;
|
|
|
|
this.saveOrder();
|
|
|
|
this.saveOrder();
|
|
|
|
},
|
|
|
|
},
|
|
|
@ -375,6 +373,7 @@ export default {
|
|
|
|
this.getCollOrderDetailList();
|
|
|
|
this.getCollOrderDetailList();
|
|
|
|
},
|
|
|
|
},
|
|
|
|
showCollectOrderDetail(row) {
|
|
|
|
showCollectOrderDetail(row) {
|
|
|
|
|
|
|
|
this.collOrderDetailVisible = true;
|
|
|
|
this.collOrderDetailList = [];
|
|
|
|
this.collOrderDetailList = [];
|
|
|
|
this.collOrderDetailTotal = 0;
|
|
|
|
this.collOrderDetailTotal = 0;
|
|
|
|
this.collDetailQuery.orderId = row.orderId;
|
|
|
|
this.collDetailQuery.orderId = row.orderId;
|
|
|
@ -384,6 +383,7 @@ export default {
|
|
|
|
getCollOrderDetailList() {
|
|
|
|
getCollOrderDetailList() {
|
|
|
|
this.collOrderDetailLoading = true;
|
|
|
|
this.collOrderDetailLoading = true;
|
|
|
|
getCollectOrderDetailList(this.collDetailQuery).then((res) => {
|
|
|
|
getCollectOrderDetailList(this.collDetailQuery).then((res) => {
|
|
|
|
|
|
|
|
this.collOrderDetailLoading = false;
|
|
|
|
if (res.code === 20000) {
|
|
|
|
if (res.code === 20000) {
|
|
|
|
this.collOrderDetailList = res.data.list || [];
|
|
|
|
this.collOrderDetailList = res.data.list || [];
|
|
|
|
this.collOrderDetailTotal = res.data.total || 0;
|
|
|
|
this.collOrderDetailTotal = res.data.total || 0;
|
|
|
@ -392,16 +392,24 @@ export default {
|
|
|
|
this.collOrderDetailTotal = 0;
|
|
|
|
this.collOrderDetailTotal = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}).catch(() => {
|
|
|
|
}).catch(() => {
|
|
|
|
|
|
|
|
this.collOrderDetailLoading = false;
|
|
|
|
this.collOrderDetailList = [];
|
|
|
|
this.collOrderDetailList = [];
|
|
|
|
this.collOrderDetailTotal = 0;
|
|
|
|
this.collOrderDetailTotal = 0;
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
},
|
|
|
|
|
|
|
|
getDepts() {
|
|
|
|
|
|
|
|
filterDepts().then((res) => {
|
|
|
|
|
|
|
|
this.deptList = res.data.list || [];
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
created() {
|
|
|
|
created() {
|
|
|
|
|
|
|
|
this.getDepts();
|
|
|
|
if (null !== this.deviceMAOrder) {
|
|
|
|
if (null !== this.deviceMAOrder) {
|
|
|
|
|
|
|
|
this.formData.id = this.deviceMAOrder.id;
|
|
|
|
this.formData.orderId = this.deviceMAOrder.orderId;
|
|
|
|
this.formData.orderId = this.deviceMAOrder.orderId;
|
|
|
|
|
|
|
|
this.formData.collOrderId = this.deviceMAOrder.collOrderId;
|
|
|
|
this.formData.createTime = this.deviceMAOrder.createTime;
|
|
|
|
this.formData.createTime = this.deviceMAOrder.createTime;
|
|
|
|
this.formData.invWarehouseCode = this.deviceMAOrder.invWarehouseCode;
|
|
|
|
|
|
|
|
this.getList();
|
|
|
|
this.getList();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|