Merge remote-tracking branch 'origin/xgmasrs' into xgmasrs

18516761980

2021-08-25 adc03660c3592d4d87076c4fefcbb86280610c4a

Merge remote-tracking branch 'origin/xgmasrs' into xgmasrs

# Conflicts:
#	src/main/java/com/zy/ints/controller/WaitMatinController.java

 src/main/java/com/zy/ints/controller/WaitMatinController.java

@@ -57,7 +57,7 @@
    @ManagerAuth
    public R getMatDataKV(@RequestParam(required = false) String condition) {
        Wrapper<MatCode> wrapper = new EntityWrapper<MatCode>()
                .andNew().like("mat_no", condition).or().like("mat_name", condition)
                .andNew().like("matnr", condition).or().like("maktx", condition)
                .orderBy("create_time", false);
        List<MatCode> mats = matCodeService.selectPage(new Page<>(1, 30), wrapper).getRecords();
        List<KeyValueVo> valueVos = new ArrayList<>();

 src/main/webapp/views/waitMatin/waitMatin.html

@@ -93,7 +93,7 @@
<!--            </div>-->
<!--        </div>-->
        <div class="layui-form-item">
            <label class="layui-form-label">物料</label>
            <label class="layui-form-label">物料 - 多选</label>
            <div class="layui-input-block">
                <div id="mat" name="mat">
                </div>
@@ -415,16 +415,12 @@
                                // 渲染物料选择
                                var matXmSelect = xmSelect.render({
                                    el: '#mat',
                                    radio: true,
                                    // radio: true,
                                    autoRow: true,
                                    toolbar: { show: true },
                                    filterable: true,
                                    remoteSearch: true,
                                    remoteMethod: function(val, cb, show){
                                        //这里如果val为空, 则不触发搜索
                                        // if(!val){
                                        //     return cb([]);
                                        // }
                                        $.ajax({
                                            url: baseUrl+"/mat/all/get/kv",
                                            headers: {'token': localStorage.getItem('token')},