|
@@ -44,13 +44,13 @@
|
|
|
<el-form-item label="姓名" prop="name">
|
|
<el-form-item label="姓名" prop="name">
|
|
|
<el-input v-model="queryModel.name" size="mini" style="width:150px;"/>
|
|
<el-input v-model="queryModel.name" size="mini" style="width:150px;"/>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
- <el-form-item label="所属单位" prop="schoolId">
|
|
|
|
|
- <el-select v-model="queryModel.schoolId"
|
|
|
|
|
|
|
+ <el-form-item label="所属单位" prop="companyId">
|
|
|
|
|
+ <el-select v-model="queryModel.companyId"
|
|
|
filterable
|
|
filterable
|
|
|
clearable
|
|
clearable
|
|
|
placeholder="请选择" size="mini" style="width:150px;">
|
|
placeholder="请选择" size="mini" style="width:150px;">
|
|
|
<el-option
|
|
<el-option
|
|
|
- v-for="item in schoolList"
|
|
|
|
|
|
|
+ v-for="item in companyList"
|
|
|
:key="item.id"
|
|
:key="item.id"
|
|
|
:label="item.name"
|
|
:label="item.name"
|
|
|
:value="item.id"
|
|
:value="item.id"
|
|
@@ -234,6 +234,7 @@
|
|
|
import Constant from "@/constant";
|
|
import Constant from "@/constant";
|
|
|
import orderApi from '@/api/base/order'
|
|
import orderApi from '@/api/base/order'
|
|
|
import goodsInfoApi from "@/api/base/goodsInfo";
|
|
import goodsInfoApi from "@/api/base/goodsInfo";
|
|
|
|
|
+import companyInfoApi from "@/api/base/companyInfo";
|
|
|
import orderDetail from "./order-detail";
|
|
import orderDetail from "./order-detail";
|
|
|
import { getToken } from "@/utils/auth"; // get token from cookie
|
|
import { getToken } from "@/utils/auth"; // get token from cookie
|
|
|
import pageUtil from "@/utils/page";
|
|
import pageUtil from "@/utils/page";
|
|
@@ -246,13 +247,13 @@ export default {
|
|
|
name:"",
|
|
name:"",
|
|
|
goodName:"",
|
|
goodName:"",
|
|
|
goodTypeId:"",
|
|
goodTypeId:"",
|
|
|
- schoolId:"",
|
|
|
|
|
|
|
+ companyId:"",
|
|
|
payStatus:"",
|
|
payStatus:"",
|
|
|
outOrderNo:"",
|
|
outOrderNo:"",
|
|
|
createTimeRanges:"",
|
|
createTimeRanges:"",
|
|
|
transactionId:"",
|
|
transactionId:"",
|
|
|
},
|
|
},
|
|
|
- schoolList:[],
|
|
|
|
|
|
|
+ companyList:[],
|
|
|
goodTypeList:[],
|
|
goodTypeList:[],
|
|
|
statusList:[{
|
|
statusList:[{
|
|
|
label:"未支付",
|
|
label:"未支付",
|
|
@@ -308,7 +309,7 @@ export default {
|
|
|
formData.append("outOrderNo", this.queryModel.outOrderNo);
|
|
formData.append("outOrderNo", this.queryModel.outOrderNo);
|
|
|
formData.append("payStatus", this.queryModel.payStatus);
|
|
formData.append("payStatus", this.queryModel.payStatus);
|
|
|
formData.append("name", this.queryModel.name);
|
|
formData.append("name", this.queryModel.name);
|
|
|
- formData.append("schoolId", this.queryModel.schoolId);
|
|
|
|
|
|
|
+ formData.append("companyId", this.queryModel.companyId);
|
|
|
formData.append("createTimeRanges", this.queryModel.createTimeRanges);
|
|
formData.append("createTimeRanges", this.queryModel.createTimeRanges);
|
|
|
formData.append("transactionId", this.queryModel.transactionId);
|
|
formData.append("transactionId", this.queryModel.transactionId);
|
|
|
|
|
|
|
@@ -566,6 +567,11 @@ export default {
|
|
|
created() {
|
|
created() {
|
|
|
var self = this;
|
|
var self = this;
|
|
|
|
|
|
|
|
|
|
+ companyInfoApi.list().then(response => {
|
|
|
|
|
+ var jsonData = response.data;
|
|
|
|
|
+ this.companyList = jsonData.data;
|
|
|
|
|
+ });
|
|
|
|
|
+
|
|
|
goodsInfoApi.goodsTypeList().then(response => {
|
|
goodsInfoApi.goodsTypeList().then(response => {
|
|
|
var jsonData = response.data;
|
|
var jsonData = response.data;
|
|
|
this.goodTypeList = jsonData.data;
|
|
this.goodTypeList = jsonData.data;
|