Skip to content

C
confucius
Commit e717e1fd authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 7241fcc3
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 93 deletions
src/components/course/courserefund-form.vue
View file @ e717e1fd
<template>
<div class="page-content">
<q-table :pagination="pageMsg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
separator="none" title="合同信息" :data="dataList" :columns="columns" row-key="name">
separator="none" title="退课协议" :data="dataList" :columns="columns" row-key="name">
<template v-slot:top="props">
<div class="col-2 q-table__title">合同信息</div>
<div class="col-2 q-table__title">退课协议</div>
<q-space />
<div class="page-option"></div>
</template>
......@@ -24,14 +24,11 @@
{{ props.row.StudentName }}
</q-td>
</template>
<template v-slot:body-cell-Status="props">
<template v-slot:body-cell-AuditStatus="props">
<q-td auto-width :props="props">
<span v-if="props.row.Status == 0" style="color: #e6a23c">草稿</span>
<span v-if="props.row.Status == 1" style="color: #409eff">提交审核</span>
<span v-if="props.row.Status == 2" style="color: #67c23a">审合通过</span>
<span v-if="props.row.Status == 3" style="color: #f56c6c">驳回</span>
<span v-if="props.row.Status == 4" style="color: #e95252">取消</span>
<span v-if="props.row.AuditStatus == 1||props.row.AuditStatus == 0" style="color: #409eff">审核中</span>
<span v-if="props.row.AuditStatus == 2" style="color: #67c23a">审合通过</span>
<span v-if="props.row.AuditStatus == 3" style="color: #f56c6c">驳回</span>
</q-td>
</template>
<template v-slot:body-cell-IsCompanySeal="props">
......@@ -41,8 +38,7 @@
</q-td>
</template>
<template v-slot:bottom>
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
:input="true" @input="changePage" />
</template>
<template v-slot:body-cell-optioned="props">
<q-td :props="props">
......@@ -51,37 +47,13 @@
style="font-weight: 400" @click="EditContract(props.row)" label="编辑" />
<el-tooltip content="复制链接发送给客人签字" placement="top" effect="light">
<q-btn flat size="xs" v-if="
props.row.Status == 2 &&
props.row.AuditStatus == 2 &&
(props.row.Sign == '' || props.row.Sign == null)
" icon="iconfont icon-qianming" color="accent" style="font-weight: 400" @click="CopyUrl(props.row)"
label="获取合同链接" />
</el-tooltip>
<q-btn flat size="xs" icon="iconfont icon-View" color="accent" @click="goContract(props.row)"
style="font-weight: 400" label="查看" />
<q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left: 10px" v-if="
props.row.Status == 0 ||
props.row.Status == 2 ||
props.row.Status == 3
">
<q-list>
<q-item clickable v-close-popup v-if="props.row.Status == 0 || props.row.Status == 3"
@click="operationContract(props.row, 1)">
<q-item-section>
<q-item-label>提交审核</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup v-if="props.row.Status == 2" @click="downloadContract(props.row)">
<q-item-section>
<q-item-label>下载</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup v-if="props.row.Status == 0" @click="operationContract(props.row, 4)">
<q-item-section>
<q-item-label>取消</q-item-label>
</q-item-section>
</q-item>
</q-list>
</q-btn-dropdown>
</div>
</q-td>
</template>
......@@ -103,28 +75,22 @@
data() {
return {
columns: [{
name: "ContractNo",
label: "合同编号",
name: "ProtocolNum",
label: "协议编号",
align: "left",
field: "ContractNo",
field: "ProtocolNum",
},
{
name: "CTypeName",
label: "类型",
align: "left",
field: "CTypeName",
},
{
name: "StudentName",
name: "PartyAName",
label: "学生名称",
field: "StudentName",
field: "PartyAName",
align: "left",
},
{
name: "CourseName",
name: "OldCourseName",
label: "课程名称",
align: "left",
field: "CourseName",
field: "OldCourseName",
},
{
name: "CreateByName",
......@@ -133,22 +99,22 @@
field: "CreateByName",
},
{
name: "CreateTime",
name: "CreateTimeStr",
label: "创建时间",
align: "left",
field: "CreateTime",
field: "CreateTimeStr",
},
{
name: "SchoolStatusStr",
name: "ReceiptId",
label: "关联退课申请单",
align: "left",
field: "SchoolStatusStr",
field: "ReceiptId",
},
{
name: "status",
name: "AuditStatus",
label: "审核状态",
align: "left",
field: "SchoolStatusStr"
field: "AuditStatus"
},
{
name: "IsCompanySeal",
......@@ -167,7 +133,9 @@
},
}
},
created() {},
created() {
},
mounted() {},
methods: {
......
src/components/sale/backclass-form.vue
View file @ e717e1fd
......@@ -160,7 +160,7 @@
</span>
</div>
</div>
<div class="row" style="margin-top:20px;display:none;">
<div class="row" style="margin-top:20px;">
<div class="col-6 q-pr-lg">
<q-input filled v-model="BackAccountName" label="退还账户名"></q-input>
</div>
......@@ -170,8 +170,8 @@
</div>
<q-input filled stack-label :dense="false" v-model="applyReason" style="margin-top: 20px" type="textarea"
class="col-12" label="申请理由" />
<q-input filled stack-label :dense="false" v-model="StateMent" style="margin-top: 20px;display:none" type="textarea"
class="col-12" label="协议申明" />
<q-input filled stack-label :dense="false" v-model="StateMent" style="margin-top: 20px;" type="textarea"
class="col-12" label="协议申明（在退课协议中显示）" />
<div class="row">
<div class="col-12 q-mt-md text-grey-6">
上传附件：<span class="fj-tip" style="font-size: 10px; color: #f00">*单文件限制5M内</span>
......@@ -338,9 +338,10 @@
picIsShow: false,
picObj: [],
initialIndex: 0,
BackAccountName: '工行', //退还户名
BackAccount: '123', //退还账户
StateMent:'我是协议' //协议申明
BackAccountName: '', //退还户名
BackAccount: '', //退还账户
StateMent: '' //协议申明
};
},
created() {
......@@ -440,7 +441,6 @@
// 预览上传文件
if (i.Type == 3) {
this.picObj.push(i.Url);
// this.imgList.push(i.Url)
this.picIsShow = true;
} else {
if (
......
src/components/sale/editOrder-form.vue
View file @ e717e1fd
......@@ -74,9 +74,9 @@
<q-select :disable="modityOrderType==2" standout="bg-primary text-white" option-value="Id" option-label="Name"
v-model="OrderMsg.OrderSource" :options="SourceEnumList" emit-value map-options class="q-pb-lg"
label="客人来源" />
<q-select :disable="(modityOrderType==2)||(OrderMsg.JoinType==3)" v-model="OrderMsg.HelpEnterId" :options="EmployeeList" filled
use-input label="协助老师" option-label="EmployeeName" option-value="Id" ref="EmployeeName" class="col-6 q-pb-lg"
emit-value map-options @filter="filterFn">
<q-select :disable="(modityOrderType==2)||(OrderMsg.JoinType==3)" v-model="OrderMsg.HelpEnterId"
:options="EmployeeList" filled use-input label="协助老师" option-label="EmployeeName" option-value="Id"
ref="EmployeeName" class="col-6 q-pb-lg" emit-value map-options @filter="filterFn">
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">
......@@ -172,7 +172,7 @@
StartClassHours: 0, //已上课时
EffectTime: '', //生效时间
UpOrderId: 0, //前置订单编号
JoinType:1,//订单报入类型
JoinType: 1, //订单报入类型
},
IsShowUpPrice: false, //是否显示高于定价
UnitPrice: 0,
......@@ -302,7 +302,7 @@
this.OrderMsg.OrderNature = tempData.OrderNature;
this.OrderMsg.OldPreferPrice = tempData.OldPreferPrice;
this.OrderMsg.CourseId = tempData.CourseId;
this.OrderMsg.JoinType=tempData.JoinType;
this.OrderMsg.JoinType = tempData.JoinType;
this.OrderMsg.StartClassHours = tempData.StartClassHours;
this.OrderMsg.IsChaBan = tempData.IsChaBan;
this.OrderMsg.EffectTime = tempData.EffectTime;
......@@ -326,7 +326,7 @@
this.OrderMsg.IsChaBan = this.isChaBan;
this.OrderMsg.EffectTime = "";
this.OrderMsg.UpOrderId = 0;
this.OrderMsg.JoinType=1;
this.OrderMsg.JoinType = 1;
this.OrderMsg.OrderType = this.orderType;
if (this.OrderMsg.OrderType == 2) {
this.OrderMsg.OrderNature = 1;
......
src/pages/administration/dropSchoolManage.vue
View file @ e717e1fd
......@@ -5,12 +5,12 @@
<div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3">
<q-input @change="resetSearch" clearable standout="bg-primary text-white" v-model="msg.QOrderId" label="订单id"
<q-input @change="resetSearch" clearable standout="bg-primary text-white" v-model="msg.QOrderId" label="订单编号"
@clear="resetSearch" maxlength="30" />
</div>
<div class="col-3">
<q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.AuditStatus" :options="StatusOpts"
option-value="Id" option-label="Name" label="状态" emit-value map-options />
<q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.AuditStatus"
:options="StatusOpts" option-value="Id" option-label="Name" label="状态" emit-value map-options />
</div>
<div class="col-3">
<q-input @change="resetSearch" clearable standout="bg-primary text-white" v-model="msg.ProtocolNum"
......@@ -23,8 +23,8 @@
</div>
</div>
<courserefund-form :loading="loading" :dataList="dataList"></courserefund-form>
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
:input="true" @input="changePage" />
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount" :input="true"
@input="changePage" />
</div>
</template>
<script>
......@@ -45,10 +45,10 @@
msg: {
pageIndex: 1,
pageSize: 12,
PartyAName: '张三',
PartyAName: '',
AuditStatus: -1,
QOrderId: 0,
ProtocolNum: '123',
QOrderId: '',
ProtocolNum: '',
IsQueryAll: 1
},
pageCount: 0,
......@@ -58,34 +58,24 @@
Id: -1,
Name: "不限",
},
{
Id: 0,
Name: "草稿",
},
{
Id: 1,
Name: "提交审核",
Name: "审核中",
},
{
Id: 2,
Name: "审核通过(行政)",
},
{
Id: 5,
Name: "审核通过(学管)",
Name: "审核通过",
},
{
Id: 3,
Name: "驳回",
},
{
Id: 4,
Name: "取消",
},
],
};
},
created() {},
created() {
},
mounted() {
this.getList();
},
......@@ -96,9 +86,9 @@
GetBackClassProtocolPage(this.msg).then((res) => {
this.loading = false;
if (res.Code == 1) {
console.log(res,'数据');
this.dataList = res.Data.PageData;
this.pageCount = res.Data.PageCount;
console.log(this.dataList ,"this.dataList ");
}
});
},
......
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