Browse Source

修复:客户资料重新审核页面,重新申请调整功能,获取业务组用户,进入重新审核节点。

dev
zhangsiqi 4 months ago
parent
commit
2b7bfdb69d
  1. 2
      ruoyi-admin/src/main/java/com/ruoyi/system/controller/CategoryController.java
  2. 286
      ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/confirm.html
  3. 116
      ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html
  4. 5
      ruoyi-admin/src/main/resources/templates/system/customer/taskYwjlVerify.html
  5. 7
      ruoyi-admin/src/main/resources/templates/system/customer/taskYwzgVerify.html
  6. 7
      ruoyi-admin/src/main/resources/templates/system/customer/taskZozjVerify.html

2
ruoyi-admin/src/main/java/com/ruoyi/system/CategoryController.java → ruoyi-admin/src/main/java/com/ruoyi/system/controller/CategoryController.java

@ -1,4 +1,4 @@
package com.ruoyi.system; package com.ruoyi.system.controller;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.framework.web.service.CategoryService; import com.ruoyi.framework.web.service.CategoryService;

286
ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/confirm.html

@ -0,0 +1,286 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('相关人员确认')" />
<th:block th:include="include :: select2-css" />
<th:block th:include="include :: datetimepicker-css" />
<th:block th:include="include :: bootstrap-editable-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-developModifyOrder-confirm" th:object="${erpDevelopModifyorder}">
<input name="developOrderId" th:field="*{developOrderId}" type="hidden">
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">开发修改单号:</label>
<div class="col-sm-8">
<input name="developOderCode" class="form-control" type="text">
</div>
</div>
<div class="container">
<div class="header">
<div class="btn-group-sm" role="group">
<header>修改开发修改单:</header>
</div>
</div>
<div class="row">
<div class="form-group">
<label class="col-sm-3 control-label is-required">生产单号:</label>
<div class="col-sm-8">
<select id="makeNo" name="makeNo" class="form-control" type="text" required>
<option value="">请选择</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">修改完成时间:</label>
<div class="input-group date">
<input name="updateInfoTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
</div>
</form>
<div class="container">
<div class="form-row">
<div class="btn-group-sm" role="group">
<span>选择开发修改单物料</span>
<a class="btn btn-success" onclick="insertRow()">
<i class="fa fa-plus"></i> 添加修改物料
</a>
</div>
</div>
<div class="row">
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-sub-table-developModify"></table>
</div>
</div>
</div>
<div class="container">
<div class="form-row">
<div class="btn-group-sm" role="group">
<span>选择采购物料</span>
<a class="btn btn-success" onclick="insertRow2()">
<i class="fa fa-plus"></i> 添加修改物料
</a>
</div>
</div>
<div class="row">
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-sub-table-material"></table>
</div>
</div>
</div>
<div class="container">
<div class="form-row">
<div class="btn-group-sm" role="group">
<span>选择通知人</span>
<a class="btn btn-success" onclick="insertRow3()">
<i class="fa fa-plus"></i> 添加通知人
</a>
</div>
</div>
<div class="row">
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-sub-table-biztoitem"></table>
</div>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: footer" />
<th:block th:include="include :: bootstrap-table-editable-js" />
<th:block th:include="include :: select2-js" />
<script th:inline="javascript">
var prefix = ctx + "erp/developModifyOrder";
$("#form-developModifyOrder-confirm").validate({focusCleanup: true});
$(function () {
$.ajax({
url: ctx + 'erp/developModifyOrder/getEngineerList',
type: 'post',
data: { roleKey: 'gcwyRole' },
success: function (res) {
if (res.data.length > 0) {
var userData = res.data;
for (let i in userData) {
$("#userId_add").append(
"<option value='" + userData[i].userId + "'>" + userData[i].userName + "</option>" // 显示用户姓名
);
}
$("userId_add").val(userData[i].userId).trigger("change");
} else {
$.modal.msgError(res.msg);
}
}
});
$("#makeNo").select2({
theme: "bootstrap",
allowClear: true,
placeholder: "请选择生产单号",
ajax: {
url: ctx + "/system/makeorder/getAllMakeNos",
dataType: 'json',
type: "POST",
delay: 250,
processResults: function (res, params) {
var options = [];
if(res.code==0){
var resultList = res.data;
console.log(resultList);
for(var i= 0, len=resultList.length;i<len;i++){
var option = resultList[i];
option.id = resultList[i]["makeNo"];
option.text = resultList[i]["makeNo"];
options.push(option);
}
}
return {
results: options
};
}
}
});
var options = {
id: "bootstrap-sub-table-developModify",
// url: prefix + "/getDevelopModifyOrderList",
showSearch: false,
showRefresh: false,
showToggle: false,
showColumns: false,
columns: [
{checkbox: true},
{field: 'index',align: 'center', title: "序号",
formatter: function (value, row, index) {
var columnIndex = $.common.sprintf("<input type='hidden' name='index' value='%s'>", $.table.serialNumber(index));
return columnIndex + $.table.serialNumber(index);
}
},
{title: '物料索引id',field: 'materialId',align: 'center',visible: false},
{title: '料号',field: 'materialCode',align: 'center'},
{title: '物料名称',field: 'materialName',align: 'center'},
{title: '图片',field: 'photoUrl',
formatter: function(value, row, index) {
if(value == null || value == ""){
value = "";
return "<img src='' herf='' />";
}
return $.table.imageView(value);
}
},
{title: '物料类型',field: 'materialType',align: 'center',
formatter: function(value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
},
{ title: '描述',field: 'describe',align: 'center'},
{title: '品牌',field: 'brand',align: 'center'},
{ title: '单位',field: 'unit',align: 'center',
formatter: function(value, row, index) {
return $.table.selectDictLabel(sysUnitClassDatas, value);
}
},
{title: '半成品类型',field: 'processMethod',align: 'center',
formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value);
}
},
{ title: '对外售价',field: 'materialSole',},
{title: '国内税率',field: 'countTax',align: 'center',},
{ title: '美元汇率',field: 'usdTax', align: 'center',},
{field: 'materialNum',align: 'center',title: '物料的数量',},
{ title: '物料的不含税单价(RMB)',field: 'materialNoRmb',align: 'center',},
{title: '物料的不含税单价(美元)',field: 'materialNoUsd',align: 'center',},
{title: '修改详情',align: 'center',
formatter:function formatterForm(value, row, index) {
// 这里的代码会为每行生成一个表单
var form = $('<form></form>').append(
$('<input/>', { type: 'text', value: row.name, name: 'name', placeholder: 'Name' }),
$('<input/>', { type: 'email', value: row.email, name: 'email', placeholder: 'Email' }),
$('<button/>', { type: 'submit' }).text('Submit')
);
form.on('submit', function(e) {
e.preventDefault(); // 阻止表单默认提交行为
var formData = form.serializeArray(); // 序列化表单数据为数组
console.log(formData); // 在控制台输出表单数据
// 这里可以添加代码处理表单提交,例如发送到服务器等
});
return form; // 返回生成的表单HTML
}},
]
};
$.table.init(options);
var option1 = {
id: "bootstrap-sub-table-material",
// url: prefix + "/list",
showSearch: false,
showRefresh: false,
showToggle: false,
showColumns: false,
modalName: "bom",
detailView: true,
height: $(window).height() - 100,
//指定父id列
onExpandRow : function(index, row, $detail) {
$detail.html('<table class="table-container" id="all_level_table_'+row.id+'"></table>').find('table');
// 多阶
initAllLevelTable(index,row,$detail);
// $.table.bootstrapTable('resetView');
},
columns: [
{checkbox: false},
{title: 'bom号',field: 'bomNo', },
{title: '关联料号',field: 'materialNo', },
{field: 'photoUrl',title: '图片',formatter: function(value, row, index) {return $.table.imageView(value);}},
{title: '物料名称',field: 'materialName', },
{field: 'materialType',title: '物料类型',formatter: function(value, row, index) { return $.table.selectCategoryLabel(materialTypeDatas, value);}},
{field: 'processMethod', title: '半成品类型',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}},
{field: 'unit',title: '单位',},
{ title: '品牌',field: 'brand', },
{title: '描述',field: 'describe'},
{field: 'num',title: '订单数量',},
{field: 'parentId',title: '父级id',visible:false},
{title: '操作',align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="remove(\'' + row.id + '\')"><i class="fa fa-eye"></i> 删除</a> ');
return actions.join('');
}
}]
};
$.table.init(option1);
var option2 = {
id: "bootstrap-sub-table-biztoitem",
// url: prefix + "/list",
showSearch: false,
showRefresh: false,
showToggle: false,
showColumns: false,
modalName: "通知人",
detailView: true,
height: $(window).height() - 100,
//指定父id列
columns: [
{checkbox: false},
{title: '通知人',field: 'item', },
{title: '确认时间',field: 'materialNo', },
{title: '操作',align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="remove(\'' + row.id + '\')"><i class="fa fa-eye"></i> 删除</a> ');
return actions.join('');
}
}]
};
$.table.init(option2);
})
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-developModifyOrder-confirm').serialize());
}
}
</script>
</body>
</html>

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

@ -38,101 +38,107 @@
<div class="form-group" hidden="hidden"> <div class="form-group" hidden="hidden">
<label class="col-sm-6 control-label is-required">客户ID:</label> <label class="col-sm-6 control-label is-required">客户ID:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input name="enterpriseCode" th:field="*{enterpriseCode}" class="form-control" type="text" readonly required> <input name="enterpriseCode" th:field="*{enterpriseCode}" class="form-control" type="text" required>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label is-required">客户/企业名称:</label> <label class="col-sm-6 control-label is-required">客户/企业名称:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input name="enterpriseName" th:field="*{enterpriseName}" class="form-control" type="text" readonly required> <input name="enterpriseName" th:field="*{enterpriseName}" class="form-control" type="text" required>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label">英文名称:</label> <label class="col-sm-6 control-label">英文名称:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input name="englishName" th:field="*{englishName}" class="form-control" type="text" readonly> <input name="englishName" th:field="*{englishName}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label">事业部:</label> <label class="col-sm-6 control-label">事业部:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input name="customerPurser" th:field="*{customerPurser}" class="form-control" type="text" readonly> <input name="customerPurser" th:field="*{customerPurser}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label">客户简称:</label> <label class="col-sm-6 control-label">客户简称:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input name="customerAbbreviation" th:field="*{customerAbbreviation}" class="form-control" type="text" readonly> <input name="customerAbbreviation" th:field="*{customerAbbreviation}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label">内外销:</label> <label class="col-sm-6 control-label">内外销:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<select name="exportSales" class="form-control m-b" th:with="type=${@dict.getType('sys_export_sales')}" th:field="*{exportSales}" disabled> <select name="exportSales" class="form-control m-b" th:with="type=${@dict.getType('sys_export_sales')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{exportSales}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label">国家地区:</label>
<div class="col-sm-6">
<select name="customerCountry" class="form-control m-b" th:with="type=${@dict.getType('sys_country')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{customerCountry}"></option>
</select> </select>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label">邮编:</label> <label class="col-sm-6 control-label">邮编:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input name="postalCode" th:field="*{postalCode}" class="form-control" type="text" readonly> <input name="postalCode" th:field="*{postalCode}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label">公司地址:</label> <label class="col-sm-6 control-label">公司地址:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input name="customerAddress" th:field="*{customerAddress}" class="form-control" type="text" readonly > <input name="customerAddress" th:field="*{customerAddress}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label" >法人代表:</label> <label class="col-sm-6 control-label" >法人代表:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input name="legalRepresentative" class="form-control" type="text" th:field="*{legalRepresentative}" readonly> <input name="legalRepresentative" class="form-control" type="text" th:field="*{legalRepresentative}">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label">成立日期:</label> <label class="col-sm-6 control-label">成立日期:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="input-group date"> <div class="input-group date">
<input name="establishedTime" th:field="*{establishedTime}" <input name="establishedTime" th:field="*{establishedTime}" class="form-control" placeholder="yyyy-MM-dd" type="text">
class="form-control" placeholder="yyyy-MM-dd" type="text"> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<span class="input-group-addon" readonly><i class="fa fa-calendar"></i></span>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label is-required">开票公司名称:</label> <label class="col-sm-6 control-label is-required" >开票公司名称:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input name="invoicingCompanyName" th:field="*{invoicingCompanyName}" class="form-control" <input required name="invoicingCompanyName" th:field="*{invoicingCompanyName}" class="form-control" type="text">
type="text" readonly required>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label">开票公司税号:</label> <label class="col-sm-6 control-label">开票公司税号:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input name="invoiceCode" th:field="*{invoiceCode}" class="form-control" type="text" readonly/> <input name="invoiceCode" th:field="*{invoiceCode}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label">开户银行:</label> <label class="col-sm-6 control-label">开户银行:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input name="depositBank" th:field="*{depositBank}" class="form-control" type="text" readonly/> <input name="depositBank" th:field="*{depositBank}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label">开户银行账号:</label> <label class="col-sm-6 control-label">开户银行账号:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input name="bankAccount" th:field="*{bankAccount}" class="form-control" type="text" readonly/> <input name="bankAccount" th:field="*{bankAccount}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label is-required">报价币种:</label> <label class="col-sm-6 control-label is-required">报价币种:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_common_currency')}"> <div class="radio-box" th:each="dict : ${@dict.getType('sys_common_currency')}">
<input type="radio" th:id="${'commonCurrency_' + dict.dictCode}" <input required type="radio" th:id="${'commonCurrency_' + dict.dictCode}"
name="commonCurrency" th:value="${dict.dictValue}" th:checked="${dict.default}" th:field="*{commonCurrency}" required disabled> name="commonCurrency" th:value="${dict.dictValue}" th:checked="${dict.default}" th:field="*{commonCurrency}">
<label th:for="${'commonCurrency_' + dict.dictCode}" th:text="${dict.dictLabel}" ></label> <label th:for="${'commonCurrency_' + dict.dictCode}" th:text="${dict.dictLabel}" ></label>
</div> </div>
</div> </div>
@ -140,9 +146,8 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label">诚信评级:</label> <label class="col-sm-6 control-label">诚信评级:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<select name="integrityRating" class="form-control m-b" <select name="integrityRating" class="form-control m-b" th:with="type=${@dict.getType('sys_integrity_rating')}">
th:with="type=${@dict.getType('sys_integrity_rating')}" th:field="*{integrityRating}" disabled> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{integrityRating}"></option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" ></option>
</select> </select>
</div> </div>
</div> </div>
@ -152,9 +157,8 @@
<label class="col-sm-6 control-label is-required">是否含税:</label> <label class="col-sm-6 control-label is-required">是否含税:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_confirm_tax')}"> <div class="radio-box" th:each="dict : ${@dict.getType('sys_confirm_tax')}">
<input type="radio" th:id="${'confirmTax_' + dict.dictCode}" name="confirmTax" th:value="${dict.dictValue}" disabled <input required type="radio" th:id="${'confirmTax_' + dict.dictCode}" name="confirmTax" th:value="${dict.dictValue}" th:checked="${dict.default}">
th:checked="${dict.default}" th:field="*{confirmTax}"> <label th:for="${'confirmTax_' + dict.dictCode}" th:text="${dict.dictLabel}" th:field="*{confirmTax}"></label>
<label th:for="${'confirmTax_' + dict.dictCode}" th:text="${dict.dictLabel}" ></label>
</div> </div>
</div> </div>
</div> </div>
@ -162,114 +166,100 @@
<label class="col-sm-6 control-label is-required" >国内税率:</label> <label class="col-sm-6 control-label is-required" >国内税率:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="input-group"> <div class="input-group">
<input name="taxRate" th:field="*{taxRate}" class="form-control" type="text" readonly required /> <input name="taxRate" th:field="*{taxRate}" class="form-control" type="text" required />
<span class="input-group-addon"><i class="fa fa-percentage"></i></span> <span class="input-group-addon">%<i class="fa fa-percentage"></i></span>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label">RMB注册资金:</label> <label class="col-sm-6 control-label">RMB注册资金:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input name="rmbRegisteredCapital" th:field="*{rmbRegisteredCapital}" class="form-control" type="text" readonly /> <input name="rmbRegisteredCapital" th:field="*{rmbRegisteredCapital}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label">外币注册资金:</label> <label class="col-sm-6 control-label">外币注册资金:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input name="registeredCapital" th:field="*{registeredCapital}" class="form-control" type="text" readonly /> <input name="registeredCapital" th:field="*{registeredCapital}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label">付款条件:</label> <label class="col-sm-6 control-label">付款条件:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input name="paymentTerms" th:field="*{paymentTerms}" class="form-control" type="text" readonly /> <input name="paymentTerms" th:field="*{paymentTerms}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label">海关代码:</label> <label class="col-sm-6 control-label">海关代码:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input name="customsCode" th:field="*{customsCode}" class="form-control" type="text" readonly /> <input name="customsCode" th:field="*{customsCode}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group" hidden="hidden"> <div class="form-group" >
<label class="col-sm-6 control-label">客户联系人id</label> <label class="col-sm-6 control-label is-required is-required" >客户第一联系人:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input name="customerContactId" class="form-control" th:field="*{customerContactId}" type="number" readonly/> <input name="customerContact" th:field="*{customerContact}" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">客户第一收货人:</label>
<div class="col-sm-6">
<input name="deliveryCustomerPerson" class="form-control" type="text" th:field="*{deliveryCustomerPerson}" readonly required/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label">第一联系人职务:</label> <label class="col-sm-6 control-label">第一联系人职务:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input name="customerOffice" class="form-control" type="text" th:field="*{customerOffice}" readonly/> <input name="customerOffice" th:field="*{customerOffice}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label is-required">第一联系人电话:</label> <label class="col-sm-6 control-label is-required">第一联系人电话:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input name="contactNumber" class="form-control" type="text" th:field="*{contactNumber}" required readonly> <input name="contactNumber" th:field="*{contactNumber}" class="form-control" type="text" required />
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label">第一联系人邮箱:</label> <label class="col-sm-6 control-label">第一联系人邮箱:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input name="customerEmail" class="form-control" type="text" th:field="*{customerEmail}" readonly> <input name="customerEmail" th:field="*{customerEmail}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label">第一联系人传真:</label> <label class="col-sm-6 control-label">第一联系人传真:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input name="customerFax" class="form-control" type="text" th:field="*{customerFax}" readonly> <input name="customerFax" th:field="*{customerFax}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label is-required">客户第一收货人:</label> <label class="col-sm-6 control-label is-required">客户第一收货人:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input name="deliveryCustomerPerson" class="form-control" <input name="deliveryCustomerPerson" class="form-control" type="text" th:field="*{deliveryCustomerPerson}" required/>
type="text" th:field="*{deliveryCustomerPerson}" readonly/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label is-required">第一收货人电话:</label> <label class="col-sm-6 control-label is-required">第一收货人电话:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input name="deliveryCustomerPhone" class="form-control" <input name="客户第一收货人联系电话" th:field="*{deliveryCustomerPhone}" class="form-control" type="text" required>
type="text" th:field="*{deliveryCustomerPhone}" readonly required >
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label is-required">第一收货人地址:</label> <label class="col-sm-6 control-label is-required">第一收货人地址:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input name="deliveryAddress" class="form-control" <input required name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text">
type="text" th:field="*{deliveryAddress}" readonly required>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label">第一收货人邮编:</label> <label class="col-sm-6 control-label">第一收货人邮编:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input name="deliveryCustomerPostal" class="form-control" <input name="deliveryCustomerPostal" th:field="*{deliveryCustomerPostal}" class="form-control" type="text">
type="text" th:field="*{deliveryCustomerPostal}" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label">第一收货人传真:</label> <label class="col-sm-6 control-label">第一收货人传真:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input name="deliveryCustomerFax" class="form-control" type="text" <input name="deliveryCustomerFax" th:field="*{deliveryCustomerFax}" class="form-control" type="text">
th:field="*{deliveryCustomerFax}" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label">业务员:</label> <label class="col-sm-6 control-label">业务员:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<select name="businessMembers" class="form-control m-b" <select name="businessMembers" th:field="*{businessMembers}" class="form-control"
th:field="*{businessMembers}" shiro:haspermission="customer:selectBusinessMembers"></select>
shiro:hasPermission="customer:selectBusinessMembers" disabled >
</select>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -280,7 +270,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label">客户标识:</label> <label class="col-sm-6 control-label">客户标识:</label>
<div class="radio-box" th:each="dict : ${@dict.getType('sys_customer_sign')}"> <div class="radio-box" th:each="dict : ${@dict.getType('sys_customer_sign')}">
<label th:for="${'customerSign_' + dict.dictCode}" th:text="${dict.dictLabel}" th:field="*{customerSign}"></label> <label th:for="${'customerSign_' + dict.dictCode}" th:text="${dict.dictLabel}" th:field="*{customerSign}"></label>
<input type="radio" name="customerSign" th:value="${dict.dictValue}" th:checked="${dict.default}" disabled /> <input type="radio" name="customerSign" th:value="${dict.dictValue}" th:checked="${dict.default}" disabled />
@ -289,7 +279,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label">备注内容:</label> <label class="col-sm-6 control-label">备注内容:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<textarea name="customerRemarks" class="form-control" readonly></textarea> <textarea th:field="*{customerRemarks}" name="customerRemarks" class="form-control"></textarea>
</div> </div>
</div> </div>
<br/> <br/>

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

@ -266,10 +266,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label">业务员:</label> <label class="col-sm-6 control-label">业务员:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<select name="businessMembers" class="form-control m-b" <input name="businessMembers" class="form-control m-b" th:field="*{businessMembers}" readonly/>
th:field="*{businessMembers}"
shiro:hasPermission="customer:selectBusinessMembers" disabled >
</select>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">

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

@ -266,10 +266,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label">业务员:</label> <label class="col-sm-6 control-label">业务员:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<select name="businessMembers" class="form-control m-b" <input name="businessMembers" class="form-control m-b" th:field="*{businessMembers}" readonly/>
th:field="*{businessMembers}"
shiro:hasPermission="customer:selectBusinessMembers" disabled >
</select>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -330,7 +327,7 @@
var usertData = res.rows; var usertData = res.rows;
for (let i in usertData) { for (let i in usertData) {
$("select[name='businessMembers']").append("<option value='" $("select[name='businessMembers']").append("<option value='"
+ usertData[i].userName + "'>" + usertData[i].userName + "</option>"); + usertData[i].loginName + "'>" + usertData[i].userName + "</option>");
} }
$("select[name='businessMembers']").val(customer.businessMembers); $("select[name='businessMembers']").val(customer.businessMembers);
} else { } else {

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

@ -265,10 +265,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-6 control-label">业务员:</label> <label class="col-sm-6 control-label">业务员:</label>
<div class="col-sm-6"> <div class="col-sm-6">
<select name="businessMembers" class="form-control m-b" <input name="businessMembers" class="form-control m-b" th:field="*{businessMembers}" readonly />
th:field="*{businessMembers}"
shiro:hasPermission="customer:selectBusinessMembers" disabled >
</select>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -328,7 +325,7 @@
var usertData = res.rows; var usertData = res.rows;
for (let i in usertData) { for (let i in usertData) {
$("select[name='businessMembers']").append("<option value='" $("select[name='businessMembers']").append("<option value='"
+ usertData[i].userName + "'>" + usertData[i].userName + "</option>"); + usertData[i].loginName + "'>" + usertData[i].userName + "</option>");
} }
$("select[name='businessMembers']").val(customer.businessMembers); $("select[name='businessMembers']").val(customer.businessMembers);
} else { } else {

Loading…
Cancel
Save