提交 15da273b 编写于 作者: W weizhiqiang

ERP 产品名称修改为商品

上级 a6d1a19c
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#### 项目介绍 #### 项目介绍
智能制造云办公软件,后端采用Springboot框架,前端采用基于layui封装的winUI,打造一款不同风格的办公软件。适用于中型企业等机构的管理。包含30多个应用模块、50多种电子流程,CRM客户、PM项目、ERP采购、库存、ADM行政、HR人事、笔记、知识库、多门店、商城、财务、考勤、HCM薪资、云盘等全面管理,打造全业务覆盖、全流程驱动的云办公。实现一体化智能制造行业的管理,实现管理流程“客户关系-> 智能制造云办公软件,后端采用Springboot框架,前端采用基于layui封装的winUI,打造一款不同风格的办公软件。适用于中型企业等机构的管理。包含30多个应用模块、50多种电子流程,CRM客户、PM项目、ERP采购、库存、ADM行政、HR人事、笔记、知识库、多门店、商城、财务、考勤、HCM薪资、云盘等全面管理,打造全业务覆盖、全流程驱动的云办公。实现一体化智能制造行业的管理,实现管理流程“客户关系->
线上/线下报价->销售报价->销售合同->生产计划->品设计->采购->加工制造->入库->发货->售后服务”的高效运作,同时实现企业员工的管理以及内部运作的流程操作,完善了员工从“入职->培训->转正->办公->离职”等多项功能。 线上/线下报价->销售报价->销售合同->生产计划->品设计->采购->加工制造->入库->发货->售后服务”的高效运作,同时实现企业员工的管理以及内部运作的流程操作,完善了员工从“入职->培训->转正->办公->离职”等多项功能。
- 最新资讯:[2022-10-24 智能制造云办公 v3.8.6 发布,ERP 更新](https://www.oschina.net/news/214690/skyeye-3-8-6-released) - 最新资讯:[2022-10-24 智能制造云办公 v3.8.6 发布,ERP 更新](https://www.oschina.net/news/214690/skyeye-3-8-6-released)
- [软件更新资讯](https://gitee.com/doc_wei01/skyeye/blob/company_server/HISTORY_UPDATE.md) - [软件更新资讯](https://gitee.com/doc_wei01/skyeye/blob/company_server/HISTORY_UPDATE.md)
......
...@@ -35,7 +35,7 @@ layui.config({ ...@@ -35,7 +35,7 @@ layui.config({
{ field: 'consumablesPrice', title: '耗材总费用', align: 'right',width: 100 }, { field: 'consumablesPrice', title: '耗材总费用', align: 'right',width: 100 },
{ field: 'procedurePrice', title: '工序总费用', align: 'right',width: 100 }, { field: 'procedurePrice', title: '工序总费用', align: 'right',width: 100 },
{ field: 'wastagePrice', title: '耗损总费用', align: 'right',width: 100 }, { field: 'wastagePrice', title: '耗损总费用', align: 'right',width: 100 },
{ field: 'sealPrice', title: '品销售价', align: 'right',width: 100 }, { field: 'sealPrice', title: '品销售价', align: 'right',width: 100 },
{ field: 'remark', title: '备注说明', align: 'left',width: 200 }, { field: 'remark', title: '备注说明', align: 'left',width: 200 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar' } { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar' }
]], ]],
......
...@@ -267,7 +267,7 @@ layui.config({ ...@@ -267,7 +267,7 @@ layui.config({
area: ['90vw', '90vh'], area: ['90vw', '90vh'],
callBack: function (refreshCode) { callBack: function (refreshCode) {
$("#productionOrder").val(productionMation.defaultNumber); $("#productionOrder").val(productionMation.defaultNumber);
// 加工品信息 // 加工品信息
machinPro = { machinPro = {
materialId: productionMation.materialId, materialId: productionMation.materialId,
materialName: productionMation.materialName, materialName: productionMation.materialName,
......
...@@ -57,7 +57,7 @@ layui.config({ ...@@ -57,7 +57,7 @@ layui.config({
id: data.productionId id: data.productionId
}; };
} }
//加工品信息 //加工品信息
machinPro = { machinPro = {
materialId: data.materialId, materialId: data.materialId,
materialName: data.normMation.materialName, materialName: data.normMation.materialName,
...@@ -335,7 +335,7 @@ layui.config({ ...@@ -335,7 +335,7 @@ layui.config({
area: ['90vw', '90vh'], area: ['90vw', '90vh'],
callBack: function (refreshCode) { callBack: function (refreshCode) {
$("#productionOrder").val(productionMation.defaultNumber); $("#productionOrder").val(productionMation.defaultNumber);
//加工品信息 //加工品信息
machinPro = { machinPro = {
materialId: productionMation.materialId, materialId: productionMation.materialId,
materialName: productionMation.materialName, materialName: productionMation.materialName,
......
...@@ -32,7 +32,7 @@ layui.config({ ...@@ -32,7 +32,7 @@ layui.config({
{ field: 'defaultNumber', title: '单据编号', align: 'left', width: 200, templet: function (d) { { field: 'defaultNumber', title: '单据编号', align: 'left', width: 200, templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.defaultNumber + '</a>'; return '<a lay-event="details" class="notice-title-click">' + d.defaultNumber + '</a>';
}}, }},
{ field: 'materialNames', title: '品信息', align: 'left', width: 300}, { field: 'materialNames', title: '品信息', align: 'left', width: 300},
{ field: 'status', title: '状态', align: 'left', width: 80, templet: function (d) { { field: 'status', title: '状态', align: 'left', width: 80, templet: function (d) {
if(d.status == '0'){ if(d.status == '0'){
return "<span class='state-down'>未审核</span>"; return "<span class='state-down'>未审核</span>";
......
...@@ -32,7 +32,7 @@ layui.config({ ...@@ -32,7 +32,7 @@ layui.config({
{ field: 'defaultNumber', title: '单据编号', align: 'left', width: 200, templet: function (d) { { field: 'defaultNumber', title: '单据编号', align: 'left', width: 200, templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.defaultNumber + '</a>'; return '<a lay-event="details" class="notice-title-click">' + d.defaultNumber + '</a>';
}}, }},
{ field: 'materialNames', title: '品信息', align: 'left', width: 300}, { field: 'materialNames', title: '品信息', align: 'left', width: 300},
{ field: 'status', title: '状态', align: 'left', width: 80, templet: function (d) { { field: 'status', title: '状态', align: 'left', width: 80, templet: function (d) {
if(d.status == '0'){ if(d.status == '0'){
return "<span class='state-down'>未审核</span>"; return "<span class='state-down'>未审核</span>";
......
...@@ -45,7 +45,7 @@ layui.config({ ...@@ -45,7 +45,7 @@ layui.config({
limit: 8, limit: 8,
cols: [[ cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'materialName', title: '品名称', align: 'left', width: 250}, { field: 'materialName', title: '品名称', align: 'left', width: 250},
{ field: 'model', title: '型号', align: 'left', width: 100}, { field: 'model', title: '型号', align: 'left', width: 100},
{ field: 'typeName', title: '分类', align: 'left', width: 100}, { field: 'typeName', title: '分类', align: 'left', width: 100},
{ field: 'unitName', title: '单位', align: 'left', width: 80}, { field: 'unitName', title: '单位', align: 'left', width: 80},
......
...@@ -22,7 +22,7 @@ layui.config({ ...@@ -22,7 +22,7 @@ layui.config({
limit: getLimit(), limit: getLimit(),
cols: [[ cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'materialName', title: '品名称', align: 'left', width: 250 }, { field: 'materialName', title: '品名称', align: 'left', width: 250 },
{ field: 'materialModel', title: '型号', align: 'left', width: 150 }, { field: 'materialModel', title: '型号', align: 'left', width: 150 },
{ field: 'unitName', title: '单位', align: 'left', width: 80 }, { field: 'unitName', title: '单位', align: 'left', width: 80 },
{ field: 'currentTock', title: '进货数量', align: 'left', width: 100 }, { field: 'currentTock', title: '进货数量', align: 'left', width: 100 },
......
...@@ -44,7 +44,7 @@ layui.config({ ...@@ -44,7 +44,7 @@ layui.config({
limit: 8, limit: 8,
cols: [[ cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'materialName', title: '品名称', align: 'left', width: 250}, { field: 'materialName', title: '品名称', align: 'left', width: 250},
{ field: 'model', title: '型号', align: 'left', width: 100}, { field: 'model', title: '型号', align: 'left', width: 100},
{ field: 'typeName', title: '分类', align: 'left', width: 100}, { field: 'typeName', title: '分类', align: 'left', width: 100},
{ field: 'unitName', title: '单位', align: 'left', width: 80}, { field: 'unitName', title: '单位', align: 'left', width: 80},
......
...@@ -25,7 +25,7 @@ layui.config({ ...@@ -25,7 +25,7 @@ layui.config({
limit: getLimit(), limit: getLimit(),
cols: [[ cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'materialName', title: '品名称', align: 'left', width: 250 }, { field: 'materialName', title: '品名称', align: 'left', width: 250 },
{ field: 'materialModel', title: '型号', align: 'left', width: 150 }, { field: 'materialModel', title: '型号', align: 'left', width: 150 },
{ field: 'unitName', title: '单位', align: 'left', width: 80 }, { field: 'unitName', title: '单位', align: 'left', width: 80 },
{ field: 'currentTock', title: '销售数量', align: 'left', width: 100 }, { field: 'currentTock', title: '销售数量', align: 'left', width: 100 },
......
...@@ -32,7 +32,7 @@ layui.config({ ...@@ -32,7 +32,7 @@ layui.config({
{ field: 'defaultNumber', title: '单据编号', align: 'left', width: 200, templet: function (d) { { field: 'defaultNumber', title: '单据编号', align: 'left', width: 200, templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.defaultNumber + '</a>'; return '<a lay-event="details" class="notice-title-click">' + d.defaultNumber + '</a>';
}}, }},
{ field: 'materialNames', title: '品信息', align: 'left', width: 300}, { field: 'materialNames', title: '品信息', align: 'left', width: 300},
{ field: 'status', title: '状态', align: 'left', width: 80, templet: function (d) { { field: 'status', title: '状态', align: 'left', width: 80, templet: function (d) {
if(d.status == '0'){ if(d.status == '0'){
return "<span class='state-down'>未审核</span>"; return "<span class='state-down'>未审核</span>";
......
...@@ -61,7 +61,7 @@ layui.config({ ...@@ -61,7 +61,7 @@ layui.config({
return str; return str;
}}, }},
{ field: 'subTypeName', title: '单据类型', align: 'left', width: 100}, { field: 'subTypeName', title: '单据类型', align: 'left', width: 100},
{ field: 'materialNames', title: '关联', align: 'left', width: 300}, { field: 'materialNames', title: '关联', align: 'left', width: 300},
{ field: 'status', title: '状态', align: 'left', width: 80, templet: function (d) { { field: 'status', title: '状态', align: 'left', width: 80, templet: function (d) {
if(d.status == '0'){ if(d.status == '0'){
return "<span class='state-down'>未审核</span>"; return "<span class='state-down'>未审核</span>";
......
...@@ -61,7 +61,7 @@ layui.config({ ...@@ -61,7 +61,7 @@ layui.config({
return str; return str;
}}, }},
{ field: 'subTypeName', title: '单据类型', align: 'left', width: 100}, { field: 'subTypeName', title: '单据类型', align: 'left', width: 100},
{ field: 'materialNames', title: '关联', align: 'left', width: 300}, { field: 'materialNames', title: '关联', align: 'left', width: 300},
{ field: 'status', title: '状态', align: 'left', width: 80, templet: function (d) { { field: 'status', title: '状态', align: 'left', width: 80, templet: function (d) {
if(d.status == '0'){ if(d.status == '0'){
return "<span class='state-down'>未审核</span>"; return "<span class='state-down'>未审核</span>";
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<thead> <thead>
<tr> <tr>
<th style="width: 120px;">调出仓库</th> <th style="width: 120px;">调出仓库</th>
<th style="width: 150px;">(型号)</th> <th style="width: 150px;">(型号)</th>
<th style="width: 70px;">单位</th> <th style="width: 70px;">单位</th>
<th style="width: 120px;">调入仓库</th> <th style="width: 120px;">调入仓库</th>
<th style="width: 80px;">数量</th> <th style="width: 80px;">数量</th>
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<tr> <tr>
<th style="width: 100px;">商品类型</th> <th style="width: 100px;">商品类型</th>
<th style="width: 120px;">仓库</th> <th style="width: 120px;">仓库</th>
<th style="width: 150px;">(型号)</th> <th style="width: 150px;">(型号)</th>
<th style="width: 70px;">单位</th> <th style="width: 70px;">单位</th>
<th style="width: 80px;">数量</th> <th style="width: 80px;">数量</th>
<th style="width: 80px;">单价</th> <th style="width: 80px;">单价</th>
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</div> </div>
<label class="layui-form-label">型号</label> <label class="layui-form-label">型号</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="text" id="model" name="model" placeholder="请输入品型号" class="layui-input" /> <input type="text" id="model" name="model" placeholder="请输入品型号" class="layui-input" />
</div> </div>
<label class="layui-form-label">所属类型</label> <label class="layui-form-label">所属类型</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</div> </div>
<label class="layui-form-label">型号</label> <label class="layui-form-label">型号</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="text" id="model" name="model" placeholder="请输入品型号" class="layui-input" /> <input type="text" id="model" name="model" placeholder="请输入品型号" class="layui-input" />
</div> </div>
<label class="layui-form-label">所属类型</label> <label class="layui-form-label">所属类型</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">类型名称<i class="red">*</i></label> <label class="layui-form-label">类型名称<i class="red">*</i></label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" id="typeName" name="typeName" win-verify="required" placeholder="请输入品类型名称" class="layui-input"/> <input type="text" id="typeName" name="typeName" win-verify="required" placeholder="请输入品类型名称" class="layui-input"/>
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">类型名称<i class="red">*</i></label> <label class="layui-form-label">类型名称<i class="red">*</i></label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" id="typeName" name="typeName" win-verify="required" placeholder="请输入品类型名称" class="layui-input" value="{{name}}"/> <input type="text" id="typeName" name="typeName" win-verify="required" placeholder="请输入品类型名称" class="layui-input" value="{{name}}"/>
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
......
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<thead> <thead>
<tr> <tr>
<th style="width: 120px;">仓库</th> <th style="width: 120px;">仓库</th>
<th style="width: 150px;">(型号)</th> <th style="width: 150px;">(型号)</th>
<th style="width: 70px;">单位</th> <th style="width: 70px;">单位</th>
<th style="width: 80px;">数量</th> <th style="width: 80px;">数量</th>
<th style="width: 80px;">单价</th> <th style="width: 80px;">单价</th>
......
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<thead> <thead>
<tr> <tr>
<th style="width: 120px;">仓库</th> <th style="width: 120px;">仓库</th>
<th style="width: 150px;">(型号)</th> <th style="width: 150px;">(型号)</th>
<th style="width: 70px;">单位</th> <th style="width: 70px;">单位</th>
<th style="width: 80px;">数量</th> <th style="width: 80px;">数量</th>
<th style="width: 80px;">单价</th> <th style="width: 80px;">单价</th>
......
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<table class="layui-table"> <table class="layui-table">
<thead> <thead>
<tr> <tr>
<th style="width: 150px;">(型号)</th> <th style="width: 150px;">(型号)</th>
<th style="width: 70px;">单位</th> <th style="width: 70px;">单位</th>
<th style="width: 80px;">数量</th> <th style="width: 80px;">数量</th>
<th style="width: 80px;">单价</th> <th style="width: 80px;">单价</th>
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<thead> <thead>
<tr> <tr>
<th style="width: 120px;">仓库</th> <th style="width: 120px;">仓库</th>
<th style="width: 150px;">(型号)</th> <th style="width: 150px;">(型号)</th>
<th style="width: 70px;">单位</th> <th style="width: 70px;">单位</th>
<th style="width: 80px;">数量</th> <th style="width: 80px;">数量</th>
<th style="width: 80px;">单价</th> <th style="width: 80px;">单价</th>
......
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<thead> <thead>
<tr> <tr>
<th style="width: 120px;">仓库</th> <th style="width: 120px;">仓库</th>
<th style="width: 150px;">(型号)</th> <th style="width: 150px;">(型号)</th>
<th style="width: 70px;">单位</th> <th style="width: 70px;">单位</th>
<th style="width: 80px;">数量</th> <th style="width: 80px;">数量</th>
<th style="width: 80px;">单价</th> <th style="width: 80px;">单价</th>
......
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<thead> <thead>
<tr> <tr>
<th style="width: 120px;">仓库</th> <th style="width: 120px;">仓库</th>
<th style="width: 150px;">(型号)</th> <th style="width: 150px;">(型号)</th>
<th style="width: 70px;">单位</th> <th style="width: 70px;">单位</th>
<th style="width: 80px;">数量</th> <th style="width: 80px;">数量</th>
<th style="width: 80px;">单价</th> <th style="width: 80px;">单价</th>
......
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<thead> <thead>
<tr> <tr>
<th style="width: 120px;">仓库</th> <th style="width: 120px;">仓库</th>
<th style="width: 150px;">(型号)</th> <th style="width: 150px;">(型号)</th>
<th style="width: 70px;">单位</th> <th style="width: 70px;">单位</th>
<th style="width: 80px;">数量</th> <th style="width: 80px;">数量</th>
<th style="width: 80px;">单价</th> <th style="width: 80px;">单价</th>
......
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<table class="layui-table"> <table class="layui-table">
<thead> <thead>
<tr> <tr>
<th style="width: 150px;">(型号)</th> <th style="width: 150px;">(型号)</th>
<th style="width: 70px;">单位</th> <th style="width: 70px;">单位</th>
<th style="width: 80px;">数量</th> <th style="width: 80px;">数量</th>
<th style="width: 80px;">单价</th> <th style="width: 80px;">单价</th>
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<thead> <thead>
<tr> <tr>
<th style="width: 120px;">仓库</th> <th style="width: 120px;">仓库</th>
<th style="width: 150px;">(型号)</th> <th style="width: 150px;">(型号)</th>
<th style="width: 70px;">单位</th> <th style="width: 70px;">单位</th>
<th style="width: 80px;">数量</th> <th style="width: 80px;">数量</th>
<th style="width: 80px;">单价</th> <th style="width: 80px;">单价</th>
......
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<thead> <thead>
<tr> <tr>
<th style="width: 120px;">仓库</th> <th style="width: 120px;">仓库</th>
<th style="width: 150px;">(型号)</th> <th style="width: 150px;">(型号)</th>
<th style="width: 70px;">单位</th> <th style="width: 70px;">单位</th>
<th style="width: 80px;">数量</th> <th style="width: 80px;">数量</th>
<th style="width: 80px;">单价</th> <th style="width: 80px;">单价</th>
......
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<tr> <tr>
<th style="width: 100px;">商品类型</th> <th style="width: 100px;">商品类型</th>
<th style="width: 120px;">仓库</th> <th style="width: 120px;">仓库</th>
<th style="width: 150px;">(型号)</th> <th style="width: 150px;">(型号)</th>
<th style="width: 70px;">单位</th> <th style="width: 70px;">单位</th>
<th style="width: 80px;">数量</th> <th style="width: 80px;">数量</th>
<th style="width: 80px;">单价</th> <th style="width: 80px;">单价</th>
......
...@@ -11,7 +11,7 @@ layui.config({ ...@@ -11,7 +11,7 @@ layui.config({
var index = parent.layer.getFrameIndex(window.name); var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$; var $ = layui.$;
var customerId = "",//客户id var customerId = "",//客户id
productId = "";//品id productId = "";//品id
AjaxPostUtil.request({url: flowableBasePath + "feedback002", params: {serviceId: parent.serviceId}, type: 'json', callback: function(json) { AjaxPostUtil.request({url: flowableBasePath + "feedback002", params: {serviceId: parent.serviceId}, type: 'json', callback: function(json) {
$("#orderNum").html(json.bean.orderNum); $("#orderNum").html(json.bean.orderNum);
......
...@@ -81,8 +81,8 @@ layui.config({ ...@@ -81,8 +81,8 @@ layui.config({
areaId: areaId,//区县,可为空 areaId: areaId,//区县,可为空
townshipId: townshipId,//乡镇,可为空 townshipId: townshipId,//乡镇,可为空
addressDetailed: $("#addressDetailed").val(),//详细地址,不可为空 addressDetailed: $("#addressDetailed").val(),//详细地址,不可为空
productId: isNull(erpOrderUtil.chooseProductMation.materialId) ? '' : erpOrderUtil.chooseProductMation.materialId,//品id,可为空 productId: isNull(erpOrderUtil.chooseProductMation.materialId) ? '' : erpOrderUtil.chooseProductMation.materialId,//品id,可为空
productName: $("#productName").val(),//品名称,可为空 productName: $("#productName").val(),//品名称,可为空
productNorms: $("#productNorms").val(),//规格型号,可为空 productNorms: $("#productNorms").val(),//规格型号,可为空
productSerialNum: $("#productSerialNum").val(),//序列号,可为空 productSerialNum: $("#productSerialNum").val(),//序列号,可为空
productWarranty: $("#productWarranty").val(),//质保类型,可为空 productWarranty: $("#productWarranty").val(),//质保类型,可为空
...@@ -211,7 +211,7 @@ layui.config({ ...@@ -211,7 +211,7 @@ layui.config({
}}); }});
} }
//品选择 //品选择
$("body").on("click", "#productNameSel", function (e) { $("body").on("click", "#productNameSel", function (e) {
erpOrderUtil.openMaterialChooseChoosePage(function (chooseProductMation) { erpOrderUtil.openMaterialChooseChoosePage(function (chooseProductMation) {
$("#productName").val(chooseProductMation.materialName); $("#productName").val(chooseProductMation.materialName);
......
var rowId = "";//情况反馈id/客户id/品id var rowId = "";//情况反馈id/客户id/品id
var serviceId = "";//工单id var serviceId = "";//工单id
layui.config({ layui.config({
...@@ -70,7 +70,7 @@ layui.config({ ...@@ -70,7 +70,7 @@ layui.config({
$("#customerName").html('<a class="customerNameMation notice-title-click" rowid="' + json.bean.customerId + '">' + $("#customerName").html() + '</a>'); $("#customerName").html('<a class="customerNameMation notice-title-click" rowid="' + json.bean.customerId + '">' + $("#customerName").html() + '</a>');
} }
//品详情 //品详情
if (!isNull(json.bean.productId)){ if (!isNull(json.bean.productId)){
$("#productName").html('<a class="productNameMation notice-title-click" rowid="' + json.bean.productId + '">' + $("#productName").html() + '</a>'); $("#productName").html('<a class="productNameMation notice-title-click" rowid="' + json.bean.productId + '">' + $("#productName").html() + '</a>');
} }
...@@ -103,12 +103,12 @@ layui.config({ ...@@ -103,12 +103,12 @@ layui.config({
}}); }});
}); });
// 品详情 // 品详情
$("body").on("click", ".productNameMation", function() { $("body").on("click", ".productNameMation", function() {
rowId = $(this).attr("rowid"); rowId = $(this).attr("rowid");
_openNewWindows({ _openNewWindows({
url: "../../tpl/material/materialdetails.html", url: "../../tpl/material/materialdetails.html",
title: "品详情", title: "品详情",
pageId: "licencedetails", pageId: "licencedetails",
area: ['90vw', '90vh'], area: ['90vw', '90vh'],
callBack: function (refreshCode) { callBack: function (refreshCode) {
......
...@@ -125,8 +125,8 @@ layui.config({ ...@@ -125,8 +125,8 @@ layui.config({
areaId: areaId,//区县,可为空 areaId: areaId,//区县,可为空
townshipId: townshipId,//乡镇,可为空 townshipId: townshipId,//乡镇,可为空
addressDetailed: $("#addressDetailed").val(),//详细地址,不可为空 addressDetailed: $("#addressDetailed").val(),//详细地址,不可为空
productId: isNull(erpOrderUtil.chooseProductMation.materialId) ? '' : erpOrderUtil.chooseProductMation.materialId,//品id,可为空 productId: isNull(erpOrderUtil.chooseProductMation.materialId) ? '' : erpOrderUtil.chooseProductMation.materialId,//品id,可为空
productName: $("#productName").val(),//品名称,可为空 productName: $("#productName").val(),//品名称,可为空
productNorms: $("#productNorms").val(),//规格型号,可为空 productNorms: $("#productNorms").val(),//规格型号,可为空
productSerialNum: $("#productSerialNum").val(),//序列号,可为空 productSerialNum: $("#productSerialNum").val(),//序列号,可为空
productWarranty: $("#productWarranty").val(),//质保类型,可为空 productWarranty: $("#productWarranty").val(),//质保类型,可为空
...@@ -315,7 +315,7 @@ layui.config({ ...@@ -315,7 +315,7 @@ layui.config({
}}); }});
} }
//品选择 //品选择
$("body").on("click", "#productNameSel", function (e) { $("body").on("click", "#productNameSel", function (e) {
erpOrderUtil.openMaterialChooseChoosePage(function (chooseProductMation) { erpOrderUtil.openMaterialChooseChoosePage(function (chooseProductMation) {
$("#productName").val(chooseProductMation.materialName); $("#productName").val(chooseProductMation.materialName);
......
...@@ -42,7 +42,7 @@ layui.config({ ...@@ -42,7 +42,7 @@ layui.config({
{ field: 'serviceTypeName', title: '服务类型', align: 'left', width: 100 }, { field: 'serviceTypeName', title: '服务类型', align: 'left', width: 100 },
{ field: 'declarationTime', title: '报单时间', align: 'center', width: 140 }, { field: 'declarationTime', title: '报单时间', align: 'center', width: 140 },
{ field: 'customerName', title: '客户名称', align: 'left', width: 120 }, { field: 'customerName', title: '客户名称', align: 'left', width: 120 },
{ field: 'productName', title: '品名称', align: 'left', width: 120 }, { field: 'productName', title: '品名称', align: 'left', width: 120 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'} { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'}
]], ]],
done: function(json) { done: function(json) {
......
...@@ -43,7 +43,7 @@ layui.config({ ...@@ -43,7 +43,7 @@ layui.config({
{ field: 'serviceTypeName', title: '服务类型', align: 'left', width: 100 }, { field: 'serviceTypeName', title: '服务类型', align: 'left', width: 100 },
{ field: 'declarationTime', title: '报单时间', align: 'center', width: 140 }, { field: 'declarationTime', title: '报单时间', align: 'center', width: 140 },
{ field: 'customerName', title: '客户名称', align: 'left', width: 120 }, { field: 'customerName', title: '客户名称', align: 'left', width: 120 },
{ field: 'productName', title: '品名称', align: 'left', width: 120 }, { field: 'productName', title: '品名称', align: 'left', width: 120 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'} { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'}
]], ]],
done: function(json) { done: function(json) {
......
...@@ -42,7 +42,7 @@ layui.config({ ...@@ -42,7 +42,7 @@ layui.config({
{ field: 'serviceTypeName', title: '服务类型', align: 'left', width: 100 }, { field: 'serviceTypeName', title: '服务类型', align: 'left', width: 100 },
{ field: 'declarationTime', title: '报单时间', align: 'center', width: 140 }, { field: 'declarationTime', title: '报单时间', align: 'center', width: 140 },
{ field: 'customerName', title: '客户名称', align: 'left', width: 120 }, { field: 'customerName', title: '客户名称', align: 'left', width: 120 },
{ field: 'productName', title: '品名称', align: 'left', width: 120 }, { field: 'productName', title: '品名称', align: 'left', width: 120 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 120, toolbar: '#tableBar'} { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 120, toolbar: '#tableBar'}
]], ]],
done: function(json) { done: function(json) {
......
...@@ -42,7 +42,7 @@ layui.config({ ...@@ -42,7 +42,7 @@ layui.config({
{ field: 'serviceTypeName', title: '服务类型', align: 'left', width: 100 }, { field: 'serviceTypeName', title: '服务类型', align: 'left', width: 100 },
{ field: 'declarationTime', title: '报单时间', align: 'center', width: 140 }, { field: 'declarationTime', title: '报单时间', align: 'center', width: 140 },
{ field: 'customerName', title: '客户名称', align: 'left', width: 120 }, { field: 'customerName', title: '客户名称', align: 'left', width: 120 },
{ field: 'productName', title: '品名称', align: 'left', width: 120 }, { field: 'productName', title: '品名称', align: 'left', width: 120 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 140, toolbar: '#tableBar'} { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 140, toolbar: '#tableBar'}
]], ]],
done: function(json) { done: function(json) {
......
...@@ -42,7 +42,7 @@ layui.config({ ...@@ -42,7 +42,7 @@ layui.config({
{ field: 'serviceTypeName', title: '服务类型', align: 'left', width: 120 }, { field: 'serviceTypeName', title: '服务类型', align: 'left', width: 120 },
{ field: 'declarationTime', title: '报单时间', align: 'center', width: 140 }, { field: 'declarationTime', title: '报单时间', align: 'center', width: 140 },
{ field: 'customerName', title: '客户名称', align: 'left', width: 120 }, { field: 'customerName', title: '客户名称', align: 'left', width: 120 },
{ field: 'productName', title: '品名称', align: 'left', width: 120 }, { field: 'productName', title: '品名称', align: 'left', width: 120 },
{ field: 'stateName', title: '状态', align: 'left', width: 80 }, { field: 'stateName', title: '状态', align: 'left', width: 80 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'} { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'}
]], ]],
......
...@@ -40,7 +40,7 @@ layui.config({ ...@@ -40,7 +40,7 @@ layui.config({
{ field: 'serviceTypeName', title: '服务类型', align: 'left', width: 100 }, { field: 'serviceTypeName', title: '服务类型', align: 'left', width: 100 },
{ field: 'declarationTime', title: '报单时间', align: 'center', width: 140 }, { field: 'declarationTime', title: '报单时间', align: 'center', width: 140 },
{ field: 'customerName', title: '客户名称', align: 'left', width: 120 }, { field: 'customerName', title: '客户名称', align: 'left', width: 120 },
{ field: 'productName', title: '品名称', align: 'left', width: 120 }, { field: 'productName', title: '品名称', align: 'left', width: 120 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 120, toolbar: '#tableBar'} { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 120, toolbar: '#tableBar'}
]], ]],
done: function(json) { done: function(json) {
......
...@@ -42,7 +42,7 @@ layui.config({ ...@@ -42,7 +42,7 @@ layui.config({
{ field: 'serviceTypeName', title: '服务类型', align: 'left', width: 100 }, { field: 'serviceTypeName', title: '服务类型', align: 'left', width: 100 },
{ field: 'declarationTime', title: '报单时间', align: 'center', width: 140 }, { field: 'declarationTime', title: '报单时间', align: 'center', width: 140 },
{ field: 'customerName', title: '客户名称', align: 'left', width: 120 }, { field: 'customerName', title: '客户名称', align: 'left', width: 120 },
{ field: 'productName', title: '品名称', align: 'left', width: 120 }, { field: 'productName', title: '品名称', align: 'left', width: 120 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 120, toolbar: '#tableBar'} { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 120, toolbar: '#tableBar'}
]], ]],
done: function(json) { done: function(json) {
......
...@@ -42,7 +42,7 @@ layui.config({ ...@@ -42,7 +42,7 @@ layui.config({
{ field: 'serviceTypeName', title: '服务类型', align: 'left', width: 100 }, { field: 'serviceTypeName', title: '服务类型', align: 'left', width: 100 },
{ field: 'declarationTime', title: '报单时间', align: 'center', width: 140 }, { field: 'declarationTime', title: '报单时间', align: 'center', width: 140 },
{ field: 'customerName', title: '客户名称', align: 'left', width: 120 }, { field: 'customerName', title: '客户名称', align: 'left', width: 120 },
{ field: 'productName', title: '品名称', align: 'left', width: 120 } { field: 'productName', title: '品名称', align: 'left', width: 120 }
]], ]],
done: function(json) { done: function(json) {
matchingLanguage(); matchingLanguage();
......
...@@ -42,7 +42,7 @@ layui.config({ ...@@ -42,7 +42,7 @@ layui.config({
{ field: 'serviceTypeName', title: '服务类型', align: 'left', width: 120 }, { field: 'serviceTypeName', title: '服务类型', align: 'left', width: 120 },
{ field: 'declarationTime', title: '报单时间', align: 'center', width: 140 }, { field: 'declarationTime', title: '报单时间', align: 'center', width: 140 },
{ field: 'customerName', title: '客户名称', align: 'left', width: 120 }, { field: 'customerName', title: '客户名称', align: 'left', width: 120 },
{ field: 'productName', title: '品名称', align: 'left', width: 120 }, { field: 'productName', title: '品名称', align: 'left', width: 120 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'} { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'}
]], ]],
done: function(json) { done: function(json) {
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">品名称:</label> <label class="layui-form-label">品名称:</label>
<div class="layui-input-block ver-center" id="productName"> <div class="layui-input-block ver-center" id="productName">
</div> </div>
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">品名称:</label> <label class="layui-form-label">品名称:</label>
<div class="layui-input-block ver-center" id="productName"> <div class="layui-input-block ver-center" id="productName">
</div> </div>
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">品名称:</label> <label class="layui-form-label">品名称:</label>
<div class="layui-input-block ver-center" id="productName"> <div class="layui-input-block ver-center" id="productName">
</div> </div>
......
...@@ -70,12 +70,12 @@ ...@@ -70,12 +70,12 @@
</div> </div>
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<span class="hr-title">品信息</span><hr> <span class="hr-title">品信息</span><hr>
</div> </div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">品名称</label> <label class="layui-form-label">品名称</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" id="productName" name="productName" placeholder="请输入品名称" class="layui-input" maxlength="50" readonly="readonly"/> <input type="text" id="productName" name="productName" placeholder="请输入品名称" class="layui-input" maxlength="50" readonly="readonly"/>
<i class="fa fa-plus-circle input-icon" id="productNameSel"></i> <i class="fa fa-plus-circle input-icon" id="productNameSel"></i>
</div> </div>
</div> </div>
......
...@@ -67,10 +67,10 @@ ...@@ -67,10 +67,10 @@
</div> </div>
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<span class="hr-title">品信息</span><hr> <span class="hr-title">品信息</span><hr>
</div> </div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">品名称:</label> <label class="layui-form-label">品名称:</label>
<div class="layui-input-block ver-center" id="productName"> <div class="layui-input-block ver-center" id="productName">
{{productName}} {{productName}}
</div> </div>
......
...@@ -60,12 +60,12 @@ ...@@ -60,12 +60,12 @@
</div> </div>
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<span class="hr-title">品信息</span><hr> <span class="hr-title">品信息</span><hr>
</div> </div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">品名称</label> <label class="layui-form-label">品名称</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" id="productName" name="productName" placeholder="请输入品名称" class="layui-input" maxlength="50" value="{{materialName}}" readonly="readonly"/> <input type="text" id="productName" name="productName" placeholder="请输入品名称" class="layui-input" maxlength="50" value="{{materialName}}" readonly="readonly"/>
<i class="fa fa-plus-circle input-icon" id="productNameSel"></i> <i class="fa fa-plus-circle input-icon" id="productNameSel"></i>
</div> </div>
</div> </div>
......
...@@ -61,10 +61,10 @@ ...@@ -61,10 +61,10 @@
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<span class="hr-title">品信息</span><hr> <span class="hr-title">品信息</span><hr>
</div> </div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">品名称</label> <label class="layui-form-label">品名称</label>
<div class="layui-input-block ver-center"> <div class="layui-input-block ver-center">
{{materialName}} {{materialName}}
</div> </div>
......
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
"com.skyeye.inventoryAvailable": {"zh": "可盘点库存", "cn": "Inventory Available"}, "com.skyeye.inventoryAvailable": {"zh": "可盘点库存", "cn": "Inventory Available"},
"com.skyeye.supplier": {"zh": "供应商", "cn": "Supplier"}, "com.skyeye.supplier": {"zh": "供应商", "cn": "Supplier"},
"com.skyeye.relatedProducts": {"zh": "关联品", "cn": "Related Products"}, "com.skyeye.relatedProducts": {"zh": "关联品", "cn": "Related Products"},
"com.skyeye.attachment": {"zh": "附件", "cn": "Attachment"}, "com.skyeye.attachment": {"zh": "附件", "cn": "Attachment"},
"com.skyeye.attachment2": {"zh": "附件资料", "cn": "Attachments"}, "com.skyeye.attachment2": {"zh": "附件资料", "cn": "Attachments"},
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册