Commit 23be7983 by 陈浩建

json数据 项目请求引用 新增-3

parent 17b16705
......@@ -11,7 +11,6 @@
{"value":"校园天翼宽带用户","name":"校园天翼宽带用户"}
],
"identifying": [
{"value":"","name":"无"},
{"value":"校园低消宽带提速包(19元)","name":"校园低消宽带提速包(19元)"},
{"value":"校园低消宽带提速包(29元)","name":"校园低消宽带提速包(29元)"},
{"value":"校园低消宽带提速包(39元)","name":"校园低消宽带提速包(39元)"},
......
......@@ -10,11 +10,11 @@
<a-range-picker @change="onChange" format="YYYY-MM-DD HH:mm:ss"/>
</a-form-item>
</a-col>
<!-- <a-col :md="6" :sm="12" style="height:35px">-->
<!-- <a-form-item label="订单完成时间:">-->
<!-- <a-range-picker @change="onSuccessChange" format="YYYY-MM-DD HH:mm:ss"/>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :md="6" :sm="12" style="height:35px">-->
<!-- <a-form-item label="订单完成时间:">-->
<!-- <a-range-picker @change="onSuccessChange" format="YYYY-MM-DD HH:mm:ss"/>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<a-col :md="6" :sm="12" style="height:35px">
<a-form-item label="快递寄出时间:">
<a-range-picker @change="onkuaidiTimeChange" format="YYYY-MM-DD HH:mm:ss"/>
......@@ -27,9 +27,9 @@
<a-select-option value="1">老用户办理</a-select-option>
<a-select-option value="0">新用户办理</a-select-option>
<a-select-option value="2">老用户续约</a-select-option>
<!-- <a-select-option value="3">融合办理</a-select-option>-->
<!-- <a-select-option value="3">融合办理</a-select-option>-->
<a-select-option value="4">抽奖业务</a-select-option>
<!-- <a-select-option value="5">单宽业务</a-select-option>-->
<!-- <a-select-option value="5">单宽业务</a-select-option>-->
<a-select-option value="6">羊城通业务</a-select-option>
</a-select>
</a-form-item>
......@@ -174,11 +174,11 @@
<a-divider type="vertical" v-if="isAbnormal"/>
<a @click="abnormal(record.id)" v-if="isAbnormal">设为异常单</a>
<!-- <a-divider v-if="record.orderStatus === '待审核'" type="vertical"/>-->
<!-- <a v-show="record.orderStatus === '待审核'" @click="reviewStudentIdCard(record)">审核学生证</a>-->
<!-- <a-divider v-if="record.orderStatus === '待审核'" type="vertical"/>-->
<!-- <a v-show="record.orderStatus === '待审核'" @click="reviewStudentIdCard(record)">审核学生证</a>-->
<!-- <a-divider type="vertical"/>-->
<!-- <a @click="showDrawer(record,'2')">编辑</a>-->
<!-- <a-divider type="vertical"/>-->
<!-- <a @click="showDrawer(record,'2')">编辑</a>-->
</span>
</template>
</s-table>
......@@ -511,7 +511,7 @@
<div>
<a-radio-group v-model="reviewSendType.sendType" @change="changeSendType">
<a-radio value="快递">快递</a-radio>
<!-- <a-radio value="送货上门">送货上门</a-radio>-->
<!-- <a-radio value="送货上门">送货上门</a-radio>-->
</a-radio-group>
</div>
</a-modal>
......@@ -698,17 +698,18 @@
<a-form-item label="订单状态:">
<a-select :value="orderInfo.orderStatus" v-model="orderInfo.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>
<a-select-option value="已发货">已发货</a-select-option>
<a-select-option value="已完成">已完成</a-select-option>
<a-select-option value="异常单">异常单</a-select-option>
<a-select-option v-for="d in orderjson.orderStatus" :key="d.value" :value="d.value" >{{d.name}}</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>-->
<!-- <a-select-option value="已发货">已发货</a-select-option>-->
<!-- <a-select-option value="已完成">已完成</a-select-option>-->
<!-- <a-select-option value="异常单">异常单</a-select-option>-->
</a-select>
</a-form-item>
</a-col>
......@@ -815,8 +816,8 @@
</template>
<script>
import STable from "@/components/table";
import {
import STable from "@/components/table";
import {
orderList,
download,
abnormal,
......@@ -831,17 +832,17 @@
updateSendType,
setUpgradeStatus,
setKuanDiData
} from "../../../api/school-center/orderAPI";
import {cloneObject, exportFile} from "@/utils/util";
import moment from "moment";
import ConstantActivity from "@/constant/ConstantActivity";
import ImportBtn from "../../../components/sysmanage/ImportBtn";
const options = [
} from "../../../api/school-center/orderAPI";
import {cloneObject, exportFile} from "@/utils/util";
import moment from "moment";
import ConstantActivity from "@/constant/ConstantActivity";
import ImportBtn from "../../../components/sysmanage/ImportBtn";
import { getJonslist } from '@/api/api';
const options = [
{label: "审核通过", value: "1"},
{label: "审核不通过", value: "0"}
];
export default {
];
export default {
name: "orderView",
components: {
STable,
......@@ -849,6 +850,7 @@
},
data() {
return {
orderjson:{},
emptyText: {emptyText: '暂无数据'},
reviewStudentImg: "",
reviewStudent: {
......@@ -1006,6 +1008,13 @@
}
};
},
mounted() {
getJonslist().then((res) => { //请求json文件
this.orderjson = res.school_center_order_order;
this.$forceUpdate()
}).catch((ress) => {// 请求失败处理
});
},
methods: {
moment,
handleMenuClick(e) {
......@@ -1584,37 +1593,37 @@
}
}
}
};
};
</script>
<style scoped>
.ant-carousel >>> .slick-dots {
.ant-carousel >>> .slick-dots {
height: auto;
}
}
.ant-carousel >>> .slick-slide img {
.ant-carousel >>> .slick-slide img {
border: 5px solid #fff;
display: block;
margin: auto;
max-width: 80%;
}
}
.ant-carousel >>> .slick-thumb {
.ant-carousel >>> .slick-thumb {
bottom: -45px;
}
}
.ant-carousel >>> .slick-thumb li {
.ant-carousel >>> .slick-thumb li {
width: 60px;
height: 45px;
}
}
.ant-carousel >>> .slick-thumb li img {
.ant-carousel >>> .slick-thumb li img {
width: 100%;
height: 100%;
filter: grayscale(100%);
}
}
.ant-carousel >>> .slick-thumb li.slick-active img {
.ant-carousel >>> .slick-thumb li.slick-active img {
filter: grayscale(0%);
}
}
</style>
......@@ -226,17 +226,17 @@
</a-row>
<a-row>
<a-col :span="12">
<!-- <p v-if="orderInfo.status == '1'">订单状态:待提交</p>-->
<!-- <p v-if="orderInfo.status == '4'">订单状态:归档</p>-->
<!-- <p v-if="orderInfo.status == '5'">订单状态:作废</p>-->
<!-- <p v-if="orderInfo.status == '6'">订单状态:待配送</p>-->
<!-- <p v-if="orderInfo.status == '7'">订单状态:物流配送中</p>-->
<!-- <p v-if="orderInfo.status == '8'">订单状态:配送成功</p>-->
<!-- <p v-if="orderInfo.status == '3'">订单状态:受理成功</p>-->
<!-- <p v-if="orderInfo.status == '9'">订单状态:已收费</p>-->
<!-- <p v-if="orderInfo.status == '10'">订单状态:受理异常</p>-->
<!-- <p v-if="orderInfo.status == '2'">订单状态:待受理</p>-->
<!-- <p v-if="orderInfo.status == '100'">订单状态:未支付</p>-->
<!-- <p v-if="orderInfo.status == '1'">订单状态:待提交</p>-->
<!-- <p v-if="orderInfo.status == '4'">订单状态:归档</p>-->
<!-- <p v-if="orderInfo.status == '5'">订单状态:作废</p>-->
<!-- <p v-if="orderInfo.status == '6'">订单状态:待配送</p>-->
<!-- <p v-if="orderInfo.status == '7'">订单状态:物流配送中</p>-->
<!-- <p v-if="orderInfo.status == '8'">订单状态:配送成功</p>-->
<!-- <p v-if="orderInfo.status == '3'">订单状态:受理成功</p>-->
<!-- <p v-if="orderInfo.status == '9'">订单状态:已收费</p>-->
<!-- <p v-if="orderInfo.status == '10'">订单状态:受理异常</p>-->
<!-- <p v-if="orderInfo.status == '2'">订单状态:待受理</p>-->
<!-- <p v-if="orderInfo.status == '100'">订单状态:未支付</p>-->
<p>订单状态:{{ orderInfo.orderStatus }}</p>
</a-col>
<a-col :span="12">
......@@ -317,21 +317,22 @@
default-value="orderInfo.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>
<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 v-for="d in orderViewjson.orderStatus" :key="d.value" :value="d.value" >{{d.name}}</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>-->
<!-- <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>
</p>
</a-col>
......@@ -398,6 +399,7 @@ import {
} from "../../../api/school-center/orderAPI";
import { cloneObject, exportFile } from "@/utils/util";
import moment from "moment";
import { getJonslist } from '@/api/api';
export default {
name: "orderView",
components: {
......@@ -405,6 +407,7 @@ export default {
},
data() {
return {
orderViewjson:{},
emptyText: { emptyText: "暂无数据" },
callback: false,
Formtable: this.$form.createForm(this),
......@@ -523,6 +526,13 @@ export default {
},
};
},
mounted() {
getJonslist().then((res) => { //请求json文件
this.orderViewjson = res.school_center_order_orderView;
this.$forceUpdate()
}).catch((ress) => {// 请求失败处理
});
},
methods: {
// 编辑下拉
statusData(value) {
......
......@@ -183,18 +183,18 @@
<a-select-option key="1">显示</a-select-option>
</a-select>
</a-form-item>
<!-- <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="适用学校:">-->
<!-- <a-select v-model="universityName" style="width: 330px">-->
<!-- <a-select-option @click="universitySchoolName('请选择')" value="请选择">请选择</a-select-option>-->
<!-- <a-select-option @click="universitySchoolName(item)" v-for="item in universitySchool" :value="item.universityId">-->
<!-- {{item.universityName}}-->
<!-- </a-select-option>-->
<!-- </a-select>-->
<!-- <a @click="visibleT = true">详情</a>-->
<!-- </a-form-item>-->
<!-- <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="套餐情况:">-->
<!-- <a-input :rows="10" v-model="modelData.productMealPrice"/>-->
<!-- </a-form-item>-->
<!-- <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="适用学校:">-->
<!-- <a-select v-model="universityName" style="width: 330px">-->
<!-- <a-select-option @click="universitySchoolName('请选择')" value="请选择">请选择</a-select-option>-->
<!-- <a-select-option @click="universitySchoolName(item)" v-for="item in universitySchool" :value="item.universityId">-->
<!-- {{item.universityName}}-->
<!-- </a-select-option>-->
<!-- </a-select>-->
<!-- <a @click="visibleT = true">详情</a>-->
<!-- </a-form-item>-->
<!-- <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="套餐情况:">-->
<!-- <a-input :rows="10" v-model="modelData.productMealPrice"/>-->
<!-- </a-form-item>-->
<div>
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="产品情况:">
<mavon-editor @save="saveProductIntroduction" ref="editor_a" v-model="productIntroduction"></mavon-editor>
......@@ -220,11 +220,11 @@
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="允许上网终端类型:">
<a-select v-decorator="[ 'universityTerminalType', {rules: [{ required: true, message: '允许上网终端类型'}]} ]" @change="changeTerminalType">
<!-- <a-select-option value="PC+手机">PC+手机</a-select-option>-->
<!-- <a-select-option value="仅PC">仅PC</a-select-option>-->
<!-- <a-select-option value="仅手机">仅手机</a-select-option>-->
<!-- <a-select-option value="PC+手机">PC+手机</a-select-option>-->
<!-- <a-select-option value="仅PC">仅PC</a-select-option>-->
<!-- <a-select-option value="仅手机">仅手机</a-select-option>-->
<a-select-option v-for="d in broadbands.universityTerminalType" :key="d.value" :value="d.value">{{d.name}}</a-select-option>
<a-select-option v-for="d in broadbands.universityTerminalType" :key="d.value" :value="d.value" >{{d.name}}</a-select-option>
</a-select>
</a-form-item>
......@@ -236,9 +236,9 @@
</a-form-item>
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="用户类型:">
<a-select v-decorator="['universityUserType', {rules: [{required:true, message: '用户类型不能为空!'}]}]" @change="changeUserType">
<!-- <a-select-option value="翼起来用户">翼起来用户</a-select-option>-->
<!-- <a-select-option value="校园天翼宽带用户">校园天翼宽带用户</a-select-option>-->
<a-select-option v-for="d in broadbands.universityUserType" :key="d.value" :value="d.value">{{d.name}}</a-select-option>
<!-- <a-select-option value="翼起来用户">翼起来用户</a-select-option>-->
<!-- <a-select-option value="校园天翼宽带用户">校园天翼宽带用户</a-select-option>-->
<a-select-option v-for="d in broadbands.universityUserType" :key="d.value" :value="d.value" >{{d.name}}</a-select-option>
</a-select>
</a-form-item>
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="月租类型:">
......@@ -285,13 +285,13 @@
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="提速包:">
<a-select v-decorator="[ 'identifying' ]" @change="changeIdentifying">
<!-- <a-select-option value="">无</a-select-option>-->
<!-- <a-select-option value="校园低消宽带提速包(19元)">校园低消宽带提速包(19元)</a-select-option>-->
<!-- <a-select-option value="校园低消宽带提速包(29元)">校园低消宽带提速包(29元)</a-select-option>-->
<!-- <a-select-option value="校园低消宽带提速包(39元)">校园低消宽带提速包(39元)</a-select-option>-->
<!-- <a-select-option value="宽带免费提速至100M">宽带免费提速至100M</a-select-option>-->
<!-- <a-select-option value="1元宽带融合提速">1元宽带融合提速</a-select-option>-->
<a-select-option v-for="d in broadbands.identifying" :key="d.value" :value="d.value">{{d.name}}</a-select-option>
<a-select-option value=""></a-select-option>
<a-select-option v-for="d in broadbands.identifying" :key="d.value" :value="d.value" >{{d.name}}</a-select-option>
<!-- <a-select-option value="校园低消宽带提速包(19元)">校园低消宽带提速包(19元)</a-select-option>-->
<!-- <a-select-option value="校园低消宽带提速包(29元)">校园低消宽带提速包(29元)</a-select-option>-->
<!-- <a-select-option value="校园低消宽带提速包(39元)">校园低消宽带提速包(39元)</a-select-option>-->
<!-- <a-select-option value="宽带免费提速至100M">宽带免费提速至100M</a-select-option>-->
<!-- <a-select-option value="1元宽带融合提速">1元宽带融合提速</a-select-option>-->
</a-select>
</a-form-item>
<a-input style="display:none" placeholder="如:20M" v-decorator="[ 'speed', {rules: [{ required: true, message: '短信速率不能为空!' ,validator: 'click'}]} ]"></a-input>
......@@ -317,7 +317,7 @@ export default {
},
data(){
return {
broadbands:[],
broadbands:{},
universityId: true,
universityName: '',
regularName: '',
......@@ -893,7 +893,6 @@ export default {
this.initSubstName();
this.getSchool();
getJonslist().then((res) => { //请求json文件
debugger
this.broadbands = res.school_center_productManagement_broadband;
this.$forceUpdate()
}).catch((ress) => {// 请求失败处理
......
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