Skip to content

E
ElectricitySheep
Commit 6270b915 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

update

parent 7e76ab08
Hide whitespace changes
Inline Side-by-side
Showing with 147 additions and 26 deletions
src/components/UserMan/distributors.vue
View file @ 6270b915
......@@ -97,7 +97,7 @@
<el-table-column prop="name" label="分销商等级">
<template slot-scope="scope">
<el-tag v-if="scope.row.GradeName=='默认等级'" type="info">{{scope.row.GradeName}}</el-tag>
<el-tag v-else>{{scope.row.GradeName}}</el-tag>
<el-tag v-if="scope.row.GradeName!='默认等级' && scope.row.GradeName!=''">{{scope.row.GradeName}}</el-tag>
</template>
</el-table-column>
<el-table-column prop="name" label="状态">
......@@ -124,22 +124,25 @@
<img v-if="scope.row.AuditStatus==1" @click="openReason(2,scope.row)" style="width:32px;height:32px"
src="../../assets/img/userman/nopass.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="修改分销商等级" placement="top-start">
<img @click="openReason(4,scope.row)" style="width:32px;height:32px"
src="../../assets/img/userman/edit.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="添加备注" placement="top-start">
<img @click="openRemark(5,scope.row)" style="width:32px;height:32px"
src="../../assets/img/userman/add_remark.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top-start">
<img @click="Delete(3,scope.row)" style="width:32px;height:32px" src="../../assets/img/userman/del.png"
alt="">
</el-tooltip>
<img @click="OpenczjfDig(scope.row,1)" style="width:32px;height:32px;"
src="../../assets/img/userman/integral.png" alt="">
<img @click="OpenczjfDig(scope.row,2)" style="width:32px;height:32px"
src="../../assets/img/userman/balance.png" alt="">
<template v-if="scope.row.AuditStatus!=1 && scope.row.AuditStatus!=3">
<el-tooltip class="item" effect="dark" content="修改分销商等级" placement="top-start">
<img @click="openReason(4,scope.row)" style="width:32px;height:32px"
src="../../assets/img/userman/edit.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="添加备注" placement="top-start">
<img @click="openRemark(5,scope.row)" style="width:32px;height:32px"
src="../../assets/img/userman/add_remark.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top-start">
<img @click="Delete(3,scope.row)" style="width:32px;height:32px" src="../../assets/img/userman/del.png"
alt="">
</el-tooltip>
<img @click="OpenczjfDig(scope.row,1)" style="width:32px;height:32px;"
src="../../assets/img/userman/integral.png" alt="">
<img @click="OpenczjfDig(scope.row,2)" style="width:32px;height:32px"
src="../../assets/img/userman/balance.png" alt="">
</template>
</template>
</el-table-column>
</el-table>
......
src/components/UserMan/setDistributorLevel.vue
View file @ 6270b915
......@@ -15,7 +15,6 @@
<el-input v-model="addMsg.Name" style="width:500px" size="small"></el-input>
</el-form-item>
<el-form-item label="是否启用自动升级">
{{addMsg.IsAutoUpGrade}}
<el-switch v-model="addMsg.IsAutoUpGrade" active-color="#409EFF" :active-value="1" :inactive-value="2">
</el-switch>
</el-form-item>
......
src/components/orderMan/BulkShipment.vue 0 → 100644
View file @ 6270b915
<template>
<div class="BulkShipment">
<div class="head-title">
批量发货
</div>
<el-card style="margin-top:10px" class="box-card" shadow="never">
<el-form class="app-batch" :model="addMsg" :rules="rules" ref="addMsg" label-width="180px">
<el-form-item label="导入模板" prop="FilePath">
<el-input v-model="addMsg.FilePath" size="small" style="width:289px"
:disabled="true"
class="input-with-select">
</el-input>
<!-- :http-request="UploadImage" -->
<el-upload
class="upload-demo"
ref="upload"
:action="importFileUrl"
:multiple="true"
:on-success="successUpload"
:show-file-list="false"
accept=".csv, .xlsx">
<el-button size="small">选择文件</el-button>
</el-upload>
<el-button size="small" style="margin-left:20px">默认模板下载</el-button>
</el-form-item>
<el-form-item label="选择快递公司" prop="ExpressId">
<el-select size="small" v-model="addMsg.ExpressId" placeholder="请选择">
<el-option v-for="item in ExpressList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
</el-form>
</el-card>
<div style="margin-top:10px" >
<el-button @click="Save('addMsg')" size="small" type="primary">提交</el-button>
</div>
</div>
</template>
<script>
export default {
data() {
return {
importFileUrl: this.domainManager().UploadFileUrl,
addMsg:{
FilePath:'',
ExpressId:'',
},
rules:{
ExpressId: [
{ required: true, message: '请选择快递公司', trigger: 'change' }
],
FilePath: [
{ required: true, message: '请选择导入模板', trigger: 'blur' }
],
},
ExpressList:[],
};
},
created() {
this.getExpressInfo();
},
methods: {
Save(formName){
this.$refs[formName].validate((valid) => {
if (valid) {
this.apipost("/api/order/SetOrderBatchSendGoods",this.addMsg,
res => {
if (res.data.resultCode === 1) {
this.addMsg={
FilePath:'',
ExpressId:'',
}
this.Success(res.data.message);
} else {
this.Error(res.data.message);
}
},
null
);
} else {
return false;
}
});
},
successUpload(file){
this.addMsg.FilePath=file.data;
},
// 快递公司
getExpressInfo() {
this.apipost("/api/MallBase/GetExpressInfo", {}, res => {
if (res.data.resultCode == 1) {
this.ExpressList = res.data.data;
} else {
this.Info(res.data.message);
}
})
},
},
mounted() {
}
};
</script>
<style>
.BulkShipment .upload-demo{
display: inline-block;
position: relative;
left:-5px;
}
</style>
src/plug/index.js
View file @ 6270b915
......@@ -55,8 +55,8 @@ export default {
Vue.prototype.domainManager = function () {
let domainUrl = '';
//domainUrl = "http://192.168.2.214:8200";
domainUrl = "https://localhost:5001";
// domainUrl = "https://localhost:5001";
domainUrl = "http://192.168.2.16:8088";
let locationName = window.location.hostname;
if (locationName.indexOf('testerp.oytour') !== -1) {
domainUrl = "http://testapi.oytour.com";
......@@ -68,7 +68,8 @@ export default {
DomainUrl: domainUrl,
//常用提交数据URL
PostUrl: domainUrl + "/api/common/post",
ImageUrl: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com'
ImageUrl: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com',
UploadFileUrl:domainUrl + '/api/File/LocalFileUploadImport'
};
return obj;
},
......
src/router/index.js
View file @ 6270b915
......@@ -283,11 +283,16 @@ export default new Router({
        },
// 订单管理 客户评价
        {
          path: '/customerEvaluation',
          name: 'customerEvaluation',
          component: resolve => require(['@/components/orderMan/customerEvaluation'], resolve),
        },
          path: '/customerEvaluation',
          name: 'customerEvaluation',
          component: resolve => require(['@/components/orderMan/customerEvaluation'], resolve),
        },
// 订单管理 批量发货
        {
          path: '/BulkShipment',
          name: 'BulkShipment',
          component: resolve => require(['@/components/orderMan/BulkShipment'], resolve),
        },
//设置 基础设置
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment