Commit e7f447d8 by 罗承锋

修改查询订单权限

parent 560bbb5f
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="12" style="height:35px"> <a-col :md="4" :sm="12" style="height:35px">
<a-form-item label="订单编号:"> <a-form-item label="订单编号:">
<a-input placeholder="订单编号" v-model="queryParam.orderNumber"></a-input> <a-input placeholder="订单编号" v-model="queryParam.orderNumber"></a-input>
...@@ -74,15 +73,16 @@ ...@@ -74,15 +73,16 @@
<a-input placeholder="合伙人姓名" v-model="queryParam.hehuorenName"></a-input> <a-input placeholder="合伙人姓名" v-model="queryParam.hehuorenName"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="12" style="height:35px"> <a-col :md="7" :sm="20" style="height:35px">
<a-form-item label="合伙人学校:"> <a-form-item label="合伙人学校:">
<a-input placeholder="合伙人学校" v-model="queryParam.hehuorenSchool"></a-input> <a-input placeholder="合伙人学校" v-model="queryParam.hehuorenSchool"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="3" :sm="6" style="height:35px"> <a-col :md="4" :sm="12" style="height:35px">
<a-form-item label="状态:"> <a-form-item label="状态:">
<a-select v-model="queryParam.orderStatus"> <a-select v-model="queryParam.orderStatus">
<a-select-option value>请选择</a-select-option> <a-select-option value>请选择</a-select-option>
<a-select-option value="未下单">未下单</a-select-option>
<a-select-option value="待处理">待处理</a-select-option> <a-select-option value="待处理">待处理</a-select-option>
<a-select-option value="待选号">待选号</a-select-option> <a-select-option value="待选号">待选号</a-select-option>
<a-select-option value="待识别">待识别</a-select-option> <a-select-option value="待识别">待识别</a-select-option>
...@@ -100,7 +100,16 @@ ...@@ -100,7 +100,16 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="7" :sm="20" style="height:35px">
<a-form-item label="智能平台单号:">
<a-input placeholder="智能平台单号" v-model="queryParam.orderId"></a-input>
</a-form-item>
</a-col>
<a-col :md="7" :sm="20" style="height:35px">
<a-form-item label="小白卡单号:">
<a-input placeholder="小白卡单号" v-model="queryParam.xbOrderId"></a-input>
</a-form-item>
</a-col>
<a-col :md="8" :sm="12" style="float:right;height:35px"> <a-col :md="8" :sm="12" style="float:right;height:35px">
<a-button @click="search()" type="primary">查询</a-button> <a-button @click="search()" type="primary">查询</a-button>
<a-button @click="handleSubmit" style="margin-left: 10px">导出</a-button> <a-button @click="handleSubmit" style="margin-left: 10px">导出</a-button>
...@@ -125,8 +134,7 @@ ...@@ -125,8 +134,7 @@
ref="table" ref="table"
size="small" size="small"
class="flex-filling" class="flex-filling"
:locale="emptyText" :locale="emptyText">
>
<!--拦截器--> <!--拦截器-->
<template slot="productLastUpdateTime" slot-scope="text">{{ text | dayjs}}</template> <template slot="productLastUpdateTime" slot-scope="text">{{ text | dayjs}}</template>
<!--拦截器--> <!--拦截器-->
...@@ -875,7 +883,9 @@ ...@@ -875,7 +883,9 @@
hehuorenSchool: "", hehuorenSchool: "",
hehuorenName: "", hehuorenName: "",
hehuorenArea:"", hehuorenArea:"",
orderStatus: "" orderStatus: "",
orderId: "",
xbOrderId: "",
}, },
orderInfo: {}, orderInfo: {},
columns: [ columns: [
......
...@@ -485,6 +485,8 @@ ...@@ -485,6 +485,8 @@
this.modifyForm.subName = data.substName; this.modifyForm.subName = data.substName;
this.modifyForm.roleId = data.roleid; this.modifyForm.roleId = data.roleid;
this.modifyForm.position = data.position; this.modifyForm.position = data.position;
this.modifyForm.parentId = "";
this.modifyForm.parentIds = "";
this.recordId = data.parentId; this.recordId = data.parentId;
this.changeSchool(data.schoolId); this.changeSchool(data.schoolId);
this.changePosition(2); this.changePosition(2);
...@@ -498,7 +500,7 @@ ...@@ -498,7 +500,7 @@
}, },
//提交表单 //提交表单
createfunctionOk(){ createfunctionOk(){
this.Formtable.validateFields(["account",'phone','name',"idCard", 'password', 'sex','schoolId', 'roleid','ysm'], {force: true}, (err, values)=>{ this.Formtable.validateFields(["account",'phone','name',"idCard", 'password', 'parentId', 'sex','schoolId', 'roleid','ysm'], {force: true}, (err, values)=>{
if (!err){ if (!err){
this.modifyForm.account=values.account this.modifyForm.account=values.account
this.modifyForm.phone=values.phone this.modifyForm.phone=values.phone
...@@ -520,6 +522,23 @@ ...@@ -520,6 +522,23 @@
} }
schools.push(this.treeModelValue[i]); schools.push(this.treeModelValue[i]);
} }
console.log(this.modifyForm);
console.log(this.xzUserList);
if(this.modifyForm.parentId == undefined){
this.modifyForm.parentId = ''
this.modifyForm.parentIds = ''
}else{
this.xzUserList.forEach((key) => {
if(this.modifyForm.parentId == key.id){
if(this.modifyForm.position == '楼长'){
this.modifyForm.parentIds = key.id + ',';
}else{
this.modifyForm.parentIds = key.parentIds + key.id + ',';
}
}
})
}
this.modifyForm.subNames = subNames; this.modifyForm.subNames = subNames;
this.modifyForm.schools = schools; this.modifyForm.schools = schools;
if(this.modifyForm.idCard.length != 18){ if(this.modifyForm.idCard.length != 18){
......
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