From 489baf0f90e9b4a1d59647f5a711d87c8a3160ab Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Tue, 3 Sep 2024 09:05:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                               | 2 +-
 src/views/basic/workplace/addBusTypeDialog.vue | 5 +----
 src/views/collect/CollectOrderUpload.vue       | 2 +-
 src/views/collect/PanelOrderUpload.vue         | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.env.development b/.env.development
index 2449bf59..5bd315d5 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ ENV = 'development'
 
 # 开发环境
 # VUE_APP_BASE_API = 'https://mudi.dsxyy.org/UDI_WMS_MC/'
-VUE_APP_BASE_API = 'http://127.0.0.1:9991'
+VUE_APP_BASE_API = 'http://192.168.0.166:9991'
 VUE_APP_SYNC_API ="http://127.0.0.1:10001"
 
 # 应用访问路径 例如使用前缀 /admin/
diff --git a/src/views/basic/workplace/addBusTypeDialog.vue b/src/views/basic/workplace/addBusTypeDialog.vue
index 94a980dd..3257e669 100644
--- a/src/views/basic/workplace/addBusTypeDialog.vue
+++ b/src/views/basic/workplace/addBusTypeDialog.vue
@@ -157,7 +157,7 @@
 
       <el-row :gutter="24" class="el-row">
         <el-col :span="12" class="el-col" v-if="formData.autoTag == 1">
-          <el-form-item label="独占工位库存:" prop="warnType" class="query-form-item">
+          <el-form-item label="独占工位库存:" prop="monopoly" class="query-form-item">
             <el-select v-model="formData.monopoly" style="width: 80%" placeholder="独占工位库存" :disabled="formData.autoTag == 0" >
               <el-option label="否" :value="0"></el-option>
               <el-option label="是" :value="1"></el-option>
@@ -397,9 +397,6 @@ export default {
     ,
     formSubmit() {
       this.formData.workplaceCode = this.workplaceId
-      if (this.formData.autoTag == 0) {
-        this.formData.monopoly = 0
-      }
       if (this.upData != null) {
         updateType(this.formData).then(res => {
           if (res.code == 20000) {
diff --git a/src/views/collect/CollectOrderUpload.vue b/src/views/collect/CollectOrderUpload.vue
index 624e84cb..5d17d358 100644
--- a/src/views/collect/CollectOrderUpload.vue
+++ b/src/views/collect/CollectOrderUpload.vue
@@ -7,7 +7,7 @@
       <el-tab-pane label="未上传单">
         <prescribePanel
           style="margin: -15px"
-          :tagStatus="5"
+          :tagStatus="3"
           :RowType="type"
           :workPlaceCode="workPlaceCode"
         ></prescribePanel>
diff --git a/src/views/collect/PanelOrderUpload.vue b/src/views/collect/PanelOrderUpload.vue
index 1fb18841..3d409762 100644
--- a/src/views/collect/PanelOrderUpload.vue
+++ b/src/views/collect/PanelOrderUpload.vue
@@ -263,7 +263,7 @@ import PanelOrderManuTagCode from './PanelOrderManuTagCode'
 import prescribeOriginPanel from '@/views/collect/PannelOrderBiz'
 import PanelOrderAllDetail from '@/views/collect/PanelOrderAllDetail'
 
-import { orderPag,orderUpload } from '@/api/collect/collectOrder'
+import { orderPage,orderUpload } from '@/api/collect/collectOrder'
 import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage'
 import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'