From 0cbc7c78492a530354321337366fa7d6af419f89 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 23 三月 2022 09:42:56 +0800
Subject: [PATCH] #杰克缝纫机立库 【整合订单主档与明细档】
---
src/main/java/com/zy/asrs/controller/OrderController.java | 33 +
src/main/webapp/static/js/order/order.js | 589 +++++++++++++-------
src/main/webapp/static/js/order/order0.js | 294 ++++++++++
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 12
src/main/webapp/views/order/order0.html | 335 +++++++++++
src/main/webapp/views/order/order.html | 407 +++----------
6 files changed, 1,146 insertions(+), 524 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 21fba07..63d2585 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -1,22 +1,24 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.service.OrderService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.service.OrderService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
public class OrderController extends BaseController {
@@ -24,6 +26,27 @@
@Autowired
private OrderService orderService;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ // ------------------------------------------------------------------------------------------------
+
@RequestMapping(value = "/order/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index 2e40bd2..db4b088 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -1,22 +1,24 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.service.OrderDetlService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.service.OrderDetlService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
public class OrderDetlController extends BaseController {
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 40a8a13..48e11b9 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -1,64 +1,29 @@
-var pageCurr;
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
-}).use(['table','laydate', 'form', 'admin'], function(){
- var table = layui.table;
+}).use(['layer', 'form', 'table', 'util', 'admin', 'xmSelect', 'laydate'], function () {
var $ = layui.jquery;
var layer = layui.layer;
- var layDate = layui.laydate;
var form = layui.form;
+ var table = layui.table;
+ var util = layui.util;
var admin = layui.admin;
+ var xmSelect = layui.xmSelect;
+ var layDate = layui.laydate;
- // 鏁版嵁娓叉煋
- tableIns = table.render({
- elem: '#order',
+ // 娓叉煋琛ㄦ牸
+ var insTb = table.render({
+ elem: '#waitMatin',
+ url: baseUrl+'/waitMatin/head/page/auth',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/order/list/auth',
page: true,
- limit: 15,
- limits: [15, 30, 50, 100, 200, 500],
- toolbar: '#toolbar',
- cellMinWidth: 50,
- height: 'full-120',
+ cellMinWidth: 100,
cols: [[
- {type: 'checkbox'}
- ,{field: 'id', align: 'center',title: 'ID'}
- ,{field: 'uuid', align: 'center',title: '缂栧彿'}
- ,{field: 'orderNo', align: 'center',title: '璁㈠崟缂栧彿'}
- ,{field: 'orderTime', align: 'center',title: '鍗曟嵁鏃ユ湡'}
- ,{field: 'docType$', align: 'center',title: '鍗曟嵁绫诲瀷'}
- ,{field: 'itemId$', align: 'center',title: '椤圭洰缂栧彿'}
- ,{field: 'itemName', align: 'center',title: ''}
- ,{field: 'allotItemId$', align: 'center',title: '璋冩嫧椤圭洰缂栧彿'}
- ,{field: 'defNumber', align: 'center',title: '鍒濆绁ㄦ嵁鍙�'}
- ,{field: 'number', align: 'center',title: '绁ㄦ嵁鍙�'}
- ,{field: 'cstmr$', align: 'center',title: '瀹㈡埛缂栧彿'}
- ,{field: 'cstmrName', align: 'center',title: '瀹㈡埛'}
- ,{field: 'tel', align: 'center',title: '鑱旂郴鏂瑰紡'}
- ,{field: 'operMemb', align: 'center',title: '鎿嶄綔浜哄憳'}
- ,{field: 'totalFee', align: 'center',title: '鍚堣閲戦'}
- ,{field: 'discount', align: 'center',title: '浼樻儬鐜�'}
- ,{field: 'discountFee', align: 'center',title: '浼樻儬閲戦'}
- ,{field: 'otherFee', align: 'center',title: '閿�鍞垨閲囪喘璐圭敤鍚堣'}
- ,{field: 'actFee', align: 'center',title: '瀹炰粯閲戦'}
- ,{field: 'payType$', align: 'center',title: '浠樻绫诲瀷'}
- ,{field: 'salesman', align: 'center',title: '涓氬姟鍛�'}
- ,{field: 'accountDay', align: 'center',title: '缁撶畻澶╂暟'}
- ,{field: 'postFeeType$', align: 'center',title: '閭垂鏀粯绫诲瀷'}
- ,{field: 'postFee', align: 'center',title: '閭垂'}
- ,{field: 'payTime$', align: 'center',title: '浠樻鏃堕棿'}
- ,{field: 'sendTime$', align: 'center',title: '鍙戣揣鏃堕棿'}
- ,{field: 'shipName', align: 'center',title: '鐗╂祦鍚嶇О'}
- ,{field: 'shipCode', align: 'center',title: '鐗╂祦鍗曞彿'}
- ,{field: 'settle$', align: 'center',title: '璁㈠崟鐘舵��'}
- ,{field: 'status$', align: 'center',title: '鐘舵��'}
- ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
- ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
- ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'memo', align: 'center',title: '澶囨敞'}
-
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ {type: 'numbers'},
+ {field: 'billNo', title: '鍗曟嵁缂栧彿', sort: true},
+ {field: 'billType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
+ {align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
+ {field: 'appeTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
+ {align: 'center', title: '鎿嶄綔', toolbar: '#operate', minWidth: 130, width: 130}
]],
request: {
pageName: 'curr',
@@ -75,122 +40,163 @@
response: {
statusCode: 200
},
- done: function(res, curr, count) {
+ done: function (res, curr, count) {
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
- pageCurr=curr;
- limit();
}
});
- // 鐩戝惉鎺掑簭浜嬩欢
- table.on('sort(order)', function (obj) {
- var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
- searchData[this.name] = this.value;
- });
- searchData['orderByField'] = obj.field;
- searchData['orderByType'] = obj.type;
- tableIns.reload({
- where: searchData,
- page: {curr: 1}
- });
+ // 鎼滅储
+ form.on('submit(waitMatinSearch)', function (data) {
+ insTb.reload({where: data.field, page: {curr: 1}});
});
- // 鐩戝惉澶村伐鍏锋爮浜嬩欢
- table.on('toolbar(order)', function (obj) {
- var checkStatus = table.checkStatus(obj.config.id).data;
- switch(obj.event) {
- case 'addData':
- showEditModel();
- break;
- case 'deleteData':
- if (checkStatus.length === 0) {
- layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
- return;
- }
- del(checkStatus.map(function (d) {
- return d.id;
- }));
- break;
- case 'exportData':
- admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
- var titles=[];
- var fields=[];
- obj.config.cols[0].map(function (col) {
- if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
- titles.push(col.title);
- fields.push(col.field);
+ // 娣诲姞
+ $("#waitMatinAddBtn").click(function () {
+ showEditModel();
+ });
+
+ // 宸ュ叿鏉＄偣鍑讳簨浠�
+ table.on('tool(waitMatin)', function (obj) {
+ var data = obj.data;
+ var layEvent = obj.event;
+ if (layEvent === 'edit') {
+ showEditModel(data);
+ } else if (layEvent === 'del') {
+ doDel(data.billNo);
+ } else if (layEvent === 'look') {
+ var $a = $(obj.tr).find('a[lay-event="look"]');
+ var offset = $a.offset();
+ var top = offset.top;
+ var left = offset.left;
+ layer.open({
+ type: 1,
+ title: false,
+ area: '800px',
+ offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
+ shade: .01,
+ shadeClose: true,
+ fixed: false,
+ content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>',
+ success: function (layero) {
+ table.render({
+ elem: '#lookSSXMTable',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/waitMatin/list/auth',
+ where: {
+ bill_no: data.billNo
+ },
+ page: true,
+ cellMinWidth: 100,
+ cols: [[
+ {type: 'numbers'},
+ {field: 'matNo', title: '鐗╂枡缂栫爜'},
+ {field: 'matName', title: '鐗╂枡鍚嶇О', width: 160},
+ {field: 'qty', title: '鏁伴噺'},
+ {
+ field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
+ return util.toDateString(d.createTime);
+ }, width: 180
+ },
+ {field: 'inQty', title: '宸插叆搴撻噺'},
+ {field: 'color', title: '棰滆壊'},
+ {field: 'specs', title: '瑙勬牸'}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function () {
+ $(layero).find('.layui-table-view').css('margin', '0');
+ },
+ size: ''
+ });
+ }
+ });
+ }
+ });
+
+ // 鏄剧ず琛ㄥ崟寮圭獥
+ function showEditModel(expTpe) {
+ var mlist=null
+ var inQtys=[]
+ admin.open({
+ type: 1,
+ title: (expTpe ? '淇敼' : '娣诲姞') + '鍗曟嵁',
+ content: $('#editDialog').html(),
+ area: '1300px',
+ success: function (layero, dIndex) {
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ var isExpAdd = !expTpe;
+ // 鍥炴樉鏁版嵁
+ form.val('editForm', expTpe);
+ if (expTpe) {
+ $('#billNo').attr("disabled", "disabled");
+ }
+ // 琛ㄥ崟鎻愪氦浜嬩欢
+ form.on('submit(waitMatinEditSubmit)', function (data) {
+ // 缁勮鏁版嵁
+ if (xxDataList.length <= 0) {
+ layer.tips('璇锋坊鍔犲崟鎹槑缁�', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
+ return false;
+ }
+ var param = [];
+ var nList = admin.util.deepClone(xxDataList);
+ for (var xi = 0; xi < nList.length; xi++) {
+ // console.log('宸插叆搴擄細'+nList[xi].inQty)
+ // console.log('鏃ф暟閲忥細'+inQtys[xi])
+ // console.log('鏁伴噺锛�'+nList[xi].qty)
+ if (nList[xi].inQty > 0 && inQtys[xi]!=nList[xi].qty) {
+ layer.msg("宸插叆搴撴棤娉曚慨鏀�", {icon: 2})
+ return false;
+ } else if (nList[xi].qty > 0) {
+ param.push({
+ billNo: data.field.billNo,
+ billType: data.field.billType,
+ matNo: nList[xi].matNo,
+ matName: nList[xi].matName,
+ color: nList[xi].color,
+ size: nList[xi].size,
+ specs: nList[xi].specs,
+ memo: nList[xi].memo,
+ unit: nList[xi].unit,
+ qty: nList[xi].qty,
+ inQty: nList[xi].inQty,
+ })
+ }else if (nList[xi].qty == 0){
+ layer.msg('鏄庣粏淇敼鏁伴噺涓嶅悎娉�', {icon: 2});
+ return false;
}
- });
- var exportData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
- exportData[this.name] = this.value;
- });
- var param = {
- 'order': exportData,
- 'fields': fields
- };
+ }
+ if (param.length === 0) {
+ layer.msg('鍗曟嵁鏄庣粏鏁伴噺涓嶅悎娉�', {icon: 2});
+ return false;
+ }
+ layer.load(2);
$.ajax({
- url: baseUrl+"/order/export/auth",
+ url: baseUrl+"/waitMatin/" + (isExpAdd?"add":"modify") + "/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
- dataType:'json',
contentType:'application/json;charset=UTF-8',
method: 'POST',
success: function (res) {
- layer.closeAll();
- if (res.code === 200) {
- table.exportFile(titles,res.data,'xls');
- } else if (res.code === 403) {
- top.location.href = baseUrl+"/";
- } else {
- layer.msg(res.msg, {icon: 2})
- }
- }
- });
- });
- break;
- }
- });
-
- // 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(order)', function(obj){
- var data = obj.data;
- switch (obj.event) {
- case 'edit':
- showEditModel(data);
- break;
- case "del":
- del([data.id]);
- break;
- }
- });
-
- /* 寮圭獥 - 鏂板銆佷慨鏀� */
- function showEditModel(mData) {
- admin.open({
- type: 1,
- area: '600px',
- title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
- content: $('#editDialog').html(),
- success: function (layero, dIndex) {
- layDateRender(mData);
- form.val('detail', mData);
- form.on('submit(editSubmit)', function (data) {
- var loadIndex = layer.load(2);
- $.ajax({
- url: baseUrl+"/order/"+(mData?'update':'add')+"/auth",
- headers: {'token': localStorage.getItem('token')},
- data: data.field,
- method: 'POST',
- success: function (res) {
- layer.close(loadIndex);
+ layer.closeAll('loading');
if (res.code === 200){
layer.close(dIndex);
+ insTb.reload({page: {curr: 1}});
layer.msg(res.msg, {icon: 1});
- tableReload();
} else if (res.code === 403){
top.location.href = baseUrl+"/";
}else {
@@ -200,33 +206,232 @@
})
return false;
});
- $(layero).children('.layui-layer-content').css('overflow', 'visible');
- layui.form.render('select');
+ // 鏄庣粏琛ㄦ牸
+ var xxDataList = [];
+ var tbOptions = {
+ elem: '#formSSXMTable',
+ headers: {token: localStorage.getItem('token')},
+ data: xxDataList,
+ page: true,
+ height: '350px;',
+ cellMinWidth: 100,
+ cols: [[
+ {type: 'numbers'},
+ {field: 'matNo', title: '鐗╂枡缂栫爜'},
+ {field: 'matName', title: '鐗╂枡鍚嶇О', width: 160},
+ {field: 'specs', title: '瑙勬牸', width: 160},
+ {field: 'color', title: '棰滆壊', width: 160},
+ {field: 'size', title: '灏哄', width: 160},
+ {field: 'qty', title: '淇敼鏁伴噺', style: 'color: blue;font-weight: bold', edit: true, minWidth: 100, width: 100},
+ {field: 'inQty', title: '宸插叆搴撻噺', minWidth: 100, width: 100},
+ {field: 'unit', title: '鍗曚綅', width: 160},
+ {field: 'memo', title: '澶囨敞' , edit: true, width: 160},
+ {align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
+ ]],
+ done: function (res) {
+ mlist= res.data
+ for (let i = 0; i < mlist.length; i++) {
+ var waitIn=mlist[i]
+ inQtys.push(waitIn.qty)
+ }
+ $(layero).find('.layui-table-view').css('margin', '0');
+ },
+ size: ''
+ };
+ if (!isExpAdd) {
+ $.ajax({
+ url: baseUrl+"/waitMatin/detl/list/auth?billNo=" + expTpe.billNo,
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ xxDataList = res.data;
+ tbOptions.data = xxDataList;
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ })
+ }
+ var insTbSSXM = table.render(tbOptions);
+ // 宸ュ叿鏉＄偣鍑讳簨浠�
+ table.on('tool(formSSXMTable)', function (obj) {
+ var data = obj.data;
+ var layEvent = obj.event;
+ if (layEvent === 'edit') {
+ showEditModel2(data);
+ } else if (layEvent === 'del') {
+ layer.confirm('纭畾瑕佸垹闄ゅ悧锛�', {
+ shade: .1,
+ skin: 'layui-layer-admin'
+ }, function (i) {
+ layer.close(i);
+ for (var j = 0; j < xxDataList.length; j++) {
+ if (xxDataList[j].matNo === data.matNo) {
+ xxDataList.splice(j, 1);
+ break;
+ }
+ }
+ insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
+ });
+ }
+ });
+ // 鏁伴噺淇敼
+ table.on('edit(formSSXMTable)', function (obj) {
+ if (obj.field=='memo'){
+ let vle = obj.value;
+ for (var i=0;i<xxDataList.length;i++) {
+ if (xxDataList[i]["matNo"] === obj.data.matNo) {
+ xxDataList[i]["memo"] = vle;
+ break;
+ }
+ }
+ }else if (obj.field=='qty'){
+ let vle = Number(obj.value);
+ if (isNaN(vle)) {
+ layer.msg("璇疯緭鍏ユ暟瀛�");
+ } else {
+ if (vle > 0) {
+ for (var i=0;i<xxDataList.length;i++) {
+ if (xxDataList[i]["matNo"] === obj.data.matNo) {
+ xxDataList[i]["qty"] = vle;
+ break;
+ }
+ }
+ } else {
+ layer.msg("鏁伴噺蹇呴』澶т簬闆�");
+ }
+ }
+ }
+ insTbSSXM.reload({data: xxDataList});
+ });
+ //
+ $('#matAddBtnComment').click(function () {
+ showEditModel2();
+ });
+
+ // 鏄剧ず娣诲姞鏄庣粏琛ㄥ崟寮圭獥
+ function showEditModel2(exp) {
+ admin.open({
+ type: 1,
+ offset: '150px',
+ area: '480px',
+ title: (exp ? '淇敼' : '娣诲姞') + '鏄庣粏',
+ content: $('#matEditDialog').html(),
+ success: function (layero, dIndex) {
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ // 鍥炴樉鏁版嵁
+ form.val('matEditForm', exp);
+ // 琛ㄥ崟鎻愪氦浜嬩欢
+ form.on('submit(matEditSubmit)', function (data) {
+ var existMats = [];
+ xxDataList.forEach(function(elem) {
+ existMats.push(elem.matNo);
+ });
+ var selectList = matXmSelect.getValue();
+ for (var i = 0; i<selectList.length; i++) {
+ var item = selectList[i];
+ if (existMats.indexOf(item.value) === -1) {
+ // 鏌ヨ鐗╂枡璇︽儏
+ $.ajax({
+ url: baseUrl+"/matCode/"+item.value+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ var mat = res.data;
+ xxDataList.push({
+ matNo: mat.matNo,
+ matName: mat.matName,
+ color:mat.color,
+ size:mat.size,
+ specs:mat.specs,
+ memo: mat.memo,
+ unit: mat.unit,
+ qty: 0.0
+ });
+ insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ })
+ }
+ }
+ layer.close(dIndex);
+ return false;
+ });
+ // 娓叉煋鐗╂枡閫夋嫨
+ var matXmSelect = xmSelect.render({
+ el: '#mat',
+ style: {
+ width: '340px',
+ },
+ autoRow: true,
+ toolbar: { show: true },
+ filterable: true,
+ remoteSearch: true,
+ remoteMethod: function(val, cb, show){
+ $.ajax({
+ url: baseUrl+"/mat/all/get/kv",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ condition: val
+ },
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ cb(res.data)
+ } else {
+ cb([]);
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ });
+ }
+ })
+ // 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
}
});
}
- /* 鍒犻櫎 */
- function del(ids) {
- layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
- skin: 'layui-layer-admin',
- shade: .1
+ // 鍒犻櫎鍗曟嵁
+ function doDel(billNo) {
+ layer.confirm('纭畾瑕佸垹闄ゅ悧锛�', {
+ shade: .1,
+ skin: 'layui-layer-admin'
}, function (i) {
layer.close(i);
- var loadIndex = layer.load(2);
+ layer.load(2);
+
$.ajax({
- url: baseUrl+"/order/delete/auth",
+ url: baseUrl+"/waitMatin/delete/auth",
headers: {'token': localStorage.getItem('token')},
- data: {ids: ids},
+ data: {
+ billNo: billNo
+ },
+ // contentType:'application/json;charset=UTF-8',
method: 'POST',
success: function (res) {
- layer.close(loadIndex);
+ layer.closeAll('loading');
if (res.code === 200){
+ insTb.reload({page: {curr: 1}});
layer.msg(res.msg, {icon: 1});
- tableReload();
} else if (res.code === 403){
top.location.href = baseUrl+"/";
- } else {
+ }else {
layer.msg(res.msg, {icon: 2});
}
}
@@ -234,61 +439,9 @@
});
}
- // 鎼滅储
- form.on('submit(search)', function (data) {
- pageCurr = 1;
- tableReload(false);
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
});
-
- // 閲嶇疆
- form.on('submit(reset)', function (data) {
- pageCurr = 1;
- clearFormVal($('#search-box'));
- tableReload(false);
- });
-
- // 鏃堕棿閫夋嫨鍣�
- function layDateRender(data) {
- setTimeout(function () {
- layDate.render({
- elem: '#payTime\\$',
- type: 'datetime',
- value: data!==undefined?data['payTime\\$']:null
- });
- layDate.render({
- elem: '#sendTime\\$',
- type: 'datetime',
- value: data!==undefined?data['sendTime\\$']:null
- });
- layDate.render({
- elem: '#createTime\\$',
- type: 'datetime',
- value: data!==undefined?data['createTime\\$']:null
- });
- layDate.render({
- elem: '#updateTime\\$',
- type: 'datetime',
- value: data!==undefined?data['updateTime\\$']:null
- });
-
- }, 300);
- }
- layDateRender();
-
});
-
-// 鍏抽棴鍔ㄤ綔
-$(document).on('click','#data-detail-close', function () {
- parent.layer.closeAll();
-});
-
-function tableReload(child) {
- var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
- searchData[this.name] = this.value;
- });
- tableIns.reload({
- where: searchData,
- page: {curr: pageCurr}
- });
-}
diff --git a/src/main/webapp/static/js/order/order0.js b/src/main/webapp/static/js/order/order0.js
new file mode 100644
index 0000000..40a8a13
--- /dev/null
+++ b/src/main/webapp/static/js/order/order0.js
@@ -0,0 +1,294 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#order',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/order/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'id', align: 'center',title: 'ID'}
+ ,{field: 'uuid', align: 'center',title: '缂栧彿'}
+ ,{field: 'orderNo', align: 'center',title: '璁㈠崟缂栧彿'}
+ ,{field: 'orderTime', align: 'center',title: '鍗曟嵁鏃ユ湡'}
+ ,{field: 'docType$', align: 'center',title: '鍗曟嵁绫诲瀷'}
+ ,{field: 'itemId$', align: 'center',title: '椤圭洰缂栧彿'}
+ ,{field: 'itemName', align: 'center',title: ''}
+ ,{field: 'allotItemId$', align: 'center',title: '璋冩嫧椤圭洰缂栧彿'}
+ ,{field: 'defNumber', align: 'center',title: '鍒濆绁ㄦ嵁鍙�'}
+ ,{field: 'number', align: 'center',title: '绁ㄦ嵁鍙�'}
+ ,{field: 'cstmr$', align: 'center',title: '瀹㈡埛缂栧彿'}
+ ,{field: 'cstmrName', align: 'center',title: '瀹㈡埛'}
+ ,{field: 'tel', align: 'center',title: '鑱旂郴鏂瑰紡'}
+ ,{field: 'operMemb', align: 'center',title: '鎿嶄綔浜哄憳'}
+ ,{field: 'totalFee', align: 'center',title: '鍚堣閲戦'}
+ ,{field: 'discount', align: 'center',title: '浼樻儬鐜�'}
+ ,{field: 'discountFee', align: 'center',title: '浼樻儬閲戦'}
+ ,{field: 'otherFee', align: 'center',title: '閿�鍞垨閲囪喘璐圭敤鍚堣'}
+ ,{field: 'actFee', align: 'center',title: '瀹炰粯閲戦'}
+ ,{field: 'payType$', align: 'center',title: '浠樻绫诲瀷'}
+ ,{field: 'salesman', align: 'center',title: '涓氬姟鍛�'}
+ ,{field: 'accountDay', align: 'center',title: '缁撶畻澶╂暟'}
+ ,{field: 'postFeeType$', align: 'center',title: '閭垂鏀粯绫诲瀷'}
+ ,{field: 'postFee', align: 'center',title: '閭垂'}
+ ,{field: 'payTime$', align: 'center',title: '浠樻鏃堕棿'}
+ ,{field: 'sendTime$', align: 'center',title: '鍙戣揣鏃堕棿'}
+ ,{field: 'shipName', align: 'center',title: '鐗╂祦鍚嶇О'}
+ ,{field: 'shipCode', align: 'center',title: '鐗╂祦鍗曞彿'}
+ ,{field: 'settle$', align: 'center',title: '璁㈠崟鐘舵��'}
+ ,{field: 'status$', align: 'center',title: '鐘舵��'}
+ ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
+ ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
+ ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'memo', align: 'center',title: '澶囨敞'}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(order)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {curr: 1}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(order)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.id;
+ }));
+ break;
+ case 'exportData':
+ admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'order': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/order/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(order)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.id]);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/order/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/order/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '#payTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['payTime\\$']:null
+ });
+ layDate.render({
+ elem: '#sendTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['sendTime\\$']:null
+ });
+ layDate.render({
+ elem: '#createTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['createTime\\$']:null
+ });
+ layDate.render({
+ elem: '#updateTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['updateTime\\$']:null
+ });
+
+ }, 300);
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 4a3d9e5..1c79663 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -8,328 +8,143 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
- <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+ <!-- <link rel="stylesheet" href="../../static/css/cool.css" media="all">-->
+ <!-- <link rel="stylesheet" href="../../static/css/common.css" media="all">-->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+ <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+ <![endif]-->
</head>
<body>
+<!-- 姝ｆ枃寮�濮� -->
<div class="layui-fluid">
<div class="layui-card">
<div class="layui-card-body">
- <div class="layui-form toolbar" id="search-box">
+ <!-- 琛ㄦ牸椤堕儴宸ュ叿鏍� -->
+ <div class="layui-form toolbar">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">缂栧彿:</label>
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ <div class="layui-input-inline mr0">
+ <input name="bill_no" class="layui-input" type="text" placeholder="杈撳叆鍗曟嵁缂栧彿"/>
</div>
</div>
- <div class="layui-inline"> 
- <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <div class="layui-inline">
+ <div class="layui-input-inline mr0">
+ <select name="bill_type" placeholder="璇烽�夋嫨鍗曟嵁绫诲瀷">
+ <option value="" style="display: none"></option>
+ <option value="1">閲囪喘鍏ュ簱</option>
+ <option value="2">鐢熶骇鍏ュ簱</option>
+ <option value="3">璋冩嫧鍏ュ簱</option>
+ <option value="4">閿�鍞��鍥炲叆搴�</option>
+ <option value="5">鍏朵粬鍏ュ簱</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="appe_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <button class="layui-btn icon-btn" lay-filter="waitMatinSearch" lay-submit>
<i class="layui-icon"></i>鎼滅储
</button>
- <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
- <i class="layui-icon"></i>閲嶇疆
+ <button id="waitMatinAddBtn" class="layui-btn icon-btn"><i class="layui-icon"></i>娣诲姞
</button>
</div>
</div>
</div>
- <table class="layui-hide" id="order" lay-filter="order"></table>
+ <table id="waitMatin" lay-filter="waitMatin"></table>
+ </div>
+ </div>
+ <div class="layui-card">
+ <div class="layui-card-body">
+ 鍏ュ簱閫氱煡鍗曪細鐢盓RP鎻愪緵鍗曟嵁缂栧彿銆佺被鍨嬨�佸崟鎹椂闂村強鐗╂枡鏄庣粏锛岀敓鎴愬叆搴撲綔涓氬崟锛屼负缁存姢绯荤粺楂樺彲鐢紝鐢ㄦ埛鍙嚜琛屾坊鍔犲叆搴撻�氱煡鍗曟暟鎹紝瀹屾垚鐙珛鐨勫叆搴撲綔涓氥��
+ <span class="text-danger">鎵嬪姩娣诲姞鏃讹紝璇锋鏌ュ崟鎹紪鍙锋槸鍚﹀湪ERP绯荤粺涓凡瀛樺湪锛岄伩鍏嶅彂鐢熸暟鎹敊璇棶棰樸��</span>
</div>
</div>
</div>
-
-<script type="text/html" id="toolbar">
- <div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
- </div>
-</script>
-
+<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+ <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<!-- 琛ㄦ牸鎿嶄綔鍒� -->
+<script type="text/html" id="tbLook">
+ <span class="layui-text">
+ <a href="javascript:;" lay-event="look">
+ <i class="layui-icon" style="font-size: 12px;"></i> 鏌ョ湅鍗曟嵁鏄庣粏
+ </a>
+ </span>
+</script>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="editForm" lay-filter="editForm" class="layui-form model-form">
+ <input name="experimentTypeId" type="hidden"/>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍗曟嵁绫诲瀷锛�</label>
+ <div class="layui-input-block">
+ <select name="billType" maxlength="20" lay-verType="tips" lay-verify="required">
+ <option value="" style="display: none"></option>
+ <option value="1">閲囪喘鍏ュ簱</option>
+ <option value="2">鐢熶骇鍏ュ簱</option>
+ <option value="3">璋冩嫧鍏ュ簱</option>
+ <option value="4">閿�鍞��鍥炲叆搴�</option>
+ <option value="5">鍏朵粬鍏ュ簱</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍗曟嵁缂栧彿锛�</label>
+ <div class="layui-input-block">
+ <input id="billNo" name="billNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" lay-verify="required"/>
+ </div>
+ </div>
+ <div class="layui-form-item" style="position: relative;">
+ <label class="layui-form-label">鍗曟嵁鏄庣粏锛�</label>
+ <div class="layui-input-block">
+ <table id="formSSXMTable" lay-filter="formSSXMTable"></table>
+ </div>
+ <button class="layui-btn layui-btn-sm icon-btn" id="matAddBtnComment"
+ style="position: absolute; left: 20px;top: 60px;padding: 0 5px;" type="button">
+ <i class="layui-icon"></i>娣诲姞鏄庣粏
+ </button>
+ </div>
+ <div class="layui-form-item text-right">
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ <button class="layui-btn" lay-filter="waitMatinEditSubmit" lay-submit>淇濆瓨</button>
+ </div>
+ </form>
+</script>
+<!-- 琛ㄦ牸鎿嶄綔鍒� -->
+<script type="text/html" id="formSSXMTableBar">
+ <!-- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">淇敼</a>-->
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="matEditDialog">
+ <form id="matEditForm" lay-filter="matEditForm" class="layui-form model-form">
+ <input name="experimentId" type="hidden"/>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐗╂枡 - 澶氶��</label>
+ <div class="layui-input-block">
+ <div id="mat" name="mat">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item text-right">
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ <button class="layui-btn" lay-filter="matEditSubmit" lay-submit>淇濆瓨</button>
+ </div>
+ </form>
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/order/order.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/waitMatin/waitMatin.js" charset="utf-8"></script>
</body>
-<!-- 琛ㄥ崟寮圭獥 -->
-<script type="text/html" id="editDialog">
- <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
- <input name="id" type="hidden">
- <div class="layui-row">
- <div class="layui-col-md12">
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">缂栧彿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="uuid" placeholder="璇疯緭鍏ョ紪鍙�" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">璁㈠崟缂栧彿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="orderNo" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍗曟嵁鏃ユ湡: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="orderTime" placeholder="璇疯緭鍏ュ崟鎹棩鏈�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍗曟嵁绫诲瀷: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="docType" placeholder="璇疯緭鍏ュ崟鎹被鍨�" style="display: none">
- <input id="docType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ崟鎹被鍨�" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="docTypeQueryBydocType" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="docTypeQueryBydocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">椤圭洰缂栧彿: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="itemId" placeholder="璇疯緭鍏ラ」鐩紪鍙�" style="display: none">
- <input id="itemId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ラ」鐩紪鍙�" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="itemQueryByitemId" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="itemQueryByitemIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="itemName" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">璋冩嫧椤圭洰缂栧彿: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="allotItemId" placeholder="璇疯緭鍏ヨ皟鎷ㄩ」鐩紪鍙�" style="display: none">
- <input id="allotItemId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヨ皟鎷ㄩ」鐩紪鍙�" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="itemQueryByallotItemId" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="itemQueryByallotItemIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍒濆绁ㄦ嵁鍙�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="defNumber" placeholder="璇疯緭鍏ュ垵濮嬬エ鎹彿">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">绁ㄦ嵁鍙�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="number" placeholder="璇疯緭鍏ョエ鎹彿">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">瀹㈡埛缂栧彿: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="cstmr" placeholder="璇疯緭鍏ュ鎴风紪鍙�" style="display: none">
- <input id="cstmr$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ鎴风紪鍙�" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="cstmrQueryBycstmr" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="cstmrQueryBycstmrSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">瀹㈡埛: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="cstmrName" placeholder="璇疯緭鍏ュ鎴�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鑱旂郴鏂瑰紡: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="tel" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鎿嶄綔浜哄憳: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="operMemb" placeholder="璇疯緭鍏ユ搷浣滀汉鍛�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍚堣閲戦: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="totalFee" placeholder="璇疯緭鍏ュ悎璁￠噾棰�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">浼樻儬鐜�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="discount" placeholder="璇疯緭鍏ヤ紭鎯犵巼">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">浼樻儬閲戦: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="discountFee" placeholder="璇疯緭鍏ヤ紭鎯犻噾棰�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">閿�鍞垨閲囪喘璐圭敤鍚堣: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="otherFee" placeholder="璇疯緭鍏ラ攢鍞垨閲囪喘璐圭敤鍚堣">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">瀹炰粯閲戦: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="actFee" placeholder="璇疯緭鍏ュ疄浠橀噾棰�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">浠樻绫诲瀷: </label>
- <div class="layui-input-block">
- <select name="payType">
- <option value="">璇烽�夋嫨浠樻绫诲瀷</option>
- <option value="1">鐜伴噾</option>
- <option value="2">璁拌处</option>
- </select>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">涓氬姟鍛�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="salesman" placeholder="璇疯緭鍏ヤ笟鍔″憳">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">缁撶畻澶╂暟: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="accountDay" placeholder="璇疯緭鍏ョ粨绠楀ぉ鏁�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">閭垂鏀粯绫诲瀷: </label>
- <div class="layui-input-block">
- <select name="postFeeType">
- <option value="">璇烽�夋嫨閭垂鏀粯绫诲瀷</option>
- <option value="1">鍦ㄧ嚎鏀粯</option>
- <option value="2">璐у埌浠樻</option>
- </select>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">閭垂: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="postFee" placeholder="璇疯緭鍏ラ偖璐�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">浠樻鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="payTime" id="payTime$" placeholder="璇疯緭鍏ヤ粯娆炬椂闂�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍙戣揣鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="sendTime" id="sendTime$" placeholder="璇疯緭鍏ュ彂璐ф椂闂�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鐗╂祦鍚嶇О: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="shipName" placeholder="璇疯緭鍏ョ墿娴佸悕绉�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鐗╂祦鍗曞彿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="shipCode" placeholder="璇疯緭鍏ョ墿娴佸崟鍙�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">璁㈠崟鐘舵��: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="settle" placeholder="璇疯緭鍏ヨ鍗曠姸鎬�" style="display: none">
- <input id="settle$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヨ鍗曠姸鎬�" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="orderSettleQueryBysettle" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="orderSettleQueryBysettleSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鐘舵��: </label>
- <div class="layui-input-block">
- <select name="status">
- <option value="">璇烽�夋嫨鐘舵��</option>
- <option value="1">姝ｅ父</option>
- <option value="0">绂佺敤</option>
- </select>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">娣诲姞浜哄憳: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="createBy" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" style="display: none">
- <input id="createBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="userQueryBycreateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryBycreateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">娣诲姞鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">淇敼浜哄憳: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="updateBy" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
- <input id="updateBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">淇敼鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">澶囨敞: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
- </div>
- </div>
-
- </div>
- </div>
- <hr class="layui-bg-gray">
- <div class="layui-form-item text-right">
- <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
- <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
- </div>
- </form>
-</script>
</html>
diff --git a/src/main/webapp/views/order/order0.html b/src/main/webapp/views/order/order0.html
new file mode 100644
index 0000000..4a3d9e5
--- /dev/null
+++ b/src/main/webapp/views/order/order0.html
@@ -0,0 +1,335 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">缂栧彿:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="order" lay-filter="order"></table>
+ </div>
+ </div>
+</div>
+
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/order/order.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">缂栧彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="uuid" placeholder="璇疯緭鍏ョ紪鍙�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">璁㈠崟缂栧彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="orderNo" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍗曟嵁鏃ユ湡: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="orderTime" placeholder="璇疯緭鍏ュ崟鎹棩鏈�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍗曟嵁绫诲瀷: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="docType" placeholder="璇疯緭鍏ュ崟鎹被鍨�" style="display: none">
+ <input id="docType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ崟鎹被鍨�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="docTypeQueryBydocType" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="docTypeQueryBydocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">椤圭洰缂栧彿: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="itemId" placeholder="璇疯緭鍏ラ」鐩紪鍙�" style="display: none">
+ <input id="itemId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ラ」鐩紪鍙�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="itemQueryByitemId" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="itemQueryByitemIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="itemName" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">璋冩嫧椤圭洰缂栧彿: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="allotItemId" placeholder="璇疯緭鍏ヨ皟鎷ㄩ」鐩紪鍙�" style="display: none">
+ <input id="allotItemId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヨ皟鎷ㄩ」鐩紪鍙�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="itemQueryByallotItemId" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="itemQueryByallotItemIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍒濆绁ㄦ嵁鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="defNumber" placeholder="璇疯緭鍏ュ垵濮嬬エ鎹彿">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">绁ㄦ嵁鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="number" placeholder="璇疯緭鍏ョエ鎹彿">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹㈡埛缂栧彿: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="cstmr" placeholder="璇疯緭鍏ュ鎴风紪鍙�" style="display: none">
+ <input id="cstmr$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ鎴风紪鍙�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="cstmrQueryBycstmr" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="cstmrQueryBycstmrSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹㈡埛: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="cstmrName" placeholder="璇疯緭鍏ュ鎴�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鑱旂郴鏂瑰紡: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="tel" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎿嶄綔浜哄憳: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="operMemb" placeholder="璇疯緭鍏ユ搷浣滀汉鍛�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍚堣閲戦: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="totalFee" placeholder="璇疯緭鍏ュ悎璁￠噾棰�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">浼樻儬鐜�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="discount" placeholder="璇疯緭鍏ヤ紭鎯犵巼">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">浼樻儬閲戦: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="discountFee" placeholder="璇疯緭鍏ヤ紭鎯犻噾棰�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">閿�鍞垨閲囪喘璐圭敤鍚堣: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="otherFee" placeholder="璇疯緭鍏ラ攢鍞垨閲囪喘璐圭敤鍚堣">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹炰粯閲戦: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="actFee" placeholder="璇疯緭鍏ュ疄浠橀噾棰�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">浠樻绫诲瀷: </label>
+ <div class="layui-input-block">
+ <select name="payType">
+ <option value="">璇烽�夋嫨浠樻绫诲瀷</option>
+ <option value="1">鐜伴噾</option>
+ <option value="2">璁拌处</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">涓氬姟鍛�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="salesman" placeholder="璇疯緭鍏ヤ笟鍔″憳">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">缁撶畻澶╂暟: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="accountDay" placeholder="璇疯緭鍏ョ粨绠楀ぉ鏁�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">閭垂鏀粯绫诲瀷: </label>
+ <div class="layui-input-block">
+ <select name="postFeeType">
+ <option value="">璇烽�夋嫨閭垂鏀粯绫诲瀷</option>
+ <option value="1">鍦ㄧ嚎鏀粯</option>
+ <option value="2">璐у埌浠樻</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">閭垂: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="postFee" placeholder="璇疯緭鍏ラ偖璐�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">浠樻鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="payTime" id="payTime$" placeholder="璇疯緭鍏ヤ粯娆炬椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍙戣揣鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="sendTime" id="sendTime$" placeholder="璇疯緭鍏ュ彂璐ф椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐗╂祦鍚嶇О: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="shipName" placeholder="璇疯緭鍏ョ墿娴佸悕绉�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐗╂祦鍗曞彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="shipCode" placeholder="璇疯緭鍏ョ墿娴佸崟鍙�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">璁㈠崟鐘舵��: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="settle" placeholder="璇疯緭鍏ヨ鍗曠姸鎬�" style="display: none">
+ <input id="settle$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヨ鍗曠姸鎬�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="orderSettleQueryBysettle" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="orderSettleQueryBysettleSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐘舵��: </label>
+ <div class="layui-input-block">
+ <select name="status">
+ <option value="">璇烽�夋嫨鐘舵��</option>
+ <option value="1">姝ｅ父</option>
+ <option value="0">绂佺敤</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">娣诲姞浜哄憳: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="createBy" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" style="display: none">
+ <input id="createBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="userQueryBycreateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryBycreateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">娣诲姞鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇敼浜哄憳: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="updateBy" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
+ <input id="updateBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇敼鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
--
Gitblit v1.9.1