root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[fix] 销售管理 

客户销售订单添加页面，其他联系人、电话、地址等已经可以手动填写；销售订单所有页面的最新报价历史这一栏目已经去掉
dev
liuxiaoxu 2 months ago
parent
f8928de0b9
commit
7429ba7332
6 changed files with 51 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
  2. 16
      ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html
  3. 16
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html
  4. 16
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html
  5. 16
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html
  6. 16
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html

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

@ -109,19 +109,19 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">联系人职务：</label> <label class="col-sm-3 control-label">联系人职务：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input readonly name="contactPost" class="form-control" type="text" > <input name="contactPost" class="form-control" type="text" >
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label ">联系人电话：</label> <label class="col-sm-3 control-label ">联系人电话：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="contactNumber" class="form-control" type="text" readonly> <input name="contactNumber" class="form-control" type="text" >
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">联系人邮箱：</label> <label class="col-sm-3 control-label">联系人邮箱：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input readonly name="contactEmail" class="form-control" type="text"> <input name="contactEmail" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -356,14 +356,14 @@
{ title: '对外售价',field: 'materialSole',align: 'center',}, { title: '对外售价',field: 'materialSole',align: 'center',},
{ title: '最新报价(RMB)',field: 'recentQuotationRMB',align: 'center',}, { title: '最新报价(RMB)',field: 'recentQuotationRMB',align: 'center',},
{ title: '最新报价(美元)',field: 'recentQuotationUSD',align: 'center',}, { title: '最新报价(美元)',field: 'recentQuotationUSD',align: 'center',},
{ title: '最新报价历史',align: 'center', // { title: '最新报价历史',align: 'center',
//
formatter: function (value, row, index) { // formatter: function (value, row, index) {
var actions = []; // var actions = [];
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="recentQuotationHistory(\'' + row.materialCode + '\')"><i class="fa fa-edit"></i>最新报价历史</a> '); // actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="recentQuotationHistory(\'' + row.materialCode + '\')"><i class="fa fa-edit"></i>最新报价历史</a> ');
return actions.join(''); // return actions.join('');
} // }
}, // },
// {title: '国内税率',field: 'countTax',align: 'center',editable: {type: 'text',mode: 'inline',},}, // {title: '国内税率',field: 'countTax',align: 'center',editable: {type: 'text',mode: 'inline',},},
// { title: '美元汇率',field: 'usdTax', align: 'center',editable: {type: 'text',mode: 'inline', }}, // { title: '美元汇率',field: 'usdTax', align: 'center',editable: {type: 'text',mode: 'inline', }},
{title: '物料的数量',field: 'materialNum',align: 'center', {title: '物料的数量',field: 'materialNum',align: 'center',

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

@ -359,14 +359,14 @@
{ title: '对外售价',field: 'materialSole'}, { title: '对外售价',field: 'materialSole'},
{ title: '最新报价(RMB)',field: 'recentQuotationRMB',align: 'center',}, { title: '最新报价(RMB)',field: 'recentQuotationRMB',align: 'center',},
{ title: '最新报价(美元)',field: 'recentQuotationUSD',align: 'center',}, { title: '最新报价(美元)',field: 'recentQuotationUSD',align: 'center',},
{ title: '最新报价历史',align: 'center', // { title: '最新报价历史',align: 'center',
//
formatter: function (value, row, index) { // formatter: function (value, row, index) {
var actions = []; // var actions = [];
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="recentQuotationHistory(\'' + row.materialCode + '\')"><i class="fa fa-edit"></i>最新报价历史</a> '); // actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="recentQuotationHistory(\'' + row.materialCode + '\')"><i class="fa fa-edit"></i>最新报价历史</a> ');
return actions.join(''); // return actions.join('');
} // }
}, // },
// {title: '国内税率',field: 'countTax',align: 'center'}, // {title: '国内税率',field: 'countTax',align: 'center'},
// { title: '美元汇率',field: 'usdTax', align: 'center'}, // { title: '美元汇率',field: 'usdTax', align: 'center'},

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

@ -375,14 +375,14 @@
{ title: '对外售价',field: 'materialSole',editable: true}, { title: '对外售价',field: 'materialSole',editable: true},
{ title: '最新报价(RMB)',field: 'recentQuotationRMB',align: 'center',}, { title: '最新报价(RMB)',field: 'recentQuotationRMB',align: 'center',},
{ title: '最新报价(美元)',field: 'recentQuotationUSD',align: 'center',}, { title: '最新报价(美元)',field: 'recentQuotationUSD',align: 'center',},
{ title: '最新报价历史',align: 'center', // { title: '最新报价历史',align: 'center',
//
formatter: function (value, row, index) { // formatter: function (value, row, index) {
var actions = []; // var actions = [];
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="recentQuotationHistory(\'' + row.materialCode + '\')"><i class="fa fa-edit"></i>最新报价历史</a> '); // actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="recentQuotationHistory(\'' + row.materialCode + '\')"><i class="fa fa-edit"></i>最新报价历史</a> ');
return actions.join(''); // return actions.join('');
} // }
}, // },
// {title: '国内税率',field: 'countTax',align: 'center',editable: true}, // {title: '国内税率',field: 'countTax',align: 'center',editable: true},
// { title: '美元汇率',field: 'usdTax', align: 'center',editable: true}, // { title: '美元汇率',field: 'usdTax', align: 'center',editable: true},
{field: 'materialNum',align: 'center',title: '物料的数量',editable: true}, {field: 'materialNum',align: 'center',title: '物料的数量',editable: true},

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

@ -359,14 +359,14 @@
{ title: '对外售价',field: 'materialSole'}, { title: '对外售价',field: 'materialSole'},
{ title: '最新报价(RMB)',field: 'recentQuotationRMB',align: 'center',}, { title: '最新报价(RMB)',field: 'recentQuotationRMB',align: 'center',},
{ title: '最新报价(美元)',field: 'recentQuotationUSD',align: 'center',}, { title: '最新报价(美元)',field: 'recentQuotationUSD',align: 'center',},
{ title: '最新报价历史',align: 'center', // { title: '最新报价历史',align: 'center',
//
formatter: function (value, row, index) { // formatter: function (value, row, index) {
var actions = []; // var actions = [];
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="recentQuotationHistory(\'' + row.materialCode + '\')"><i class="fa fa-edit"></i>最新报价历史</a> '); // actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="recentQuotationHistory(\'' + row.materialCode + '\')"><i class="fa fa-edit"></i>最新报价历史</a> ');
return actions.join(''); // return actions.join('');
} // }
}, // },
// {title: '国内税率',field: 'countTax',align: 'center'}, // {title: '国内税率',field: 'countTax',align: 'center'},
// { title: '美元汇率',field: 'usdTax', align: 'center'}, // { title: '美元汇率',field: 'usdTax', align: 'center'},

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

@ -358,14 +358,14 @@
{ title: '对外售价',field: 'materialSole'}, { title: '对外售价',field: 'materialSole'},
{ title: '最新报价(RMB)',field: 'recentQuotationRMB',align: 'center',}, { title: '最新报价(RMB)',field: 'recentQuotationRMB',align: 'center',},
{ title: '最新报价(美元)',field: 'recentQuotationUSD',align: 'center',}, { title: '最新报价(美元)',field: 'recentQuotationUSD',align: 'center',},
{ title: '最新报价历史',align: 'center', // { title: '最新报价历史',align: 'center',
//
formatter: function (value, row, index) { // formatter: function (value, row, index) {
var actions = []; // var actions = [];
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="recentQuotationHistory(\'' + row.materialCode + '\')"><i class="fa fa-edit"></i>最新报价历史</a> '); // actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="recentQuotationHistory(\'' + row.materialCode + '\')"><i class="fa fa-edit"></i>最新报价历史</a> ');
return actions.join(''); // return actions.join('');
} // }
}, // },
// {title: '国内税率',field: 'countTax',align: 'center'}, // {title: '国内税率',field: 'countTax',align: 'center'},

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

@ -359,14 +359,14 @@
{ title: '对外售价',field: 'materialSole'}, { title: '对外售价',field: 'materialSole'},
{ title: '最新报价(RMB)',field: 'recentQuotationRMB',align: 'center',}, { title: '最新报价(RMB)',field: 'recentQuotationRMB',align: 'center',},
{ title: '最新报价(美元)',field: 'recentQuotationUSD',align: 'center',}, { title: '最新报价(美元)',field: 'recentQuotationUSD',align: 'center',},
{ title: '最新报价历史',align: 'center', // { title: '最新报价历史',align: 'center',
//
formatter: function (value, row, index) { // formatter: function (value, row, index) {
var actions = []; // var actions = [];
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="recentQuotationHistory(\'' + row.materialCode + '\')"><i class="fa fa-edit"></i>最新报价历史</a> '); // actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="recentQuotationHistory(\'' + row.materialCode + '\')"><i class="fa fa-edit"></i>最新报价历史</a> ');
return actions.join(''); // return actions.join('');
} // }
}, // },
// {title: '国内税率',field: 'countTax',align: 'center'}, // {title: '国内税率',field: 'countTax',align: 'center'},
// { title: '美元汇率',field: 'usdTax', align: 'center'}, // { title: '美元汇率',field: 'usdTax', align: 'center'},

Write Preview
Loading…
Cancel
Save