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

[fix]销售管理 

销售订单新增页面、详情页面、修改页面、驳回调整页面、业务经理审批页面、业务主管审批页面、总经理助理审批页面：物料列表加工方式为物料类型、列表页面不展示美元汇率和国内税率；form表单的美元汇率没有值默认为”当前未配置美元汇率，请联系总经理“，且为只读选项
dev
liuxiaoxu 4 weeks ago
parent
5ca11eb0ea
commit
d2aa3a8677
6 changed files with 23 additions and 23 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. 2
      ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
  2. 4
      ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html
  3. 22
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html
  4. 6
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html
  5. 6
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html
  6. 6
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html

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

@ -355,7 +355,7 @@
} }
}, },
{title: '半成品类型',field: 'processMethod',align: 'center',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}}, {title: '加工方式',field: 'processMethod',align: 'center',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}},
{ 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',},

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

@ -367,8 +367,8 @@
} }
}, },
{title: '国内税率',field: 'countTax',align: 'center'}, // {title: '国内税率',field: 'countTax',align: 'center'},
{ title: '美元汇率',field: 'usdTax', align: 'center'}, // { title: '美元汇率',field: 'usdTax', align: 'center'},
{ title: '物料的不含税单价(RMB)', { title: '物料的不含税单价(RMB)',
field: 'materialNoRmb', field: 'materialNoRmb',
align: 'center' align: 'center'

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

@ -366,7 +366,7 @@
return $.table.selectDictLabel(sysUnitClassDatas, value); return $.table.selectDictLabel(sysUnitClassDatas, value);
} }
}, },
{title: '半成品类型',field: 'processMethod',align: 'center', {title: '加工方式',field: 'processMethod',align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }
@ -382,8 +382,8 @@
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},
{ title: '物料的不含税单价(RMB)', { title: '物料的不含税单价(RMB)',
field: 'materialNoRmb', field: 'materialNoRmb',
@ -604,14 +604,14 @@
recentQuotationRMB: quotationData.data.materialRmb || '', recentQuotationRMB: quotationData.data.materialRmb || '',
recentQuotationUSD: quotationData.data.materialUsd || '', recentQuotationUSD: quotationData.data.materialUsd || '',
materialNum: "", materialNum: "",
materialNoRmb: 0.00, materialNoRmb: "",
materialNoUsd: 0.00, materialNoUsd: "",
materialRmb: 0.00, materialRmb: "",
materialNoRmbSum: 0.00, materialNoRmbSum: "",
materialRmbSum: 0.00, materialRmbSum: "",
materialUsd: 0.00, materialUsd: "",
materialUsdSum: 0.00, materialUsdSum: "",
materialNoUsdSum: 0.00, materialNoUsdSum: "",
createBy: "", createBy: "",
createTime: "", createTime: "",
updateBy: "", updateBy: "",

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

@ -354,7 +354,7 @@
{ title: '描述',field: 'describe',align: 'center'}, { title: '描述',field: 'describe',align: 'center'},
{title: '品牌',field: 'brand',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'},
{ title: '单位',field: 'unit',align: 'center', formatter: function(value, row, index) {return $.table.selectDictLabel(sysUnitClassDatas, value);}}, { 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: 'processMethod',align: 'center',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}},
{ 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',},
@ -367,8 +367,8 @@
} }
}, },
{title: '国内税率',field: 'countTax',align: 'center'}, // {title: '国内税率',field: 'countTax',align: 'center'},
{ title: '美元汇率',field: 'usdTax', align: 'center'}, // { title: '美元汇率',field: 'usdTax', align: 'center'},
{ title: '物料的不含税单价(RMB)', { title: '物料的不含税单价(RMB)',
field: 'materialNoRmb', field: 'materialNoRmb',
align: 'center' align: 'center'

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

@ -353,7 +353,7 @@
{ title: '描述',field: 'describe',align: 'center'}, { title: '描述',field: 'describe',align: 'center'},
{title: '品牌',field: 'brand',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'},
{ title: '单位',field: 'unit',align: 'center', formatter: function(value, row, index) {return $.table.selectDictLabel(sysUnitClassDatas, value);}}, { 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: 'processMethod',align: 'center',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}},
{ 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',},
@ -367,8 +367,8 @@
}, },
{title: '国内税率',field: 'countTax',align: 'center'}, // {title: '国内税率',field: 'countTax',align: 'center'},
{ title: '美元汇率',field: 'usdTax', align: 'center'}, // { title: '美元汇率',field: 'usdTax', align: 'center'},
{ title: '物料的不含税单价(RMB)', { title: '物料的不含税单价(RMB)',
field: 'materialNoRmb', field: 'materialNoRmb',
align: 'center' align: 'center'

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

@ -354,7 +354,7 @@
{ title: '描述',field: 'describe',align: 'center'}, { title: '描述',field: 'describe',align: 'center'},
{title: '品牌',field: 'brand',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'},
{ title: '单位',field: 'unit',align: 'center', formatter: function(value, row, index) {return $.table.selectDictLabel(sysUnitClassDatas, value);}}, { 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: 'processMethod',align: 'center',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}},
{ 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',},
@ -367,8 +367,8 @@
} }
}, },
{title: '国内税率',field: 'countTax',align: 'center'}, // {title: '国内税率',field: 'countTax',align: 'center'},
{ title: '美元汇率',field: 'usdTax', align: 'center'}, // { title: '美元汇率',field: 'usdTax', align: 'center'},
{ title: '物料的不含税单价(RMB)', { title: '物料的不含税单价(RMB)',
field: 'materialNoRmb', field: 'materialNoRmb',
align: 'center' align: 'center'

Write Preview
Loading…
Cancel
Save