[update]销售订单，业务员字段修改获取下拉框

ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html

@@ -258,7 +258,8 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">业务员：</label>
                 <div class="col-sm-8">
-                    <select name="businessMembers" id="businessMembers_add" class="form-control m-b" required >
+                    <select name="businessMembers" id="businessMembers_add" class="form-control" required >
+                        <option value="">请选择</option>
                     </select>
                 </div>
             </div>
@@ -312,7 +313,7 @@
     var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
     var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]];
     var processMethodDatas = [[${@dict.getType('processMethod')}]];
-    var userName = [[${@permission.getPrincipalProperty('userName')}]];
+    var loginName = [[${@permission.getPrincipalProperty('loginName')}]];
     var prefix = ctx + "system/salesOrder"
     $(function() {
         var options = {
@@ -514,10 +515,11 @@
             url: ctx + 'system/salesOrder/getBinessMembers',
             type: 'get',
             success: function (res) {
+                console.log(res)
                 if (res.rows.length > 0) {
                     var usertData = res.rows;
                     for (let i in usertData) {
-                        $("#select[name='businessMembers']").append(
+                        $("select[name='businessMembers']").append(
                             "<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
                     }
                 } else {

ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html

@@ -327,6 +327,7 @@
     var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]];
     var processMethodDatas = [[${@dict.getType('processMethod')}]];
     var sysSalesOrder = [[${sysSalesOrder}]];
+    var loginName = [[${@permission.getPrincipalProperty('loginName')}]];
     $("#form-salesOrder-edit").validate({focusCleanup: true});
     $(function() {
         var options = {

ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html

@@ -522,10 +522,11 @@
             url: ctx + 'system/salesOrder/getBinessMembers',
             type: 'get',
             success: function (res) {
+                console.log(res)
                 if (res.rows.length > 0) {
                     var usertData = res.rows;
                     for (let i in usertData) {
-                        $("#select[name='businessMembers']").append(
+                        $("select[name='businessMembers']").append(
                             "<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
                     }
                 } else {

ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html

@@ -203,19 +203,18 @@
     var deliveryStatusDatas = [[${@dict.getType('sys_delivery_status')}]];
     var closeStatusDatas = [[${@dict.getType('sys_close_status')}]];
     var confirmTaxDatas = [[${@dict.getType('sys_confirm_tax')}]];
-    var userName = [[${@permission.getPrincipalProperty('userName')}]];
-    var currentUser = [[${currentUser}]];
-    var loginName = currentUser.loginName;
+    var loginName = [[${@permission.getPrincipalProperty('loginName')}]];
     var prefix = ctx + "system/salesOrder";
     $(function () {
         $.ajax({
             url: ctx + 'system/salesOrder/getBinessMembers',
             type: 'get',
             success: function (res) {
+                console.log(res)
                 if (res.rows.length > 0) {
                     var usertData = res.rows;
                     for (let i in usertData) {
-                        $("#select[name='businessMembers']").append(
+                        $("select[name='businessMembers']").append(
                             "<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
                     }
                 } else {

ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html

@@ -577,10 +577,11 @@
         url: ctx + 'system/salesOrder/getBinessMembers',
         type: 'get',
         success: function (res) {
+            console.log(res)
             if (res.rows.length > 0) {
                 var usertData = res.rows;
                 for (let i in usertData) {
-                    $("#select[name='businessMembers']").append(
+                    $("select[name='businessMembers']").append(
                         "<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
                 }
             } else {

ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html

@@ -553,10 +553,11 @@
         url: ctx + 'system/salesOrder/getBinessMembers',
         type: 'get',
         success: function (res) {
+            console.log(res)
             if (res.rows.length > 0) {
                 var usertData = res.rows;
                 for (let i in usertData) {
-                    $("#select[name='businessMembers']").append(
+                    $("select[name='businessMembers']").append(
                         "<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
                 }
             } else {

ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html

@@ -516,10 +516,11 @@
             url: ctx + 'system/salesOrder/getBinessMembers',
             type: 'get',
             success: function (res) {
+                console.log(res)
                 if (res.rows.length > 0) {
                     var usertData = res.rows;
                     for (let i in usertData) {
-                        $("#select[name='businessMembers']").append(
+                        $("select[name='businessMembers']").append(
                             "<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
                     }
                 } else {

ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html

@@ -562,10 +562,11 @@
         url: ctx + 'system/salesOrder/getBinessMembers',
         type: 'get',
         success: function (res) {
+            console.log(res)
             if (res.rows.length > 0) {
                 var usertData = res.rows;
                 for (let i in usertData) {
-                    $("#select[name='businessMembers']").append(
+                    $("select[name='businessMembers']").append(
                         "<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
                 }
             } else {

ruoyi-admin/src/main/resources/templates/system/supplier/detail.html

@@ -0,0 +1,292 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('详情供应商资料')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-supplier-edit" th:object="${sysSupplier}">
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">供应商编号：</label>
+                <div class="col-sm-8">
+                    <input name="supplierCode" th:field="*{supplierCode}" class="form-control" type="text" disabled required>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">供应商名称：</label>
+                <div class="col-sm-8">
+                    <input name="supplierName" th:field="*{supplierName}" class="form-control" type="text" disabled required>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">内外销：</label>
+                <div class="col-sm-8">
+                    <select name="exportSales" class="form-control m-b" th:with="type=${@dict.getType('sys_export_sales')}" disabled required>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">企业名称：</label>
+                <div class="col-sm-8">
+                    <input name="enterpriseName" th:field="*{enterpriseName}" disabled class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">供应商类型：</label>
+                <div class="col-sm-8">
+                    <div class="radio-box" th:each="dict : ${@dict.getType('sys_supplier_type')}">
+                        <input type="radio" th:id="${'supplierType_' + dict.dictCode}"
+                               name="supplierType" th:value="${dict.dictValue}" th:checked="${dict.default}" disabled required>
+                        <label th:for="${'supplierType_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">企业性质：</label>
+                <div class="col-sm-8">
+                    <select name="enterpriseNature" th:field="*{enterpriseNature}" class="form-control m-b"
+                            th:with="type=${@dict.getType('sys_enterprise_nature')}" disabled>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">企业地址：</label>
+                <div class="col-sm-8">
+                    <input name="customerAddress" th:field="*{customerAddress}"
+                           class="form-control" type="text" required disabled>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">厂商类别：</label>
+                <div class="col-sm-8">
+                    <input name="manufacturerCategory" th:field="*{manufacturerCategory}"
+                           class="form-control" type="text" disabled>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">邮编：</label>
+                <div class="col-sm-8">
+                    <input name="postalCode" th:field="*{postalCode}" disabled class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">经营范围：</label>
+                <div class="col-sm-8">
+                    <input name="businessScope" th:field="*{businessScope}" class="form-control" type="text" disabled>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">国家：</label>
+                <div class="col-sm-8">
+                    <select name="customerCountry" th:field="*{customerCountry}" class="form-control m-b"
+                            th:with="type=${@dict.getType('sys_country')}" disabled>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">成立日期：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <input name="establishedTime" th:field="*{establishedTime}"
+                               class="form-control" placeholder="yyyy-mm-dd" type="text" disabled>
+                        <span class="input-group-addon" disabled><i class="fa fa-calendar"></i></span>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">法人代表：</label>
+                <div class="col-sm-8">
+                    <input name="legalRepresentative" disabled
+                           th:field="*{legalRepresentative}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">主联系人：</label>
+                <div class="col-sm-8">
+                    <input name="customerContact" th:field="*{customerContact}"  disabled
+                           class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">联系电话：</label>
+                <div class="col-sm-8">
+                    <input name="contactNumber" th:field="*{contactNumber}" disabled
+                           class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">传真：</label>
+                <div class="col-sm-8">
+                    <input name="customerFax" th:field="*{customerFax}" disabled class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">Email：</label>
+                <div class="col-sm-8">
+                    <input name="customerEmail" th:field="*{customerEmail}" disabled class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">网站：</label>
+                <div class="col-sm-8">
+                    <input name="website" th:field="*{website}" disabled class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">付款条件：</label>
+                <div class="col-sm-8">
+                    <input name="paymentTerms" th:field="*{paymentTerms}" disabled class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">天数：</label>
+                <div class="col-sm-8">
+                    <input name="supplierDays" th:field="*{supplierDays}" disabled class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">实际付款天数：</label>
+                <div class="col-sm-8">
+                    <input name="actualPaymentDays" th:field="*{actualPaymentDays}" disabled class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">结汇银行：</label>
+                <div class="col-sm-8">
+                    <input name="settlementBank" th:field="*{settlementBank}" disabled class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">结汇账号：</label>
+                <div class="col-sm-8">
+                    <input name="exchangeSettlementAccount" disabled th:field="*{exchangeSettlementAccount}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">开户银行：</label>
+                <div class="col-sm-8">
+                    <input name="depositBank" disabled th:field="*{depositBank}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">开户银行账号：</label>
+                <div class="col-sm-8">
+                    <input name="bankAccount" disabled th:field="*{bankAccount}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">RMB注册资金：</label>
+                <div class="col-sm-8">
+                    <input name="rmbRegisteredCapital" disabled th:field="*{rmbRegisteredCapital}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">行业代码：</label>
+                <div class="col-sm-8">
+                    <input name="industryCode" disabled th:field="*{industryCode}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">跟单员：</label>
+                <div class="col-sm-8">
+                    <input name="merchandiser" disabled th:field="*{merchandiser}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">跟单电话：</label>
+                <div class="col-sm-8">
+                    <input name="merchandiserTelephone" disabled th:field="*{merchandiserTelephone}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">采购员：</label>
+                <div class="col-sm-8">
+                    <select id="purchaseBuyer_add" name="purchaseBuyer" class="form-control" disabled></select>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">是否含税：</label>
+                <div class="col-sm-8">
+                    <div class="radio-box" th:each="dict : ${@dict.getType('sys_confirm_tax')}">
+                        <input type="radio" th:id="${'confirmTax_' + dict.dictCode}" name="confirmTax" disabled
+                               th:value="${dict.dictValue}" th:checked="${dict.default}">
+                        <label th:for="${'confirmTax_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">税率：</label>
+                <div class="col-sm-8">
+                    <input name="taxRate" th:field="*{taxRate}" disabled
+                           class="form-control" type="text" placeholder="%">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-2 control-label">证件：</label>
+                <div class="col-sm-10">
+                    <el-upload
+                            :action="fileUploadUrl"
+                            :on-success="uploadSuccess"
+                            :on-remove="uploadRemove"
+                            :file-list="fileList"
+                            list-type="picture"
+                            accept=".jpg,.png"
+                            multiple>
+                        <el-button size="small" type="primary">点击上传</el-button>
+                        <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，第一张图片为主图</div>
+                    </el-upload>
+                </div>
+                <input id="fileIdStr" type="text" name="fileIdStr" hidden>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">供应商：</label>
+                <div class="col-sm-8">
+                    <div class="radio-box" th:each="dict : ${@dict.getType('sys_supplier_qualification')}">
+                        <input required type="radio" th:id="${'supplierQualification_' + dict.dictCode}" disabled
+                               name="supplierQualification" th:value="${dict.dictValue}" th:checked="${dict.default}">
+                        <label th:for="${'confirmTax_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: select2-js"/>
+    <th:block th:include="include :: bootstrap-table-editable-js"/>
+    <th:block th:include="include :: datetimepicker-js"/>
+    <th:block th:include="include :: bootstrap-fileinput-js"/>
+    <script th:src="@{/ajax/libs/vue/vue.js}"></script>
+    <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
+    <script th:inline="javascript">
+        var prefix = ctx + "system/supplier";
+        var sysSupplier = [[${sysSupplier}]];
+        $("#form-supplier-edit").validate({
+            focusCleanup: true
+        });
+        $(function(){
+            $.ajax({
+                url: ctx + 'system/user/cutomerList',
+                type: 'post',
+                success: function (res) {
+                    if (res.rows.length > 0) {
+                        var usertData = res.rows;
+                        for (let i in usertData) {
+                            $("#form-supplier-edit select[name='purchaseBuyer']").append(
+                                "<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
+                        }
+                        $("#form-supplier-edit select[name='purchaseBuyer']").val(sysSupplier.purchaseBuyer).trigger("change");
+                    } else {
+                        $.modal.msgError(res.msg);
+                    }
+                }
+            });
+            $("input[name='confirmFax']").val(sysSupplier.confirmFax);
+            $("input[name='supplierType']").val(sysSupplier.supplierType);
+            $("input[name='supplierQualification']").val(sysSupplier.supplierQualification);
+        })
+    </script>
+</body>
+</html>