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

1.修复部分bug，优化仓库选择

Browse Source
feature-order-fix
x_z 3 years ago
parent 4f0d7ad64c
commit db1da58dc4
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File

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

@ -57,6 +57,7 @@
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -79,6 +80,7 @@
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>

14
src/views/inventory/invMAOrderAudit.vue
Unescape Escape View File

@ -16,6 +16,7 @@
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -28,6 +29,7 @@
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -110,28 +112,25 @@
<el-table-column width="150" label="养护数量" prop="count" show-overflow-tooltip></el-table-column> <el-table-column width="150" label="养护数量" prop="count" show-overflow-tooltip></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="true" v-model="scope.row.maintenanceStatus"
:label="0">未养护 :label="0">未养护
</el-radio> </el-radio>
<el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.maintenanceStatus" <el-radio disabled="true" v-model="scope.row.maintenanceStatus"
:label="1">已养护 :label="1">已养护
</el-radio> </el-radio>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" label="设备状态" prop="deviceStatus"> <el-table-column width="150" label="设备状态" prop="deviceStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio v-model="scope.row.deviceStatus" :label="1"> <el-radio v-model="scope.row.deviceStatus" :label="1" disabled="true">
正常 正常
</el-radio> </el-radio>
<el-radio v-model="scope.row.deviceStatus" :label="0"> <el-radio v-model="scope.row.deviceStatus" :label="0" disabled="true">
异常 异常
</el-radio> </el-radio>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" label="养护备注" prop="remark"> <el-table-column width="200" label="养护备注" prop="remark">
<template slot-scope="scope">
<el-input v-model="scope.row.remark"></el-input>
</template>
</el-table-column> </el-table-column>
<el-table-column width="180" label="生产日期(yyMMdd)" prop="produceDate"></el-table-column> <el-table-column width="180" label="生产日期(yyMMdd)" prop="produceDate"></el-table-column>
<el-table-column width="180" label="失效日期(yyMMdd)" prop="expireDate" <el-table-column width="180" label="失效日期(yyMMdd)" prop="expireDate"
@ -233,6 +232,7 @@ export default {
handleChange(row) { handleChange(row) {
this.detailQuery.orderIdFk = row.orderId; this.detailQuery.orderIdFk = row.orderId;
this.detailQuery.page = 1; this.detailQuery.page = 1;
this.getDetailList();
}, },
getDetailList() { getDetailList() {
getMAOrderDetailList(this.detailQuery).then((res) => { getMAOrderDetailList(this.detailQuery).then((res) => {

22
src/views/inventory/invMAOrderCompleted.vue
Unescape Escape View File

@ -16,6 +16,7 @@
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -28,6 +29,7 @@
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -42,10 +44,6 @@
>查询 >查询
</el-button </el-button
> >
<el-button type="primary" icon="search" @click="addMAOrder"
>新增养护记录
</el-button
>
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-row> </el-row>
@ -92,29 +90,25 @@
<el-table-column width="150" label="养护数量" prop="count" show-overflow-tooltip></el-table-column> <el-table-column width="150" label="养护数量" prop="count" show-overflow-tooltip></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="true" v-model="scope.row.maintenanceStatus"
:label="0">未养护 :label="0">未养护
</el-radio> </el-radio>
<el-radio :disabled="scope.$index !== currentIndex" v-model="scope.row.maintenanceStatus" <el-radio disabled="true" v-model="scope.row.maintenanceStatus"
:label="1">已养护 :label="1">已养护
</el-radio> </el-radio>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" label="设备状态" prop="deviceStatus"> <el-table-column width="150" label="设备状态" prop="deviceStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio v-model="scope.row.deviceStatus" :label="1"> <el-radio v-model="scope.row.deviceStatus" :label="1" disabled="true">
正常 正常
</el-radio> </el-radio>
<el-radio v-model="scope.row.deviceStatus" :label="0"> <el-radio v-model="scope.row.deviceStatus" :label="0" disabled="true">
异常 异常
</el-radio> </el-radio>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" label="养护备注" prop="remark"> <el-table-column width="200" label="养护备注" prop="remark"></el-table-column>
<template slot-scope="scope">
<el-input v-model="scope.row.remark"></el-input>
</template>
</el-table-column>
<el-table-column width="180" label="生产日期(yyMMdd)" prop="produceDate"></el-table-column> <el-table-column width="180" label="生产日期(yyMMdd)" prop="produceDate"></el-table-column>
<el-table-column width="180" label="失效日期(yyMMdd)" prop="expireDate" <el-table-column width="180" label="失效日期(yyMMdd)" prop="expireDate"
show-overflow-tooltip></el-table-column> show-overflow-tooltip></el-table-column>
@ -141,6 +135,7 @@ import {getSpaceCodeList} from "@/api/inventory/invSpace";
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";
import {userInfo} from "@/api/auth/login"; import {userInfo} from "@/api/auth/login";
import {getMAOrderList, getMAOrderDetailList} from "@/api/inventory/invMAOrder"; import {getMAOrderList, getMAOrderDetailList} from "@/api/inventory/invMAOrder";
import {filterSubAll} from "@/api/basic/invSubWarehouse";
export default { export default {
data() { data() {
@ -223,6 +218,7 @@ export default {
handleChange(row) { handleChange(row) {
this.detailQuery.orderIdFk = row.orderId; this.detailQuery.orderIdFk = row.orderId;
this.detailQuery.page = 1; this.detailQuery.page = 1;
this.getDetailList();
}, },
getDetailList() { getDetailList() {
getMAOrderDetailList(this.detailQuery).then((res) => { getMAOrderDetailList(this.detailQuery).then((res) => {

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

@ -16,6 +16,7 @@
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -28,6 +29,7 @@
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>

Write Preview
Loading…
Cancel
Save