From 34dfe8bbf9c1d33e511244af259683275e8b057f Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Sat, 9 Nov 2024 15:56:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E8=B4=A7=E6=A7=BD=20=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basic/workPlace/SysWorkplaceQueue.js  |   9 --
 .../workplace/addWorkplaceFreightDialog.vue   |   2 +-
 .../basic/workplace/cargowWorkplaceManage.vue | 123 +-----------------
 src/views/basic/workplace/selectBusType.vue   |   2 +-
 4 files changed, 3 insertions(+), 133 deletions(-)

diff --git a/src/api/basic/workPlace/SysWorkplaceQueue.js b/src/api/basic/workPlace/SysWorkplaceQueue.js
index e28e8686..8ccfd4ee 100644
--- a/src/api/basic/workPlace/SysWorkplaceQueue.js
+++ b/src/api/basic/workPlace/SysWorkplaceQueue.js
@@ -27,15 +27,6 @@ export function updateQueue(query) {
   });
 }
 
-export function getQueueList(query) {
-  return axios({
-    url: "/udiwms/sysWorkplaceQueue/page",
-    method: "get",
-    params: query
-  });
-}
-
-
 export function deleteQueue(query) {
   return axios({
     url: "/udiwms/sysWorkplaceQueue/delete",
diff --git a/src/views/basic/workplace/addWorkplaceFreightDialog.vue b/src/views/basic/workplace/addWorkplaceFreightDialog.vue
index 7d3c6599..172ef68c 100644
--- a/src/views/basic/workplace/addWorkplaceFreightDialog.vue
+++ b/src/views/basic/workplace/addWorkplaceFreightDialog.vue
@@ -240,7 +240,7 @@ export default {
           if (this.rowData != null) {
             updateWorkplaceFreight(this.formData).then(res => {
               if (res.code == 20000) {
-                this.$message.success('更新成功')
+                this.$message.success('成功')
                 this.closeDialog()
               } else {
                 this.$message.error(res.message)
diff --git a/src/views/basic/workplace/cargowWorkplaceManage.vue b/src/views/basic/workplace/cargowWorkplaceManage.vue
index 70326a25..0bf5b251 100644
--- a/src/views/basic/workplace/cargowWorkplaceManage.vue
+++ b/src/views/basic/workplace/cargowWorkplaceManage.vue
@@ -258,86 +258,6 @@
               >
               </pagination>
             </el-tab-pane>
-            <!--<el-tab-pane>-->
-            <!--  &lt;!&ndash;              {{ workplaceName }}-&ndash;&gt;-->
-            <!--  <span slot="label">货位</span>-->
-            <!--  <el-form :inline="true" :model="queueQuery" class="query-form" size="mini"-->
-            <!--           style="margin-bottom: 10px"-->
-            <!--  >-->
-            <!--    <el-form-item class="query-form-item" label="名称/编号:">-->
-            <!--      <el-input-->
-            <!--        v-model="queueQuery.key"-->
-            <!--        placeholder="请输入货位名称或货位编号"-->
-            <!--        clearable-->
-            <!--      ></el-input>-->
-            <!--    </el-form-item>-->
-            <!--    <el-form-item>-->
-            <!--      <el-button-group>-->
-            <!--        <el-button-->
-            <!--          type="primary"-->
-            <!--          icon="el-icon-refresh"-->
-            <!--          @click="onQueueList"-->
-            <!--        >重置-->
-            <!--        </el-button>-->
-            <!--        <el-button type="primary" @click="loadQueueList"-->
-            <!--                   icon="el-icon-search"-->
-            <!--        >查询-->
-            <!--        </el-button-->
-            <!--        >-->
-            <!--        <el-button type="primary" @click="addPlaid"-->
-            <!--                   icon="el-icon-plus"-->
-            <!--        >新增货位-->
-            <!--        </el-button-->
-            <!--        >-->
-            <!--        &lt;!&ndash;<el-button type="primary" @click="choosePlaid"&ndash;&gt;-->
-            <!--        &lt;!&ndash;           icon="el-icon-plus"&ndash;&gt;-->
-            <!--        &lt;!&ndash;&gt;选入工位分格&ndash;&gt;-->
-            <!--        &lt;!&ndash;</el-button&ndash;&gt;-->
-            <!--        &lt;!&ndash;&gt;&ndash;&gt;-->
-            <!--      </el-button-group>-->
-            <!--    </el-form-item>-->
-            <!--  </el-form>-->
-            <!--  <el-table :data="queueList" style="width: 100%;" :row-style="{height: '32px' }"-->
-            <!--            highlight-current-row-->
-            <!--  >-->
-            <!--    <el-table-column type="index" label="序号"></el-table-column>-->
-            <!--    &lt;!&ndash;                <el-table-column label="业务类型编码 " prop="documentTypeCode" width="100"></el-table-column>&ndash;&gt;-->
-            <!--    <el-table-column label="货位名称" prop="name"></el-table-column>-->
-            <!--    <el-table-column label="货位编号 " prop="code"></el-table-column>-->
-            <!--    <el-table-column label="产品名称" prop="productName"></el-table-column>-->
-            <!--    <el-table-column label="产品规格" prop="productSpec"></el-table-column>-->
-            <!--    <el-table-column label="备注" prop="remark"></el-table-column>-->
-            <!--    <el-table-column label="操作" fixed="right" width="120">-->
-            <!--      <template slot-scope="scope">-->
-            <!--        <el-button-->
-            <!--          type="text"-->
-            <!--          size="small"-->
-            <!--          @click.native.stop="printQueue(scope.row)"-->
-            <!--        >打印-->
-            <!--        </el-button>-->
-            <!--        <el-button-->
-            <!--          type="text"-->
-            <!--          size="small"-->
-            <!--          @click.native.stop="updateQueue(scope.row)"-->
-            <!--        >编辑-->
-            <!--        </el-button>-->
-            <!--        <el-button-->
-            <!--          type="text"-->
-            <!--          size="small"-->
-            <!--          @click.native.stop="removeQueue(scope.row)"-->
-            <!--        >删除-->
-            <!--        </el-button>-->
-            <!--      </template>-->
-            <!--    </el-table-column>-->
-            <!--  </el-table>-->
-            <!--  <pagination-->
-            <!--    :total="collectTotal"-->
-            <!--    :limit.sync="cargowQuery.limit"-->
-            <!--    :page.sync="cargowQuery.page"-->
-            <!--    @pagination="getCargowBindCollectList()"-->
-            <!--  >-->
-            <!--  </pagination>-->
-            <!--</el-tab-pane>-->
             <el-tab-pane label="取货架" name="huojia">
               <!--              {{ workplaceName }}--->
               <freightManage
@@ -942,15 +862,7 @@ export default {
 
       })
     },
-    getQueueList() {
-      this.queueQuery.workPlaceIdFk = this.rowData.workplaceId
-      getQueueList(this.queueQuery).then(res => {
-        if (res.code == 20000) {
-          this.queueList = res.data.list || []
-          this.queueTotal = res.data.total || 0
-        }
-      })
-    },
+
 
     onCollectList() {
       if (this.rowData.workplaceId == null) {
@@ -967,21 +879,6 @@ export default {
       }
         this.getCargowBindCollectList()
     },
-    onQueueList() {
-      if (this.rowData.workplaceId == null) {
-        return this.$message.error('请选择上货工位')
-      }
-      this.$router.push({
-        path: ''
-      })
-      this.queueQuery = {
-        page: 1,
-        limit: 10,
-        key: null,
-        workPlaceIdFk: null
-      }
-      this.getQueueList()
-    },
     loadCollectList() {
       if (this.rowData.workplaceId == null) {
         return this.$message.error('请选择上货工位')
@@ -994,7 +891,6 @@ export default {
         return this.$message.error('请选择上货工位')
       }
       this.queueQuery.page = 1
-      this.getQueueList()
     },
     chooseCollect() {
       if (this.rowData.workplaceId == null) {
@@ -1262,22 +1158,6 @@ export default {
       this.queueData = null
       this.plaidDialogVisible = true
     },
-    removeQueue(row) {
-      this.$confirm('此操作将永久删除该工位分格, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        deleteQueue(row).then(res => {
-          if (res.code == 20000) {
-            this.$message.success('删除成功')
-            this.getQueueList()
-          } else {
-            this.$message.error(res.message)
-          }
-        })
-      })
-    },
     updateQueue(row) {
       this.queueData = row
       this.plaidName = 'edit'
@@ -1285,7 +1165,6 @@ export default {
     },
     closePlaidDialog() {
       this.plaidDialogVisible = false
-      this.getQueueList()
     },
     printQueue(row) {
       row.labelId = 8
diff --git a/src/views/basic/workplace/selectBusType.vue b/src/views/basic/workplace/selectBusType.vue
index d7cb70d3..76e92600 100644
--- a/src/views/basic/workplace/selectBusType.vue
+++ b/src/views/basic/workplace/selectBusType.vue
@@ -84,7 +84,7 @@
           </template>
         </el-table-column>
         <el-table-column label="业务顺号" prop="number" width="100"></el-table-column>
-        <el-table-column label="备注:" prop="remark" width="100"></el-table-column>
+        <el-table-column label="备注" prop="remark" width="100"></el-table-column>
 
       </el-table>