Merge branch 'master' of http://121.37.12.51:13000/huoran/FE_middlePlatform_server

2 years ago · 9704ba89cd
parent ab306e452f e3ba6cab26
commit 9704ba89cd
3 changed files with 10 additions and 7 deletions
--- 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>
--- 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>
@ -1072,7 +1073,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()
@ -1885,6 +1887,7 @@ export default {
        // 团队选择回调
        teamChange() {
          this.form.businessManagerId = ''
+          this.form.businessManagerName = ''
          this.getBm()
          this.getRate()
        },
--- 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 => {})
      }
      //触发点击