Mes
/
middle-admin-ant
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitlab.com/seasoul1/middle-admin-ant

This commit is contained in:
xielue 2023-10-18 16:26:55 +08:00
parent 100c8960c0 eadd35ca37
commit 2c257189f1
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pages/Middle/Mold/MoldOrder/List.vue
View File

@ -1,10 +1,7 @@
<template> <template>
<basic-page-list ref="listPage" :desc="desc" :options="pageOptions"> <basic-page-list ref="listPage" :desc="desc" :options="pageOptions">
<template v-slot:column1="{ row }"> <template v-slot:column1="{ row }">
<span v-if="row.progress == 1">已完成</span> <a-progress type="line" :percent="row.progress" />
<span v-else-if="row.progress > 0">部分完成</span>
<span v-else>未完成</span>
</template> </template>
</basic-page-list> </basic-page-list>
</template> </template>
@ -134,7 +131,7 @@ export default {
{ field: 'name', sortable: true, title: '客户名称', width: 250 }, { field: 'name', sortable: true, title: '客户名称', width: 250 },
{ field: 'production_status', sortable: true, title: '布产状态', width: 100 }, { field: 'production_status', sortable: true, title: '布产状态', width: 100 },
{ title: '完成状态', slots: { default: 'column1' }, width: 120 }, { title: '进度条', slots: { default: 'column1' }, width: 320 },

18
vue.config.js
View File

@ -36,15 +36,15 @@ const assetsCDN = { // 静态资源CDN地址
module.exports = { module.exports = {
devServer: { // 代理配置 devServer: { // 代理配置
// proxy: { proxy: {
// '/api': { //此处要与 /services/api.js 中的 API_PROXY_PREFIX 值保持一致 '/api': { //此处要与 /services/api.js 中的 API_PROXY_PREFIX 值保持一致
// target: process.env.VUE_APP_API_BASE_URL, target: process.env.VUE_APP_API_BASE_URL,
// changeOrigin: true, changeOrigin: true,
// pathRewrite: { pathRewrite: {
// '^/api': '' '^/api': ''
// } }
// } }
// } }
}, },
pluginOptions: { // 插件配置 pluginOptions: { // 插件配置
'style-resources-loader': { // 全局样式配置 'style-resources-loader': { // 全局样式配置