From 2fb4239e828bcfa9711ce4cecc4b942767621d62 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期一, 06 十一月 2023 17:20:20 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.5.5:29418/web/crm-web into dev

---
 src/views/sales/salesDetails/AddSalesDetailsDialog.vue |   66 ++++++++++++++++++++++++--------
 1 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 4cead8b..2bd7459 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -27,10 +27,11 @@
                 <el-form-item label="鏄庣粏鍗曠紪鍙�" prop="number">
                   <el-input
                     v-if="
+                      isView ||
                       editConfig.title == '缂栬緫' ||
                       (editConfig.title == '鏂板缓' && codenumer && (explain != '' || isIdDisabled))
                     "
-                    :disabled="editConfig.title == '缂栬緫'"
+                    :disabled="editConfig.title == '缂栬緫' || isView"
                     v-model="editConfig.infomation.number"
                     placeholder="璇疯緭鍏ョ紪鐮�"
                   >
@@ -65,16 +66,21 @@
                       "
                       value-key="name"
                       @select="handleSelectClient('client', $event)"
-                      :disabled="isNameChanceEdit"
+                      :disabled="isNameChanceEdit || isView"
                     ></el-autocomplete>
-                    <div v-if="!isNameChanceEdit" class="common-select-btn" @click="selClientClick('client')">
+                    <div
+                      v-if="!isNameChanceEdit && !isView"
+                      class="common-select-btn"
+                      @click="selClientClick('client')"
+                    >
                       <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
                     </div>
                     <div
                       v-if="
                         editConfig.infomation.client_name &&
                         editConfig.infomation.client_name.length > 0 &&
-                        !isNameChanceEdit
+                        !isNameChanceEdit &&
+                        !isView
                       "
                       class="common-select-btn"
                       @click="clearupClient('client')"
@@ -98,16 +104,21 @@
                       "
                       value-key="name"
                       @select="handleSelectClient('chance', $event)"
-                      :disabled="isNameChanceEdit"
+                      :disabled="isNameChanceEdit || isView"
                     ></el-autocomplete>
-                    <div v-if="!isNameChanceEdit" class="common-select-btn" @click="selClientClick('chance')">
+                    <div
+                      v-if="!isNameChanceEdit && !isView"
+                      class="common-select-btn"
+                      @click="selClientClick('chance')"
+                    >
                       <i class="el-icon-circle-plus-outline"></i>
                     </div>
                     <div
                       v-if="
                         editConfig.infomation.sale_chance_name &&
                         editConfig.infomation.sale_chance_name.length > 0 &&
-                        !isNameChanceEdit
+                        !isNameChanceEdit &&
+                        !isView
                       "
                       class="common-select-btn"
                       @click="clearupClient('chance')"
@@ -163,16 +174,21 @@
                       @select="handleSelectClient('quotation', $event)"
                       style="width: 100%"
                       placeholder="璇峰厛閫夋嫨閿�鍞満浼�"
-                      :disabled="isAddQuatation"
+                      :disabled="isAddQuatation || isView"
                     ></el-autocomplete>
-                    <div v-if="!isAddQuatation" class="common-select-btn" @click="selClientClick('quotation')">
+                    <div
+                      v-if="!isAddQuatation && !isView"
+                      class="common-select-btn"
+                      @click="selClientClick('quotation')"
+                    >
                       <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
                     </div>
                     <div
                       v-if="
                         editConfig.infomation.quotation_number &&
                         editConfig.infomation.quotation_number.length > 0 &&
-                        !isAddQuatation
+                        !isAddQuatation &&
+                        !isView
                       "
                       class="common-select-btn"
                       @click="clearupClient('quotation')"
@@ -190,6 +206,7 @@
                     type="date"
                     placeholder="閫夋嫨鏃ユ湡"
                     style="width: 100%"
+                    :disabled="isView"
                   >
                   </el-date-picker>
                 </el-form-item>
@@ -201,6 +218,7 @@
                     placeholder="璇烽�夋嫨"
                     size="mini"
                     style="width: 100%"
+                    :disabled="isView"
                   >
                     <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
                     </el-option>
@@ -215,6 +233,7 @@
                     type="date"
                     placeholder="閫夋嫨鏃ユ湡"
                     style="width: 100%"
+                    :disabled="isView"
                   >
                   </el-date-picker>
                 </el-form-item>
@@ -226,6 +245,7 @@
                     placeholder="璇烽�夋嫨"
                     size="mini"
                     style="width: 100%"
+                    :disabled="isView"
                   >
                     <el-option v-for="item in deliveryTypeList" :key="item.id" :label="item.name" :value="item.id">
                     </el-option>
@@ -240,12 +260,12 @@
             <el-row>
               <el-col :span="12">
                 <el-form-item label="鏀惰揣浜�" prop="addressee">
-                  <el-input v-model="editConfig.infomation.addressee"></el-input>
+                  <el-input v-model="editConfig.infomation.addressee" :disabled="isView"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="鏀惰揣浜鸿仈绯绘柟寮�" prop="phone">
-                  <el-input v-model="editConfig.infomation.phone"></el-input>
+                  <el-input v-model="editConfig.infomation.phone" :disabled="isView"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -255,17 +275,18 @@
                     type="textarea"
                     :autosize="{ minRows: 2 }"
                     v-model="editConfig.infomation.address"
+                    :disabled="isView"
                   ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="鐗╂祦鍏徃" prop="logisticCompany">
-                  <el-input v-model="editConfig.infomation.logisticCompany"></el-input>
+                  <el-input v-model="editConfig.infomation.logisticCompany" :disabled="isView"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="鐗╂祦鍗曞彿" prop="logisticNumber">
-                  <el-input v-model="editConfig.infomation.logisticNumber"></el-input>
+                  <el-input v-model="editConfig.infomation.logisticNumber" :disabled="isView"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -277,6 +298,7 @@
                     :precision="2"
                     :controls="false"
                     style="width: 100%; margin-right: 5px"
+                    :disabled="isView"
                   ></el-input-number>
                 </el-form-item>
               </el-col>
@@ -293,6 +315,7 @@
                     type="textarea"
                     :autosize="{ minRows: 4 }"
                     v-model="editConfig.infomation.conditions"
+                    :disabled="isView"
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -308,6 +331,7 @@
                     type="textarea"
                     :autosize="{ minRows: 2 }"
                     v-model="editConfig.infomation.remark"
+                    :disabled="isView"
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -345,7 +369,13 @@
             浜у搧绠$悊
             <div style="margin-left: 400px">
               甯佺
-              <el-select v-model="editConfig.infomation.currency" placeholder="璇烽�夋嫨" size="mini" style="width: 63%">
+              <el-select
+                v-model="editConfig.infomation.currency"
+                placeholder="璇烽�夋嫨"
+                size="mini"
+                style="width: 63%"
+                :disabled="isView"
+              >
                 <el-option v-for="item in currencyOptions" :key="item.id" :label="item.name" :value="item.id">
                 </el-option>
               </el-select>
@@ -355,7 +385,7 @@
             <CommonFormTableView
               ref="commonFormTableView"
               :detail-enter="true"
-              :select-box="true"
+              :select-box="selectBox"
               :show-summary="showSummary"
               :product-table-list="productTableList"
               @inputContent="inputContent"
@@ -540,7 +570,9 @@
       quotationList: [],
       quotationId: this.editCommonConfig.infomation.quotationId,
       tableData: [],
-      selProductData: []
+      selProductData: [],
+      isView: this.editCommonConfig.title === "鏌ョ湅",
+      selectBox: this.editCommonConfig.title !== "鏌ョ湅"
     }
   },
   created() {

--
Gitblit v1.8.0