From 017a8a1c143b619ea501d3822df80423a1f4d881 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 28 Apr 2023 15:22:33 +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/views/inout/DialogCreateOrder.vue | 16 ++++++++-------
 src/views/sync/SysUdimsData.vue       | 28 +++++++++++++--------------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index c9d3ab8..f9d48d0 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -3,7 +3,8 @@
     <el-card style="margin: 5px;margin-top: -20px">
       <el-form :model="orderFormData" :rules="formRules" ref="dataForm" label-width="100px"
                style="margin-bottom: -15px">
-        <el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
+        <el-button-group
+          style="display: flex; margin: 0px 0 15px 75%; height: 35px">
           <el-button
             size="mini"
             type="primary"
@@ -11,13 +12,14 @@
           >草稿保存
           </el-button
           >
-          <el-button
-            size="mini"
-            type="primary"
-            @click.native="submit()"
+          <el-button size="mini" type="primary" @click.native="submit()"
+                     v-if="curAction.checkWebNew != 2  || viewType !=1"
           >立即提交
-          </el-button
-          >
+          </el-button>
+          <el-button size="mini" type="primary" @click.native="submit(1)"
+                     v-if="curAction.checkWebNew > 1  && viewType == 1"
+          >待配货提交
+          </el-button>
 
           <el-button size="mini" type="primary" @click.native="submit(1)"
                      v-if="curAction.checkWebNew == 3"
diff --git a/src/views/sync/SysUdimsData.vue b/src/views/sync/SysUdimsData.vue
index c46c6dd..f5b5171 100644
--- a/src/views/sync/SysUdimsData.vue
+++ b/src/views/sync/SysUdimsData.vue
@@ -29,20 +29,20 @@
             <el-button-group style="display:flex;">
               <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
               <el-button type="primary" icon="search" @click="search">查询</el-button>
-              <el-button type="primary" icon="search" @click="createScheduleDialog(1)">同步单据
-              </el-button>
-              <!--               :disabled="!configParms.orderScanFinish&& !configParms.orderUnReceive&& !configParms.orderUnCheck"-->
-              <el-button type="primary" icon="search" @click="createScheduleDialog(2)"
-                         v-if="!configParms.typeBus&& !configParms.typeScan&& !configParms.typeThird">
-                同步单据类型
-              </el-button>
-              <el-button type="primary" icon="search" @click="createScheduleDialog(3)" v-if="!configParms.basicProducts&& !configParms.basicCorp&&
-                                        !configParms.basicInv&&!configParms.basicThirdProducts&& !configParms.basicThirdCorp&& !configParms.basicThirdInv
-                                && !configParms.basicThirdBusOrder&& !configParms.sysUser">同步基础信息
-              </el-button>
-              <el-button type="primary" icon="search" @click="createScheduleDialog(4)"
-                         v-if="configParms.dbDiProducts==2">同步国家库DI数据
-              </el-button>
+<!--              <el-button type="primary" icon="search" @click="createScheduleDialog(1)">同步单据-->
+              <!--              </el-button>-->
+              <!--              &lt;!&ndash;               :disabled="!configParms.orderScanFinish&& !configParms.orderUnReceive&& !configParms.orderUnCheck"&ndash;&gt;-->
+              <!--              <el-button type="primary" icon="search" @click="createScheduleDialog(2)"-->
+              <!--                         v-if="!configParms.typeBus&& !configParms.typeScan&& !configParms.typeThird">-->
+              <!--                同步单据类型-->
+              <!--              </el-button>-->
+              <!--              <el-button type="primary" icon="search" @click="createScheduleDialog(3)" v-if="!configParms.basicProducts&& !configParms.basicCorp&&-->
+              <!--                                        !configParms.basicInv&&!configParms.basicThirdProducts&& !configParms.basicThirdCorp&& !configParms.basicThirdInv-->
+              <!--                                && !configParms.basicThirdBusOrder&& !configParms.sysUser">同步基础信息-->
+              <!--              </el-button>-->
+              <!--              <el-button type="primary" icon="search" @click="createScheduleDialog(4)"-->
+              <!--                         v-if="configParms.dbDiProducts==2">同步国家库DI数据-->
+              <!--              </el-button>-->
             </el-button-group>
           </el-form-item>
         </el-row>