diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue
index 2d48d00..525a3e8 100644
--- a/src/components/ProjectDetailModal.vue
+++ b/src/components/ProjectDetailModal.vue
@@ -142,7 +142,7 @@
class="j-table-force-nowrap"
>
- 查看物流
+ 查看物流
@@ -227,7 +227,7 @@ const columns = [
{
title: '快递',
align: 'center',
- dataIndex: 'sendMethod'
+ dataIndex: 'sendMethod_dictText'
},
{
title: '快递单号',
@@ -324,8 +324,9 @@ export default {
/*
* 查看物流
* */
- lookLogistics() {
- window.open('https://www.ems.com.cn/', '_blank')
+ lookLogistics(record) {
+ const com = Number(record.sendMethod) === 1 && 'ems' || 'shunfeng'
+ window.open(`https://www.kuaidi100.com/chaxun?com=${ com }&nu=${ record.postNo }`)
},
/*
* 去合同详情 传入合同id
diff --git a/src/components/tools/StatusSlot.vue b/src/components/tools/StatusSlot.vue
index 72ed18b..0244431 100644
--- a/src/components/tools/StatusSlot.vue
+++ b/src/components/tools/StatusSlot.vue
@@ -1,9 +1,9 @@
+
-
@@ -147,6 +146,7 @@ export default {
},
/**
* 显示的模板数据,即根据返回值怎么处理数据
+ * 判断是否存在一句话里所有变量为null,存在就不显示那句话了
* @param item -传入的item的值
* @return 返回一个模板字符串用于后续显示,可按照需求进行更改
*/
@@ -155,11 +155,17 @@ export default {
console.log(item)
// 来款
if (this.statusKey === 'paymentRecord') {
- result = `${ item.paymentDate }到账${ item.amountReceived }`
+ if (item.paymentDate || item.amountReceived) {
+ result = `${ item.paymentDate }到账${ item.amountReceived }`
+ }
} else if (this.statusKey === 'bill') {
- result = `${ item.billDate }新增发票,发票单号:${ item.billNo }`
+ if (item.billDate || item.billNo) {
+ result = `${ item.billDate }新增发票,发票单号:${ item.billNo }`
+ }
} else if (this.statusKey === 'mail') {
- result = `${ item.sendDate }新增邮寄信息,邮寄单号:${ item.postNo }`
+ if (item.sendDate || item.postNo) {
+ result = `${ item.sendDate }新增邮寄信息,邮寄单号:${ item.postNo }`
+ }
}
return result
}
@@ -173,6 +179,7 @@ export default {
diff --git a/src/views/projectManagement/CommitteeMeeting.vue b/src/views/projectManagement/CommitteeMeeting.vue
index bb79a94..02b9e75 100644
--- a/src/views/projectManagement/CommitteeMeeting.vue
+++ b/src/views/projectManagement/CommitteeMeeting.vue
@@ -197,7 +197,7 @@ export default {
align: 'center',
dataIndex: 'startTime',
width: 160,
- customRender: (text, record) => ()
+ customRender: (text, record) => ()
},
{
title: '召开地点',