diff --git a/ruoyi-admin/src/main/resources/templates/system/supplier/supplier.html b/ruoyi-admin/src/main/resources/templates/system/supplier/supplier.html
index 112e2858..6b2bf469 100644
--- a/ruoyi-admin/src/main/resources/templates/system/supplier/supplier.html
+++ b/ruoyi-admin/src/main/resources/templates/system/supplier/supplier.html
@@ -128,8 +128,7 @@
return '
' + (value ? value : "-") + '';
}
},
- {field: 'applyTime',title: '申请时间'
- },
+ {field: 'applyTime',title: '申请时间'},
{title: '当前任务ID',field: 'taskId',visible: false},
{ title: '待办用户ID',field: 'todoUserId', visible: false},
{ title: '当前任务名称',field: 'taskName',
@@ -162,32 +161,35 @@
{title: '主联系人',field: 'customerContact'},
{title: '联系电话',field: 'contactNumber'},
{title: '传真',field: 'customerFax'},
- { title: 'Email',field: 'customerEmail'},
- { title: '网站',field: 'website'},
+ {title: 'Email',field: 'customerEmail'},
+ {title: '网站',field: 'website'},
{title: '付款条件',field: 'paymentTerms'},
{title: '采购员',field: 'purchaseBuyer',visible: false},
{title: '天数',field: 'supplierDays'},
- { title: '实际付款天数',field: 'actualPaymentDays',visible: false},
+ {title: '实际付款天数',field: 'actualPaymentDays',visible: false},
{title: '结汇银行',field: 'settlementBank',visible: false},
- { title: '结汇账号',field: 'exchangeSettlementAccount',visible: false},
+ {title: '结汇账号',field: 'exchangeSettlementAccount',visible: false},
{title: '开户银行',field: 'depositBank'},
{title: '开户银行账号',field: 'bankAccount' },
{title: 'RMB注册资金',field: 'rmbRegisteredCapital'},
{title: '行业代码',field: 'industryCode'},
{title: '跟单员', field: 'merchandiser',visible: false},
- { title: '跟单电话',field: 'merchandiserTelephone',visible: false},
- {title: '采购员',field: 'purchaseBuyer',},
- {
- field: 'confirmTax',
- title: '是否含税',
+ {title: '跟单电话',field: 'merchandiserTelephone',visible: false},
+
+ {title: '采购员',field: 'purchaseBuyer',},
+ {field: 'confirmTax', title: '是否含税',
formatter: function(value, row, index) {
return $.table.selectDictLabel(confirmTaxDatas, value);
}
},
{title: '税率', field: 'taxRate'},
- {
- field: 'firstAddTime',
- title: '录入时间',
+ {title: '发货人', field: 'deliverPerson',visible: false},
+ {title: '发货人电话', field: 'deliverPersonPhone',visible: false},
+ {title: '发货人地址', field: 'deliverAddress',visible: false},
+ {title: '收货人', field: 'receivePerson',visible: false},
+ {title: '收货人电话', field: 'receivePersonPhone',visible: false},
+ {title: '收货地址', field: 'receiveAddress',visible: false},
+ {field: 'firstAddTime', title: '录入时间',
formatter: function (value, row, index) {
if (value == null) {
return " ";
@@ -247,7 +249,15 @@
return actions.join('');
}
}
- ]
+ ],
+ rowStyle: function (row, index) {
+ if (row.auditStatus=="0") {
+ // 如果审核状态为待审核,则设置为红色
+ return {css:{"color":"red"}};
+ }
+ // 否则使用默认样式
+ return {};
+ }
};
$.table.init(options);
});
diff --git a/ruoyi-admin/src/main/resources/templates/system/supplier/taskCgjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/supplier/taskCgjlVerify.html
index a2402651..89f51ac7 100644
--- a/ruoyi-admin/src/main/resources/templates/system/supplier/taskCgjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/supplier/taskCgjlVerify.html
@@ -256,14 +256,16 @@