#

luxiaotao1123

2021-04-13 c36c0562f48f671d36aae11505e7ecc83b9fd042

#

 src/main/java/zy/cloud/wms/manager/controller/WorkController.java

@@ -14,8 +14,10 @@
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.*;
import zy.cloud.wms.manager.entity.param.*;
import zy.cloud.wms.manager.entity.result.KeyValueVo;
import zy.cloud.wms.manager.service.*;

import java.util.ArrayList;
import java.util.List;

/**
@@ -183,6 +185,21 @@
        return R.ok().add(cstmrs);
    }

    // 获取所有客户 [键值对版]
    @RequestMapping("/cstmr/all/get/kv")
    @ManagerAuth
    public R getCstmrDataKV() {
        List<Cstmr> cstmrs = cstmrService.selectList(new EntityWrapper<Cstmr>().eq("status", 1).orderBy("create_time", false));
        List<KeyValueVo> valueVos = new ArrayList<>();
        for (Cstmr cstmr : cstmrs) {
            KeyValueVo vo = new KeyValueVo();
            vo.setName(cstmr.getName());
            vo.setValue(cstmr.getId());
            valueVos.add(vo);
        }
        return R.ok().add(valueVos);
    }

    // 获取所有项目
    @RequestMapping("/item/all/get")
    @ManagerAuth
@@ -190,5 +207,19 @@
        List<Item> items = itemService.selectList(new EntityWrapper<Item>().eq("status", 1).orderBy("create_time", false));
        return R.ok().add(items);
    }
    // 获取所有项目
    @RequestMapping("/item/all/get/kv")
    @ManagerAuth
    public R getItemDataKV() {
        List<Item> items = itemService.selectList(new EntityWrapper<Item>().eq("status", 1).orderBy("create_time", false));
        List<KeyValueVo> valueVos = new ArrayList<>();
        for (Item item : items) {
            KeyValueVo vo = new KeyValueVo();
            vo.setName(item.getName());
            vo.setValue(item.getId());
            valueVos.add(vo);
        }
        return R.ok().add(valueVos);
    }

}

 src/main/java/zy/cloud/wms/manager/entity/result/KeyValueVo.java

New file
@@ -0,0 +1,15 @@
package zy.cloud.wms.manager.entity.result;

import lombok.Data;

/**
 * Created by vincent on 2021/4/13
 */
@Data
public class KeyValueVo {

    private String name;

    private Long value;

}

 src/main/webapp/static/css/img/icon_date.png

 src/main/webapp/static/js/ioWorks/matQuery.js

@@ -13,7 +13,7 @@
    base: baseUrl + "/static/layui/lay/modules/"
}).extend({
    notice: 'notice/notice',
}).use(['table','laydate', 'form', 'admin', 'notice'], function() {
}).use(['table','laydate', 'form', 'admin', 'notice', 'xmSelect'], function() {
    var table = layui.table;
    var $ = layui.jquery;
    var layer = layui.layer;
@@ -21,6 +21,7 @@
    var notice = layui.notice;
    var layDate = layui.laydate;
    var admin = layui.admin;
    var xmSelect = layui.xmSelect;

    tableIns = table.render({
        elem: '#chooseData',
@@ -86,44 +87,114 @@

                    // 客户
                    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);
                    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);
                    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) {
                        admin.open({
@@ -148,6 +219,26 @@
        }
    });


    // // 多选
    // 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){
        var data = obj.data;

 src/main/webapp/views/order/matQuery.html

@@ -168,21 +168,21 @@
        <div class="layui-form-item">
            <label class="layui-form-label layui-form-required">单据日期:</label>
            <div class="layui-input-block">
                <input id="orderTime" name="orderTime" placeholder="请输入客户编号" class="layui-input" lay-verify="required" autocomplete="off">
                <input id="orderTime" name="orderTime" placeholder="请输入单据日期" class="layui-input icon-date" lay-verify="required" autocomplete="off">
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label layui-form-required">项目编号:</label>
            <label class="layui-form-label layui-form-required">项目:</label>
            <div class="layui-input-block">
                <select id="item" name="item" lay-verType="tips" lay-verify="required" required lay-search="">
                </select>
                <div id="item" name="item" lay-verType="tips" lay-verify="required" required lay-search="">
                </div>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label layui-form-required">客户编号:</label>
            <label class="layui-form-label layui-form-required">客户:</label>
            <div class="layui-input-block">
                <select id="cstmr" name="cstmr" lay-verType="tips" lay-verify="required" required lay-search="">
                </select>
                <div id="cstmr" name="cstmr" lay-verType="tips" lay-verify="required" required lay-search="">
                </div>
            </div>
        </div>
        <div class="layui-form-item cool-button-contain">