From a95d3f55cad0b9175d3c24eb250671040fc8c773 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 11 Apr 2023 11:50:18 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=95=86=E5=8A=A1?=
 =?UTF-8?q?=E7=BB=8F=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/AddOrder.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/order/AddOrder.vue b/src/views/order/AddOrder.vue
index c9729f9..8efbf72 100644
--- a/src/views/order/AddOrder.vue
+++ b/src/views/order/AddOrder.vue
@@ -97,9 +97,10 @@
                                                       placeholder="请输入订单金额"></el-input>
                                         </el-form-item>
                                         <el-form-item label="商务经理">
-                                            <el-select :disabled="viewDisabled || !form.teamId" v-model="form.businessManagerId" clearable filterable placeholder="请选择商务经理">
-                                                <el-option v-for="(item, i) in bmList" :key="i" :label="item.userName" :value="item.partnerId"></el-option>
-                                            </el-select>
+                                          <el-input v-if="form.businessManagerName" disabled v-model="form.businessManagerName"></el-input>
+                                          <el-select v-else :disabled="viewDisabled || !form.teamId" v-model="form.businessManagerId" clearable filterable placeholder="请选择商务经理">
+                                              <el-option v-for="(item, i) in bmList" :key="i" :label="item.userName" :value="item.partnerId"></el-option>
+                                          </el-select>
                                         </el-form-item>
                                     </el-col>
                                 </el-form>
@@ -1070,7 +1071,8 @@ export default {
                     teamId: form.teamId,
                     profit: form.profit,
                     purchaseCost: form.purchaseCost,
-                    businessManagerId: form.businessManagerId ? +form.businessManagerId : ''
+                    businessManagerId: form.businessManagerId ? +form.businessManagerId : '',
+                    businessManagerName: form.businessManagerName
                 };
                 this.$nextTick(() => {
                   form.provinceId && this.getCityData()
@@ -1867,6 +1869,7 @@ export default {
         // 团队选择回调
         teamChange() {
           this.form.businessManagerId = ''
+          this.form.businessManagerName = ''
           this.getBm()
           this.getRate()
         },

From 057f5bfa7319b5b2fdfdad08c7fdcccb22087761 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 11 Apr 2023 14:48:30 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/parnerOperation/editor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/parnerOperation/editor.js b/src/views/parnerOperation/editor.js
index e9b3c73..513c13e 100644
--- a/src/views/parnerOperation/editor.js
+++ b/src/views/parnerOperation/editor.js
@@ -349,14 +349,14 @@ export default {
         fd.append("file", file);
         Axios({
           method: 'post',
-          url: Api.fileupload,
+          url: Api.fileUploadNakadai,
           data: fd,
           headers: {
             'Content-Type': 'multipart/form-data',
             token: Util.local.get(Setting.tokenKey)
           },
         }).then(({ data }) => {
-          callback(data.data.filesResult.fileId)
+          callback(data.filesResult.fileUrl)
         }).catch(res => {})
       }
       //触发点击

From e3ba6cab26a625f29643641c465dae75544d30da Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 12 Apr 2023 14:19:15 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/index.html b/public/index.html
index 3a13e45..3189b0b 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="keywords" content="深圳或然科技中台">
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no">
-    <link rel="stylesheet" href="//at.alicdn.com/t/font_830376_qzecyukz0s.css">
+    <script src="/styles/tinymce/tinymce.min.js"></script>
     <title>深圳或然科技中台</title>
   </head>
   <body>