yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa

pull/781/head
zy 2025-05-12 12:02:17 +08:00
parent f407837155 03bd4d6eba
commit 9026738299
3 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/crm/business/components/BusinessProductForm.vue
View File

@ -37,7 +37,7 @@
<dict-tag :type="DICT_TYPE.CRM_PRODUCT_UNIT" :value="scope.row.productUnit" />
</template>
</el-table-column>
<el-table-column label="线上价格（元）" fixed="right" min-width="100">
<el-table-column label="线上（元）" align="center" fixed="right" min-width="100">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.onlinePrice`" :rules="formRules.onlinePrice" class="mb-0px!" v-if="!disabled">
<el-input
@ -49,7 +49,7 @@
<div v-else>{{row.onlinePrice}}</div>
</template>
</el-table-column>
<el-table-column label="线下价格（元）" fixed="right" min-width="100">
<el-table-column label="线下（元）" align="center" fixed="right" min-width="100">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.offlinePrice`" :rules="formRules.offlinePrice" class="mb-0px!" v-if="!disabled">
<el-input
@ -61,7 +61,7 @@
<div v-else>{{row.offlinePrice}}</div>
</template>
</el-table-column>
<el-table-column label="合计(元)" prop="totalPrice" fixed="right" min-width="100">
<el-table-column label="合计(元)" prop="totalPrice" align="center" fixed="right" min-width="100">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.totalPrice`" class="mb-0px!">
{{row.totalPrice}}

76
src/views/crm/contract/index.vue
View File

@ -116,13 +116,13 @@
width="140"
:formatter="erpPriceTableColumnFormatter"
/>
<el-table-column
<!-- <el-table-column
align="center"
label="下单时间"
prop="orderDate"
width="120"
:formatter="dateFormatter2"
/>
/>-->
<el-table-column
align="center"
label="合同开始时间"
@ -137,44 +137,44 @@
width="120"
:formatter="dateFormatter2"
/>
<el-table-column align="center" label="客户签约人" prop="signContactName" width="130">
<!-- <template #default="scope">
<el-link
:underline="false"
type="primary"
@click="openContactDetail(scope.row.signContactId)"
>
{{ scope.row.signContactName }}
</el-link>
</template> -->
</el-table-column>
<el-table-column align="center" label="公司签约人" prop="signUserName" width="130" />
<el-table-column align="center" label="备注" prop="remark" width="200" />
<el-table-column
align="center"
label="已回款金额（元）"
prop="totalReceivablePrice"
width="140"
:formatter="erpPriceTableColumnFormatter"
/>
<el-table-column
align="center"
label="未回款金额（元）"
prop="totalReceivablePrice"
width="140"
:formatter="erpPriceTableColumnFormatter"
>
<template #default="scope">
{{ erpPriceInputFormatter(scope.row.totalPrice - scope.row.totalReceivablePrice) }}
</template>
</el-table-column>
<el-table-column
<!-- <el-table-column align="center" label="客户签约人" prop="signContactName" width="130">
<template #default="scope">
<el-link
:underline="false"
type="primary"
@click="openContactDetail(scope.row.signContactId)"
>
{{ scope.row.signContactName }}
</el-link>
</template>
</el-table-column>-->
<!-- <el-table-column align="center" label="公司签约人" prop="signUserName" width="130" />-->
<!-- <el-table-column align="center" label="备注" prop="remark" width="200" />
<el-table-column
align="center"
label="已回款金额（元）"
prop="totalReceivablePrice"
width="140"
:formatter="erpPriceTableColumnFormatter"
/>
<el-table-column
align="center"
label="未回款金额（元）"
prop="totalReceivablePrice"
width="140"
:formatter="erpPriceTableColumnFormatter"
>
<template #default="scope">
{{ erpPriceInputFormatter(scope.row.totalPrice - scope.row.totalReceivablePrice) }}
</template>
</el-table-column>-->
<!-- <el-table-column
:formatter="dateFormatter"
align="center"
label="最后跟进时间"
prop="contactLastTime"
width="180px"
/>
/>-->
<el-table-column align="center" label="负责人" prop="ownerUserName" width="120" />
<el-table-column align="center" label="所属部门" prop="ownerUserDeptName" width="100px" />
<el-table-column
@ -192,12 +192,12 @@
width="180px"
/>
<el-table-column align="center" label="创建人" prop="creatorName" width="120" />
<el-table-column align="center" label="合同状态" prop="auditStatus" width="120">
<el-table-column align="center" fixed="right" label="合同状态" prop="auditStatus" width="120">
<template #default="scope">
<dict-tag :type="DICT_TYPE.CRM_AUDIT_STATUS" :value="scope.row.auditStatus" />
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="250">
<el-table-column align="center" fixed="right" label="操作" width="180">
<template #default="scope">
<div style="display:flex">
<el-button
@ -264,7 +264,7 @@
'crm:contract:change'
]"
>
<el-button type="primary" link><Icon icon="ep:d-arrow-right" /> 更多</el-button>
<el-button type="primary" link>更多<Icon icon="ep:d-arrow-right" /> </el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item

2
src/views/crm/quotation/index.vue
View File

@ -216,7 +216,7 @@
'system:permission:assign-user-role'
]"
>
<el-button type="primary" link><Icon icon="ep:d-arrow-right" /> 更多</el-button>
<el-button type="primary" link>更多<Icon icon="ep:d-arrow-right" /> </el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item