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

Junjie

2023-09-14 2a8710c50e2f7c4dd0e333dcf650a2dff960fff4

 src/main/webapp/static/js/order/order.js

@@ -2,6 +2,8 @@
var pageCount = 0;
var treeCond;
var admin;
var userId ;
var userName ;
layui.config({
    base: baseUrl + "/static/layui/lay/modules/"
}).extend({
@@ -268,6 +270,7 @@
            success: function (layero, dIndex) {
                let cstmrSel = loadCstmrSel();
                let companySel = loadCompanySel();
                let method = mData?'update':'add';
                if (!mData){
                    companySel.setValue([{name: "浙江中扬立库技术有限公司", value: 4}]);
                }
@@ -277,8 +280,8 @@
                    if (mData.company) { companySel.setValue([{name: mData.company$, value: mData.company}]); }
                }else {
                    mData = {
                        director: 25,
                        director$: "陆晓涛"
                        director: Number(userId),
                        director$: userName
                    }
                }
                layDateRender(mData);
@@ -313,11 +316,13 @@
                    }
                    var loadIndex = layer.load(2);
                    $.ajax({
                        url: baseUrl+"/order/"+(mData?'update':'add')+"/auth",
                        url: baseUrl+"/order/"+(method)+"/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: data.field,
                        method: 'POST',
                        success: function (res) {
                            console.log(data.field)
                            console.log(res)
                            layer.close(loadIndex);
                            if (res.code === 200){
                                layer.close(dIndex);
@@ -328,6 +333,12 @@
                            }else {
                                layer.msg(res.msg, {icon: 2});
                            }
                        }
                        ,error: function(xhr, status, error) {
                            // 处理错误
                            console.log(data.field)
                            console.log(res)
                            console.log(error)
                        }
                    })
                    return false;
@@ -410,6 +421,25 @@
        });
    }

    $(document).ready(function() {
        $.ajax({
            url: baseUrl + "/order/userName/userId/auth",
            headers: { 'token': localStorage.getItem('token') },
            method: 'POST',
            success: function(res) {
                if (res.code === 200) {
                    userId = res.data.value;
                    userName = res.data.name;
                }
            },
            error: function(xhr, status, error) {
                // 处理错误
                console.log(error);
            }
        });
    });


    window.loadCstmrSel = function () {
        return xmSelect.render({
            el: '#cstmrXmlSel',