diff --git a/src/components/MySupplierListCard/index.vue b/src/components/MySupplierListCard/index.vue index 8d5e6a2..7d2dca2 100644 --- a/src/components/MySupplierListCard/index.vue +++ b/src/components/MySupplierListCard/index.vue @@ -58,14 +58,12 @@ }}
-
+
+ 合同状态: {{ getDictDataLabel( - DICT_TYPE.SR_CT_TYPE, - itemData.contractType + DICT_TYPE.BS_EXPENSE_APPLY_STATUS, + itemData.status ) || '未知' }}
@@ -127,13 +125,13 @@ export default { props: { itemData: { required: true, - default: () => {}, - }, + default: () => {} + } }, components: {}, data() { return { - jumoStudentId: null, + jumoStudentId: null } }, activated() { @@ -145,7 +143,7 @@ export default { computed: { userInfo() { return JSON.parse(window.localStorage.getItem('userInfo') || { dept: {} }) - }, + } }, methods: { handleMerge(id, status) { @@ -160,7 +158,7 @@ export default { this.jumoStudentId = id this.$router.push({ path: '/supplier', - query: { id, type: 'edit' }, + query: { id, type: 'edit' } }) }, handleDel(id, status, creator) { @@ -169,7 +167,7 @@ export default { } Dialog.confirm({ title: '提示', - message: '你确定要删除吗?', + message: '你确定要删除吗?' }).then(() => { deleteSupplierContract(id).then(() => { this.$emit('onAllRefresh') @@ -182,18 +180,18 @@ export default { this.jumoStudentId = id this.$router.push({ path: '/supplier', - query: { id, type: 'show' }, + query: { id, type: 'show' } }) }, dayjs, handleUpdataInfo() { this.jumoStudentId = null this.$emit('onUpdataInfo', this.itemData.id) - }, - }, + } + } } \ No newline at end of file + diff --git a/src/components/MysupplierMsgListCard/index.vue b/src/components/MysupplierMsgListCard/index.vue index c13c1eb..11aad5f 100644 --- a/src/components/MysupplierMsgListCard/index.vue +++ b/src/components/MysupplierMsgListCard/index.vue @@ -49,9 +49,9 @@ getDictDataLabel(DICT_TYPE.GYS_LEVEL, itemData.gradeGys) || '' }}
-
+
diff --git a/src/views/contract/myPayPlan/components/UserList.vue b/src/views/contract/myPayPlan/components/UserList.vue index f82669b..0c220fa 100644 --- a/src/views/contract/myPayPlan/components/UserList.vue +++ b/src/views/contract/myPayPlan/components/UserList.vue @@ -10,13 +10,25 @@ clearable input-align="left" /> - +
@@ -85,6 +97,7 @@