Skip to content

C
confucius
Commit 0736d768 authored by zhengke's avatar zhengke
Browse files
Options

修改

parent d5deeb14
Show whitespace changes
Inline Side-by-side
Showing with 659 additions and 692 deletions
src/components/sale/orderlist.vue
View file @ 0736d768
...@@ -5,17 +5,17 @@ ...@@ -5,17 +5,17 @@
<table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0"> <table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0">
<colgroup> <colgroup>
<col width="12%" /> <col width="12%" />
<col width="7%"/> <col width="7%" />
<col width="7%"/> <col width="7%" />
<col width="7%"/> <col width="7%" />
<col width="7%"/> <col width="7%" />
<col width="7%"/> <col width="7%" />
<col width="7%"/> <col width="7%" />
<col width="6%"/> <col width="6%" />
<col width="7%"/> <col width="7%" />
<col width="7%"/> <col width="7%" />
<col width="7%"/> <col width="7%" />
<col width="7%"/> <col width="7%" />
<col> <col>
</colgroup> </colgroup>
<thead> <thead>
...@@ -32,48 +32,31 @@ ...@@ -32,48 +32,31 @@
<th width="7%">平台税金</th> <th width="7%">平台税金</th>
<th width="7%">待收金额</th> <th width="7%">待收金额</th>
<th width="7%">状态</th> <th width="7%">状态</th>
<th v-if="isEdit">操作</th> <th>操作</th>
</tr> </tr>
</thead> </thead>
</table> </table>
</div> </div>
<div class="table-body"> <div class="table-body">
<table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0"> <table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0">
<!-- <tr class="fix_th">
<th width="12%">单号</th>
<th width="7.5%">人数</th>
<th width="7.5%">单价</th>
<th width="7.5%">成交</th>
<th width="7.5%">应收总额</th>
<th width="7.5%">实收</th>
<th width="7.5%">优惠</th>
<th width="7.5%">退款</th>
<th width="7.5%">平台税金</th>
<th width="7.5%">待收金额</th>
<th width="8%">状态</th>
<th v-if="isEdit">操作</th>
</tr> -->
<colgroup> <colgroup>
<col width="12%" /> <col width="12%" />
<col width="7%"/> <col width="7%" />
<col width="7%"/> <col width="7%" />
<col width="7%"/> <col width="7%" />
<col width="7%"/> <col width="7%" />
<col width="7%"/> <col width="7%" />
<col width="7%"/> <col width="7%" />
<col width="6%"/> <col width="6%" />
<col width="7%"/> <col width="7%" />
<col width="7%"/> <col width="7%" />
<col width="7%"/> <col width="7%" />
<col width="7%"/> <col width="7%" />
<col> <col>
</colgroup> </colgroup>
<tr> <tr>
<td v-show="dataList && dataList.length==0" :colspan="12" align="center">暂无数据</td> <td v-show="dataList && dataList.length==0" :colspan="12" align="center">暂无数据</td>
</tr> </tr>
<tbody v-for="(item,index) in dataList" :key="index"> <tbody v-for="(item,index) in dataList" :key="index">
<tr> <tr>
<td :rowspan="3" style="text-align: left"> <td :rowspan="3" style="text-align: left">
...@@ -134,7 +117,7 @@ ...@@ -134,7 +117,7 @@
<span style="color: #02C499">{{item.OrderStateName}}</span> <span style="color: #02C499">{{item.OrderStateName}}</span>
</div> </div>
</td> </td>
<td style="border:none" v-if="isEdit"> <td style="border:none">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑" <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
@click="editOrder(item)" /> @click="editOrder(item)" />
<q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;"> <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
...@@ -180,13 +163,24 @@ ...@@ -180,13 +163,24 @@
<q-item-label>修改提成</q-item-label> <q-item-label>修改提成</q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item clickable v-close-popup v-if="AuthorityObj.isShowRewardEdit"> <q-item clickable v-close-popup v-if="AuthorityObj.isShowRewardEdit&&isShowReward">
<q-item-section @click="upDateMoney(item,2)"> <q-item-section @click="upDateMoney(item,2)">
<q-item-label>额外奖励</q-item-label> <q-item-label>额外奖励</q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item clickable v-close-popup> <q-item clickable v-close-popup disabled
v-if="(item.FinanceList&&item.FinanceList.length>0)||(item.RefundFinanceList&&item.RefundFinanceList.length>0)">
<q-item-section>
<q-item-label>
取消订单
</q-item-label>
<q-tooltip anchor="center left" self="center right" content-class="bg-red">
已有财务单据无法取消
</q-tooltip>
</q-item-section>
</q-item>
<q-item clickable v-close-popup v-else>
<q-item-section @click="CancelOrder(item)"> <q-item-section @click="CancelOrder(item)">
<q-item-label>取消订单</q-item-label> <q-item-label>取消订单</q-item-label>
</q-item-section> </q-item-section>
...@@ -230,14 +224,12 @@ ...@@ -230,14 +224,12 @@
<td>{{subItem.ContractStatusStr}}</td> <td>{{subItem.ContractStatusStr}}</td>
<td v-if="isEdit"> <td v-if="isEdit">
<template v-if="subItem.ContractId==0"> <template v-if="subItem.ContractId==0">
<q-btn color="accent" size="sm" <q-btn color="accent" size="sm" @click="takeContractTwo(item,subItem)" label="领取合同" />
@click="takeContractTwo(item,subItem)" label="领取合同" />
</template> </template>
<template v-else> <template v-else>
<!-- <q-btn color="accent" size="sm" style="margin-right:5px;" <!-- <q-btn color="accent" size="sm" style="margin-right:5px;"
@click="takeContractTwo(item,subItem)" label="修改" /> --> @click="takeContractTwo(item,subItem)" label="修改" /> -->
<q-btn color="secondary" size="sm" <q-btn color="secondary" size="sm" @click="goContractMannage()" label="查看合同" />
@click="goContractMannage()" label="查看合同" />
</template> </template>
</td> </td>
</tr> </tr>
...@@ -375,14 +367,16 @@ ...@@ -375,14 +367,16 @@
<th>状态</th> <th>状态</th>
</tr> </tr>
<tr v-for="subItem in item.GuestList"> <tr v-for="subItem in item.GuestList">
<td><q-radio dense v-model="chooseStudent" :val="subItem.Id"/> <td>
<q-radio dense v-model="chooseStudent" :val="subItem.Id" />
<td>{{subItem.GuestName}}</td> <td>{{subItem.GuestName}}</td>
<td>{{subItem.ContractNo}}</td> <td>{{subItem.ContractNo}}</td>
<td>{{subItem.ContractStatusStr}}</td> <td>{{subItem.ContractStatusStr}}</td>
</tr> </tr>
</table> </table>
</div> </div>
<q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,1)" label="制单" style="min-width:70px;float:right;margin-top:10px" /> <q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,1)" label="制单"
style="min-width:70px;float:right;margin-top:10px" />
</q-banner> </q-banner>
</q-popup-proxy> </q-popup-proxy>
</div> </div>
...@@ -409,14 +403,16 @@ ...@@ -409,14 +403,16 @@
<th>状态</th> <th>状态</th>
</tr> </tr>
<tr v-for="subItem in item.GuestList"> <tr v-for="subItem in item.GuestList">
<td><q-radio dense v-model="chooseStudent" :val="subItem.Id"/> <td>
<q-radio dense v-model="chooseStudent" :val="subItem.Id" />
<td>{{subItem.GuestName}}</td> <td>{{subItem.GuestName}}</td>
<td>{{subItem.ContractNo}}</td> <td>{{subItem.ContractNo}}</td>
<td>{{subItem.ContractStatusStr}}</td> <td>{{subItem.ContractStatusStr}}</td>
</tr> </tr>
</table> </table>
</div> </div>
<q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,2)" label="制单" style="min-width:70px;float:right;margin-top:10px" /> <q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,2)" label="制单"
style="min-width:70px;float:right;margin-top:10px" />
</q-banner> </q-banner>
</q-popup-proxy> </q-popup-proxy>
</div> </div>
...@@ -605,7 +601,7 @@ ...@@ -605,7 +601,7 @@
<div class="row" style="justify-content: space-between"> <div class="row" style="justify-content: space-between">
<span>收款单据：</span> <span>收款单据：</span>
<q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn" <q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn"
style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=true"/> style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=true" />
<q-popup-proxy v-if="showChooseStudent"> <q-popup-proxy v-if="showChooseStudent">
<q-banner> <q-banner>
<div style="width:500px;max-height:220px;overflow-y:auto;"> <div style="width:500px;max-height:220px;overflow-y:auto;">
...@@ -617,14 +613,16 @@ ...@@ -617,14 +613,16 @@
<th>状态</th> <th>状态</th>
</tr> </tr>
<tr v-for="subItem in item.GuestList"> <tr v-for="subItem in item.GuestList">
<td><q-radio dense v-model="chooseStudent" :val="subItem.Id"/> <td>
<q-radio dense v-model="chooseStudent" :val="subItem.Id" />
<td>{{subItem.GuestName}}</td> <td>{{subItem.GuestName}}</td>
<td>{{subItem.ContractNo}}</td> <td>{{subItem.ContractNo}}</td>
<td>{{subItem.ContractStatusStr}}</td> <td>{{subItem.ContractStatusStr}}</td>
</tr> </tr>
</table> </table>
</div> </div>
<q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,1)" label="制单" style="min-width:70px;float:right;margin-top:10px" /> <q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,1)" label="制单"
style="min-width:70px;float:right;margin-top:10px" />
</q-banner> </q-banner>
</q-popup-proxy> </q-popup-proxy>
</div> </div>
...@@ -651,14 +649,16 @@ ...@@ -651,14 +649,16 @@
<th>状态</th> <th>状态</th>
</tr> </tr>
<tr v-for="subItem in item.GuestList"> <tr v-for="subItem in item.GuestList">
<td><q-radio dense v-model="chooseStudent" :val="subItem.Id"/> <td>
<q-radio dense v-model="chooseStudent" :val="subItem.Id" />
<td>{{subItem.GuestName}}</td> <td>{{subItem.GuestName}}</td>
<td>{{subItem.ContractNo}}</td> <td>{{subItem.ContractNo}}</td>
<td>{{subItem.ContractStatusStr}}</td> <td>{{subItem.ContractStatusStr}}</td>
</tr> </tr>
</table> </table>
</div> </div>
<q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,2)" label="制单" style="min-width:70px;float:right;margin-top:10px" /> <q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,2)" label="制单"
style="min-width:70px;float:right;margin-top:10px" />
</q-banner> </q-banner>
</q-popup-proxy> </q-popup-proxy>
</div> </div>
...@@ -679,7 +679,8 @@ ...@@ -679,7 +679,8 @@
</table> </table>
</div> </div>
<!--修改订单--> <!--修改订单-->
<editorder-form v-if="isShowEditOrderForm" :save-obj="editObj" :orderType="1" @close="closeOrderSaveForm" @success="refreshOrder"> <editorder-form v-if="isShowEditOrderForm" :save-obj="orderObj" :orderType="orderObj.OrderType"
@close="closeOrderSaveForm" @success="refreshOrder">
</editorder-form> </editorder-form>
<!--修改订单备注--> <!--修改订单备注-->
...@@ -772,9 +773,9 @@ ...@@ -772,9 +773,9 @@
type: Object, type: Object,
}, },
//是否可以编辑 //是否可以编辑
isEdit:{ isEdit: {
type:Boolean, type: Boolean,
default:true default: true
} }
}, },
data() { data() {
...@@ -812,23 +813,33 @@ ...@@ -812,23 +813,33 @@
isShowRewardEdit: false, //是否显示修改额外提成按钮 isShowRewardEdit: false, //是否显示修改额外提成按钮
isShowBackClass: false, //是否显示退课按钮 isShowBackClass: false, //是否显示退课按钮
isShowRenewClass: false, //是否显示续课按钮 isShowRenewClass: false, //是否显示续课按钮
isShowContract:true,//是都显示合同 isShowContract: true, //是都显示合同
}, },
isShowEduForm:false, isShowEduForm: false,
eduObj:{}, eduObj: {},
isShowPop:false, isShowPop: false,
showChooseStudent:false,//收款单据，是否显示单选学生 showChooseStudent: false, //收款单据，是否显示单选学生
chooseStudent:"",//收款单据，单选学生 chooseStudent: "", //收款单据，单选学生
editObj:{} isShowReward: false, // 是否可以修改额外金额
} }
}, },
created() { created() {
this.initAuth(); this.initAuth();
this.Employee(); this.Employee();
var localStorageData = window.localStorage["loginUserInfo"];
let ActionMenuList = JSON.parse(localStorageData).data.ActionMenuList
if (ActionMenuList && ActionMenuList.length > 0) {
ActionMenuList.forEach(x => {
if (x.FunctionCode == 'Edit_OrderExtraMoney') {
this.isShowReward = true
}
})
}
}, },
mounted() { mounted() {},
},
methods: { methods: {
//初始化权限信息 //初始化权限信息
initAuth() { initAuth() {
...@@ -991,9 +1002,9 @@ ...@@ -991,9 +1002,9 @@
this.$router.push({ this.$router.push({
path: tempStr, path: tempStr,
query: { query: {
OrderId:item.OrderId, OrderId: item.OrderId,
ClassId:item.ClassId, ClassId: item.ClassId,
SourceId:item.SourceId, SourceId: item.SourceId,
isShow: this.AuthorityObj.isShowGuestBtn isShow: this.AuthorityObj.isShowGuestBtn
} }
}); });
...@@ -1015,7 +1026,6 @@ ...@@ -1015,7 +1026,6 @@
//显示修改订单 //显示修改订单
editOrder(item) { editOrder(item) {
this.orderObj = item; this.orderObj = item;
this.editObj.OrderId = item.OrderId;
this.isShowEditOrderForm = true; this.isShowEditOrderForm = true;
}, },
//刷新页面 //刷新页面
...@@ -1061,7 +1071,7 @@ ...@@ -1061,7 +1071,7 @@
}, },
//财务单据 //财务单据
chanceType(obj, type) { chanceType(obj, type) {
if(this.chooseStudent==""){ if (this.chooseStudent == "") {
this.$q.notify({ this.$q.notify({
icon: 'close', icon: 'close',
color: 'accent', color: 'accent',
...@@ -1112,7 +1122,7 @@ ...@@ -1112,7 +1122,7 @@
'blank': 'y', 'blank': 'y',
'orderObj': JSON.stringify(orderObj), 'orderObj': JSON.stringify(orderObj),
'tradeWay': obj.tradeWay, 'tradeWay': obj.tradeWay,
"GuestId":this.chooseStudent "GuestId": this.chooseStudent
} }
}); });
}, },
...@@ -1170,11 +1180,11 @@ ...@@ -1170,11 +1180,11 @@
ContractId: subItem.ContractId ContractId: subItem.ContractId
} }
this.eduObj = obj; this.eduObj = obj;
this.isShowPop=false; this.isShowPop = false;
this.isShowEduForm=true; this.isShowEduForm = true;
}, },
//跳转至合同管理 //跳转至合同管理
goContractMannage(){ goContractMannage() {
this.$router.push({ this.$router.push({
path: '/sale/contractManage', path: '/sale/contractManage',
query: {} query: {}
...@@ -1407,16 +1417,17 @@ ...@@ -1407,16 +1417,17 @@
border-collapse: collapse; border-collapse: collapse;
} }
.Contract_Table th, .Contract_Table td { .Contract_Table th,
.Contract_Table td {
padding: 5px; padding: 5px;
color: #000; color: #000;
text-align: center; text-align: center;
} }
.table-body{
height:590px; .table-body {
height: 590px;
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
} }
</style> </style>
src/pages/sale/japaneseTrain.vue
View file @ 0736d768
...@@ -222,50 +222,6 @@ ...@@ -222,50 +222,6 @@
</ul> </ul>
<div v-else style="width: 100%;color: #999999;text-align: center;font-size: 15px">暂无数据</div> <div v-else style="width: 100%;color: #999999;text-align: center;font-size: 15px">暂无数据</div>
</div> </div>
<!-- <q-dialog v-model="dialog" maximized full-height seamless position="right">
<q-card style="margin-top:61px;width:500px" class="no-border-radius classinfo_Dialog">
<div class="drawerTop">
<div style="display:flex;align-items:center;margin-left:10px;">
<span class="drawer_Span">学员报名</span>
</div>
</div>
<div style="padding:20px 15px;">
<q-input filled stack-label maxlength="4" :dense="false" v-model="enrollMsg.GuestNum" type="number"
@input="peopleNumber" class="col-12" label="人数" :rules="[val => !!val || '请填写人数']" />
<q-input filled stack-label :dense="false" maxlength="8" v-model="enrollMsg.Unit_Price"
:disable="IsUpPrice==true?false:true" @blur="priceNumber" class="col-12" label="成交单价"
:rules="[val => !!val || '请填成交单价']" />
<q-toggle v-model="IsUpPrice" label="高于定价收生" class="q-mb-md" />
<q-select v-model="enrollMsg.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">
未找到相关数据
</q-item-section>
</q-item>
</template>
</q-select>
<q-select standout="bg-primary text-white" option-value="Id" option-label="Name"
v-model="enrollMsg.OrderSource" :options="SourceEnumList" class="q-pb-lg" emit-value map-options label="客人来源" />
<q-input v-if="enrollMsg.OrderSource==3" filled stack-label :dense="false" v-model="enrollMsg.GeneralOccupation" maxlength="50" class="col-12 q-pb-lg" label="一般同行" />
<q-input v-if="enrollMsg.OrderSource==7" filled stack-label :dense="false" v-model="enrollMsg.EduOccupation" maxlength="50" class="col-12 q-pb-lg" label="教育同行" />
<q-toggle v-model="enrollMsg.IsLessPrice" :false-value="0" :true-value="1" label="是否少价" class="q-mb-md" />
<q-input v-if="enrollMsg.IsLessPrice==1" @keyup.native="checkPrice(enrollMsg,'LessPrice')" filled stack-label maxlength="10" :dense="false" v-model="enrollMsg.LessPrice" class="col-12" label="少价金额" />
<q-input filled stack-label type="textarea" maxlength="500" :dense="false" v-model="enrollMsg.SaleRemark"
style="margin-top: 20px" class="col-12" label="备注" />
<div style="margin:30px 10px 0 0;">
<q-btn class="q-mr-md" label="取消" @click="dialog=false" />
<q-btn color="accent" class="q-mr-md" label="保存" @click="saveSatMsg()" />
</div>
</div>
</q-card>
<div class="dialog-out-close" @click="dialog=false"
style="height:40px !important;border-top-left-radius: 4px !important;border-bottom-left-radius: 4px !important;">
<q-icon name="iconfont icon-jujue1" size="26px" />
</div>
</q-dialog> -->
<editorder-form v-if="isShowEditOrderForm" :save-obj="orderObj" :orderType="1" @close="closeOrderSaveForm" @success="refreshOrder"> <editorder-form v-if="isShowEditOrderForm" :save-obj="orderObj" :orderType="1" @close="closeOrderSaveForm" @success="refreshOrder">
</editorder-form> </editorder-form>
</div> </div>
......
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