From 47ded611248fffb405b9b729e8c0cf1cb6d46006 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 10 Feb 2022 11:43:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=96=B0=E5=A2=9E=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/AddOrder.vue | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/views/order/AddOrder.vue b/src/views/order/AddOrder.vue
index 4fab8e5..8eecf09 100644
--- a/src/views/order/AddOrder.vue
+++ b/src/views/order/AddOrder.vue
@@ -65,7 +65,7 @@
                                                       v-model="form.customerName" placeholder="请选择客户"></el-input>
                                         </el-form-item>
                                         <el-form-item prop="orderType" label="订单类型">
-                                            <el-select :disabled="viewDisabled||editDisabled||renewDisabled"
+                                            <el-select :disabled="viewDisabled || renewDisabled"
                                                        v-model="form.orderType" clearable placeholder="请选择订单类型">
                                                 <el-option v-for="(item,index) in orderTypeList" :key="index"
                                                            :label="item.name" :value="item.value"></el-option>
@@ -180,7 +180,7 @@
                                     <template slot-scope="scope">
                                         <div class="small">
                                             <el-input :class="!scope.row.finalPrice&&whetherSubmit?'red':''"
-                                                      :disabled="viewDisabled||editDisabled"
+                                                      :disabled="viewDisabled"
                                                       oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
                                                       @change="[allAmount($event,scope.row),calculateDiscount($event,scope.row)]"
                                                       v-model="scope.row.finalPrice"
@@ -202,7 +202,7 @@
                                         <el-button @click="configure(scope.row)">配置</el-button>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="操作" align="center" min-width="120">
+                                <el-table-column label="操作" align="center" width="240">
                                     <template slot-scope="scope">
                                         <div class="flex-c-c">
                                             <el-button
@@ -212,6 +212,7 @@
                                                 style="margin-right:10px;"
                                             >删除</el-button>
                                             <el-switch
+                                                style="margin-right:10px;"
                                                 v-if='dispose || (!editDisabled&&!viewDisabled)'
                                                 v-model="scope.row.ship"
                                                 :active-value="1"
@@ -220,7 +221,7 @@
                                                 @change="handleDeliver($event,scope.row)">
                                             </el-switch>
                                             <el-switch
-                                                v-show="scope.row.ship && !isAdd && !dispose"
+                                                v-show="scope.row.ship && editDisabled && !dispose"
                                                 :disabled="viewDisabled"
                                                 v-model="scope.row.isEnable"
                                                 :active-value="1"
@@ -317,7 +318,7 @@
                                     <template slot-scope="scope">
                                         <div class="small">
                                             <el-input :class="!scope.row.finalPrice&&whetherSubmit?'red':''"
-                                                      :disabled="viewDisabled||editDisabled"
+                                                      :disabled="viewDisabled"
                                                       oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
                                                       @change="[dealComputers($event,scope.row),calculateDiscount($event,scope.row),userAmount($event,scope.row)]"
                                                       v-model="scope.row.finalPrice"
@@ -339,7 +340,7 @@
                                     <template slot-scope="scope">
                                         <div class="small">
                                             <el-input :class="!scope.row.accountNum&&whetherSubmit?'red':''"
-                                                      :disabled="viewDisabled||editDisabled"
+                                                      :disabled="viewDisabled"
                                                       onkeyup="value=this.value.replace(/\D+/g,'')"
                                                       oninput="value=value.replace(/[^0-9.]/g,'')"
                                                       v-model="scope.row.accountNum"
@@ -361,7 +362,7 @@
                                         </div>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="操作" align="center" min-width="120">
+                                <el-table-column label="操作" align="center" width="240">
                                     <template slot-scope="scope">
                                         <div class="flex-c-c">
                                             <el-button
@@ -371,6 +372,7 @@
                                                 style="margin-right:10px;"
                                             >删除</el-button>
                                             <el-switch
+                                                style="margin-right:10px;"
                                                 v-if='dispose || (!editDisabled&&!viewDisabled)'
                                                 v-model="scope.row.ship"
                                                 :active-value="1"
@@ -379,7 +381,7 @@
                                                 @change="handleDeliver($event,scope.row)">
                                             </el-switch>
                                             <el-switch
-                                                v-show="scope.row.ship && !isAdd && !dispose"
+                                                v-show="scope.row.ship && editDisabled && !dispose"
                                                 :disabled="viewDisabled"
                                                 v-model="scope.row.isEnable"
                                                 :active-value="1"