新建

src/main/resources/com/minpay/db/table/own/mapper/OrderManageMapper.xml

@@ -5,19 +5,20 @@
 	<select id="selectOrderDetail" resultType="hashmap" parameterType="java.util.Map">
 	    SELECT
 		d.VOI_ID  				"orderNo",
-		d.VOI_PRODUCT_ID 		"productId",
-		d.VOI_PRODUCT_NAME 		"productName",
+		o.VOD_PRODUCT_ID 		"productId",
+		o.VOD_PRO_NAME 			"productName",
 		p.VCI_NAME 				"userName",
-		d.VOI_EQUREL_ID 		"equrelId",
+		o.VOD_PRO_EQU_REL_ID 		"equrelId",
 		r.VCI_EQUIPMENT_ID 		"machineNo",
 		d.VOI_ORDER_AMT 		"orderAmt",
 		d.VOI_CREATE_TIME 		"createTime",
 		d.VOI_PICKUP_NO 		"pickupNo",
 		d.VOI_PICKUP_TIME 		"pickUpTime",
 		d.VOI_PICKUP_STT 		"stt"
-	    FROM vm_order_inf d, vm_pro_equ_rel r, vm_person_inf p
-		where d.VOI_EQUREL_ID = r.VCI_ID
+	    FROM vm_order_details o,vm_order_inf d, vm_pro_equ_rel r, vm_person_inf p
+		where o.VOD_PRO_EQU_REL_ID = r.VCI_ID
 		and d.VOI_PERSON_ID = p.VCI_ID
+		and o.VOD_ORDER_ID = d.VOI_ID
     	<if test="pickupNo != null and pickupNo != ''">
 			AND	 d.VOI_PICKUP_NO  = #{pickupNo,jdbcType=VARCHAR}
 		</if>
@@ -25,7 +26,7 @@
 			AND	 d.VOI_PICKUP_STT  = #{pickUpState,jdbcType=VARCHAR}
 		</if>
 		<if test="machineNo != null and machineNo != ''">
-			AND	 d.VCI_EQUIPMENT_ID  = #{machineNo,jdbcType=VARCHAR}
+			AND	 o.VOD_PRO_EQU_REL_ID  = #{machineNo,jdbcType=VARCHAR}
 		</if>
 		<if test="creatdDtes != null and creatdDtes != ''">
 			and substr(VOI_CREATE_TIME,1,8) between substr((#{creatdDtes, jdbcType=VARCHAR}),1,8)
@@ -42,7 +43,7 @@
 	</select>
 	<select id="selectPickupRecord" resultType="hashmap" parameterType="java.util.Map">
 		SELECT
-		oi.VOI_EQUIPMENT_ID 	"",
+		oi.VOI_EQUIPMENT_ID 	"machineNo",
 		oi.VOI_ID 				"orderNo",
 		di.VDI_STATUS 			"stt",
 		oi.VOI_PICKUP_TIME 		"pickUpDates"
@@ -50,7 +51,7 @@
 		where di.VDI_ORD_DET_ID = od.VOD_DETAILS_ID
 		and VOD_ORDER_ID = oi.VOI_ID
 		<if test="machineNo != null and machineNo != ''">
-			AND	oi.VCI_EQUIPMENT_ID  = #{machineNo,jdbcType=VARCHAR}
+			AND	oi.VOI_EQUIPMENT_ID  = #{machineNo,jdbcType=VARCHAR}
 		</if>
 		<if test="orderNo != null and orderNo != ''">
 			AND	oi.VOI_ID  = #{orderNo,jdbcType=VARCHAR}
@@ -116,13 +117,13 @@
 	</select>
 <!--	累计收入-->
 	<select id="selectCountIncome" resultType="java.lang.String" parameterType="java.util.Map">
-		select sum(PIF_TRXAMOUT)
+		select SUM(PIF_TRXAMOUT)
 		from vm_payment_inf
 		where PIF_STATUS = '1'
 	</select>
 	<!--	总机台数-->
 	<select id="selectCountDevice" resultType="java.lang.String" parameterType="java.util.Map">
-		SELECT SUM(PIF_TRXAMOUT)
+		SELECT COUNT(VEQ_ID)
 		FROM vm_equipment_inf
 		WHERE VEQ_STATE = '00'
 	</select>
@@ -145,14 +146,14 @@
 		ORDER BY aa.PRT_MODIFY_TIME DESC
 	</select>
 	<!--	总实际金额-->
-	<select id="selectAllSale" resultType="hashmap" parameterType="java.util.Map">
+	<select id="selectAllSale" resultType="java.lang.String" parameterType="java.util.Map">
 		SELECT SUM(VOI_ORDER_AMT)
 		FROM vm_order_inf
 		WHERE VOI_PRO_TYPE = '00'
 		AND VOI_STATE IN ('80', '00')
 	</select>
 	<!--	总商品成本-->
-	<select id="selectAllCost" resultType="hashmap" parameterType="java.util.Map">
+	<select id="selectAllCost" resultType="java.lang.String" parameterType="java.util.Map">
 		SELECT SUM(proSum) FROM (
 			SELECT aa.PRT_PRO_COST * SUM(bb.VOD_PRO_NUMS) AS proSum
 			FROM vm_product_inf aa, vm_order_details bb

src/main/webapp/admin/invCardManage/invCardManage.html

@@ -14,7 +14,6 @@
         <div class="tiaojian-part2 fr  demoTable">
             <button class="layui-btn order-bnt1"  data-type="reload" >搜索</button>
             <button class="layui-btn  order-bnt2" data-type="reset">重置</button>
-            <button class="layui-btn order-bnt2" id = "addUser">添加</button>
             <a href="#" id="toggle" class="top">收起</a>
         </div>
     </div>
@@ -22,11 +21,11 @@
         <div class="order-select back-border" id="content">
             <div class="layui-inline">
                 <label class="f12-gray4">机台号 ：</label>
-                <input type="tel" name="machineNo"  id ="machineNo" autocomplete="off" placeholder="请输入机台号" class="layui-input">
+                <input type="tel" name="machineNo"  id ="machineNo" onchange = "changeSelectCon(0,this,'inp')" placeholder="请输入机台号" class="search-select">
             </div>
             <div class="layui-inline">
                 <label class="f12-gray4">取货码：</label>
-                <input type="tel" name="pickUpCode"  id ="pickUpCode" autocomplete="off" placeholder="请输入取货码" class="layui-input">
+                <input type="tel" name="pickUpCode" id ="pickUpCode" onchange = "changeSelectCon(1,this,'inp')" placeholder="请输入取货码" class="search-select">
             </div>
             <div class="d-dashed" style="margin: 10px 0;"></div>
             <div class="layui-inline">
@@ -72,7 +71,7 @@
 		   ,range: true
 		   ,format:'yyyyMMdd'
 		   ,done: function(value, date, endDate){
-    			  changeSelectCon(1,"dates",'date',value)
+    			  changeSelectCon(1,"creatdDtes",'date',value)
   			}
 		});
 
@@ -81,13 +80,13 @@
 		   ,range: true
 		   ,format:'yyyyMMdd'
 		   ,done: function(value, date, endDate){
-    			  changeSelectCon(1,"dates",'date',value)
+    			  changeSelectCon(2,"pickUpDates",'date',value)
   			}
 		});
 		form = layui.form;
 		initSelect('pickUpState', "PICKUP_STT", "pickUpState", ' ', true);
 		form.on('select(pickUpState)', function(data){
-   			changeSelectCon(2, data.elem, "sel","pickUpState");
+   			changeSelectCon(3, data.elem, "sel","pickUpState");
    		});
 		form.render();
 	})
@@ -205,12 +204,81 @@
 	        ,where: {
 	        	machineNo : machineNo,
 	        	pickUpCode : pickUpCode,
-	        	stt : state,
+	        	pickUpState : pickUpState,
 	        	creatdDtes : creatdDtes,
 	        	pickUpDates : pickUpDates
 	        }
       	});
 	}
+	//查询
+	function changeSelectCon(index, t, type, dateValue){
+		if (type == "date") {
+			if (isEmpty(dateValue)) {
+				$("#search" + index).remove();
+			} else {
+				$("#search" + index).remove();
+				if (isEmpty($("#search" + index).attr("name"))) {
+					$("#conditions").append(getSelectConHtml(index, t, type,dateValue));
+				}
+			}
+		} else if (type == 'inp') {
+			if (isEmpty($(t).val())) {
+				$("#search" + index).remove();
+			} else {
+				$("#search" + index).remove();
+				if (isEmpty($("#search" + index).attr("name"))) {
+					$("#conditions").append(getSelectConHtml(index, t, type));
+				}
+			}
+		} else {
+			if (isEmpty($(t).val())) {
+				$("#search" + index).remove();
+			} else {
+				$("#search" + index).remove();
+				if (isEmpty($("#search" + index).attr("name"))) {
+					$(t).attr("id",dateValue);
+					$("#conditions").append(getSelectConHtml(index, t, type,dateValue));
+				}
+			}
+		}
+	}
+	var array = new Array('机台号','取货码','状态','创建日期','取货日期');
+	function getSelectConHtml(index, t, type,dateValue){
+		var name;
+		var value;
+		if(type == "inp"){
+			value = t.value.substr(0,5)+"..";
+		}
+		if (type == "date") {
+			value = dateValue;
+		}
+		if(type == "sel" && dateValue =="state"){
+			value = $("#state").find("option:selected").text();
+		}
+		if (type == "date") {
+			name = $("#"+t).attr("id");
+		} else {
+			name = $(t).attr("id");
+		}
+		var html = '<div class="fl xuanzhong-active" id = "search' + index + '" name = "' + name + '" onclick = "removeSearch(this)">' +
+						'<div class="fl">' + array[index] + '</div>' +
+						':<i class="iconfont">'+value+'</i>' +
+						'<svg class="icon" aria-hidden="true">' +
+						  '<use xlink:href="#iconicon_close1"></use>' +
+						'</svg>' +
+					'</div>';
+		return html;
+	}
+	function removeSearch(t) {
+		if ($(t).attr("name") == 'state') {
+			initSelect('pickUpState', "PICKUP_STT", "pickUpState", ' ', true);
+			form.render();
+			$(t).remove();
+		} else {
+			$("#"+$(t).attr("name")).val('');
+			$(t).remove();
+		}
+	}
 </script>
 </body>
 </html>