huoran
/
FE_middlePlatform_server
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

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

Browse Source
dev_202304
wangchenguang 2 years ago
parent ab306e452f e3ba6cab26
commit 9704ba89cd
3 changed files with 10 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      public/index.html
  2. 7
      src/views/order/AddOrder.vue
  3. 4
      src/views/parnerOperation/editor.js

2
public/index.html
Unescape View File

@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="keywords" content="深圳或然科技中台"> <meta name="keywords" content="深圳或然科技中台">
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"> <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> <title>深圳或然科技中台</title>
</head> </head>
<body> <body>

7
src/views/order/AddOrder.vue
Unescape View File

@ -97,7 +97,8 @@
placeholder="请输入订单金额"></el-input> placeholder="请输入订单金额"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="商务经理"> <el-form-item label="商务经理">
<el-select :disabled="viewDisabled || !form.teamId" v-model="form.businessManagerId" clearable filterable placeholder="请选择商务经理"> <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-option v-for="(item, i) in bmList" :key="i" :label="item.userName" :value="item.partnerId"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -1072,7 +1073,8 @@ export default {
teamId: form.teamId, teamId: form.teamId,
profit: form.profit, profit: form.profit,
purchaseCost: form.purchaseCost, purchaseCost: form.purchaseCost,
businessManagerId: form.businessManagerId ? +form.businessManagerId : '' businessManagerId: form.businessManagerId ? +form.businessManagerId : '',
businessManagerName: form.businessManagerName
}; };
this.$nextTick(() => { this.$nextTick(() => {
form.provinceId && this.getCityData() form.provinceId && this.getCityData()
@ -1885,6 +1887,7 @@ export default {
// 团队选择回调 // 团队选择回调
teamChange() { teamChange() {
this.form.businessManagerId = '' this.form.businessManagerId = ''
this.form.businessManagerName = ''
this.getBm() this.getBm()
this.getRate() this.getRate()
}, },

4
src/views/parnerOperation/editor.js
Unescape View File

@ -349,14 +349,14 @@ export default {
fd.append("file", file); fd.append("file", file);
Axios({ Axios({
method: 'post', method: 'post',
url: Api.fileupload, url: Api.fileUploadNakadai,
data: fd, data: fd,
headers: { headers: {
'Content-Type': 'multipart/form-data', 'Content-Type': 'multipart/form-data',
token: Util.local.get(Setting.tokenKey) token: Util.local.get(Setting.tokenKey)
}, },
}).then(({ data }) => { }).then(({ data }) => {
callback(data.data.filesResult.fileId) callback(data.filesResult.fileUrl)
}).catch(res => {}) }).catch(res => {})
} }
//触发点击 //触发点击

Write Preview
Loading…
Cancel
Save