From db1da58dc4fa7be6ea168bcecdff8324f81d996a Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Mon, 28 Nov 2022 21:19:43 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E4=BB=93=E5=BA=93=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/addInvMAOrder.vue       |  2 ++
 src/views/inventory/invMAOrderAudit.vue     | 14 ++++++-------
 src/views/inventory/invMAOrderCompleted.vue | 22 +++++++++------------
 src/views/inventory/invMAOrderNew.vue       |  2 ++
 4 files changed, 20 insertions(+), 20 deletions(-)

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