Skip to content

G
gdtel-gztel-school-center-ui
Commit 032fac16 by 罗承锋
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/views/school-center/order/order.vue
parents ff859a2b c6e21a27
Showing with 19 additions and 14 deletions
src/assets/less/ws.less
...@@ -56,7 +56,10 @@ ...@@ -56,7 +56,10 @@
*/ */
.ant-table-small > .ant-table-content > .ant-table-header > table > .ant-table-thead > tr > th, .ant-table-small > .ant-table-content > .ant-table-body > table > .ant-table-thead > tr > th, .ant-table-small > .ant-table-content > .ant-table-scroll > .ant-table-header > table > .ant-table-thead > tr > th, .ant-table-small > .ant-table-content > .ant-table-scroll > .ant-table-body > table > .ant-table-thead > tr > th, .ant-table-small > .ant-table-content > .ant-table-fixed-left > .ant-table-header > table > .ant-table-thead > tr > th, .ant-table-small > .ant-table-content > .ant-table-fixed-right > .ant-table-header > table > .ant-table-thead > tr > th, .ant-table-small > .ant-table-content > .ant-table-fixed-left > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-thead > tr > th, .ant-table-small > .ant-table-content > .ant-table-fixed-right > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-thead > tr > th { .ant-table-small > .ant-table-content > .ant-table-header > table > .ant-table-thead > tr > th, .ant-table-small > .ant-table-content > .ant-table-body > table > .ant-table-thead > tr > th, .ant-table-small > .ant-table-content > .ant-table-scroll > .ant-table-header > table > .ant-table-thead > tr > th, .ant-table-small > .ant-table-content > .ant-table-scroll > .ant-table-body > table > .ant-table-thead > tr > th, .ant-table-small > .ant-table-content > .ant-table-fixed-left > .ant-table-header > table > .ant-table-thead > tr > th, .ant-table-small > .ant-table-content > .ant-table-fixed-right > .ant-table-header > table > .ant-table-thead > tr > th, .ant-table-small > .ant-table-content > .ant-table-fixed-left > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-thead > tr > th, .ant-table-small > .ant-table-content > .ant-table-fixed-right > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-thead > tr > th {
background: #f5f5f5 !important; background: #f5f5f5 !important;
}
.ant-table-row-cell-break-word{
padding:4px 4px !important;
text-align:center !important;
} }
.ant-table-tbody td{ .ant-table-tbody td{
......
src/views/school-center/order/order.vue
...@@ -108,10 +108,10 @@ ...@@ -108,10 +108,10 @@
<a-menu slot="overlay" @click="handleMenuClick"> <a-menu slot="overlay" @click="handleMenuClick">
<a-menu-item key="1"><a-icon type="arrow-up"/>受理单</a-menu-item> <a-menu-item key="1"><a-icon type="arrow-up"/>受理单</a-menu-item>
<a-menu-item key="2"><a-icon type="arrow-up"/>快递</a-menu-item> <a-menu-item key="2"><a-icon type="arrow-up"/>快递</a-menu-item>
<a-menu-item key="3"><a-icon type="arrow-up"/>iccid填号</a-menu-item>
</a-menu> </a-menu>
<a-button style="margin-left: 8px">导入<a-icon type="down"/></a-button> <a-button style="margin-left: 8px">导入<a-icon type="down"/></a-button>
</a-dropdown> </a-dropdown>
<a-button @click="handleSubmit3" style="margin-left: 8px"><a-icon type="arrow-up"/>iccid批量填号</a-button>
</a-col> </a-col>
</a-row> </a-row>
</a-form> </a-form>
...@@ -136,17 +136,17 @@ ...@@ -136,17 +136,17 @@
</template> </template>
<template slot="userType" slot-scope="text"> <template slot="userType" slot-scope="text">
<p v-if="text=='1'">老用户办理</p> <span v-if="text=='1'">老用户办理</span>
<p v-if="text=='0'">新用户办理</p> <span v-if="text=='0'">新用户办理</span>
<p v-if="text=='2'">老用户续约</p> <span v-if="text=='2'">老用户续约</span>
<p v-if="text=='3'">融合办理</p> <span v-if="text=='3'">融合办理</span>
<p v-if="text=='4'">抽奖业务</p> <span v-if="text=='4'">抽奖业务</span>
<p v-if="text=='5'">单宽业务</p> <span v-if="text=='5'">单宽业务</span>
<p v-if="text=='6'">羊城通业务</p> <span v-if="text=='6'">羊城通业务</span>
</template> </template>
<template slot="studentCardCheckStatus" slot-scope="text"> <template slot="studentCardCheckStatus" slot-scope="text">
<p v-if="text=='0'">未审核</p> <span v-if="text=='0'">未审核</span>
<p v-if="text=='1'">已审核</p> <span v-if="text=='1'">已审核</span>
</template> </template>
<template slot="operation" slot-scope="text, record"> <template slot="operation" slot-scope="text, record">
<span> <span>
...@@ -157,8 +157,8 @@ ...@@ -157,8 +157,8 @@
<a-divider v-if="record.orderStatus === '待审核'" type="vertical"/> <a-divider v-if="record.orderStatus === '待审核'" type="vertical"/>
<a v-show="record.orderStatus === '待审核'" @click="reviewStudentIdCard(record)">审核学生证</a> <a v-show="record.orderStatus === '待审核'" @click="reviewStudentIdCard(record)">审核学生证</a>
<a-divider type="vertical"/> <!-- <a-divider type="vertical"/>-->
<a @click="showDrawer(record,'2')">编辑</a> <!-- <a @click="showDrawer(record,'2')">编辑</a>-->
</span> </span>
</template> </template>
</s-table> </s-table>
...@@ -805,7 +805,6 @@ ...@@ -805,7 +805,6 @@
let obj = cloneObject(this.queryParam); let obj = cloneObject(this.queryParam);
//表示 //表示
return orderList(Object.assign(params, obj)).then(res => { return orderList(Object.assign(params, obj)).then(res => {
console.log(res);
this.isAbnormal = res.isAbnormal; this.isAbnormal = res.isAbnormal;
this.isEdit = res.isEdit; this.isEdit = res.isEdit;
let data = {}; let data = {};
...@@ -840,6 +839,9 @@ ...@@ -840,6 +839,9 @@
if (e.key == "2") { if (e.key == "2") {
this.handleSubmit2(); this.handleSubmit2();
} }
if (e.key == "3") {
this.handleSubmit3();
}
}, },
reviewStudentIdCard(res) { reviewStudentIdCard(res) {
this.reviewStudentImg = this.apis + res.studentCard; this.reviewStudentImg = this.apis + res.studentCard;
......
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