删除申科业务的逻辑，额外开分支

shop/src/main/resources/template/js/keepFitOrder/keepFitOrderAdd.js

@@ -123,7 +123,6 @@ layui.config({
                     servicePrice: 0,
                     remark: $("#remark").val(),
                     type: 2,
-                    source: 2,
                     consumeMationList: JSON.stringify(tableData)
                 };
 

shop/src/main/resources/template/js/meal/mealShenkeChoose.js

-var rowId = "";
-
-layui.config({
-	base: basePath, 
-	version: skyeyeVersion
-}).extend({
-    window: 'js/winui.window'
-}).define(['window', 'table', 'jquery', 'winui', 'form', 'fsCommon'], function (exports) {
-	winui.renderColor();
-	var index = parent.layer.getFrameIndex(window.name);
-	var $ = layui.$,
-		form = layui.form,
-		table = layui.table;
-		
-	// 设置提示信息
-	var s = "套餐选择规则：1.单选，双击指定行数据即可选中";
-	s += '如没有查到要选择的套餐，请检查套餐信息是否满足当前规则。';
-	$("#showInfo").html(s);
-
-	initTable();
-
-	// 根据门店id获取申科的套餐信息
-	function initTable(){
-		table.render({
-		    id: 'messageTable',
-		    elem: '#messageTable',
-		    method: 'GET',
-		    url: shopBasePath + 'getMealListByShenke',
-		    where: getTableParams(),
-			even: true,
-		    page: false,
-		    cols: [[
-		    	{ type: 'radio'},
-		        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers'},
-				{ field: 'mealName', title: '套餐', align: 'left', width: 200 },
-				{ field: 'name', title: '规格', align: 'left', width: 200 },
-				{ field: 'totalCount', title: '可使用次数', width: 120 },
-				{ field: 'showPrice', title: '展示价', width: 100 },
-		    ]],
-		    done: function(res, curr, count){
-		    	matchingLanguage();
-				$('#messageTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('dblclick',function(){
-					var dubClick = $('#messageTable').next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover");
-					dubClick.find("input[type='radio']").prop("checked", true);
-					form.render();
-					var chooseIndex = JSON.stringify(dubClick.data('index'));
-					var obj = res.rows[chooseIndex];
-					parent.mealMation = obj;
-
-					parent.refreshCode = '0';
-					parent.layer.close(index);
-				});
-
-				$('#messageTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('click',function(){
-					var click = $('#messageTable').next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover");
-					click.find("input[type='radio']").prop("checked", true);
-					form.render();
-				})
-		    }
-		});
-		
-		table.on('tool(messageTable)', function (obj) {
-	        var data = obj.data;
-	        var layEvent = obj.event;
-	        if (layEvent === 'select') { //详情
-	        	details(data);
-	        }
-	    });
-		
-		form.render();
-	}
-	
-	form.render();
-	form.on('submit(formSearch)', function (data) {
-		if (winui.verifyForm(data.elem)) {
-			table.reload("messageTable", {page: {curr: 1}, where: getTableParams()});
-		}
-		return false;
-	});
-	
-	$("body").on("click", "#reloadTable", function(){
-    	loadTable();
-    });
-    
-    function loadTable(){
-    	table.reload("messageTable", {where: getTableParams()});
-    }
-    
-	function getTableParams(){
-		return {
-			storeId: parent.storeId,
-		};
-	}
-	
-    exports('mealShenkeChoose', {});
-});
\ No newline at end of file

shop/src/main/resources/template/js/mealOrder/allMealOrderList.js

@@ -67,7 +67,6 @@ layui.config({
             }},
             { field: 'natureName', title: '订单性质', width: 80, rowspan: '2', align: "center"},
             { field: 'createName', title: '专属顾问', width: 120, rowspan: '2' },
-            { field: 'label', title: '员工标签', width: 120, rowspan: '2', align: "left"},
             { field: 'payTime', title: '支付时间', align: 'center', rowspan: '2', width: 150 },
             { field: 'type', title: '订单来源', width: 80, align: "center", rowspan: '2', templet: function(d){
                 if(d.type == 1){
@@ -142,7 +141,6 @@ layui.config({
             createName: $("#createName").val(),
             type: $("#type").val(),
             natureId: $("#natureId").val(),
-            label: $("#label").val(),
             state: $("#state").val(),
             areaId: $("#areaId").val(),
             storeId: $("#storeId").val(),

shop/src/main/resources/template/js/mealOrder/memberMealOrderList.js

@@ -39,7 +39,6 @@ layui.config({
                 return shopUtil.getMealOrderStateName(d);
             }},
             { field: 'natureName', title: '订单性质', width: 80, align: "center"},
-            { field: 'label', title: '员工标签', width: 120, align: "left"},
             { field: 'payTime', title: '支付时间', align: 'center', width: 150 },
             { field: 'type', title: '订单来源', width: 80, align: "center", templet: function(d){
                 if(d.type == 1){

shop/src/main/resources/template/js/mealOrder/storeMealOrderAdd.js

@@ -31,11 +31,6 @@ layui.config({
         memberMation = parent.memberMation;
         $("#memberName").html(memberMation.contacts);
 
-        // 获取当前登录员工信息
-        systemCommonUtil.getSysCurrentLoginUserMation(function (json){
-            $("#label").html(json.bean.label);
-        });
-
         // 加载我所在的门店
         shopUtil.queryStaffBelongStoreList(function (json){
             $("#storeId").html(getDataUseHandlebars($("#selectTemplate").html(), json));
@@ -114,9 +109,7 @@ layui.config({
                     natureId: $("#natureId").val(),
                     memberId: memberMation.id,
                     remark: $("#remark").val(),
-                    label: $("#label").html(),
                     type: 2,
-                    source: 2,
                     mealList: JSON.stringify(tableData)
                 };
 
@@ -183,9 +176,9 @@ layui.config({
                 return false;
             }
             _openNewWindows({
-                url: "../../tpl/meal/mealShenkeChoose.html",
+                url: "../../tpl/meal/mealChoose.html",
                 title: "选择套餐",
-                pageId: "mealShenkeChoose",
+                pageId: "mealChoose",
                 area: ['90vw', '90vh'],
                 callBack: function(refreshCode){
                     if (refreshCode == '0') {
@@ -215,8 +208,7 @@ layui.config({
                 var mealMationJson = $("#mealId" + rowNum.toString()).attr("mealMaion");
                 if(!isNull(mealMationJson)){
                     var mealMation = JSON.parse(mealMationJson);
-                    // allPrice = sum(allPrice, mealMation.unformatPrice);
-                    allPrice = sum(allPrice, mealMation.showPrice);
+                    allPrice = sum(allPrice, mealMation.unformatPrice);
                 }
             });
             $("#allPrice").html(allPrice + "元");

shop/src/main/resources/template/js/mealOrder/storeMealOrderList.js

@@ -65,7 +65,6 @@ layui.config({
             }},
             { field: 'natureName', title: '订单性质', width: 80, align: "center"},
             { field: 'createName', title: '专属顾问', width: 120 },
-            { field: 'label', title: '员工标签', width: 120, align: "left"},
             { field: 'payTime', title: '支付时间', align: 'center', width: 150 },
             { field: 'type', title: '订单来源', width: 80, align: "center", templet: function(d){
                 if(d.type == 1){
@@ -233,7 +232,6 @@ layui.config({
             createName: $("#createName").val(),
             type: $("#type").val(),
             natureId: $("#natureId").val(),
-            label: $("#label").val(),
             state: $("#state").val(),
             storeId: storeId,
             startTime: startTime,

shop/src/main/resources/template/tpl/meal/mealShenkeChoose.html

-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title></title>
-    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
-    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
-</head>
-<body>
-	<div class="txtcenter" style="margin:0 auto;padding-top:10px;">
-		<div class="winui-tip alert-info" id="showInfo">
-		
-		</div>
-	</div>
-    <div class="winui-toolbar">
-        <div class="winui-tool">
-            <button id="reloadTable" class="winui-toolbtn"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
-        </div>
-    </div>
-	<div style="margin:auto 10px;">
-		<table id="messageTable" lay-filter="messageTable"></table>
-	</div>
-    <script src="../../assets/lib/layui/layui.js"></script>
-    <script src="../../assets/lib/layui/custom.js"></script>
-    <script type="text/javascript">
-        layui.config({base: '../../js/meal/'}).use('mealShenkeChoose');
-    </script>
-</body>
-</html>
\ No newline at end of file

shop/src/main/resources/template/tpl/mealOrder/allMealOrderList.html

@@ -73,10 +73,6 @@
                         <select id="natureId" name="natureId" lay-filter="natureId" lay-search="">
                         </select>
                     </div>
-                    <label class="layui-form-label">员工标签</label>
-                    <div class="layui-input-inline">
-                        <input type="text" id="label" name="label" placeholder="请输入员工标签" class="layui-input" />
-                    </div>
                     <label class="layui-form-label">创建时间</label>
                     <div class="layui-input-inline">
                         <input type="text" id="createTime" name="createTime" placeholder="请输入创建时间" class="layui-input" />

shop/src/main/resources/template/tpl/mealOrder/storeMealOrderAdd.html

@@ -31,12 +31,6 @@
                     </select>
                 </div>
             </div>
-            <div class="layui-form-item layui-col-xs6">
-                <label class="layui-form-label">员工标签</label>
-                <div class="layui-input-block ver-center" id="label">
-
-                </div>
-            </div>
             <div class="layui-form-item layui-col-xs12">
                 <label class="layui-form-label">套餐</label>
                 <div class="layui-input-block">

shop/src/main/resources/template/tpl/mealOrder/storeMealOrderList.html

@@ -68,10 +68,6 @@
                         <select id="natureId" name="natureId" lay-filter="natureId" lay-search="">
                         </select>
                     </div>
-                    <label class="layui-form-label">员工标签</label>
-                    <div class="layui-input-inline">
-                        <input type="text" id="label" name="label" placeholder="请输入员工标签" class="layui-input" />
-                    </div>
                     <label class="layui-form-label">创建时间</label>
                     <div class="layui-input-inline">
                         <input type="text" id="createTime" name="createTime" placeholder="请输入创建时间" class="layui-input" />

userauth/src/main/resources/template/js/syseveuserstaff/syseveuserstafflist.js

@@ -88,7 +88,6 @@ layui.config({
 					return "<span class='state-down'>未分配</span>";
 				}
 			}},
-			{ field: 'label', title: '员工标签', width: 120, rowspan: '3', align: "left"},
 	        { field: 'userIdCard', title: '身份证', rowspan: '3', align: 'center', width: 160 },
 			{ field: 'workTimeNum', title: '考勤班次', rowspan: '3', align: 'center', width: 80 },
 	        { field: 'userSex', title: '性别', width: 60, rowspan: '3', align: 'center', templet: function(d){