dev_2022-05-11
yujialong 3 years ago
parent be97ea823c
commit 43cafcabfc
  1. 4
      src/App.vue
  2. 3
      src/assets/css/main.css
  3. 1
      src/components/Header.vue
  4. 4
      src/setting.js
  5. 4
      src/views/customer/AddCustomer.vue
  6. 2
      src/views/customer/Order.vue
  7. 2
      src/views/join/index.vue
  8. 11
      src/views/parner/staff.vue
  9. 8
      src/views/system/manageLog.vue
  10. 1
      src/views/system/staff.vue

@ -12,10 +12,10 @@
if (sessionStorage.getItem("store") ) { if (sessionStorage.getItem("store") ) {
this.$store.replaceState(Object.assign({}, this.$store.state,JSON.parse(sessionStorage.getItem("store")))) this.$store.replaceState(Object.assign({}, this.$store.state,JSON.parse(sessionStorage.getItem("store"))))
} }
//vuexsessionStorage //vuexsessionStorage
window.addEventListener("beforeunload",()=>{ window.addEventListener("beforeunload",()=>{
sessionStorage.setItem("store",JSON.stringify(this.$store.state)) sessionStorage.getItem("token") && sessionStorage.setItem("store",JSON.stringify(this.$store.state))
}) })
} }
} }

@ -437,4 +437,7 @@ li {
min-width: auto !important; min-width: auto !important;
width: 85%; width: 85%;
} }
}
.el-tooltip__popper {
max-width: 500px !important;
} }

@ -43,6 +43,7 @@ export default {
}, },
loginout() { loginout() {
localStorage.removeItem('ms_username'); localStorage.removeItem('ms_username');
localStorage.removeItem('token');
sessionStorage.clear() sessionStorage.clear()
location.reload() location.reload()
}, },

@ -10,8 +10,8 @@ let host = `${location.origin}:9000/`
if (isDev) { if (isDev) {
jumpPath = "http://192.168.31.125:8087/"; // 本地调试-需要启动本地判分点系统 jumpPath = "http://192.168.31.125:8087/"; // 本地调试-需要启动本地判分点系统
// host = 'http://39.108.250.202:9000/' // host = 'http://39.108.250.202:9000/'
// host = 'http://192.168.31.151:9000/'// 榕 host = 'http://192.168.31.151:9000/'// 榕
host = 'http://192.168.31.137:9000/'// 赓 // host = 'http://192.168.31.137:9000/'// 赓
} else if (isPro) { } else if (isPro) {
jumpPath = "http://www.huorantech.cn/judgmentPoint/"; jumpPath = "http://www.huorantech.cn/judgmentPoint/";
} }

@ -5,7 +5,7 @@
<div class="per_title" v-preventReClick @click="goback(0)"> <div class="per_title" v-preventReClick @click="goback(0)">
<i class="el-icon-arrow-left"></i> <i class="el-icon-arrow-left"></i>
<span class="per_back">返回</span> <span class="per_back">返回</span>
<span class="per_school" v-text="isDetail ? '查看客户信息' : (customerId ? '编辑客户信息' : '新增客户信息')"></span> <span v-if="form.customerName || !customerId" class="per_school" v-text="isDetail ? form.customerName + '/查看' : (customerId ? form.customerName + '/编辑' : '新增')"></span>
</div> </div>
</div> </div>
</el-card> </el-card>
@ -971,7 +971,7 @@ export default {
i ? this.tabChange(i, 1) : this.backPage() i ? this.tabChange(i, 1) : this.backPage()
}) })
} else { } else {
this.tabChange(i, 1) i ? this.tabChange(i, 1) : this.backPage()
} }
}, },
backPage(){ backPage(){

@ -29,7 +29,7 @@
{{ customerName }} {{ customerName }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="productName" label="产品内容" align="center"></el-table-column> <el-table-column prop="productName" label="产品内容" align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="orderAmount" label="订单金额(元)" align="center"> <el-table-column prop="orderAmount" label="订单金额(元)" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="订单日期" align="center"> <el-table-column prop="createTime" label="订单日期" align="center">

@ -132,7 +132,7 @@ export default {
if (this.emailRepeat) return util.warningMsg("该邮箱已存在") if (this.emailRepeat) return util.warningMsg("该邮箱已存在")
const { form } = this const { form } = this
form.uniqueIdentification = Date.now() form.uniqueIdentification = Date.now()
form.isTeam = +this.isMobile // (1)pc(0) form.isTeam = this.isMobile ? 0 : 1 // (0)pc(1)
this.submiting = true this.submiting = true
this.$post(this.api.savePartnerAccount, form).then(res => { this.$post(this.api.savePartnerAccount, form).then(res => {
util.successMsg('加入成功!') util.successMsg('加入成功!')

@ -53,6 +53,7 @@
:visible.sync="orgVisible" :visible.sync="orgVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
width="50%" width="50%"
@close="closeType"
> >
<el-form v-if="orgVisible" ref="typeForm" :model="typeForm" :rules="orgRules" label-width="100px"> <el-form v-if="orgVisible" ref="typeForm" :model="typeForm" :rules="orgRules" label-width="100px">
<el-form-item label="分类名称" prop="partnerClassificationName"> <el-form-item label="分类名称" prop="partnerClassificationName">
@ -275,6 +276,7 @@ export default {
id: '', id: '',
parentId: data ? data.id : 1, parentId: data ? data.id : 1,
level: data ? data.level + 1 : 1, level: data ? data.level + 1 : 1,
parentName: data ? data.partnerClassificationName : '',
partnerClassificationName: '' partnerClassificationName: ''
} }
this.orgListDia = this.orgList this.orgListDia = this.orgList
@ -294,6 +296,13 @@ export default {
ids.splice(ids.length - 1, 1) ids.splice(ids.length - 1, 1)
this.cascaderValue = ids this.cascaderValue = ids
}, },
//
closeType() {
this.typeForm = {
id: '',
partnerClassificationName: ''
}
},
// //
handleOrg(list) { handleOrg(list) {
for (const i in list) { for (const i in list) {
@ -366,7 +375,7 @@ export default {
this.getTeamId(data.children) this.getTeamId(data.children)
} }
if (!this.curTeamId) this.curTeamId = data.id if (!this.curTeamId) this.curTeamId = data.id
this.$refs.orgTree.setCurrentKey(this.curTeamId) // this.$refs.orgTree.setCurrentKey(this.curTeamId)
this.initData() this.initData()
this.$refs.table.clearSelection() this.$refs.table.clearSelection()
}, },

@ -42,6 +42,7 @@
</span> </span>
</div> </div>
<div> <div>
<span class="withdraw" v-if="item.withdraw && !item.revoke">已撤回</span>
<el-button v-if="item.revoke" style="margin-right: 10px" type="primary" size="small" @click="revoke(item)">撤销</el-button> <el-button v-if="item.revoke" style="margin-right: 10px" type="primary" size="small" @click="revoke(item)">撤销</el-button>
<el-switch v-model="item.open" :active-value="0" :inactive-value="1" @change="switchOff($event, item)" v-auth="'/system:日志更新:管理:开启日志'"></el-switch> <el-switch v-model="item.open" :active-value="0" :inactive-value="1" @change="switchOff($event, item)" v-auth="'/system:日志更新:管理:开启日志'"></el-switch>
</div> </div>
@ -155,7 +156,7 @@ export default {
this.$confirm("确定要撤销吗?", "提示", { this.$confirm("确定要撤销吗?", "提示", {
type: "warning" type: "warning"
}).then(() => { }).then(() => {
this.$get(`${this.api.logWithdrawal}?platformId=${this.platformId}`).then(res => { this.$get(`${this.api.logWithdrawal}?platformId=${this.platformId}&logId=${item.logId}`).then(res => {
this.$message.success('撤销成功') this.$message.success('撤销成功')
this.getData() this.getData()
}).catch(res => {}) }).catch(res => {})
@ -254,6 +255,11 @@ export default {
color: #9076FF; color: #9076FF;
border-bottom: 1px dashed #bfbfbf; border-bottom: 1px dashed #bfbfbf;
} }
.withdraw {
margin-right: 10px;
font-size: 13px;
color: #979797;
}
.action { .action {
margin-left: 15px; margin-left: 15px;
i { i {

@ -672,6 +672,7 @@ export default {
}) })
} else { } else {
form.uniqueIdentification = new Date().getTime() form.uniqueIdentification = new Date().getTime()
form.userAvatars = this.$store.state.avatar
this.$post(this.api.saveStaff, form).then(res => { this.$post(this.api.saveStaff, form).then(res => {
util.successMsg("新增成功!") util.successMsg("新增成功!")
this.staffVisible = false this.staffVisible = false

Loading…
Cancel
Save