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

1.修复设备领用，盘点，养护等功能的bug

Browse Source
prod
x_z 2 years ago
parent ebe8570201
commit f6b5688491
8 changed files with 41 additions and 56 deletions
Show Stats Download Patch File Download Diff File

1
src/views/basic/busType/bussinessTypeModify.vue
Unescape Escape View File

@ -293,6 +293,7 @@ export default {
if (isBlank(this.inputQuery.id)) { if (isBlank(this.inputQuery.id)) {
this.$message.warning("请先保存当前单据类型！"); this.$message.warning("请先保存当前单据类型！");
} else { } else {
console.log(this.inputQuery)
this.settingDialogVisible = true; this.settingDialogVisible = true;
} }
}, },

51
src/views/inventory/DeviceReceiveOrderModify.vue
Unescape Escape View File

@ -146,7 +146,7 @@
highlight-current-row highlight-current-row
border max-height="300" height="300"> border max-height="300" height="300">
<el-table-column label="序号" type="index" width="50"></el-table-column> <el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="条码" width="180" prop="code" show-overflow-tooltip></el-table-column> <el-table-column label="条码" width="180" prop="originCode" show-overflow-tooltip></el-table-column>
<el-table-column width="150" <el-table-column width="150"
label="产品通用名" label="产品通用名"
prop="productName" prop="productName"
@ -154,44 +154,21 @@
></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="serialNo">
<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.maStatus" <el-input :disabled="scope.$index != currentIndex" v-model="scope.row.serialNo"></el-input>
:label="0">未养护
</el-radio>
<el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.maStatus"
:label="1">已养护
</el-radio>
</template>
</el-table-column>
<el-table-column width="150" label="设备状态" prop="deviceStatus">
<template slot-scope="scope">
<el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.deviceStatus" :label="1">
正常
</el-radio>
<el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.deviceStatus" :label="0">
异常
</el-radio>
</template>
</el-table-column>
<el-table-column width="200" label="养护备注" prop="remark">
<template slot-scope="scope">
<el-input :disabled="scope.$index !== currentIndex" v-model="scope.row.remark"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="生产日期(yyMMdd)" prop="productionDate"></el-table-column> <el-table-column label="生产日期(yyMMdd)" prop="productionDate"></el-table-column>
<el-table-column label="失效日期(yyMMdd)" prop="expireDate" <el-table-column label="失效日期(yyMMdd)" prop="expireDate" show-overflow-tooltip></el-table-column>
show-overflow-tooltip></el-table-column> <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" <el-table-column label="生产厂家" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
show-overflow-tooltip></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc"
show-overflow-tooltip></el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
size="small" size="small"
v-if="scope.row.serialNo === null"
@click.stop="true" @click.stop="true"
@click.native="editOrderDetail(scope.$index, scope.row)" @click.native="editOrderDetail(scope.$index, scope.row)"
>编辑 >编辑
@ -433,7 +410,7 @@ export default {
} }
this.spaceList = res.data.list || []; this.spaceList = res.data.list || [];
}) })
this.formData.fromInvSpaceCode=""; this.formData.fromInvSpaceCode = "";
}, },
selectInvProduct() { selectInvProduct() {
let message = this.verifyOrder(); let message = this.verifyOrder();
@ -447,8 +424,8 @@ export default {
this.saveOrder(); this.saveOrder();
this.onReset(); this.onReset();
this.selectInvProductVisible = true; this.selectInvProductVisible = true;
this.filterQuery.invCode=this.formData.fromInvCode; this.filterQuery.invCode = this.formData.fromInvCode;
this.filterQuery.invSpaceCode=this.formData.fromInvSpaceCode; this.filterQuery.invSpaceCode = this.formData.fromInvSpaceCode;
}, },
saveMAOrder() { saveMAOrder() {
this.saveOrder(); this.saveOrder();
@ -636,8 +613,8 @@ export default {
this.queryInvProducts(); this.queryInvProducts();
}, },
queryInvProducts() { queryInvProducts() {
this.filterQuery.invCode=this.formData.fromInvCode; this.filterQuery.invCode = this.formData.fromInvCode;
this.filterQuery.invSpaceCode=this.formData.fromInvSpaceCode; this.filterQuery.invSpaceCode = this.formData.fromInvSpaceCode;
getInvMAProducts(this.filterQuery).then((res) => { getInvMAProducts(this.filterQuery).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.productList = res.data.list || []; this.productList = res.data.list || [];
@ -665,6 +642,8 @@ export default {
let params = { let params = {
orderIdFk: this.formData.orderId, orderIdFk: this.formData.orderId,
invProductIds: invProductIds, invProductIds: invProductIds,
invCode: this.formData.fromInvCode,
invSpaceCode: this.formData.fromInvSpaceCode
}; };
addDeviceReceiveOrderDetail(params).then((res) => { addDeviceReceiveOrderDetail(params).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
@ -690,7 +669,7 @@ export default {
}, },
created() { created() {
this.getDeptList(); this.getDeptList();
if (!(isBlank(this.deviceReceiveOrder.orderId)) ) { if (!(isBlank(this.deviceReceiveOrder.orderId))) {
this.formData.orderId = this.deviceReceiveOrder.orderId; this.formData.orderId = this.deviceReceiveOrder.orderId;
this.formData.createTime = this.deviceReceiveOrder.createTime; this.formData.createTime = this.deviceReceiveOrder.createTime;
this.formData.fromDeptCode = this.deviceReceiveOrder.fromDeptCode; this.formData.fromDeptCode = this.deviceReceiveOrder.fromDeptCode;

2
src/views/inventory/InvCountCodes.vue
Unescape Escape View File

@ -22,7 +22,7 @@
<el-button <el-button
type="text" type="text"
size="small" size="small"
@click.native.stop="deleteCountCode(scope.row.id)" @click.native.stop="deleteCountCode(scope.row)"
>减一 >减一
</el-button </el-button
> >

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

@ -138,6 +138,7 @@
> >
<invCountCodes <invCountCodes
:codeQuery="codeQuery" :codeQuery="codeQuery"
:getCountOrderDetail="getCountOrderDetailList"
></invCountCodes> ></invCountCodes>
</el-dialog> </el-dialog>

27
src/views/inventory/InvCountOrderModify.vue
Unescape Escape View File

@ -343,8 +343,6 @@ export default {
} }
this.spaceList = res.data.list || []; this.spaceList = res.data.list || [];
}); });
this.formData.invSpaceCode=JSON.parse(localStorage.getItem('key'));
}, },
invSpaceChange() { invSpaceChange() {
this.$forceUpdate(); this.$forceUpdate();
@ -358,7 +356,6 @@ export default {
invSpaceCode: this.formData.invSpaceCode, invSpaceCode: this.formData.invSpaceCode,
countType: this.countType countType: this.countType
}; };
localStorage.setItem('key', JSON.stringify(this.formData.invSpaceCode));
saveCountOrder(orderData).then((res) => { saveCountOrder(orderData).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.formData.orderId = res.data.orderId; this.formData.orderId = res.data.orderId;
@ -373,7 +370,9 @@ export default {
nameCode: product.nameCode, nameCode: product.nameCode,
batchNo: product.batchNo, batchNo: product.batchNo,
produceDate: product.productionDate, produceDate: product.productionDate,
expireDate: product.expireDate expireDate: product.expireDate,
invCode: this.formData.invCode,
invSpaceCode: this.formData.invSpaceCode
}; };
addCountOrderDetail(detailData).then((result) => { addCountOrderDetail(detailData).then((result) => {
if (result.code === 20000) { if (result.code === 20000) {
@ -503,7 +502,6 @@ export default {
//添加第一个产品，先保存单据，再添加单据详情 //添加第一个产品，先保存单据，再添加单据详情
this.saveOrder(1); this.saveOrder(1);
} }
this.formData.invSpaceCode = JSON.parse(localStorage.getItem('key'));
this.selectInvProductVisible = false; this.selectInvProductVisible = false;
}, },
getRowKeys(row) { getRowKeys(row) {
@ -516,7 +514,6 @@ export default {
}); });
}, },
startCount(val) { startCount(val) {
localStorage.setItem('key', JSON.stringify(this.formData.invSpaceCode));
this.countProductList = []; this.countProductList = [];
if (this.countType === 0) { if (this.countType === 0) {
if (isBlank(this.formData.invCode)) { if (isBlank(this.formData.invCode)) {
@ -537,12 +534,12 @@ export default {
this.saveOrder(1); this.saveOrder(1);
} }
}); });
} else if (this.countType === 1 ) { } else if (this.countType === 1) {
if( val === 1) { if (isBlank(this.formData.invCode) || isBlank(this.formData.invSpaceCode)) {
if (isBlank(this.formData.invCode) || isBlank(this.formData.invSpaceCode)) { this.$message.warning("请先选择盘点仓库和货位");
this.$message.warning("请先选择盘点仓库和货位"); return;
return; }
} if (val === 1) {
let params = { let params = {
invCode: this.formData.invCode, invCode: this.formData.invCode,
invSpaceCode: this.formData.invSpaceCode invSpaceCode: this.formData.invSpaceCode
@ -551,14 +548,14 @@ export default {
if (res.data.total !== 0) { if (res.data.total !== 0) {
let invProductList = res.data.list; let invProductList = res.data.list;
for (let product of invProductList) { for (let product of invProductList) {
this.codeArray.push(product); this.countProductList.push(product);
} }
this.saveOrder(1); this.saveOrder(1);
} }
}); });
}else{ } else {
this.productList = [];
this.selectInvProductVisible = true; this.selectInvProductVisible = true;
} }
} else if (this.countType === 2) { } else if (this.countType === 2) {
if (isBlank(this.formData.invCode)) { if (isBlank(this.formData.invCode)) {

2
src/views/inventory/InvMAOrderModify.vue
Unescape Escape View File

@ -444,6 +444,7 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.formData.code = null;
let params = {id: row.id}; let params = {id: row.id};
deleteInvMAOrderDetail(params).then((res) => { deleteInvMAOrderDetail(params).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
@ -454,6 +455,7 @@ export default {
}).catch(() => { }).catch(() => {
}); });
} else { } else {
this.formData.code = null;
let params = {id: row.id}; let params = {id: row.id};
deleteInvMAOrderDetail(params).then((res) => { deleteInvMAOrderDetail(params).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {

7
src/views/inventory/InvPreInSerach.vue
Unescape Escape View File

@ -57,7 +57,8 @@
@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>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column> <el-table-column label="单据号" prop="billNo" width="150"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
<el-table-column label="来源" prop="fromType"> <el-table-column label="来源" prop="fromType">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.orderFromType] }}</span> <span>{{ fromTypeMap[scope.row.orderFromType] }}</span>
@ -65,9 +66,9 @@
</el-table-column> </el-table-column>
<el-table-column label="往来单位" prop="fromCorpName" width="220"> <el-table-column label="往来单位" prop="fromCorpName" width="220">
</el-table-column> </el-table-column>
<el-table-column label="当前部门" prop="deptName" width="120"> <el-table-column label="当前部门" prop="deptName" width="220">
</el-table-column> </el-table-column>
<el-table-column label="当前仓库" prop="invName" width="120"> <el-table-column label="当前仓库" prop="invName" width="220">
</el-table-column> </el-table-column>
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip> <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">

6
src/views/system/dept/invRelUsers.vue
Unescape Escape View File

@ -16,7 +16,7 @@
@click="onUserReset" @click="onUserReset"
>重置 >重置
</el-button> </el-button>
<el-button type="primary" @click="loadUserList" <el-button type="primary" @click="search"
icon="el-icon-search" icon="el-icon-search"
>查询 >查询
</el-button </el-button
@ -207,6 +207,10 @@ export default {
}; };
this.loadUserList(); this.loadUserList();
}, },
search() {
this.userQuery.page = 1;
this.loadUserList();
},
loadUserList() { //获取仓库用户列表 loadUserList() { //获取仓库用户列表
// if (val != null) { // if (val != null) {
// this.userQuery.page = val; // this.userQuery.page = val;

Write Preview
Loading…
Cancel
Save