DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

Browse Source
This commit is contained in:
Joshi
2025-10-31 11:22:56 +08:00
parent fd40fa0e18 1287531a81
commit 70cb16618c
8 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
klp-ui/src/main.js
View File

@@ -3,13 +3,12 @@ import Vue from 'vue'
import Cookies from 'js-cookie'
import VueKonva from 'vue-konva';
import * as echarts from 'echarts'
import dataV from '@jiaminghi/data-view';
import Element from 'element-ui'
import '@/modules/dashboardBig/assets/scss/style.scss';
import './assets/styles/element-variables.scss'
import dashboardBigPlugin from '@/modules/dashboardBig/init.js'
import vueFlvPlayer from 'vue-flv-player'
import '@/assets/styles/index.scss' // global css
@@ -58,7 +57,6 @@ Vue.prototype.selectDictLabel = selectDictLabel
Vue.prototype.selectDictLabels = selectDictLabels
Vue.prototype.download = download
Vue.prototype.handleTree = handleTree
Vue.prototype.$echarts = echarts
// 全局组件挂载
@@ -75,8 +73,8 @@ Vue.use(vueFlvPlayer)
Vue.use(directive)
Vue.use(plugins)
Vue.use(VueMeta)
Vue.use(dataV);
Vue.use(VueKonva);
Vue.use(dashboardBigPlugin)
DictData.install()
/**

12
klp-ui/src/modules/dashboardBig/init.js Normal file
View File

@@ -0,0 +1,12 @@
import * as echarts from 'echarts'
import dataV from '@jiaminghi/data-view';
import '@/modules/dashboardBig/assets/scss/style.scss';
// 导出包含 install 方法的对象，供 Vue.use() 调用
export default {
install(Vue) {
// 原逻辑放入 install 方法中，接收 Vue 构造函数作为参数
Vue.prototype.$echarts = echarts;
Vue.use(dataV);
}
}

5
klp-ui/src/views/index.vue
View File

@@ -1,10 +1,5 @@
<!-- 代码已包含 CSS：使用 TailwindCSS , 安装 TailwindCSS 后方可看到布局样式效果 -->
<template>
<div class="dashboard-root">
<!-- 第一行：头像+欢迎语 -->
<Greeting />
<!-- 全部应用 -->
<el-row>
<AllApplications />

8
klp-ui/src/views/login.vue
View File

@@ -5,7 +5,7 @@
<div class="login-title-welcome">
<img src="../assets/logo/logo.png" alt="logo" class="logo-img" />
<span class="login-title">欢迎使用科伦普综合办公系统</span>
<span class="login-title">欢迎使用科伦普冷轧涂镀数智一体化平台</span>
</div>
<p>
嘉祥科伦普重工有限公司是山东省重点工程项目，是济宁市工程之一，也是科伦普产品结构调整重要的工程项目。工程采用了外方技术总负责、关键设备整体引进、点菜集成、国内技术总成、自主创新、单体设备引进等多种建设方
@@ -179,6 +179,10 @@ $--metal-gradient-light: linear-gradient(145deg, #f5f5f550, #ffffff50);
justify-content: center;
align-items: center;
background: url('../assets/images/login.jpg'); // 金属渐变背景
// 拉伸且不重复
background-size: cover;
background-position: center;
background-repeat: no-repeat;
}
.login-box {
@@ -219,7 +223,7 @@ $--metal-gradient-light: linear-gradient(145deg, #f5f5f550, #ffffff50);
}
.login-title {
font-size: 20px ;
font-size: 18px ;
color: $--color-text-primary; // 白色文字
}
}

6
klp-ui/src/views/wms/product/index.vue
View File

@@ -169,7 +169,7 @@
/>
<!-- 添加或修改产品对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="400px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<!-- <el-divider>基础信息</el-divider> -->
<el-row :gutter="20">
@@ -256,7 +256,7 @@
</div>
</el-dialog>
<el-dialog title="SKU" @close="bomDialogVisible = false" :visible.sync="bomDialogVisible" width="900px" append-to-body>
<el-dialog title="SKU" @close="bomDialogVisible = false" :visible.sync="bomDialogVisible" width="600px" append-to-body>
<BomPanel :id="bomId" type="product" @addBom="handleAddBom" :itemId="itemId" />
</el-dialog>
</div>
@@ -375,7 +375,7 @@ export default {
width: undefined,
innerDiameter: undefined,
isEnabled: undefined,
unit: undefined,
unit: '卷',
delFlag: undefined,
createTime: undefined,
createBy: undefined,

6
klp-ui/src/views/wms/product/semi.vue
View File

@@ -172,7 +172,7 @@
/>
<!-- 添加或修改半成品对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="400px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<!-- <el-divider>基础信息</el-divider> -->
<el-row :gutter="20">
@@ -259,7 +259,7 @@
</div>
</el-dialog>
<el-dialog title="SKU" @close="bomDialogVisible = false" :visible.sync="bomDialogVisible" width="900px" append-to-body>
<el-dialog title="SKU" @close="bomDialogVisible = false" :visible.sync="bomDialogVisible" width="600px" append-to-body>
<BomPanel :id="bomId" type="product" @addBom="handleAddBom" :itemId="itemId" />
</el-dialog>
</div>
@@ -378,7 +378,7 @@ export default {
width: undefined,
innerDiameter: undefined,
isEnabled: undefined,
unit: undefined,
unit: '卷',
delFlag: undefined,
createTime: undefined,
createBy: undefined,

26
klp-ui/src/views/wms/rawMaterial/index.vue
View File

@@ -172,7 +172,7 @@
/>
<!-- 添加或修改原材料对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="400px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="原材料编号" prop="rawMaterialCode">
<el-input v-model="form.rawMaterialCode" placeholder="请输入原材料编号" />
@@ -183,14 +183,14 @@
<el-form-item label="计量单位" prop="unit">
<el-input v-model="form.unit" placeholder="请输入计量单位" />
</el-form-item>
<el-form-item label="钢种/牌号" prop="steelGrade">
<!-- <el-form-item label="钢种/牌号" prop="steelGrade">
<el-input v-model="form.steelGrade" placeholder="请输入钢种/牌号" />
</el-form-item>
<el-form-item label="目标冷轧牌号" prop="targetColdGrade">
<el-input v-model="form.targetColdGrade" placeholder="请输入目标冷轧牌号" />
</el-form-item>
</el-form-item> -->
<!-- 基础材质分类和表面处理分类同一行 -->
<el-row :gutter="20">
<!-- <el-row :gutter="20">
<el-col :span="12">
<el-form-item label="基础材质分类" prop="baseMaterialId">
<CategorySelect v-model="form.baseMaterialId" category-type="base_material" placeholder="请选择基础材质分类" clearable />
@@ -201,9 +201,9 @@
<CategorySelect v-model="form.surfaceTreatmentId" category-type="surface_treatment" placeholder="请选择表面处理分类" clearable />
</el-form-item>
</el-col>
</el-row>
</el-row> -->
<el-form-item label="是否启用" prop="isEnabled">
<!-- <el-form-item label="是否启用" prop="isEnabled">
<el-select v-model="form.isEnabled" placeholder="请选择是否启用" clearable>
<el-option
v-for="dict in dict.type.common_swicth"
@@ -212,12 +212,12 @@
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
</el-form-item> -->
<!-- <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-form-item> -->
<el-collapse>
<!-- <el-collapse>
<el-collapse-item title="详细参数">
<el-row :gutter="20">
<el-col :span="12">
@@ -268,7 +268,7 @@
</el-col>
</el-row>
</el-collapse-item>
</el-collapse>
</el-collapse> -->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -290,7 +290,7 @@
</el-descriptions>
</el-dialog>
<el-dialog title="SKU" @close="bomDialogVisible = false" :visible.sync="bomDialogVisible" width="900px" append-to-body>
<el-dialog title="SKU" @close="bomDialogVisible = false" :visible.sync="bomDialogVisible" width="600px" append-to-body>
<BomPanel :id="bomId" type="raw_material" @addBom="handleAddBom" :itemId="itemId" />
</el-dialog>
</div>
@@ -442,7 +442,7 @@ export default {
createBy: undefined,
updateTime: undefined,
updateBy: undefined,
unit: undefined,
unit: '卷',
};
this.resetForm("form");
},

4
klp-ui/src/views/wms/warehouse/index.vue
View File

@@ -190,7 +190,7 @@ export default {
parentId: undefined,
warehouseCode: undefined,
warehouseName: undefined,
warehouseType: 1,
warehouseType: undefined,
sortNo: undefined,
isEnabled: undefined,
},
@@ -265,7 +265,7 @@ export default {
parentId: null,
warehouseCode: null,
warehouseName: null,
warehouseType: null,
warehouseType: 1,
sortNo: null,
isEnabled: null,
delFlag: null,