From 3bac5f119a929dd003948fa4bb0cf8a48a18bdef Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Mon, 15 Jul 2024 11:26:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=89=93=E5=8C=85=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../claimAndreturn/picking/outbound/index.vue | 43 +++++++++++--------
 .../machinery/coding/index.vue                | 24 ++++++++---
 2 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
index ffa1d89a..203afc10 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
@@ -109,8 +109,18 @@
             ></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="leaseList" border @selection-change="handleSelect">
-            <el-table-column type="selection" width="55" align="center" :selectable="(row) => row.taskStatus == 35" />
+        <el-table
+            v-loading="loading"
+            :data="leaseList"
+            border
+            @selection-change="handleSelect"
+        >
+            <el-table-column
+                type="selection"
+                width="55"
+                align="center"
+                :selectable="(row) => row.taskStatus == 35"
+            />
             <el-table-column
                 align="center"
                 label="序号"
@@ -174,21 +184,16 @@
                         size="mini"
                         >已推送</el-tag
                     >
-                    <el-tag
-                        v-else
-                        type="danger"
-                        size="mini"
-                        >未推送</el-tag
-                    >
+                    <el-tag v-else type="danger" size="mini">未推送</el-tag>
                 </template>
             </el-table-column>
-            <el-table-column
-                label="位置信息"
-                align="center"
-                prop="location"
-            >
-                <template v-slot="{row}">
-                    <i class="el-icon-location-information" style="color: #459BD4; font-size: 24px;" @click="handleMap(row)"></i>
+            <el-table-column label="位置信息" align="center" prop="location">
+                <template v-slot="{ row }">
+                    <i
+                        class="el-icon-location-information"
+                        style="color: #459bd4; font-size: 24px"
+                        @click="handleMap(row)"
+                    ></i>
                 </template>
             </el-table-column>
 
@@ -430,7 +435,9 @@
                     align="center"
                     width="80"
                     type="index"
-                    :index="indexContinuation(outQuery.pageNum, outQuery.pageSize)"
+                    :index="
+                        indexContinuation(outQuery.pageNum, outQuery.pageSize)
+                    "
                 >
                     <!-- <template slot-scope="scope">
                         <span>{{
@@ -569,7 +576,7 @@ import {
 import { getTypeList } from '@/api/store/warehousing'
 import { equipmentTypeTree } from '@/api/store/tools'
 import Treeselect from '@riophae/vue-treeselect'
-import MapDialog from '@/views/warehouseManage/machinery/coding/component/MapDialog'
+import MapDialog from '@/views/warehouseManage/machinery/coding/component/MapDIalog'
 import DialogPush from './component/DialogPush'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 export default {
@@ -882,7 +889,7 @@ export default {
         },
         // 推送智慧工地
         handlePush() {
-            console.log('🚀 ~ handlePush ~ :',)
+            console.log('🚀 ~ handlePush ~ :')
             this.$refs.dialogPush.openDialog(true)
         },
         handleSelect(val) {
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue b/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
index 36f1449a..3cf3229e 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
@@ -146,7 +146,12 @@
             :data="devicesList"
             @selection-change="handleSelectionChange"
         >
-            <el-table-column type="selection" width="55" align="center" :selectable="(row) => row.maStatus == '15'" />
+            <el-table-column
+                type="selection"
+                width="55"
+                align="center"
+                :selectable="(row) => row.maStatus == '15'"
+            />
             <el-table-column
                 align="center"
                 label="序号"
@@ -545,7 +550,7 @@ import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import QRCode from 'qrcodejs2'
 import BindIOT from './component/BindIOT'
-import MapDialog from './component/MapDialog'
+import MapDialog from './component/MapDIalog'
 
 export default {
     name: 'Devices',
@@ -760,7 +765,8 @@ export default {
             const maId = row.maId || this.ids
             getMachine(maId).then((response) => {
                 this.form = response.data
-                if (this.form.maVender) this.form.maVender = parseInt(this.form.maVender)
+                if (this.form.maVender)
+                    this.form.maVender = parseInt(this.form.maVender)
                 if (this.form.propId == 0) this.form.propId = ''
                 this.open = true
                 this.title = '编辑'
@@ -802,10 +808,14 @@ export default {
         },
         /** 导出按钮操作 */
         handleExport() {
-            this.download('base/machine/export', {
-              ...this.queryParams,
-              dataCondition: this.ids
-            }, `编码设备管理_${new Date().getTime()}.xlsx`)
+            this.download(
+                'base/machine/export',
+                {
+                    ...this.queryParams,
+                    dataCondition: this.ids,
+                },
+                `编码设备管理_${new Date().getTime()}.xlsx`,
+            )
         },
         handleBindIOT(row) {
             console.log('🚀 ~ handleBindIOT ~ row:', row)