From de363dc9abbc7b1bf72cca19861497a99108f304 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Fri, 18 Dec 2020 00:05:35 +0800
Subject: [PATCH] modify vip_detail.html

---
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateOrderTime.html   |    8 +
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html           |    8 +
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip_detail.html        |  134 ++++++++++++++++++++++++---------
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html         |    8 +
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service-hk.html        |    8 +
 zq-erp/src/main/resources/templates/views/admin/hive/store/projServiceStartpl-list.html |    8 +
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html        |    8 +
 7 files changed, 139 insertions(+), 43 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html
index 169bc31..73e91ce 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html
@@ -276,7 +276,13 @@
 			var total = parseFloat($("#zkTotal").html());
 		},
 		afterSubmit : function() {
-			parent.myGrid.serchData();
+			if(parent.myGrid) {
+				parent.myGrid.serchData();
+			}
+
+			if (parent.app) {
+				parent.app.orderQuery();
+			}
 		},
 	});
 
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
index 8168b3b..c964927 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
@@ -818,7 +818,13 @@
                                 } else {
                                     _this.$message.success(data.info);
                                 }
-                                parent.myGrid.serchData();
+                                if(parent.myGrid) {
+                                    parent.myGrid.serchData();
+                                }
+
+                                if (parent.app) {
+                                    parent.app.orderQuery();
+                                }
                             }
                         });
                     }
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service-hk.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service-hk.html
index e4f5269..da5709f 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service-hk.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service-hk.html
@@ -176,7 +176,13 @@
                 c : false
             }).invoke(basePath+"/admin/projService/hkService?id="+id, function(loj) {
                 layer.msg(loj.getValue("info"),{icon:1,time:2000},function(){
-                    parent.myGrid.serchData();
+                    if (parent.myGrid) {
+                        parent.myGrid.serchData();
+                    }
+
+                    if (parent.app) {
+                        parent.app.serviceOrderQuery();
+                    }
                     MTools.closeForm()
                 });
             });
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateOrderTime.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateOrderTime.html
index e1c132d..9d7bdf9 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateOrderTime.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateOrderTime.html
@@ -83,7 +83,13 @@
 	var myForm = MForm.initForm({
 		invokeUrl : basePath+"/admin/order/updateOrderTime",
 		afterSubmit : function(loj) {
-			_p.myGrid.serchData();
+			if(_p.myGrid) {
+				_p.myGrid.serchData();
+			}
+
+			if (_p.app) {
+				_p.app.orderQuery();
+			}
 
 		},
 	});
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip_detail.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip_detail.html
index dc26623..65a2b15 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip_detail.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip_detail.html
@@ -193,7 +193,7 @@
                     <el-tab-pane label="项目/套餐" name="proj">
                         <el-row style="line-height: 40px;">
                             <el-col :span="10" style="margin-left: 20px;">
-                                <el-radio-group v-model="projTab.projType" @change="refreshTable">
+                                <el-radio-group v-model="projTab.projType" @change="refreshTable(1)">
                                     <el-radio label="proj">项目</el-radio>
                                     <el-radio label="taocan">套餐</el-radio>
                                     <el-radio label="card">卡项</el-radio>
@@ -241,10 +241,10 @@
                                 </el-table-column>
                                 <el-table-column label="操作">
                                     <template slot-scope="scope">
-                                        <el-button v-if="scope.row.status!='有效'" type="text" size="small" @click="tabProjValid(scope.$index, scope.row)">有效</el-button>
-                                        <el-button v-if="scope.row.status!='无效'" type="text" size="small" @click="tabProjInvalid(scope.$index, scope.row)">无效</el-button>
-                                        <el-button v-if="scope.row.status!='冻结'" type="text" size="small" @click="tabProjCold(scope.$index, scope.row)">冻结</el-button>
-                                        <el-button type="text" size="small" @click="tabProjEdit(scope.$index, scope.row)">编辑</el-button>
+                                        <el-button matrix:btn="vipInfo-youxiao" v-if="scope.row.status!='有效'" type="text" size="small" @click="tabProjValid(scope.$index, scope.row)">有效</el-button>
+                                        <el-button matrix:btn="vipInfo-wuxiao" v-if="scope.row.status!='无效'" type="text" size="small" @click="tabProjInvalid(scope.$index, scope.row)">无效</el-button>
+                                        <el-button matrix:btn="vipInfo-dongjie" v-if="scope.row.status!='冻结'" type="text" size="small" @click="tabProjCold(scope.$index, scope.row)">冻结</el-button>
+                                        <el-button matrix:btn="vipInfo-cardEdit" type="text" size="small" @click="tabProjEdit(scope.$index, scope.row)">编辑</el-button>
                                     </template>
                                 </el-table-column>
                             </el-table>
@@ -276,10 +276,10 @@
                                 </el-table-column>
                                 <el-table-column label="操作">
                                     <template slot-scope="scope">
-                                        <el-button v-if="scope.row.status!='有效'" type="text" size="small" @click="tabProjValid(scope.$index, scope.row)">有效</el-button>
-                                        <el-button v-if="scope.row.status!='无效'" type="text" size="small" @click="tabProjInvalid(scope.$index, scope.row)">无效</el-button>
-                                        <el-button v-if="scope.row.status!='冻结'" type="text" size="small" @click="tabProjCold(scope.$index, scope.row)">冻结</el-button>
-                                        <el-button type="text" size="small" @click="tabProjEdit(scope.$index, scope.row)">编辑</el-button>
+                                        <el-button matrix:btn="vipInfo-youxiao" v-if="scope.row.status!='有效'" type="text" size="small" @click="tabProjValid(scope.$index, scope.row)">有效</el-button>
+                                        <el-button matrix:btn="vipInfo-wuxiao" v-if="scope.row.status!='无效'" type="text" size="small" @click="tabProjInvalid(scope.$index, scope.row)">无效</el-button>
+                                        <el-button matrix:btn="vipInfo-dongjie" v-if="scope.row.status!='冻结'" type="text" size="small" @click="tabProjCold(scope.$index, scope.row)">冻结</el-button>
+                                        <el-button matrix:btn="vipInfo-cardEdit" type="text" size="small" @click="tabProjEdit(scope.$index, scope.row)">编辑</el-button>
                                     </template>
                                 </el-table-column>
                             </el-table>
@@ -336,24 +336,23 @@
                                 </el-table-column>
                                 <el-table-column label="操作">
                                     <template slot-scope="scope">
-                                        <el-button v-if="scope.row.status!='有效'" type="text" size="small" @click="tabProjValid(scope.$index, scope.row)">有效</el-button>
-                                        <el-button v-if="scope.row.status!='无效'" type="text" size="small" @click="tabProjInvalid(scope.$index, scope.row)">无效</el-button>
-                                        <el-button v-if="scope.row.status!='冻结'" type="text" size="small" @click="tabProjCold(scope.$index, scope.row)">冻结</el-button>
-                                        <el-button type="text" size="small" @click="tabProjEdit(scope.$index, scope.row)">编辑</el-button>
+                                        <el-button matrix:btn="vipInfo-youxiao" v-if="scope.row.status!='有效'" type="text" size="small" @click="tabProjValid(scope.$index, scope.row)">有效</el-button>
+                                        <el-button matrix:btn="vipInfo-wuxiao" v-if="scope.row.status!='无效'" type="text" size="small" @click="tabProjInvalid(scope.$index, scope.row)">无效</el-button>
+                                        <el-button matrix:btn="vipInfo-dongjie" v-if="scope.row.status!='冻结'" type="text" size="small" @click="tabProjCold(scope.$index, scope.row)">冻结</el-button>
+                                        <el-button matrix:btn="vipInfo-cardEdit" type="text" size="small" @click="tabProjEdit(scope.$index, scope.row)">编辑</el-button>
                                     </template>
                                 </el-table-column>
                             </el-table>
                         </el-row>
                         <el-row>
-                            <el-pagination
-                                    background
-                                    @size-change="tabHandleSizeChange"
-                                    @current-change="tabHandleCurrentChange"
-                                    :current-page="projTab.page.currentPage"
-                                    :page-sizes="[10, 20, 30, 50]"
-                                    :page-size="projTab.page.pageSize"
-                                    layout="total, sizes, prev, pager, next, jumper"
-                                    :total="projTab.page.total">
+                            <el-pagination background
+                                           @size-change="projTabSizeChange"
+                                           @current-change="projTabCurrentChange"
+                                           :current-page="projTab.page.currentPage"
+                                           :page-sizes="[10, 20, 30, 50]"
+                                           :page-size="projTab.page.pageSize"
+                                           layout="total, sizes, prev, pager, next, jumper"
+                                           :total="projTab.page.total">
                             </el-pagination>
                         </el-row>
                     </el-tab-pane>
@@ -425,13 +424,13 @@
                                 <el-table-column fixed="right" label="操作"  width="200">
                                     <template slot-scope="scope">
                                         <el-button type="text" size="small" @click="lookServiceOrder(scope.$index, scope.row)">查看</el-button>
-                                        <el-button type="text" size="small" v-if="scope.row.state=='待预约'" @click="paiban(scope.$index, scope.row)">排班</el-button>
-                                        <el-button type="text" size="small" v-if="scope.row.state=='预约成功待处理'" @click="giveServiceOrder(scope.$index, scope.row)">派单</el-button>
-                                        <el-button type="text" size="small" v-if="scope.row.state=='预约成功待处理'" @click="modifyServiceOrder(scope.$index, scope.row)">修改</el-button>
-                                        <el-button type="text" size="small" v-if="scope.row.state=='需配料'" @click="peiliao(scope.$index, scope.row)">配料</el-button>
-                                        <el-button type="text" size="small" v-if="scope.row.state=='服务完成'" @click="openHKService(scope.$index, scope.row)">划扣</el-button>
-                                        <el-button type="text" size="small" @click="modifyTime(scope.$index, scope.row)">修改时间</el-button>
-                                        <el-button type="text" size="small" @click="cancelServiceOrder(scope.$index, scope.row)">取消</el-button>
+                                        <el-button matrix:btn="serviceClub-paiban" type="text" size="small" v-if="scope.row.state=='待预约'" @click="paiban(scope.$index, scope.row)">排班</el-button>
+                                        <el-button matrix:btn="serviceClub-paidan" type="text" size="small" v-if="scope.row.state=='预约成功待处理'" @click="giveServiceOrder(scope.$index, scope.row)">派单</el-button>
+                                        <el-button matrix:btn="serviceClub-edit" type="text" size="small" v-if="scope.row.state=='预约成功待处理'" @click="modifyServiceOrder(scope.$index, scope.row)">修改</el-button>
+                                        <el-button matrix:btn="serviceClub-peiliao" type="text" size="small" v-if="scope.row.state=='需配料'" @click="peiliao(scope.$index, scope.row)">配料</el-button>
+                                        <el-button matrix:btn="serviceClub-huakou" type="text" size="small" v-if="scope.row.state=='服务完成'" @click="openHKService(scope.$index, scope.row)">划扣</el-button>
+                                        <el-button matrix:btn="serviceClub-edit" type="text" size="small" @click="modifyTime(scope.$index, scope.row)">修改时间</el-button>
+                                        <el-button matrix:btn="serviceClub-del" type="text" size="small" v-if="scope.row.state!='预约取消'" @click="cancelServiceOrder(scope.$index, scope.row)">取消</el-button>
                                     </template>
                                 </el-table-column>
                             </el-table>
@@ -524,9 +523,10 @@
                                 </el-table-column>
                                 <el-table-column label="操作" fixed="right" width="160">
                                     <template slot-scope="scope">
-                                        <el-button type="text" size="small" @click="tabProjInvalid(scope.$index, scope.row)">结算</el-button>
-                                        <el-button type="text" size="small" @click="tabProjCold(scope.$index, scope.row)">详情</el-button>
-                                        <el-button type="text" size="small" @click="tabProjCold(scope.$index, scope.row)">取消</el-button>
+                                        <el-button type="text" size="small" @click="lookOrderInfo(scope.$index, scope.row)">查看</el-button>
+                                        <el-button matrix:btn="orderClub-payment" v-if="scope.row.statu == '欠款'" type="text" size="small" @click="bjMoney(scope.$index, scope.row)">补交</el-button>
+                                        <el-button matrix:btn="orderClub-gathering" v-if="scope.row.statu == '待付款'" type="text" size="small" @click="skMoney(scope.$index, scope.row)">收款</el-button>
+                                        <el-button matrix:btn="orderClub-edit" type="text" size="small" @click="updateTime(scope.$index, scope.row)">修改时间</el-button>
                                     </template>
                                 </el-table-column>
                             </el-table>
@@ -627,6 +627,7 @@
             // 项目/套餐 tab
             projTab : {
                 projType : "proj",
+                projTypeBak : "proj",
                 projOptions : [{ value : '', label : "全部" }, { value : '有效', label : "有效" }, { value : '无效', label : "无效" }, { value : "冻结", label : "冻结" }, { value : "转让", label : "转让" }, { value : "退款", label : "退款" }],
                 projIsValid : "",
 
@@ -795,9 +796,25 @@
                     _this.projTab.cardTableData = loj.getValue("rows");
                 });
             },
+            projTabSizeChange(val) {
+                this.projTab.page.pageSize = val;
+                this.refreshTable();
+            },
+            projTabCurrentPage(val) {
+                this.projTab.page.currentPage = val;
+                this.refreshTable();
+            },
             // 单选框切换
-            refreshTable() {
+            refreshTable(val) {
                 let _this = this;
+                if (val) {
+                    this.projTab.page = {
+                        currentPage : 1,
+                        pageSize : 10,
+                        total : 0
+                    };
+                }
+
                 if (_this.projTab.projType === 'proj') {
                     _this.projTableQueryFn();
                 }
@@ -809,6 +826,8 @@
                 if (_this.projTab.projType === 'card') {
                     _this.cardTableQueryFn();
                 }
+
+
             },
             // 下拉框选择
             selectChange() {
@@ -841,7 +860,6 @@
                             _this.refreshTable();
                         } else {
                             var rs = loj.attr("result");
-                            console.log(rs);
                             if (rs.info == '已过期') {
                                 layer.open({
                                     type : 2,
@@ -980,7 +998,7 @@
             },
             // 派单
             giveServiceOrder(index, row) {
-                openPd(row.id);
+                MTools.handleItem(basePath + "/admin/projService/paidan?id=" + row.id, "确定派单吗?", this.serviceOrderQuery)
             },
             // 修改
             modifyServiceOrder(index, row) {
@@ -988,7 +1006,13 @@
             },
             // 配料
             peiliao(index, row) {
-                openEdit1(row.id);
+                layer.full(layer.open({
+                    type: 2,
+                    title: "开始配料",
+                    maxmin: true,
+                    area: [MUI.SIZE_L, '450px'],
+                    content: [basePath + '/admin/projService/startpl?id=' + row.id]
+                }));
             },
             // 划扣
             openHkService(index, row) {
@@ -996,7 +1020,7 @@
             },
             // 取消
             cancelServiceOrder(index, row) {
-                qxPb(row.id);
+                MTools.handleItem(basePath + "/admin/projService/cancelOrder?id=" + row.row, "确定取消订单吗?", this.serviceOrderQuery);
             },
             // 修改时间
             modifyTime(index, row) {
@@ -1043,6 +1067,42 @@
                 this.orderTab.page.currentPage = val;
                 this.orderTableDataQueryFn();
             },
+            lookOrderInfo(index, row) {
+                layer.full(layer.open({
+                    type : 2,
+                    title : "订单详情",
+                    maxmin : true,
+                    area : [ MUI.SIZE_L, '500px' ],
+                    content : [ basePath + '/admin/order/orderItem?id=' + row.id ]
+                }));
+            },
+            bjMoney(index, row) {
+                layer.full(layer.open({
+                    type : 2,
+                    title : "补交",
+                    area : [ MUI.SIZE_L, '400px' ],
+                    maxmin : true,
+                    content : [ basePath+'/admin/moneyCardUse/toBj?id=' + row.id]
+                }));
+            },
+            skMoney(index, row) {
+                layer.full(layer.open({
+                    type : 2,
+                    title : "收款",
+                    area : [ MUI.SIZE_L, '400px' ],
+                    maxmin : true,
+                    content : [ basePath+'/admin/redirect/hive/beautySalon/order-form?id=' + row.id]
+                }));
+            },
+            updateTime(index, row) {
+                layer.open({
+                    type : 2,
+                    title : "修改订单时间",
+                    maxmin : true,
+                    area : [ MUI.SIZE_L, '500px' ],
+                    content : [ basePath + '/admin/order/toUpdateTime?id=' + row.id ]
+                });
+            },
             /********* 订单Tab end ***********/
 
             /************** 皮肤检测tab start **************/
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html
index 43e23bb..c8421ac 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html
@@ -357,7 +357,13 @@
                                     _this.closeFram();
                                 }
                             });
-                            parent.myGrid.serchData();
+                            if (parent.myGrid) {
+                                parent.myGrid.serchData();
+                            }
+
+                            if (parent.app) {
+                                parent.app.serviceOrderQuery();
+                            }
                         }
                     });
                 }
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/store/projServiceStartpl-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/store/projServiceStartpl-list.html
index 7333c1f..f547d4c 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/store/projServiceStartpl-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/store/projServiceStartpl-list.html
@@ -80,7 +80,13 @@
 	var myForm=MForm.initForm({
 		invokeUrl:basePath+"/admin/projService/endPl",
 		afterSubmit:function(){
-			parent.myGrid.serchData();
+			if (parent.myGrid) {
+				parent.myGrid.serchData();
+			}
+
+			if (parent.app) {
+				parent.app.serviceOrderQuery();
+			}
 		},
 	});
 

--
Gitblit v1.9.1