From 69e416081014eaf28986119760dc235b067ef94d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 26 四月 2021 15:01:10 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/ioWorks/matQuery.js | 147 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 119 insertions(+), 28 deletions(-)
diff --git a/src/main/webapp/static/js/ioWorks/matQuery.js b/src/main/webapp/static/js/ioWorks/matQuery.js
index 1fb11d4..7a2b7f1 100644
--- a/src/main/webapp/static/js/ioWorks/matQuery.js
+++ b/src/main/webapp/static/js/ioWorks/matQuery.js
@@ -1,5 +1,8 @@
var matData = [];
+var cstmrVal;
+var itemVal;
+
function getCol() {
var cols = [
{field: 'count', align: 'center',title: '鍑哄簱鏁伴噺', edit:'text', width: 130, style:'color: blue;font-weight: bold'}
@@ -13,13 +16,15 @@
base: baseUrl + "/static/layui/lay/modules/"
}).extend({
notice: 'notice/notice',
-}).use(['table','laydate', 'form', 'notice'], function() {
+}).use(['table','laydate', 'form', 'admin', 'notice', 'xmSelect'], function() {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
var form = layui.form;
var notice = layui.notice;
var layDate = layui.laydate;
+ var admin = layui.admin;
+ var xmSelect = layui.xmSelect;
tableIns = table.render({
elem: '#chooseData',
@@ -85,55 +90,126 @@
// 瀹㈡埛
var cstmrData;
+ // $.ajax({
+ // url: baseUrl+"/work/cstmr/all/get",
+ // headers: {'token': localStorage.getItem('token')},
+ // method: 'POST',
+ // async: false,
+ // success: function (res) {
+ // if (res.code === 200){
+ // cstmrData = res;
+ // } else {
+ // layer.msg(res.msg, {icon: 2})
+ // }
+ // }
+ // });
+ // var tpl2 = $('#cstmrSelectTpl').html();
+ // var template2 = Handlebars.compile(tpl2);
+ // var html2 = template2(cstmrData);
+ // $("#cstmr").html(html2);
+ // 鍗曢��
$.ajax({
- url: baseUrl+"/work/cstmr/all/get",
+ url: baseUrl+"/work/cstmr/all/get/kv",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
async: false,
success: function (res) {
if (res.code === 200){
- cstmrData = res;
+ cstmrData = res.data;
} else {
layer.msg(res.msg, {icon: 2})
}
}
});
- var tpl2 = $('#cstmrSelectTpl').html();
- var template2 = Handlebars.compile(tpl2);
- var html2 = template2(cstmrData);
- $("#cstmr").html(html2);
+ cstmrVal = xmSelect.render({
+ el: '#cstmr',
+ radio: true,
+ clickClose: true,
+ filterable: true,
+ create: function(val, arr){
+ if(arr.length === 0){
+ return {
+ name: val,
+ value: val
+ }
+ }
+ },
+ model: {
+ icon: 'hidden',
+ label: {
+ type: 'text',
+ }
+ },
+ data: cstmrData
+ })
// 椤圭洰
var itemData;
+ // $.ajax({
+ // url: baseUrl+"/work/item/all/get",
+ // headers: {'token': localStorage.getItem('token')},
+ // method: 'POST',
+ // async: false,
+ // success: function (res) {
+ // if (res.code === 200){
+ // itemData = res;
+ // } else {
+ // layer.msg(res.msg, {icon: 2});
+ // }
+ // }
+ // });
+ // var tpl3 = $('#itemSelectTpl').html();
+ // var template3 = Handlebars.compile(tpl3);
+ // var html3 = template3(itemData);
+ // $("#item").html(html3);
$.ajax({
- url: baseUrl+"/work/item/all/get",
+ url: baseUrl+"/work/item/all/get/kv",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
async: false,
success: function (res) {
if (res.code === 200){
- itemData = res;
+ itemData = res.data;
} else {
- layer.msg(res.msg, {icon: 2})
+ layer.msg(res.msg, {icon: 2});
}
}
});
- var tpl3 = $('#itemSelectTpl').html();
- var template3 = Handlebars.compile(tpl3);
- var html3 = template3(itemData);
- $("#item").html(html3);
+ itemVal = xmSelect.render({
+ el: '#item',
+ radio: true,
+ clickClose: true,
+ filterable: true,
+ create: function(val, arr){
+ if(arr.length === 0){
+ return {
+ name: val,
+ value: val
+ }
+ }
+ },
+ model: {
+ icon: 'hidden',
+ label: {
+ type: 'text',
+ }
+ },
+ data: itemData
+ })
+ // 寮圭獥
layer.close(index);
if (success) {
- layer.open({
+ admin.open({
type: 1,
title: '鍗曟嵁濉厖',
offset: '100px',
area: ['360px'],
- shade: 0.1,
+ shade: 0.3,
content: $('#getOrderNo'),
success: function(layero, index){
layer.iframeAuto(index);
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
layui.form.render('select');
},
cancel: function () {
@@ -145,6 +221,26 @@
break;
}
});
+
+
+ // // 澶氶��
+ // var demo1 = xmSelect.render({
+ // el: '#demo1',
+ // filterable: true,
+ // create: function(val, arr){
+ // if(arr.length === 0){
+ // return {
+ // name: val,
+ // value: val
+ // }
+ // }
+ // },
+ // data: [
+ // {name: '寮犱笁', value: 1, selected: true},
+ // {name: '鏉庡洓', value: 2},
+ // {name: '鐜嬩簲', value: 3, disabled: true},
+ // ]
+ // })
// 鐩戝惉琛屽伐鍏蜂簨浠�
table.on('tool(chooseData)', function(obj){
@@ -167,22 +263,17 @@
form.on('submit(confirm)', function (data) {
var matDetls = [];
matData.forEach(function(elem) {
- matDetls.push({matnr: elem.matnr
+ matDetls.push({
+ matnr: elem.matnr
, count: elem.count
-
});
});
- var number = data.field.orderNo; // 鍗曞彿
- if (number.substring(0, 3) !== 'PR-') {
- notice.error({
- title: '娑堟伅閫氱煡',
- message: '鍗曞彿涓嶇鍚堣鍒欙紝璇蜂互 PR- 寮�澶�'
- });
- return false;
- }
var req = JSON.stringify({
- number: number
- , customerTypeId: data.field.customerTypeId
+ docType: data.field.docType
+ , orderNo: data.field.orderNo
+ , orderTime: data.field.orderTime
+ , item: itemVal.getValue()[0] ? itemVal.getValue()[0].name : null
+ , cstmr: cstmrVal.getValue()[0] ? cstmrVal.getValue()[0].name : null
, list: matDetls
})
$.ajax({
--
Gitblit v1.9.1