Skip to content

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

修改

parent 894fb62f
Show whitespace changes
Inline Side-by-side
Showing with 438 additions and 384 deletions
src/components/sale/myOrder-form.vue
View file @ f8e56487
<template> <template>
<q-dialog v-model="dialog" maximized full-height seamless position="right" > <q-dialog v-model="dialog" maximized full-height seamless position="right">
<q-card style="margin-top:61px;width:900px" class="no-border-radius classinfo_Dialog"> <q-card style="margin-top:61px;width:900px" class="no-border-radius classinfo_Dialog">
<div class="drawerTop2 row" > <div class="drawerTop2 row">
<div class="drawerTop-d"> <div class="drawerTop-d">
订 订
</div> </div>
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
<span style="font-size: 16px;color: #000000;font-weight: bold">订单编号</span> <span style="font-size: 16px;color: #000000;font-weight: bold">订单编号</span>
<span style="font-size: 12px;color: #666666">{{Detail.OrderId}}</span> <span style="font-size: 12px;color: #666666">{{Detail.OrderId}}</span>
</div> </div>
<div style="background: rgba(2, 196, 153, 0.2);border-radius: 4px;text-align: center;padding: 2px 13px;margin-left: 30px"> <div
style="background: rgba(2, 196, 153, 0.2);border-radius: 4px;text-align: center;padding: 2px 13px;margin-left: 30px">
<span style="color: #02C499">{{Detail.OrderStateName}}</span> <span style="color: #02C499">{{Detail.OrderStateName}}</span>
</div> </div>
</div> </div>
...@@ -24,19 +25,15 @@ ...@@ -24,19 +25,15 @@
</div> </div>
<div class="col-6 row"> <div class="col-6 row">
<span class="two-left">应收总额：</span> <span class="two-left">应收总额：</span>
<span class="two-r">{{Detail.PreferPrice.toFixed(2)}}</span> <span class="two-r">{{getTwoWei(Detail.PreferPrice)}}</span>
</div> </div>
<div class="col-6 row"> <div class="col-6 row">
<span class="two-left">待收金额：</span> <span class="two-left">待收金额：</span>
<span class="two-r">{{Detail.DueInMoney.toFixed(2)}}</span> <span class="two-r">{{getTwoWei(Detail.DueInMoney)}}</span>
</div> </div>
</div> </div>
<div style="padding: 20px;"> <div style="padding: 20px;">
<q-tabs <q-tabs v-model="tab" align="left" class="qtabs">
v-model="tab"
align="left"
class="qtabs"
>
<q-tab name="1" label="订单详情" /> <q-tab name="1" label="订单详情" />
<q-tab name="2" label="名单" /> <q-tab name="2" label="名单" />
<q-tab name="3" label="备注" /> <q-tab name="3" label="备注" />
...@@ -59,31 +56,31 @@ ...@@ -59,31 +56,31 @@
</div> </div>
<div class="col-6 row"> <div class="col-6 row">
<span class="two-left">单价：</span> <span class="two-left">单价：</span>
<span class="two-r">{{Detail.Class_Price.toFixed(2)}}</span> <span class="two-r">{{getTwoWei(Detail.Class_Price)}}</span>
</div> </div>
<div class="col-6 row"> <div class="col-6 row">
<span class="two-left">成交单价：</span> <span class="two-left">成交单价：</span>
<span class="two-r" style="color: #3FC4FF">{{Detail.Unit_Price.toFixed(2)}}</span> <span class="two-r" style="color: #3FC4FF">{{getTwoWei(Detail.Unit_Price)}}</span>
</div> </div>
<div class="col-6 row"> <div class="col-6 row">
<span class="two-left">应收金额：</span> <span class="two-left">应收金额：</span>
<span class="two-r">{{Detail.PreferPrice.toFixed(2)}}</span> <span class="two-r">{{getTwoWei(Detail.PreferPrice)}}</span>
</div> </div>
<div class="col-6 row"> <div class="col-6 row">
<span class="two-left">实收金额：</span> <span class="two-left">实收金额：</span>
<span class="two-r">{{Detail.Income.toFixed(2)}}</span> <span class="two-r">{{getTwoWei(Detail.Income)}}</span>
</div> </div>
<div class="col-6 row"> <div class="col-6 row">
<span class="two-left">优惠金额：</span> <span class="two-left">优惠金额：</span>
<span class="two-r">{{Detail.DiscountMoney.toFixed(2)}}</span> <span class="two-r">{{getTwoWei(Detail.DiscountMoney)}}</span>
</div> </div>
<div class="col-6 row"> <div class="col-6 row">
<span class="two-left">退款总额：</span> <span class="two-left">退款总额：</span>
<span class="two-r">{{Detail.Refund.toFixed(2)}}</span> <span class="two-r">{{getTwoWei(Detail.Refund)}}</span>
</div> </div>
<div class="col-6 row"> <div class="col-6 row">
<span class="two-left">待收总额：</span> <span class="two-left">待收总额：</span>
<span class="two-r" style="color:#2961FE;">{{Detail.DueInMoney.toFixed(2)}}</span> <span class="two-r" style="color:#2961FE;">{{getTwoWei(Detail.DueInMoney)}}</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -94,12 +91,13 @@ ...@@ -94,12 +91,13 @@
<template v-slot:body-cell-Sex="props"> <template v-slot:body-cell-Sex="props">
<q-td :props="props"> <q-td :props="props">
<span >{{props.row.Sex==1?'男':'女'}}</span> <span>{{props.row.Sex==1?'男':'女'}}</span>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-GuestName="props"> <template v-slot:body-cell-GuestName="props">
<q-td :props="props" class="row" style="align-items: center"> <q-td :props="props" class="row" style="align-items: center">
<div style="width: 34px;height: 34px;border-radius: 50%;background: rgba(41, 97, 254, 0.2);text-align: center;line-height: 34px;font-size: 14px;color: #2961FE;margin-right: 5px"> <div
style="width: 34px;height: 34px;border-radius: 50%;background: rgba(41, 97, 254, 0.2);text-align: center;line-height: 34px;font-size: 14px;color: #2961FE;margin-right: 5px">
{{props.row.GuestName.slice(0,1)}} {{props.row.GuestName.slice(0,1)}}
</div> </div>
{{props.row.GuestName}} {{props.row.GuestName}}
...@@ -130,20 +128,16 @@ ...@@ -130,20 +128,16 @@
<span>总经理备注</span> <span>总经理备注</span>
</div> </div>
</div> </div>
<div class="q-px-lg q-pb-md" style="padding-bottom: 50px;"> <div class="q-px-lg q-pb-md" style="padding:20px 0 50px 0;">
<el-timeline> <el-timeline>
<el-timeline-item <el-timeline-item v-for="(activity, index) in data2" :key="index" :color="activity.color" size="large">
v-for="(activity, index) in data2"
:key="index"
:color="activity.color"
size="large"
>
<div> <div>
<div class="row" style="font-size: 14px;color: #111111"> <div class="row" style="font-size: 14px;color: #111111;margin-bottom:10px;">
<span>{{activity.CreateByName}}</span> <span>{{activity.CreateByName}}</span>
<span style="margin-left: 10px">{{activity.CreateTime}}</span> <span style="margin-left: 10px">{{activity.CreateTime}}</span>
</div> </div>
<div style="width: 100%;padding: 15px;line-height: 20px;background: #F0F5FB;border-radius: 4px;font-size: 12px;color: #333333"> <div
style="width: 100%;padding: 15px;line-height: 20px;background: #F0F5FB;border-radius: 4px;font-size: 12px;color: #333333">
{{activity.Content}} {{activity.Content}}
</div> </div>
</div> </div>
...@@ -154,13 +148,11 @@ ...@@ -154,13 +148,11 @@
</div> </div>
</div> </div>
<div v-if="tab==4" style="padding:0 20px"> <div v-if="tab==4" style="padding:0 20px">
<div class="row " style="align-items: center;margin-bottom: 20px;" > <div class="row " style="align-items: center;margin-bottom: 20px;">
<div style="width: 3px;height: 15px;background: #3FC4FF;margin-right: 10px"></div>收款单 <div style="width: 3px;height: 15px;background: #3FC4FF;margin-right: 10px"></div>收款单
</div> </div>
<q-table :pagination="financiaMsg" :loading="floading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table" <q-table :pagination="financiaMsg" :loading="floading" no-data-label="暂无相关数据" flat
:hide-pagination="true" class="sticky-tow-column-table" :hide-pagination="true" :data="dataList" :columns="columnsf" row-key="name">
:data="dataList" :columns="columnsf" row-key="name">
<template v-slot:body-cell-FrID="props"> <template v-slot:body-cell-FrID="props">
<q-td :props="props" @click="goUrl('FinancialDocumentsDetail',props.row)"> <q-td :props="props" @click="goUrl('FinancialDocumentsDetail',props.row)">
<span style="font-size: 14px;color: #2961FE;font-weight: bold;cursor: pointer;">{{props.row.FrID}}</span> <span style="font-size: 14px;color: #2961FE;font-weight: bold;cursor: pointer;">{{props.row.FrID}}</span>
...@@ -168,38 +160,49 @@ ...@@ -168,38 +160,49 @@
</template> </template>
<template v-slot:body-cell-CostTypeList="props"> <template v-slot:body-cell-CostTypeList="props">
<q-td :props="props" v-for="(s,si) in props.row.CostTypeList" :key="si"> <q-td :props="props" v-for="(s,si) in props.row.CostTypeList" :key="si">
<span style="background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #646464;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;margin-right: 4px;">{{s}}</span> <span
style="background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #646464;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;margin-right: 4px;">{{s}}</span>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-TradeWayList="props"> <template v-slot:body-cell-TradeWayList="props">
<q-td :props="props" class="row" style="align-items: center;height: auto"> <q-td :props="props" class="row" style="align-items: center;height: auto">
<div v-if="props.row.TradeWayList&&props.row.TradeWayList.length>0" class="my-table-details"> <div v-if="props.row.TradeWayList&&props.row.TradeWayList.length>0" class="my-table-details">
<div v-for="(tw,twIn) in props.row.TradeWayList" style="line-height: normal !important;padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;width:210px;display: flex;flex-direction: column;align-items: center"> <div v-for="(tw,twIn) in props.row.TradeWayList"
<p><span style="font-weight: bold;color:#333333">{{tw.Alias}}</span><span class="_bank_name" style="height:20px;;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;margin-letf:10px">{{props.row.TradeWayList[0].TypeName}}</span><span style="height:20px;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;" :style="{'background-color':tw.AccountType=='私'?'#2AAEF2':'#FF9C01'}">{{tw.AccountType==""?'无':tw.AccountType}}</span> </p> style="line-height: normal !important;padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;width:210px;display: flex;flex-direction: column;align-items: center">
<p><span style="font-weight: bold;color:#333333">{{tw.Alias}}</span><span class="_bank_name"
style="height:20px;;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;margin-letf:10px">{{props.row.TradeWayList[0].TypeName}}</span><span
style="height:20px;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;"
:style="{'background-color':tw.AccountType=='私'?'#2AAEF2':'#FF9C01'}">{{tw.AccountType==""?'无':tw.AccountType}}</span>
</p>
<p style="color:#333333">{{tw.BankNo}}</p> <p style="color:#333333">{{tw.BankNo}}</p>
</div> </div>
</div> </div>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-zhaungt="props"> <template v-slot:body-cell-zhaungt="props">
<q-td :props="props" > <q-td :props="props">
<i v-if="props.row.Status==1" class="iconfont icon-daiqueren" style="color: #4BCA81"></i> <i v-if="props.row.Status==1" class="iconfont icon-daiqueren" style="color: #4BCA81"></i>
<i v-if="props.row.Status==4" class="iconfont icon-yiquxiao" style="color: #4BCA81"></i> <i v-if="props.row.Status==4" class="iconfont icon-yiquxiao" style="color: #4BCA81"></i>
<i v-if="props.row.Status==2" class="iconfont icon-yiqueren" style="color: #959595"></i> <i v-if="props.row.Status==2" class="iconfont icon-yiqueren" style="color: #959595"></i>
<i v-if="props.row.Status==3" class="iconfont icon-shenhebohui" style="color: #E95252"></i> <i v-if="props.row.Status==3" class="iconfont icon-shenhebohui" style="color: #E95252"></i>
<i v-if="props.row.Status==0" class="iconfont icon-zancun" style="color: #FF9C01"></i> <i v-if="props.row.Status==0" class="iconfont icon-zancun" style="color: #FF9C01"></i>
<span style="cursor: pointer;" @click="Financial_post_GetFinancLogList(props.row.FrID)">{{props.row.StatusStr}}</span> <span style="cursor: pointer;"
<q-popup-proxy > @click="Financial_post_GetFinancLogList(props.row.FrID)">{{props.row.StatusStr}}</span>
<q-popup-proxy>
<q-banner> <q-banner>
<div style="height: auto;max-height: 220px;background-color: #FFFFFF;width: 230px"> <div style="height: auto;max-height: 220px;background-color: #FFFFFF;width: 230px">
<div class="changLog"> <div class="changLog">
<p class="_log_t">流程日志</p> <p class="_log_t">流程日志</p>
<ul style="padding-left: 20px;max-height: 180px;overflow: auto;" v-if="GetFinancLogList" v-loading='LogLoading'> <ul style="padding-left: 20px;max-height: 180px;overflow: auto;" v-if="GetFinancLogList"
<li style="border-left: 1px solid #E9E9E9;position: relative;padding-bottom: 10px;padding-left: 20px;padding-top: 10px;" v-for="(log,li) in GetFinancLogList"> v-loading='LogLoading'>
<span style="background-color: #47BF8C;width: 7px;height: 7px;border-radius: 50%;display: inline-block;position: absolute;left: -4px;top: 19px;"></span> <li
<p class="row" style="justify-content: space-between"> <span class="_color_blue">{{log.EmName}}</span> <span class="fr changLog_time">{{log.UpdateDate}}</span> </p> style="border-left: 1px solid #E9E9E9;position: relative;padding-bottom: 10px;padding-left: 20px;padding-top: 10px;"
v-for="(log,li) in GetFinancLogList">
<span
style="background-color: #47BF8C;width: 7px;height: 7px;border-radius: 50%;display: inline-block;position: absolute;left: -4px;top: 19px;"></span>
<p class="row" style="justify-content: space-between"> <span
class="_color_blue">{{log.EmName}}</span> <span
class="fr changLog_time">{{log.UpdateDate}}</span> </p>
<p class="_dtel">{{log.StartValue}}</p> <p class="_dtel">{{log.StartValue}}</p>
</li> </li>
</ul> </ul>
...@@ -214,14 +217,12 @@ ...@@ -214,14 +217,12 @@
</template> </template>
</q-table> </q-table>
<!-- 付款单--> <!-- 付款单-->
<div class="row " style="align-items: center;margin: 20px 0;" > <div class="row " style="align-items: center;margin: 20px 0;">
<div style="width: 3px;height: 15px;background: #3FC4FF;margin-right: 10px"></div>付款单 <div style="width: 3px;height: 15px;background: #3FC4FF;margin-right: 10px"></div>付款单
</div> </div>
<q-table :pagination="financiaMsg" :loading="floading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table" <q-table :pagination="financiaMsg" style="padding-bottom:80px;" :loading="floading" no-data-label="暂无相关数据" flat
:hide-pagination="true" class="sticky-tow-column-table" :hide-pagination="true" :data="dataListP" :columns="columnsf" row-key="name">
:data="dataListP" :columns="columnsf" row-key="name">
<template v-slot:body-cell-FrID="props"> <template v-slot:body-cell-FrID="props">
<q-td :props="props" @click="goUrl('FinancialDocumentsDetail',props.row)"> <q-td :props="props" @click="goUrl('FinancialDocumentsDetail',props.row)">
<span style="font-size: 14px;color: #2961FE;font-weight: bold;cursor: pointer;">{{props.row.FrID}}</span> <span style="font-size: 14px;color: #2961FE;font-weight: bold;cursor: pointer;">{{props.row.FrID}}</span>
...@@ -229,37 +230,49 @@ ...@@ -229,37 +230,49 @@
</template> </template>
<template v-slot:body-cell-CostTypeList="props"> <template v-slot:body-cell-CostTypeList="props">
<q-td :props="props" v-for="(s,si) in props.row.CostTypeList" :key="si"> <q-td :props="props" v-for="(s,si) in props.row.CostTypeList" :key="si">
<span style="background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #646464;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;margin-right: 4px;">{{s}}</span> <span
style="background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #646464;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;margin-right: 4px;">{{s}}</span>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-TradeWayList="props"> <template v-slot:body-cell-TradeWayList="props">
<q-td :props="props" class="row" style="align-items: center;height: auto"> <q-td :props="props" class="row" style="align-items: center;height: auto">
<div v-if="props.row.TradeWayList&&props.row.TradeWayList.length>0" class="my-table-details"> <div v-if="props.row.TradeWayList&&props.row.TradeWayList.length>0" class="my-table-details">
<div v-for="(tw,twIn) in props.row.TradeWayList" style="line-height: normal !important;padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;width:210px;display: flex;flex-direction: column;align-items: center"> <div v-for="(tw,twIn) in props.row.TradeWayList"
<p><span style="font-weight: bold;color:#333333">{{tw.Alias}}</span><span class="_bank_name" style="height:20px;;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;margin-letf:10px">{{props.row.TradeWayList[0].TypeName}}</span><span style="height:20px;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;" :style="{'background-color':tw.AccountType=='私'?'#2AAEF2':'#FF9C01'}">{{tw.AccountType==""?'无':tw.AccountType}}</span> </p> style="line-height: normal !important;padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;width:210px;display: flex;flex-direction: column;align-items: center">
<p><span style="font-weight: bold;color:#333333">{{tw.Alias}}</span><span class="_bank_name"
style="height:20px;;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;margin-letf:10px">{{props.row.TradeWayList[0].TypeName}}</span><span
style="height:20px;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;"
:style="{'background-color':tw.AccountType=='私'?'#2AAEF2':'#FF9C01'}">{{tw.AccountType==""?'无':tw.AccountType}}</span>
</p>
<p style="color:#333333">{{tw.BankNo}}</p> <p style="color:#333333">{{tw.BankNo}}</p>
</div> </div>
</div> </div>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-zhaungt="props"> <template v-slot:body-cell-zhaungt="props">
<q-td :props="props" > <q-td :props="props">
<i v-if="props.row.Status==1" class="iconfont icon-daiqueren" style="color: #4BCA81"></i> <i v-if="props.row.Status==1" class="iconfont icon-daiqueren" style="color: #4BCA81"></i>
<i v-if="props.row.Status==4" class="iconfont icon-yiquxiao" style="color: #4BCA81"></i> <i v-if="props.row.Status==4" class="iconfont icon-yiquxiao" style="color: #4BCA81"></i>
<i v-if="props.row.Status==2" class="iconfont icon-yiqueren" style="color: #959595"></i> <i v-if="props.row.Status==2" class="iconfont icon-yiqueren" style="color: #959595"></i>
<i v-if="props.row.Status==3" class="iconfont icon-shenhebohui" style="color: #E95252"></i> <i v-if="props.row.Status==3" class="iconfont icon-shenhebohui" style="color: #E95252"></i>
<i v-if="props.row.Status==0" class="iconfont icon-zancun" style="color: #FF9C01"></i> <i v-if="props.row.Status==0" class="iconfont icon-zancun" style="color: #FF9C01"></i>
<span style="cursor: pointer;" @click="Financial_post_GetFinancLogList(props.row.FrID)">{{props.row.StatusStr}}</span> <span style="cursor: pointer;"
<q-popup-proxy > @click="Financial_post_GetFinancLogList(props.row.FrID)">{{props.row.StatusStr}}</span>
<q-popup-proxy>
<q-banner> <q-banner>
<div style="height: auto;max-height: 220px;background-color: #FFFFFF;width: 230px"> <div style="height: auto;max-height: 220px;background-color: #FFFFFF;width: 230px">
<div class="changLog"> <div class="changLog">
<p class="_log_t">流程日志</p> <p class="_log_t">流程日志</p>
<ul style="padding-left: 20px;max-height: 180px;overflow: auto;" v-if="GetFinancLogList" v-loading='LogLoading'> <ul style="padding-left: 20px;max-height: 180px;overflow: auto;" v-if="GetFinancLogList"
<li style="border-left: 1px solid #E9E9E9;position: relative;padding-bottom: 10px;padding-left: 20px;padding-top: 10px;" v-for="(log,li) in GetFinancLogList"> v-loading='LogLoading'>
<span style="background-color: #47BF8C;width: 7px;height: 7px;border-radius: 50%;display: inline-block;position: absolute;left: -4px;top: 19px;"></span> <li
<p class="row" style="justify-content: space-between"> <span class="_color_blue">{{log.EmName}}</span> <span class="fr changLog_time">{{log.UpdateDate}}</span> </p> style="border-left: 1px solid #E9E9E9;position: relative;padding-bottom: 10px;padding-left: 20px;padding-top: 10px;"
v-for="(log,li) in GetFinancLogList">
<span
style="background-color: #47BF8C;width: 7px;height: 7px;border-radius: 50%;display: inline-block;position: absolute;left: -4px;top: 19px;"></span>
<p class="row" style="justify-content: space-between"> <span
class="_color_blue">{{log.EmName}}</span> <span
class="fr changLog_time">{{log.UpdateDate}}</span> </p>
<p class="_dtel">{{log.StartValue}}</p> <p class="_dtel">{{log.StartValue}}</p>
</li> </li>
</ul> </ul>
...@@ -273,29 +286,21 @@ ...@@ -273,29 +286,21 @@
</q-td> </q-td>
</template> </template>
</q-table> </q-table>
</div> </div>
<div v-if="tab==5" style="padding: 10px 20px"> <div v-if="tab==5" style="padding: 10px 20px">
<div class="q-px-lg q-pb-md" style="padding-bottom: 50px;"> <div class="q-px-lg q-pb-md" style="padding-bottom: 50px;">
<el-timeline> <el-timeline>
<el-timeline-item <el-timeline-item v-for="(activity, index) in data3" :key="index" size="large">
v-for="(activity, index) in data3"
:key="index"
size="large"
>
<div> <div>
<div class="row" style="font-size: 14px;color: #111111"> <div class="row" style="font-size: 14px;color: #111111">
<span>{{activity.CreateByName}}</span> <span>{{activity.CreateByName}}</span>
<span style="margin-left: 10px">{{activity.CreateTime}}</span> <span style="margin-left: 10px">{{activity.CreateTime}}</span>
</div> </div>
<div style="width: 100%;padding: 15px;line-height: 20px;background: #F0F5FB;border-radius: 4px;font-size: 12px;color: #333333"> <div
style="width: 100%;padding: 15px;line-height: 20px;background: #F0F5FB;border-radius: 4px;font-size: 12px;color: #333333">
{{activity.LogContent}} {{activity.LogContent}}
</div> </div>
</div> </div>
</el-timeline-item> </el-timeline-item>
</el-timeline> </el-timeline>
<q-pagination class="full-width justify-end" v-model="msg3.PageIndex" color="primary" :max="pageCount3" <q-pagination class="full-width justify-end" v-model="msg3.PageIndex" color="primary" :max="pageCount3"
...@@ -313,8 +318,8 @@ ...@@ -313,8 +318,8 @@
<script> <script>
import { import {
getOrderGuestPageList, getOrderGuestPageList,
getClassOrderRemarkList,//获取备注列表 getClassOrderRemarkList, //获取备注列表
getClassOrderLogList,//获取订单操作日志列表 getClassOrderLogList, //获取订单操作日志列表
getClassOrderForDetail getClassOrderForDetail
} from '../../api/sale/sale' } from '../../api/sale/sale'
export default { export default {
...@@ -323,14 +328,14 @@ ...@@ -323,14 +328,14 @@
saveObj: { saveObj: {
type: Object, type: Object,
default: null, default: null,
data:[], data: [],
pageCount:0, pageCount: 0,
} }
}, },
data(){ data() {
return{ return {
dialog:true, dialog: true,
tab:'1', tab: '1',
columns: [{ columns: [{
name: 'GuestName', name: 'GuestName',
label: '名称', label: '名称',
...@@ -381,8 +386,7 @@ ...@@ -381,8 +386,7 @@
align: 'left' align: 'left'
}, },
], ],
columnsf:[ columnsf: [{
{
name: 'FrID', name: 'FrID',
label: '单号', label: '单号',
align: 'left', align: 'left',
...@@ -435,51 +439,51 @@ ...@@ -435,51 +439,51 @@
}, },
], ],
msg:{ msg: {
PageIndex: 1, PageIndex: 1,
PageSize: 12, PageSize: 12,
rowsPerPage:12, rowsPerPage: 12,
OrderId: 0, OrderId: 0,
ClassId: 0, ClassId: 0,
GuestName: '', GuestName: '',
GuestState:0, GuestState: 0,
}, },
loading:false, loading: false,
data2:[], data2: [],
pageCount2:0, pageCount2: 0,
msg2:{ msg2: {
PageIndex: 1, PageIndex: 1,
PageSize: 6, PageSize: 6,
rowsPerPage:6, rowsPerPage: 6,
OrderId:0, OrderId: 0,
}, },
loading2:false, loading2: false,
data3:[], data3: [],
pageCount3:0, pageCount3: 0,
msg3:{ msg3: {
PageIndex: 1, PageIndex: 1,
PageSize: 6, PageSize: 6,
rowsPerPage:6, rowsPerPage: 6,
SourceId:0, SourceId: 0,
}, },
financiaMsg:{ financiaMsg: {
pageIndex: 1, pageIndex: 1,
pageSize: 999, pageSize: 999,
rowsPerPage:999, rowsPerPage: 999,
TCID:0, TCID: 0,
OrderID:0, OrderID: 0,
Type:1, Type: 1,
}, },
dataList:[], dataList: [],
dataListP:[], dataListP: [],
floading:false, floading: false,
LogLoading:false, LogLoading: false,
GetFinancLogList:[], GetFinancLogList: [],
Detail:{}, Detail: {},
} }
}, },
created(){ created() {
if(this.saveObj.tab){ if (this.saveObj.tab) {
this.tab = (this.saveObj.tab).toString(); this.tab = (this.saveObj.tab).toString();
} }
...@@ -491,33 +495,37 @@ ...@@ -491,33 +495,37 @@
this.getRolelist() this.getRolelist()
this.getRemarkList() this.getRemarkList()
this.OrderLogList() this.OrderLogList()
this.getfinanciaALLPageList(1)//财务单据 this.getfinanciaALLPageList(1) //财务单据
}, },
methods:{ methods: {
Financial_post_GetFinancLogList: function(id){ // 获取单据日志 Financial_post_GetFinancLogList: function (id) { // 获取单据日志
this.LogLoading = true; this.LogLoading = true;
this.apipost('Financial_post_GetFinancLogList',{ID: id, Type: 2}, res => { this.apipost('Financial_post_GetFinancLogList', {
ID: id,
Type: 2
}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
data.forEach(x=>{ console.log(res,'名单数据');
data.forEach(x => {
x.UpdateDate = this.$commonUtils.formatMsgTime(x.UpdateDate) x.UpdateDate = this.$commonUtils.formatMsgTime(x.UpdateDate)
}) })
this.LogLoading = false; this.LogLoading = false;
this.GetFinancLogList = data; this.GetFinancLogList = data;
} }
},null) }, null)
}, },
getOrderInfo(){ getOrderInfo() {
getClassOrderForDetail({
getClassOrderForDetail({OrderId:this.saveObj.OrderId}).then(res => { OrderId: this.saveObj.OrderId
}).then(res => {
this.Detail = res.Data this.Detail = res.Data
console.log(res, '数据来了');
}).catch(() => { }).catch(() => {
}) })
}, },
closeSaveForm(){ closeSaveForm() {
this.$emit('close') this.$emit('close')
this.dialog = false this.dialog = false
}, },
...@@ -536,7 +544,7 @@ ...@@ -536,7 +544,7 @@
this.msg3.PageIndex = val; this.msg3.PageIndex = val;
this.OrderLogList() this.OrderLogList()
}, },
getRolelist() {//名单 getRolelist() { //名单
this.loading = true this.loading = true
getOrderGuestPageList(this.msg).then(res => { getOrderGuestPageList(this.msg).then(res => {
this.data = res.Data.PageData this.data = res.Data.PageData
...@@ -546,19 +554,19 @@ ...@@ -546,19 +554,19 @@
this.loading = false this.loading = false
}) })
}, },
getRemarkList(){ getRemarkList() {
this.loading2 = true this.loading2 = true
getClassOrderRemarkList(this.msg2).then(res => { getClassOrderRemarkList(this.msg2).then(res => {
this.data2 = res.Data.PageData this.data2 = res.Data.PageData
this.pageCount2 = res.Data.PageCount; this.pageCount2 = res.Data.PageCount;
this.data2.forEach(x=>{ this.data2.forEach(x => {
if(x.Type==1){ if (x.Type == 1) {
x.color = '#2961FE' x.color = '#2961FE'
}else if(x.Type==2){ } else if (x.Type == 2) {
x.color = '#8175FB' x.color = '#8175FB'
}else if(x.Type==3){ } else if (x.Type == 3) {
x.color = '#F28C1D' x.color = '#F28C1D'
}else if(x.Type==4){ } else if (x.Type == 4) {
x.color = '#F72E52' x.color = '#F72E52'
} }
}) })
...@@ -567,7 +575,7 @@ ...@@ -567,7 +575,7 @@
this.loading2 = false this.loading2 = false
}) })
}, },
OrderLogList(){ OrderLogList() {
getClassOrderLogList(this.msg3).then(res => { getClassOrderLogList(this.msg3).then(res => {
this.data3 = res.Data.PageData this.data3 = res.Data.PageData
this.pageCount3 = res.Data.PageCount; this.pageCount3 = res.Data.PageCount;
...@@ -575,30 +583,30 @@ ...@@ -575,30 +583,30 @@
}) })
}, },
getfinanciaALLPageList(Type){ getfinanciaALLPageList(Type) {
this.floading= true this.floading = true
this.financiaMsg.TCID = this.Detail.ClassId this.financiaMsg.TCID = this.Detail.ClassId
this.financiaMsg.OrderID = this.Detail.OrderId this.financiaMsg.OrderID = this.Detail.OrderId
this.financiaMsg.Type = Type this.financiaMsg.Type = Type
this.apipost('Financial_post_GetALLPageList',this.financiaMsg,res=>{ this.apipost('Financial_post_GetALLPageList', this.financiaMsg, res => {
if(res.data.resultCode===1){ if (res.data.resultCode === 1) {
let data = res.data.data.pageData.list; let data = res.data.data.pageData.list;
if (Type===1) { if (Type === 1) {
this.dataList = data; this.dataList = data;
this.getfinanciaALLPageList(2) this.getfinanciaALLPageList(2)
} else { } else {
this.dataListP = data; this.dataListP = data;
this.floading= false this.floading = false
} }
}else{ } else {
this.floading= false this.floading = false
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
},err=>{}) }, err => {})
}, },
goUrl(path, rowData,) { goUrl(path, rowData, ) {
this.$router.push({ this.$router.push({
path:'/financial/financalDocument/'+ path, path: '/financial/financalDocument/' + path,
query: { query: {
"id": rowData.FrID, "id": rowData.FrID,
blank: 'y', blank: 'y',
...@@ -606,16 +614,24 @@ ...@@ -606,16 +614,24 @@
} }
}) })
}, },
//返回2位小数
getTwoWei(num) {
if (num>=0) {
return num.toFixed(2);
}
} }
} }
}
</script> </script>
<style scoped> <style scoped>
.classinfo_Dialog .drawerTop2{ .classinfo_Dialog .drawerTop2 {
padding: 10px 20px; padding: 10px 20px;
align-items: center; align-items: center;
} }
.classinfo_Dialog .drawerTop-d{
.classinfo_Dialog .drawerTop-d {
width: 34px; width: 34px;
height: 34px; height: 34px;
border-radius: 50%; border-radius: 50%;
...@@ -627,32 +643,62 @@ ...@@ -627,32 +643,62 @@
color: #2860FB; color: #2860FB;
font-weight: bold; font-weight: bold;
} }
.classinfo_Dialog .drawerTop-t{
.classinfo_Dialog .drawerTop-t {
margin-left: 10px; margin-left: 10px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
} }
.classinfo_Dialog .two-left{
.classinfo_Dialog .two-left {
width: 70px; width: 70px;
display: inline-block; display: inline-block;
font-size: 12px; font-size: 12px;
color: #999999; color: #999999;
} }
.classinfo_Dialog .two-r{
.classinfo_Dialog .two-r {
font-size: 12px; font-size: 12px;
color: #111111; color: #111111;
} }
.classinfo_Dialog .qtabs{
.classinfo_Dialog .qtabs {
border-bottom: 1px solid #E2E2E2; border-bottom: 1px solid #E2E2E2;
} }
.classinfo_Dialog .tis {align-items: center}
.classinfo_Dialog .tis .tis-k{width: 12px;height: 12px;border-radius: 50%;margin-right: 8px} .classinfo_Dialog .tis {
.classinfo_Dialog .tis span{font-size: 14px;color: #2D2D2D;font-weight: 600;margin-right: 20px} align-items: center
.classinfo_Dialog .my-table-details{max-width: 230px;white-space: normal;margin-bottom: 5px;} }
.classinfo_Dialog .my-table-details p{margin: 0}
.classinfo_Dialog .q-px-lg{padding: 0} .classinfo_Dialog .tis .tis-k {
width: 12px;
height: 12px;
border-radius: 50%;
margin-right: 8px
}
.classinfo_Dialog .tis span {
font-size: 14px;
color: #2D2D2D;
font-weight: 600;
margin-right: 20px
}
.classinfo_Dialog .my-table-details {
max-width: 230px;
white-space: normal;
margin-bottom: 5px;
}
.classinfo_Dialog .my-table-details p {
margin: 0
}
.classinfo_Dialog .q-px-lg {
padding: 0
}
</style> </style>
src/components/sale/orderlist.vue
View file @ f8e56487
...@@ -565,7 +565,10 @@ ...@@ -565,7 +565,10 @@
gostudent(item) { gostudent(item) {
var tempStr = '/sale/studentList?OrderId=' + item.OrderId + '&ClassId=' + item.ClassId; var tempStr = '/sale/studentList?OrderId=' + item.OrderId + '&ClassId=' + item.ClassId;
this.$router.push({ this.$router.push({
path: tempStr path: tempStr,
query:{
isFrom:1
}
}); });
}, },
//修改订单备注 //修改订单备注
......
src/pages/sale/studentList.vue
View file @ f8e56487
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<div class="col-2 q-table__title" @click="goreturn">返回</div> <div class="col-2 q-table__title" @click="goreturn">返回</div>
<q-space /> <q-space />
<div class="page-option"> <div class="page-option">
<q-btn color="accent" size="sm" icon="add" label="新增名单" @click="addxue" /> <q-btn color="accent" size="sm" v-if="isShowBtn" icon="add" label="新增名单" @click="addxue" />
</div> </div>
</template> </template>
<template v-slot:body-cell-Sex="props"> <template v-slot:body-cell-Sex="props">
...@@ -192,6 +192,8 @@ ...@@ -192,6 +192,8 @@
GEList:[], GEList:[],
GLList:[], GLList:[],
OFList:[], OFList:[],
isShowBtn:true //默认显示新增名单
} }
}, },
mounted() { mounted() {
...@@ -199,6 +201,9 @@ ...@@ -199,6 +201,9 @@
this.msg.OrderId =this.$route.query.OrderId; this.msg.OrderId =this.$route.query.OrderId;
this.addMsg.OrderId =this.$route.query.OrderId; this.addMsg.OrderId =this.$route.query.OrderId;
this.msg.ClassId =this.$route.query.ClassId this.msg.ClassId =this.$route.query.ClassId
if(this.$route.query.isFrom==1){
this.isShowBtn = false;
}
} }
this.getRolelist(); this.getRolelist();
this.getGuestBasics()//日语基础枚举 this.getGuestBasics()//日语基础枚举
......
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