From b388f4e1deb6f4a4680bb74b8a0f074f80df61f8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 09 四月 2021 17:55:56 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/entity/DocType.java | 3
src/main/resources/mapper/DocTypeMapper.xml | 2
src/main/webapp/static/js/order/order.js | 1157 ++++++++++++++++++++++++++------------------------
src/main/webapp/views/order/order.html | 196 ++++----
4 files changed, 703 insertions(+), 655 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/entity/DocType.java b/src/main/java/zy/cloud/wms/manager/entity/DocType.java
index 5e29b72..234de7c 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/DocType.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/DocType.java
@@ -1,7 +1,9 @@
package zy.cloud.wms.manager.entity;
import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
@@ -22,6 +24,7 @@
*/
@ApiModelProperty(value= "绫诲瀷缂栧彿")
@TableField("doc_id")
+ @TableId(value = "doc_id", type = IdType.INPUT)
private Long docId;
/**
diff --git a/src/main/resources/mapper/DocTypeMapper.xml b/src/main/resources/mapper/DocTypeMapper.xml
index b4d0e44..c1688e8 100644
--- a/src/main/resources/mapper/DocTypeMapper.xml
+++ b/src/main/resources/mapper/DocTypeMapper.xml
@@ -4,7 +4,7 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="zy.cloud.wms.manager.entity.DocType">
- <result column="doc_id" property="docId" />
+ <id column="doc_id" property="docId" />
<result column="doc_name" property="docName" />
<result column="status" property="status" />
<result column="create_by" property="createBy" />
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 2b9e055..99d261e 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -1,59 +1,181 @@
var pageCurr;
-layui.use(['table','laydate', 'form'], function(){
+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',
+ /****************************************** 宸﹁竟琛� *************************************************/
+
+ /* 娓叉煋琛ㄦ牸 */
+ var insTb = table.render({
+ elem: '#docTypeTable',
+ url: baseUrl + '/docType/list/auth',
+ height: 'full-100',
+ headers: {token: localStorage.getItem('token')},
+ 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
+ },
+ toolbar: ['<p>',
+ '<button lay-event="add" class="layui-btn layui-btn-sm icon-btn"><i class="layui-icon"></i>娣诲姞</button> ',
+ '<button lay-event="edit" class="layui-btn layui-btn-sm layui-btn-warm icon-btn"><i class="layui-icon"></i>淇敼</button> ',
+ '<button lay-event="del" class="layui-btn layui-btn-sm layui-btn-danger icon-btn"><i class="layui-icon"></i>鍒犻櫎</button>',
+ '</p>'].join(''),
+ defaultToolbar: [],
+ cols: [[
+ {field: 'docId', title: '缂栧彿', width: 80, align: 'center'},
+ {field: 'docName', title: '鍗曟嵁绫诲瀷'}
+ ]],
+ done: function (res, curr, count) {
+ $('#dictTable+.layui-table-view .layui-table-body tbody>tr:first').trigger('click');
+ }
+ });
+
+ /* 琛ㄦ牸鎼滅储 */
+ form.on('submit(docTypeTable)', function (data) {
+ insTb.reload({where: data.field});
+ return false;
+ });
+
+ /* 琛ㄦ牸澶村伐鍏锋爮鐐瑰嚮浜嬩欢 */
+ table.on('toolbar(docTypeTable)', function (obj) {
+ if (obj.event === 'add') { // 娣诲姞
+ showEditModel();
+ } else if (obj.event === 'edit') { // 淇敼
+ showEditModel(selObj.data, selObj);
+ } else if (obj.event === 'del') { // 鍒犻櫎
+ doDel(selObj);
+ }
+ });
+
+ /* 鐩戝惉琛屽崟鍑讳簨浠� */
+ table.on('row(docTypeTable)', function (obj) {
+ selObj = obj;
+ obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');
+ insTb2.reload({where: {doc_type: obj.data.docId}, page: {curr: 1}});
+ });
+
+ /* 鏄剧ず琛ㄥ崟寮圭獥 */
+ function showEditModel(mData, obj) {
+ admin.open({
+ type: 1,
+ title: (mData ? '淇敼' : '娣诲姞') + '瀛楀吀',
+ content: $('#dictEditDialog').html(),
+ success: function (layero, dIndex) {
+ // 鍥炴樉琛ㄥ崟鏁版嵁
+ form.val('dictEditForm', mData);
+ // 琛ㄥ崟鎻愪氦浜嬩欢
+ form.on('submit(dictEditSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.get(mData ? '../../json/ok.json' : '../../json/ok.json', data.field, function (res) {
+ layer.close(loadIndex);
+ if (200 === res.code) {
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ if (obj) {
+ obj.update(data.field);
+ } else {
+ insTb.reload();
+ }
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }, 'json');
+ return false;
+ });
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function doDel(obj) {
+ layer.confirm('纭畾瑕佸垹闄ゆ瀛楀吀鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.get('../../json/ok.json', {
+ id: obj.data.dictId,
+ }, function (res) {
+ layer.close(loadIndex);
+ if (200 === res.code) {
+ layer.msg(res.msg, {icon: 1});
+ obj.del();
+ $('#dictTable+.layui-table-view .layui-table-body tbody>tr:first').trigger('click');
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }, 'json');
+ });
+ }
+
+
+ /****************************************** 鍙宠竟琛� *************************************************/
+
+
+ /* 娓叉煋琛ㄦ牸2 */
+ var insTb2 = table.render({
+ elem: '#orderTable',
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/order/list/auth',
page: true,
limit: 16,
limits: [16, 30, 50, 100, 200, 500],
- even: true,
toolbar: '#toolbar',
- cellMinWidth: 50,
+ height: 'full-100',
cols: [[
{type: 'checkbox'}
-// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
- ,{field: 'id', align: 'center',title: 'ID'}
- ,{field: 'uuid', align: 'center',title: '缂栧彿'}
+ // ,{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: '鍗曟嵁绫诲瀷',event: 'docType', style: 'cursor:pointer'}
- ,{field: 'itemId$', align: 'center',title: '椤圭洰缂栧彿',event: 'itemId', style: 'cursor:pointer'}
- ,{field: 'allotItemId$', align: 'center',title: '璋冩嫧椤圭洰缂栧彿',event: 'allotItemId', style: 'cursor:pointer'}
- ,{field: 'defNumber', align: 'center',title: '鍒濆绁ㄦ嵁鍙�'}
+ ,{field: 'docType$', align: 'center',title: '鍗曟嵁绫诲瀷'}
+ ,{field: 'itemId$', align: 'center',title: '椤圭洰缂栧彿'}
+ ,{field: 'allotItemId$', align: 'center',title: '璋冩嫧椤圭洰缂栧彿', hide: true}
+ ,{field: 'defNumber', align: 'center',title: '鍒濆绁ㄦ嵁鍙�', hide: true}
,{field: 'number', align: 'center',title: '绁ㄦ嵁鍙�'}
- ,{field: 'cstmr$', align: 'center',title: '瀹㈡埛缂栧彿',event: 'cstmr', style: 'cursor:pointer'}
- ,{field: 'cstmrName', align: 'center',title: '瀹㈡埛'}
- ,{field: 'tel', align: 'center',title: '鑱旂郴鏂瑰紡'}
+ // ,{field: 'cstmr$', align: 'center',title: '瀹㈡埛缂栧彿'}
+ ,{field: 'cstmrName', align: 'center',title: '瀹㈡埛', hide: true}
+ ,{field: 'tel', align: 'center',title: '鑱旂郴鏂瑰紡', hide: true}
,{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: '璁㈠崟鐘舵��',event: 'settle', style: 'cursor:pointer'}
- ,{field: 'status$', align: 'center',title: '鐘舵��'}
- ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳',event: 'createBy', style: 'cursor:pointer'}
- ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳',event: 'updateBy', style: 'cursor:pointer'}
- ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'memo', align: 'center',title: '澶囨敞'}
+ ,{field: 'discount', align: 'center',title: '浼樻儬鐜�', hide: true}
+ ,{field: 'discountFee', align: 'center',title: '浼樻儬閲戦', hide: true}
+ ,{field: 'otherFee', align: 'center',title: '閿�鍞垨閲囪喘璐圭敤鍚堣', hide: true}
+ ,{field: 'actFee', align: 'center',title: '瀹炰粯閲戦', hide: true}
+ ,{field: 'payType$', align: 'center',title: '浠樻绫诲瀷', hide: true}
+ ,{field: 'salesman', align: 'center',title: '涓氬姟鍛�', hide: true}
+ ,{field: 'accountDay', align: 'center',title: '缁撶畻澶╂暟', hide: true}
+ ,{field: 'postFeeType$', align: 'center',title: '閭垂鏀粯绫诲瀷', hide: true}
+ ,{field: 'postFee', align: 'center',title: '閭垂', hide: true}
+ ,{field: 'payTime$', align: 'center',title: '浠樻鏃堕棿', hide: true}
+ ,{field: 'sendTime$', align: 'center',title: '鍙戣揣鏃堕棿', hide: true}
+ ,{field: 'shipName', align: 'center',title: '鐗╂祦鍚嶇О', hide: true}
+ ,{field: 'shipCode', align: 'center',title: '鐗╂祦鍗曞彿', hide: true}
+ ,{field: 'settle$', align: 'center',title: '璁㈠崟鐘舵��'}
+ // ,{field: 'status$', align: 'center',title: '鐘舵��'}
+ // ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳',event: 'createBy', style: 'cursor:pointer'}
+ // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ // ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳',event: 'updateBy', style: 'cursor:pointer'}
+ // ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+ // ,{field: 'memo', align: 'center',title: '澶囨敞'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
]],
@@ -88,531 +210,460 @@
});
}
});
+ /* 琛ㄦ牸2鎼滅储 */
+ form.on('submit(orderTable)', function (data) {
+ insTb2.reload({where: data.field, page: {curr: 1}});
+ return false;
+ });
- // 鐩戝惉鎺掑簭浜嬩欢
- table.on('sort(locMast)', 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
- },
- done: function (res, curr, count) {
- if (res.code === 403) {
- top.location.href = baseUrl+"/";
- }
- pageCurr=curr;
- limit();
+ /* 琛ㄦ牸2宸ュ叿鏉＄偣鍑讳簨浠� */
+ table.on('tool(orderTable)', function (obj) {
+ if (obj.event === 'edit') { // 淇敼
+ showEditModel2(obj.data);
+ } else if (obj.event === 'del') { // 鍒犻櫎
+ doDel2(obj);
+ }
+ });
+
+ /* 琛ㄦ牸2澶村伐鍏锋爮鐐瑰嚮浜嬩欢 */
+ table.on('toolbar(orderTable)', function (obj) {
+ if (obj.event === 'add') { // 娣诲姞
+ showEditModel2();
+ } else if (obj.event === 'del') { // 鍒犻櫎
+ var checkRows = table.checkStatus('dictDataTable');
+ if (checkRows.data.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ var ids = checkRows.data.map(function (d) {
+ return d.dictDataId;
+ });
+ doDel2({ids: ids});
+ }
+ });
+
+ /* 鏄剧ず琛ㄥ崟寮圭獥2 */
+ function showEditModel2(mData) {
+ admin.open({
+ type: 1,
+ title: (mData ? '淇敼' : '娣诲姞') + '鏁版嵁瀛楀吀椤�',
+ content: $('#dictDataEditDialog').html(),
+ success: function (layero, dIndex) {
+ // 鍥炴樉琛ㄥ崟鏁版嵁
+ form.val('dictDataEditForm', mData);
+ // 琛ㄥ崟鎻愪氦浜嬩欢
+ form.on('submit(dictDataEditSubmit)', function (data) {
+ data.field.dictId = selObj.data.dictId;
+ var loadIndex = layer.load(2);
+ $.get(mData ? '../../json/ok.json' : '../../json/ok.json', data.field, function (res) {
+ layer.close(loadIndex);
+ if (200 === res.code) {
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ insTb2.reload({page: {curr: 1}});
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }, 'json');
+ return false;
+ });
}
});
- });
-
- // 鐩戝惉澶村伐鍏锋爮浜嬩欢
- table.on('toolbar(order)', function (obj) {
- var checkStatus = table.checkStatus(obj.config.id);
- switch(obj.event) {
- case 'addData':
- layer.open({
- type: 2,
- title: '鏂板',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- content: 'order_detail.html',
- success: function(layero, index){
- layer.getChildFrame('#data-detail-submit-edit', index).hide();
- clearFormVal(layer.getChildFrame('#detail', index));
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- }
- });
- break;
- case 'deleteData':
- var data = checkStatus.data;
- if (data.length === 0){
- layer.msg('璇烽�夋嫨鏁版嵁');
- } else {
- layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
- $.ajax({
- url: baseUrl+"/order/delete/auth",
- headers: {'token': localStorage.getItem('token')},
- data: {param: JSON.stringify(data)},
- method: 'POST',
- traditional:true,
- success: function (res) {
- if (res.code === 200){
- layer.closeAll();
- tableReload(false);
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- } else {
- layer.msg(res.msg)
- }
- }
- })
- });
- }
- break;
- case 'exportData':
- layer.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)
- }
- }
- });
- });
- break;
- }
- });
-
- // 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(order)', function(obj){
- var data = obj.data;
- switch (obj.event) {
- // 璇︽儏
- case 'detail':
- layer.open({
- type: 2,
- title: '璇︽儏',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: true,
- content: 'order_detail.html',
- success: function(layero, index){
- setFormVal(layer.getChildFrame('#detail', index), data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- }
- });
- break;
- // 缂栬緫
- case 'edit':
- layer.open({
- type: 2,
- title: '淇敼',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- content: 'order_detail.html',
- success: function(layero, index){
- layer.getChildFrame('#data-detail-submit-save', index).hide();
- setFormVal(layer.getChildFrame('#detail', index), data, false);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
- top.convertDisabled(layer.getChildFrame('#id', index), true);
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- }
- });
- break;
- case 'docType':
- var param = top.reObject(data).docType;
- if (param === undefined) {
- layer.msg("鏃犳暟鎹�");
- } else {
- layer.open({
- type: 2,
- title: '鍗曟嵁绫诲瀷璇︽儏',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: true,
- content: '../docType/docType_detail.html',
- success: function(layero, index){
- $.ajax({
- url: "baseUrl+/docType/"+ param +"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200){
- setFormVal(layer.getChildFrame('#detail', index), res.data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg)
- }
- }
- })
- }
- });
- }
- break;
- case 'itemId':
- var param = top.reObject(data).itemId;
- if (param === undefined) {
- layer.msg("鏃犳暟鎹�");
- } else {
- layer.open({
- type: 2,
- title: '椤圭洰缂栧彿璇︽儏',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: true,
- content: '../item/item_detail.html',
- success: function(layero, index){
- $.ajax({
- url: "baseUrl+/item/"+ param +"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200){
- setFormVal(layer.getChildFrame('#detail', index), res.data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg)
- }
- }
- })
- }
- });
- }
- break;
- case 'allotItemId':
- var param = top.reObject(data).allotItemId;
- if (param === undefined) {
- layer.msg("鏃犳暟鎹�");
- } else {
- layer.open({
- type: 2,
- title: '璋冩嫧椤圭洰缂栧彿璇︽儏',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: true,
- content: '../item/item_detail.html',
- success: function(layero, index){
- $.ajax({
- url: "baseUrl+/item/"+ param +"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200){
- setFormVal(layer.getChildFrame('#detail', index), res.data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg)
- }
- }
- })
- }
- });
- }
- break;
- case 'cstmr':
- var param = top.reObject(data).cstmr;
- if (param === undefined) {
- layer.msg("鏃犳暟鎹�");
- } else {
- layer.open({
- type: 2,
- title: '瀹㈡埛缂栧彿璇︽儏',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: true,
- content: '../cstmr/cstmr_detail.html',
- success: function(layero, index){
- $.ajax({
- url: "baseUrl+/cstmr/"+ param +"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200){
- setFormVal(layer.getChildFrame('#detail', index), res.data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg)
- }
- }
- })
- }
- });
- }
- break;
- case 'settle':
- var param = top.reObject(data).settle;
- if (param === undefined) {
- layer.msg("鏃犳暟鎹�");
- } else {
- layer.open({
- type: 2,
- title: '璁㈠崟鐘舵�佽鎯�',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: true,
- content: '../orderSettle/orderSettle_detail.html',
- success: function(layero, index){
- $.ajax({
- url: "baseUrl+/orderSettle/"+ param +"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200){
- setFormVal(layer.getChildFrame('#detail', index), res.data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg)
- }
- }
- })
- }
- });
- }
- break;
- case 'createBy':
- var param = top.reObject(data).createBy;
- if (param === undefined) {
- layer.msg("鏃犳暟鎹�");
- } else {
- layer.open({
- type: 2,
- title: '娣诲姞浜哄憳璇︽儏',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: true,
- content: '../user/user_detail.html',
- success: function(layero, index){
- $.ajax({
- url: "baseUrl+/user/"+ param +"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200){
- setFormVal(layer.getChildFrame('#detail', index), res.data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg)
- }
- }
- })
- }
- });
- }
- break;
- case 'updateBy':
- var param = top.reObject(data).updateBy;
- if (param === undefined) {
- layer.msg("鏃犳暟鎹�");
- } else {
- layer.open({
- type: 2,
- title: '淇敼浜哄憳璇︽儏',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: true,
- content: '../user/user_detail.html',
- success: function(layero, index){
- $.ajax({
- url: "baseUrl+/user/"+ param +"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200){
- setFormVal(layer.getChildFrame('#detail', index), res.data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg)
- }
- }
- })
- }
- });
- }
- break;
-
- }
- });
-
- // 鏁版嵁淇濆瓨鍔ㄤ綔
- form.on('submit(save)', function () {
- if (banMsg != null){
- layer.msg(banMsg);
- return;
- }
- method("add");
- });
-
- // 鏁版嵁淇敼鍔ㄤ綔
- form.on('submit(edit)', function () {
- method("update")
- });
-
- function method(name){
- var index = layer.load(1, {
- shade: [0.5,'#000'] //0.1閫忔槑搴︾殑鑳屾櫙
- });
- var data = {
-// id: $('#id').val(),
- id: $('#id').val(),
- uuid: $('#uuid').val(),
- orderNo: $('#orderNo').val(),
- orderTime: $('#orderTime').val(),
- docType: $('#docType').val(),
- itemId: $('#itemId').val(),
- allotItemId: $('#allotItemId').val(),
- defNumber: $('#defNumber').val(),
- number: $('#number').val(),
- cstmr: $('#cstmr').val(),
- cstmrName: $('#cstmrName').val(),
- tel: $('#tel').val(),
- operMemb: $('#operMemb').val(),
- totalFee: $('#totalFee').val(),
- discount: $('#discount').val(),
- discountFee: $('#discountFee').val(),
- otherFee: $('#otherFee').val(),
- actFee: $('#actFee').val(),
- payType: $('#payType').val(),
- salesman: $('#salesman').val(),
- accountDay: $('#accountDay').val(),
- postFeeType: $('#postFeeType').val(),
- postFee: $('#postFee').val(),
- payTime: top.strToDate($('#payTime\\$').val()),
- sendTime: top.strToDate($('#sendTime\\$').val()),
- shipName: $('#shipName').val(),
- shipCode: $('#shipCode').val(),
- settle: $('#settle').val(),
- status: $('#status').val(),
- createBy: $('#createBy').val(),
- createTime: top.strToDate($('#createTime\\$').val()),
- updateBy: $('#updateBy').val(),
- updateTime: top.strToDate($('#updateTime\\$').val()),
- memo: $('#memo').val(),
-
- };
- $.ajax({
- url: baseUrl+"/order/"+name+"/auth",
- headers: {'token': localStorage.getItem('token')},
- data: top.reObject(data),
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- parent.layer.closeAll();
- parent.$(".layui-laypage-btn")[0].click();
- $("#data-detail :input").each(function () {
- $(this).val("");
- });
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg)
- }
- layer.close(index);
- }
- })
}
- // 澶嶉�夋浜嬩欢
- form.on('checkbox(detailCheckbox)', function (data) {
- var el = data.elem;
- if (el.checked) {
- $(el).val('Y');
- } else {
- $(el).val('N');
- }
- });
+ /* 鍒犻櫎2 */
+ function doDel2(obj) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.get('../../json/ok.json', {
+ id: obj.data ? obj.data.dictDataId : '',
+ ids: obj.ids ? obj.ids.join(',') : ''
+ }, function (res) {
+ layer.close(loadIndex);
+ if (200 === res.code) {
+ layer.msg(res.msg, {icon: 1});
+ insTb2.reload({page: {curr: 1}});
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }, 'json');
+ });
+ }
- // 鎼滅储鏍忔悳绱簨浠�
- form.on('submit(search)', function (data) {
- pageCurr = 1;
- tableReload(false);
- });
- // 鎼滅储鏍忛噸缃簨浠�
- form.on('submit(reset)', function (data) {
- pageCurr = 1;
- clearFormVal($('#search-box'));
- tableReload(false);
- });
- // 鏃堕棿閫夋嫨鍣�
- layDate.render({
- elem: '#payTime\\$',
- type: 'datetime'
- });
- layDate.render({
- elem: '#sendTime\\$',
- type: 'datetime'
- });
- layDate.render({
- elem: '#createTime\\$',
- type: 'datetime'
- });
- layDate.render({
- elem: '#updateTime\\$',
- type: 'datetime'
- });
+
+
+
+
+
+
+
+
+
+
+
+
+
+// // 鏁版嵁娓叉煋
+// tableIns = table.render({
+// elem: '#order',
+// headers: {token: localStorage.getItem('token')},
+// url: baseUrl+'/order/list/auth',
+// page: true,
+// limit: 16,
+// limits: [16, 30, 50, 100, 200, 500],
+// even: true,
+// toolbar: '#toolbar',
+// cellMinWidth: 50,
+// 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: 'allotItemId$', align: 'center',title: '璋冩嫧椤圭洰缂栧彿', hide: true}
+// ,{field: 'defNumber', align: 'center',title: '鍒濆绁ㄦ嵁鍙�', hide: true}
+// ,{field: 'number', align: 'center',title: '绁ㄦ嵁鍙�'}
+// // ,{field: 'cstmr$', align: 'center',title: '瀹㈡埛缂栧彿'}
+// ,{field: 'cstmrName', align: 'center',title: '瀹㈡埛', hide: true}
+// ,{field: 'tel', align: 'center',title: '鑱旂郴鏂瑰紡', hide: true}
+// ,{field: 'operMemb', align: 'center',title: '鎿嶄綔浜哄憳'}
+// ,{field: 'totalFee', align: 'center',title: '鍚堣閲戦'}
+// ,{field: 'discount', align: 'center',title: '浼樻儬鐜�', hide: true}
+// ,{field: 'discountFee', align: 'center',title: '浼樻儬閲戦', hide: true}
+// ,{field: 'otherFee', align: 'center',title: '閿�鍞垨閲囪喘璐圭敤鍚堣', hide: true}
+// ,{field: 'actFee', align: 'center',title: '瀹炰粯閲戦', hide: true}
+// ,{field: 'payType$', align: 'center',title: '浠樻绫诲瀷'}
+// ,{field: 'salesman', align: 'center',title: '涓氬姟鍛�', hide: true}
+// ,{field: 'accountDay', align: 'center',title: '缁撶畻澶╂暟', hide: true}
+// ,{field: 'postFeeType$', align: 'center',title: '閭垂鏀粯绫诲瀷', hide: true}
+// ,{field: 'postFee', align: 'center',title: '閭垂', hide: true}
+// ,{field: 'payTime$', align: 'center',title: '浠樻鏃堕棿', hide: true}
+// ,{field: 'sendTime$', align: 'center',title: '鍙戣揣鏃堕棿', hide: true}
+// ,{field: 'shipName', align: 'center',title: '鐗╂祦鍚嶇О', hide: true}
+// ,{field: 'shipCode', align: 'center',title: '鐗╂祦鍗曞彿', hide: true}
+// ,{field: 'settle$', align: 'center',title: '璁㈠崟鐘舵��'}
+// // ,{field: 'status$', align: 'center',title: '鐘舵��'}
+// // ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳',event: 'createBy', style: 'cursor:pointer'}
+// // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+// // ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳',event: 'updateBy', style: 'cursor:pointer'}
+// // ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+// // ,{field: 'memo', align: 'center',title: '澶囨敞'}
+//
+// ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+// ]],
+// 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();
+// form.on('checkbox(tableCheckbox)', function (data) {
+// var _index = $(data.elem).attr('table-index')||0;
+// if(data.elem.checked){
+// res.data[_index][data.value] = 'Y';
+// }else{
+// res.data[_index][data.value] = 'N';
+// }
+// });
+// }
+// });
+//
+// // 鐩戝惉鎺掑簭浜嬩欢
+// table.on('sort(locMast)', 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
+// },
+// done: function (res, curr, count) {
+// if (res.code === 403) {
+// top.location.href = baseUrl+"/";
+// }
+// pageCurr=curr;
+// limit();
+// }
+// });
+// });
+//
+// // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+// table.on('toolbar(order)', function (obj) {
+// var checkStatus = table.checkStatus(obj.config.id);
+// switch(obj.event) {
+// case 'addData':
+// layer.open({
+// type: 2,
+// title: '鏂板',
+// maxmin: true,
+// area: [top.detailWidth, top.detailHeight],
+// content: 'order_detail.html',
+// success: function(layero, index){
+// layer.getChildFrame('#data-detail-submit-edit', index).hide();
+// clearFormVal(layer.getChildFrame('#detail', index));
+// layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+// }
+// });
+// break;
+// case 'deleteData':
+// var data = checkStatus.data;
+// if (data.length === 0){
+// layer.msg('璇烽�夋嫨鏁版嵁');
+// } else {
+// layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+// $.ajax({
+// url: baseUrl+"/order/delete/auth",
+// headers: {'token': localStorage.getItem('token')},
+// data: {param: JSON.stringify(data)},
+// method: 'POST',
+// traditional:true,
+// success: function (res) {
+// if (res.code === 200){
+// layer.closeAll();
+// tableReload(false);
+// } else if (res.code === 403){
+// top.location.href = baseUrl+"/";
+// } else {
+// layer.msg(res.msg)
+// }
+// }
+// })
+// });
+// }
+// break;
+// case 'exportData':
+// layer.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)
+// }
+// }
+// });
+// });
+// break;
+// }
+// });
+//
+// // 鐩戝惉琛屽伐鍏蜂簨浠�
+// table.on('tool(order)', function(obj){
+// var data = obj.data;
+// switch (obj.event) {
+// // 璇︽儏
+// case 'detail':
+// layer.open({
+// type: 2,
+// title: '璇︽儏',
+// maxmin: true,
+// area: [top.detailWidth, top.detailHeight],
+// shadeClose: true,
+// content: 'order_detail.html',
+// success: function(layero, index){
+// setFormVal(layer.getChildFrame('#detail', index), data, true);
+// top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+// layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
+// layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+// layero.find('iframe')[0].contentWindow.layui.form.render('select');
+// layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+// }
+// });
+// break;
+// // 缂栬緫
+// case 'edit':
+// layer.open({
+// type: 2,
+// title: '淇敼',
+// maxmin: true,
+// area: [top.detailWidth, top.detailHeight],
+// content: 'order_detail.html',
+// success: function(layero, index){
+// layer.getChildFrame('#data-detail-submit-save', index).hide();
+// setFormVal(layer.getChildFrame('#detail', index), data, false);
+// top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
+// top.convertDisabled(layer.getChildFrame('#id', index), true);
+// layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+// layero.find('iframe')[0].contentWindow.layui.form.render('select');
+// layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+// }
+// });
+// break;
+//
+//
+// }
+// });
+//
+// // 鏁版嵁淇濆瓨鍔ㄤ綔
+// form.on('submit(save)', function () {
+// if (banMsg != null){
+// layer.msg(banMsg);
+// return;
+// }
+// method("add");
+// });
+//
+// // 鏁版嵁淇敼鍔ㄤ綔
+// form.on('submit(edit)', function () {
+// method("update")
+// });
+//
+// function method(name){
+// var index = layer.load(1, {
+// shade: [0.5,'#000'] //0.1閫忔槑搴︾殑鑳屾櫙
+// });
+// var data = {
+// // id: $('#id').val(),
+// id: $('#id').val(),
+// uuid: $('#uuid').val(),
+// orderNo: $('#orderNo').val(),
+// orderTime: $('#orderTime').val(),
+// docType: $('#docType').val(),
+// itemId: $('#itemId').val(),
+// allotItemId: $('#allotItemId').val(),
+// defNumber: $('#defNumber').val(),
+// number: $('#number').val(),
+// cstmr: $('#cstmr').val(),
+// cstmrName: $('#cstmrName').val(),
+// tel: $('#tel').val(),
+// operMemb: $('#operMemb').val(),
+// totalFee: $('#totalFee').val(),
+// discount: $('#discount').val(),
+// discountFee: $('#discountFee').val(),
+// otherFee: $('#otherFee').val(),
+// actFee: $('#actFee').val(),
+// payType: $('#payType').val(),
+// salesman: $('#salesman').val(),
+// accountDay: $('#accountDay').val(),
+// postFeeType: $('#postFeeType').val(),
+// postFee: $('#postFee').val(),
+// payTime: top.strToDate($('#payTime\\$').val()),
+// sendTime: top.strToDate($('#sendTime\\$').val()),
+// shipName: $('#shipName').val(),
+// shipCode: $('#shipCode').val(),
+// settle: $('#settle').val(),
+// status: $('#status').val(),
+// createBy: $('#createBy').val(),
+// createTime: top.strToDate($('#createTime\\$').val()),
+// updateBy: $('#updateBy').val(),
+// updateTime: top.strToDate($('#updateTime\\$').val()),
+// memo: $('#memo').val(),
+//
+// };
+// $.ajax({
+// url: baseUrl+"/order/"+name+"/auth",
+// headers: {'token': localStorage.getItem('token')},
+// data: top.reObject(data),
+// method: 'POST',
+// success: function (res) {
+// if (res.code === 200){
+// parent.layer.closeAll();
+// parent.$(".layui-laypage-btn")[0].click();
+// $("#data-detail :input").each(function () {
+// $(this).val("");
+// });
+// } else if (res.code === 403){
+// top.location.href = baseUrl+"/";
+// }else {
+// layer.msg(res.msg)
+// }
+// layer.close(index);
+// }
+// })
+// }
+//
+// // 澶嶉�夋浜嬩欢
+// form.on('checkbox(detailCheckbox)', function (data) {
+// var el = data.elem;
+// if (el.checked) {
+// $(el).val('Y');
+// } else {
+// $(el).val('N');
+// }
+// });
+//
+// // 鎼滅储鏍忔悳绱簨浠�
+// form.on('submit(search)', function (data) {
+// pageCurr = 1;
+// tableReload(false);
+// });
+//
+// // 鎼滅储鏍忛噸缃簨浠�
+// form.on('submit(reset)', function (data) {
+// pageCurr = 1;
+// clearFormVal($('#search-box'));
+// tableReload(false);
+// });
+//
+// // 鏃堕棿閫夋嫨鍣�
+// layDate.render({
+// elem: '#payTime\\$',
+// type: 'datetime'
+// });
+// layDate.render({
+// elem: '#sendTime\\$',
+// type: 'datetime'
+// });
+// layDate.render({
+// elem: '#createTime\\$',
+// type: 'datetime'
+// });
+// layDate.render({
+// elem: '#updateTime\\$',
+// type: 'datetime'
+// });
});
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index daeda40..e707048 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -7,114 +7,110 @@
<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" media="all">
<link rel="stylesheet" href="../../static/css/cool.css" media="all">
- <link rel="stylesheet" href="../../static/css/common.css" media="all">
+<!-- <link rel="stylesheet" href="../../static/css/common.css" media="all">-->
+ <style>
+ body {
+ color: #595959;
+ background-color: #f5f7f9;
+ }
+
+ /* 宸﹁〃 */
+ #docTypeTable + .layui-table-view .layui-table-tool-temp {
+ padding-right: 0;
+ }
+
+ #docTypeTable + .layui-table-view .layui-table-body tbody > tr td {
+ cursor: pointer;
+ }
+
+ #docTypeTable + .layui-table-view .layui-table-body tbody > tr.layui-table-click {
+ background-color: #fff3e0;
+ }
+
+ #docTypeTable + .layui-table-view .layui-table-body tbody > tr.layui-table-click td:last-child > div:before {
+ position: absolute;
+ right: 6px;
+ content: "\e602";
+ font-size: 12px;
+ font-style: normal;
+ font-family: layui-icon,serif !important;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ }
+
+ #left-table .layui-table-grid-down {
+ display: none;
+ }
+
+
+ .layui-form.layui-border-box.layui-table-view {
+ border-width: 1px;
+ }
+ #left-table .layui-table thead th {
+ /* font-weight: bold; */
+ text-align: left;
+ }
+ </style>
</head>
<body>
-
-<!-- 鎼滅储鏍� -->
-<div id="search-box" class="layui-form layui-card-header">
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline cool-auto-complete">
- <input id="docType" class="layui-input" name="doc_type" type="text" placeholder="璇疯緭鍏�" autocomplete="off" 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 class="layui-fluid" style="padding-bottom: 0;">
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md3" id="left-table">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 10px;">
+ <!-- 琛ㄦ牸宸ュ叿鏍�1 -->
+ <form class="layui-form toolbar">
+ <div class="layui-form-item">
+ <div class="layui-inline" style="max-width: 140px;">
+ <input name="dictName" class="layui-input" placeholder="杈撳叆瀛楀吀鍚嶇О"/>
+ </div>
+ <div class="layui-inline">
+ <button class="layui-btn icon-btn" lay-filter="dictTbSearch" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ </div>
+ </div>
+ </form>
+ <!-- 鏁版嵁琛ㄦ牸1 -->
+ <table id="docTypeTable" lay-filter="docTypeTable"></table>
+ </div>
</div>
</div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline cool-auto-complete">
- <input id="itemId" class="layui-input" name="item_id" type="text" placeholder="璇疯緭鍏�" autocomplete="off" 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 class="layui-col-md9">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 10px;">
+ <!-- 琛ㄦ牸宸ュ叿鏍�2 -->
+ <form 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 name="dictDataName" class="layui-input" placeholder="杈撳叆瀛楀吀鍚嶇О"/>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瀛楀吀閿��:</label>
+ <div class="layui-input-inline">
+ <input name="dictDataCode" class="layui-input" placeholder="杈撳叆瀛楀吀閿��"/>
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="dictDataTbSearch" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ </div>
+ </div>
+ </form>
+ <!-- 鏁版嵁琛ㄦ牸2 -->
+ <table id="orderTable" lay-filter="orderTable"></table>
+ </div>
</div>
</div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline cool-auto-complete">
- <input id="allotItemId" class="layui-input" name="allot_item_id" type="text" placeholder="璇疯緭鍏�" autocomplete="off" 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-inline">
- <div class="layui-input-inline cool-auto-complete">
- <input id="cstmr" class="layui-input" name="cstmr" type="text" placeholder="璇疯緭鍏�" autocomplete="off" 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-inline">
- <div class="layui-input-inline cool-auto-complete">
- <input id="settle" class="layui-input" name="settle" type="text" placeholder="璇疯緭鍏�" autocomplete="off" 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-inline">
- <div class="layui-input-inline cool-auto-complete">
- <input id="createBy" class="layui-input" name="create_by" type="text" placeholder="璇疯緭鍏�" autocomplete="off" 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-inline">
- <div class="layui-input-inline cool-auto-complete">
- <input id="updateBy" class="layui-input" name="update_by" type="text" placeholder="璇疯緭鍏�" autocomplete="off" 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 id="data-search-btn" class="layui-btn-container layui-form-item">
- <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
- <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
</div>
</div>
-
-<!-- 琛ㄦ牸 -->
-<div class="layui-form">
- <table class="layui-hide" id="order" lay-filter="order"></table>
-</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" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
- </div>
-</script>
<script type="text/html" id="operate">
<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
@@ -126,8 +122,6 @@
<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>
-
-<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
</body>
</html>
--
Gitblit v1.9.1