From 593ee4065d56436881101101c823aa47048bbab3 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Fri, 30 Aug 2024 17:55:13 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/collect/IoDestroy.js                  |  1 -
 .../CollectOrderAllotCardComponents.vue       |  8 +--
 src/views/collect/CollectOrderTabs.vue        | 25 ++++----
 src/views/collect/DealOrder.vue               |  2 +-
 src/views/collect/IoCreateOrder.vue           | 64 +++++++++----------
 5 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/src/api/collect/IoDestroy.js b/src/api/collect/IoDestroy.js
index c4626b2b..050f2d57 100644
--- a/src/api/collect/IoDestroy.js
+++ b/src/api/collect/IoDestroy.js
@@ -26,7 +26,6 @@ export function getCodeList(query) {
 }
 
 
-
 export function destroyOut(query) {
   return axios({
     url: "/udiwms/collect/fifo/desOrder/destroyOut",
diff --git a/src/views/collect/CollectOrderAllotCardComponents.vue b/src/views/collect/CollectOrderAllotCardComponents.vue
index a8726912..020e080a 100644
--- a/src/views/collect/CollectOrderAllotCardComponents.vue
+++ b/src/views/collect/CollectOrderAllotCardComponents.vue
@@ -217,7 +217,7 @@
         :total="total"
         :limit.sync="filterQuery.limit"
         :page.sync="filterQuery.page"
-        :page-sizes="[12, 24, 48]"
+        :page-sizes="[9, 18, 36]"
         @pagination="handleCurrentChange"
       ></pagination>
     </el-card>
@@ -420,7 +420,7 @@ export default {
     return {
       msgTip: "库存预警提醒：",
       isLinkDisabled: false,
-      changeViewDisabled: true,
+      changeViewDisabled: false,
       userInfo: {
         inv: this.$store.getters.locInvName,
         deptName: this.$store.getters.locDeptName,
@@ -452,7 +452,7 @@ export default {
         workPlaceCode: null,
         tagStatus: null,
         page: 1,
-        limit: 12,
+        limit: 9,
       },
       defaultSort: {prop: 'createTime', order: 'desc'},
       loading: false,
@@ -591,7 +591,7 @@ export default {
         billNo: null,
         tagStatus: null,
         page: 1,
-        limit: 12,
+        limit: 9,
       };
       this.actDateRange = [];
       this.getList();
diff --git a/src/views/collect/CollectOrderTabs.vue b/src/views/collect/CollectOrderTabs.vue
index d77818e8..6d0302b4 100644
--- a/src/views/collect/CollectOrderTabs.vue
+++ b/src/views/collect/CollectOrderTabs.vue
@@ -87,18 +87,7 @@
             <i class="el-icon-edit-outline"></i>
             <span slot="title">处理单据</span>
           </el-menu-item>
-          <el-menu-item :index=1 @click="clickMenuItem(1)">
-            <i class="el-icon-s-unfold"></i>
-            <span slot="title">工位上货</span>
-          </el-menu-item>
-          <el-menu-item :index=2 @click="clickMenuItem(2)">
-            <i class="el-icon-s-fold"></i>
-            <span slot="title">工位退货</span>
-          </el-menu-item>
-          <el-menu-item :index=3 @click="clickMenuItem(3)">
-            <i class="el-icon-s-platform"></i>
-            <span slot="title">工位存量</span>
-          </el-menu-item>
+
           <el-menu-item :index=4 @click="clickMenuItem(4)">
             <i class="el-icon-s-order"></i>
             <span slot="title">待处理单</span>
@@ -111,6 +100,18 @@
             <i class="el-icon-s-claim"></i>
             <span slot="title">单据上传</span>
           </el-menu-item>
+          <el-menu-item :index=1 @click="clickMenuItem(1)">
+            <i class="el-icon-s-unfold"></i>
+            <span slot="title">工位上货</span>
+          </el-menu-item>
+          <el-menu-item :index=2 @click="clickMenuItem(2)">
+            <i class="el-icon-s-fold"></i>
+            <span slot="title">工位退货</span>
+          </el-menu-item>
+          <el-menu-item :index=3 @click="clickMenuItem(3)">
+            <i class="el-icon-s-platform"></i>
+            <span slot="title">工位存量</span>
+          </el-menu-item>
           <el-menu-item :index=7 @click="clickMenuItem(7)">
             <i class="el-icon-s-claim"></i>
             <span slot="title">损耗出库</span>
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index 4002d75d..85039c57 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form :model="formData" class="order-el-form" ref="formData" label-width="120px">
+    <el-form :model="formData" class="order-el-form" ref="formData" label-width="120px" @submit.native.prevent>
       <el-card>
 
         <!--  <el-alert-->
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 4da56c73..14632587 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -26,12 +26,12 @@
         <!--          </el-col>-->
         <!--        </el-row>-->
 
-        <!--<el-alert-->
-        <!--  style="margin-top: 1px;margin-bottom: 10px;font-size: 20px;"-->
-        <!--  :title="msgTip"-->
-        <!--  :closable="false"-->
-        <!--  type="warning">-->
-        <!--</el-alert>-->
+<!--        <el-alert-->
+<!--          style="margin-top: 1px;margin-bottom: 10px;font-size: 20px;"-->
+<!--          :title="msgTip"-->
+<!--          :closable="false"-->
+<!--          type="warning">-->
+<!--        </el-alert>-->
 
 
         <el-row>
@@ -131,31 +131,31 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">
-            <el-form-item prop="workPlaceCode" class="query-form-item" label="当前工位:" v-if="!corpOrderIdDisabled">
-              <el-select
-                v-model="orderFormData.workPlaceCode"
-                placeholder="当前工位"
-                style="width: 90%"
-                :disabled="corpOrderIdDisabled"
-                filterable
-                @change="changeInvRemind"
-              >
-                <el-option
-                  v-for="item in curWorkPlaces"
-                  :key="item.workplaceId"
-                  :label="item.workplaceName"
-                  :value="item.workplaceId"
-
-                >
-                  <span style="float: left">{{ item.workplaceName }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{
-                      item.workplaceId
-                    }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="8">-->
+          <!--            <el-form-item prop="workPlaceCode" class="query-form-item" label="当前工位:" v-if="!corpOrderIdDisabled">-->
+          <!--              <el-select-->
+          <!--                v-model="orderFormData.workPlaceCode"-->
+          <!--                placeholder="当前工位"-->
+          <!--                style="width: 90%"-->
+          <!--                :disabled="corpOrderIdDisabled"-->
+          <!--                filterable-->
+          <!--                @change="changeInvRemind"-->
+          <!--              >-->
+          <!--                <el-option-->
+          <!--                  v-for="item in curWorkPlaces"-->
+          <!--                  :key="item.workplaceId"-->
+          <!--                  :label="item.workplaceName"-->
+          <!--                  :value="item.workplaceId"-->
+
+          <!--                >-->
+          <!--                  <span style="float: left">{{ item.workplaceName }}</span>-->
+          <!--                  <span style="float: right; color: #8492a6; font-size: 13px">{{-->
+          <!--                      item.workplaceId-->
+          <!--                    }}</span>-->
+          <!--                </el-option>-->
+          <!--              </el-select>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
           <el-col :span="8" v-if="splitType=='out'">
             <el-form-item prop="fifoSplit" class="query-form-item" label="上货方式:">
               <el-radio-group v-model="orderFormData.fifoSplit" :disabled="fifoSplitEnable" @change="splitChange">
@@ -531,7 +531,7 @@ export default {
       isSuccess: false,
       result: "",
       scanResultType: "success",
-      msgTip: "当前上货产品的总量：",
+      msgTip: "当前工位存量提醒：",
       splitType: null,
       rowData: {},
       curWorkPlace: null,