dianliang/lanan-system-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码补正

Browse Source
This commit is contained in:
xiao-fajia 2024-08-30 16:21:02 +08:00
parent 7a0e5680b8
commit 664449f090
7 changed files with 47 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -41,6 +41,7 @@
"url": "https://github.com/YunaiV/ruoyi-vue-pro"
},
"dependencies": {
"@amap/amap-jsapi-loader": "^1.0.1",
"@babel/parser": "^7.18.4",
"@riophae/vue-treeselect": "0.4.0",
"axios": "0.27.2",
@ -70,6 +71,7 @@
"vue-count-to": "1.0.13",
"vue-cropper": "0.5.8",
"vue-meta": "^2.4.0",
"vue-qriously": "^1.1.1",
"vue-quill-editor": "^3.0.6",
"vue-router": "3.4.9",
"vue-video-player": "^5.0.2",

4
src/main.js
View File

@ -30,6 +30,8 @@ import ImagePreview from "@/components/ImagePreview/index.vue";
// import hljs from 'highlight.js'
// import 'highlight.js/styles/github-gist.css'
import {DICT_TYPE, getDictDataLabel, getDictDatas, getDictDatas2} from "@/utils/dict";
// 二维码
import VueQriously from 'vue-qriously'
// 全局方法挂载
Vue.prototype.getDicts = getDicts
@ -61,6 +63,8 @@ import VueMeta from 'vue-meta'
Vue.use(directive)
Vue.use(plugins)
Vue.use(VueMeta)
// 二维码
Vue.use(VueQriously)
// Vue.use(hljs.vuePlugin);
// bpmnProcessDesigner 需要引入

12
src/views/company/promotion/index.vue
View File

@ -15,9 +15,9 @@
/>
</el-select>
</el-form-item>
<el-form-item label="推广人推广码" prop="uniqueCode">
<el-input v-model="queryParams.uniqueCode" placeholder="请输入推广人推广码" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<!-- <el-form-item label="推广人推广码" prop="uniqueCode">-->
<!-- <el-input v-model="queryParams.uniqueCode" placeholder="请输入推广人推广码" clearable @keyup.enter.native="handleQuery"/>-->
<!-- </el-form-item>-->
<el-form-item label="被推广人姓名" prop="newUserName">
<el-input v-model="queryParams.newUserName" placeholder="请输入被推广人姓名" clearable
@keyup.enter.native="handleQuery"
@ -59,7 +59,11 @@
<dict-tag :type="DICT_TYPE.SYSTEM_USER_TYPE" :value="scope.row.oldUser.userType"/>
</template>
</el-table-column>
<el-table-column label="推广人推广码" align="center" prop="uniqueCode" width="180" />
<el-table-column label="推广人推广码" align="center" prop="uniqueCode" width="180">
<template v-slot="scope">
<qriously :value="scope.row.uniqueCode" :options="{ width: 100, height: 100 }"/>
</template>
</el-table-column>
<el-table-column label="推广渠道" align="center" prop="promotionChannel" width="180">
<template v-slot="scope">
<dict-tag :type="DICT_TYPE.PROMOTION_CHANNEL" :value="scope.row.promotionChannel"/>

16
src/views/company/staff/index.vue
View File

@ -53,11 +53,11 @@
<el-form-item label="司龄" prop="joinedYear">
<el-input v-model="queryParams.joinedYear" placeholder="请输入司龄" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="唯一推广码" prop="uniqueCode">
<el-input v-model="queryParams.uniqueCode" placeholder="请输入唯一推广码" clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="唯一推广码" prop="uniqueCode">-->
<!-- <el-input v-model="queryParams.uniqueCode" placeholder="请输入唯一推广码" clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="工作日期" prop="workDateArray">
<el-date-picker v-model="queryParams.workDateArray" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
type="daterange"
@ -105,6 +105,11 @@
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="唯一推广码" align="center" prop="uniqueCode" width="180">
<template v-slot="scope">
<qriously :value="scope.row.uniqueCode" :options="{ width: 100, height: 100 }"/>
</template>
</el-table-column>
<el-table-column label="工号" align="center" prop="workNo" width="180"/>
<el-table-column label="姓名" align="center" prop="name" width="180"/>
<el-table-column label="角色" :show-overflow-tooltip="true" align="center" prop="roleNames" width="180"/>
@ -125,7 +130,6 @@
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" label="个人简介" align="center" prop="content" width="180"/>
<el-table-column label="唯一推广码" align="center" prop="uniqueCode" width="180"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180">
<template v-slot="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"

10
src/views/knowledge/views/archives/components/ArchivesTable.vue
View File

@ -87,11 +87,11 @@
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" label="档案名称" align="center" prop="archivesName" width="180"/>
<el-table-column label="档案类别" align="center" prop="sex" width="80">
<template v-slot="scope">
<dict-tag :type="DICT_TYPE.ARCHIVES_ITEM_TYPE" :value="scope.row.archivesType"/>
</template>
</el-table-column>
<!-- <el-table-column label="档案类别" align="center" prop="sex" width="80">-->
<!-- <template v-slot="scope">-->
<!-- <dict-tag :type="DICT_TYPE.ARCHIVES_ITEM_TYPE" :value="scope.row.archivesType"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column :show-overflow-tooltip="true" label="档案存放位置" align="center" prop="archivesPhysicsUrl" width="180"/>
<el-table-column v-if="activeTab === 'contract_type'" label="签订日期" align="center" prop="signTime" width="180"/>
<el-table-column v-if="activeTab === 'contract_type'" label="到期日期" align="center" prop="expireTime" width="180"/>

22
src/views/knowledge/views/archives/form/ArchivesForm.vue
View File

@ -50,17 +50,17 @@
</div>
<!-- 卡片内容 -->
<div>
<el-form-item label="档案类型" prop="archivesType">
<el-radio-group v-model="formData.archivesType">
<el-radio-button
v-for="dict in this.getDictDatas(DICT_TYPE.ARCHIVES_ITEM_TYPE)"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio-button>
</el-radio-group>
</el-form-item>
<!-- <el-form-item label="档案类型" prop="archivesType">-->
<!-- <el-radio-group v-model="formData.archivesType">-->
<!-- <el-radio-button-->
<!-- v-for="dict in this.getDictDatas(DICT_TYPE.ARCHIVES_ITEM_TYPE)"-->
<!-- :key="dict.value"-->
<!-- :label="dict.value"-->
<!-- >-->
<!-- {{ dict.label }}-->
<!-- </el-radio-button>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<el-form-item label="文件上传" prop="archivesUrls">
<FileUpload ref="fileUpload" v-model="formData.archivesUrls" :limit="50" />
</el-form-item>

14
src/views/rescue/index.vue
View File

@ -198,13 +198,13 @@
@click="designateDriver(scope.row)"
>指派司机</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleMap(scope.row)"
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleMap(scope.row)"-->
>路线</el-button>
<!-- >路线</el-button>-->
<el-button
size="mini"
type="text"
@ -547,7 +547,7 @@ export default {
},
getDriverList() {
getDriver().then(response => {
this.driverList = response.rows;
this.driverList = response.data;
});
},
// 取消按钮