代码补正
This commit is contained in:
parent
7a0e5680b8
commit
664449f090
@ -41,6 +41,7 @@
|
|||||||
"url": "https://github.com/YunaiV/ruoyi-vue-pro"
|
"url": "https://github.com/YunaiV/ruoyi-vue-pro"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@amap/amap-jsapi-loader": "^1.0.1",
|
||||||
"@babel/parser": "^7.18.4",
|
"@babel/parser": "^7.18.4",
|
||||||
"@riophae/vue-treeselect": "0.4.0",
|
"@riophae/vue-treeselect": "0.4.0",
|
||||||
"axios": "0.27.2",
|
"axios": "0.27.2",
|
||||||
@ -70,6 +71,7 @@
|
|||||||
"vue-count-to": "1.0.13",
|
"vue-count-to": "1.0.13",
|
||||||
"vue-cropper": "0.5.8",
|
"vue-cropper": "0.5.8",
|
||||||
"vue-meta": "^2.4.0",
|
"vue-meta": "^2.4.0",
|
||||||
|
"vue-qriously": "^1.1.1",
|
||||||
"vue-quill-editor": "^3.0.6",
|
"vue-quill-editor": "^3.0.6",
|
||||||
"vue-router": "3.4.9",
|
"vue-router": "3.4.9",
|
||||||
"vue-video-player": "^5.0.2",
|
"vue-video-player": "^5.0.2",
|
||||||
|
@ -30,6 +30,8 @@ import ImagePreview from "@/components/ImagePreview/index.vue";
|
|||||||
// import hljs from 'highlight.js'
|
// import hljs from 'highlight.js'
|
||||||
// import 'highlight.js/styles/github-gist.css'
|
// import 'highlight.js/styles/github-gist.css'
|
||||||
import {DICT_TYPE, getDictDataLabel, getDictDatas, getDictDatas2} from "@/utils/dict";
|
import {DICT_TYPE, getDictDataLabel, getDictDatas, getDictDatas2} from "@/utils/dict";
|
||||||
|
// 二维码
|
||||||
|
import VueQriously from 'vue-qriously'
|
||||||
|
|
||||||
// 全局方法挂载
|
// 全局方法挂载
|
||||||
Vue.prototype.getDicts = getDicts
|
Vue.prototype.getDicts = getDicts
|
||||||
@ -61,6 +63,8 @@ import VueMeta from 'vue-meta'
|
|||||||
Vue.use(directive)
|
Vue.use(directive)
|
||||||
Vue.use(plugins)
|
Vue.use(plugins)
|
||||||
Vue.use(VueMeta)
|
Vue.use(VueMeta)
|
||||||
|
// 二维码
|
||||||
|
Vue.use(VueQriously)
|
||||||
// Vue.use(hljs.vuePlugin);
|
// Vue.use(hljs.vuePlugin);
|
||||||
|
|
||||||
// bpmnProcessDesigner 需要引入
|
// bpmnProcessDesigner 需要引入
|
||||||
|
@ -15,9 +15,9 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="推广人推广码" prop="uniqueCode">
|
<!-- <el-form-item label="推广人推广码" prop="uniqueCode">-->
|
||||||
<el-input v-model="queryParams.uniqueCode" placeholder="请输入推广人推广码" clearable @keyup.enter.native="handleQuery"/>
|
<!-- <el-input v-model="queryParams.uniqueCode" placeholder="请输入推广人推广码" clearable @keyup.enter.native="handleQuery"/>-->
|
||||||
</el-form-item>
|
<!-- </el-form-item>-->
|
||||||
<el-form-item label="被推广人姓名" prop="newUserName">
|
<el-form-item label="被推广人姓名" prop="newUserName">
|
||||||
<el-input v-model="queryParams.newUserName" placeholder="请输入被推广人姓名" clearable
|
<el-input v-model="queryParams.newUserName" placeholder="请输入被推广人姓名" clearable
|
||||||
@keyup.enter.native="handleQuery"
|
@keyup.enter.native="handleQuery"
|
||||||
@ -59,7 +59,11 @@
|
|||||||
<dict-tag :type="DICT_TYPE.SYSTEM_USER_TYPE" :value="scope.row.oldUser.userType"/>
|
<dict-tag :type="DICT_TYPE.SYSTEM_USER_TYPE" :value="scope.row.oldUser.userType"/>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</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">
|
<el-table-column label="推广渠道" align="center" prop="promotionChannel" width="180">
|
||||||
<template v-slot="scope">
|
<template v-slot="scope">
|
||||||
<dict-tag :type="DICT_TYPE.PROMOTION_CHANNEL" :value="scope.row.promotionChannel"/>
|
<dict-tag :type="DICT_TYPE.PROMOTION_CHANNEL" :value="scope.row.promotionChannel"/>
|
||||||
|
@ -53,11 +53,11 @@
|
|||||||
<el-form-item label="司龄" prop="joinedYear">
|
<el-form-item label="司龄" prop="joinedYear">
|
||||||
<el-input v-model="queryParams.joinedYear" placeholder="请输入司龄" clearable @keyup.enter.native="handleQuery"/>
|
<el-input v-model="queryParams.joinedYear" placeholder="请输入司龄" clearable @keyup.enter.native="handleQuery"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="唯一推广码" prop="uniqueCode">
|
<!-- <el-form-item label="唯一推广码" prop="uniqueCode">-->
|
||||||
<el-input v-model="queryParams.uniqueCode" placeholder="请输入唯一推广码" clearable
|
<!-- <el-input v-model="queryParams.uniqueCode" placeholder="请输入唯一推广码" clearable-->
|
||||||
@keyup.enter.native="handleQuery"
|
<!-- @keyup.enter.native="handleQuery"-->
|
||||||
/>
|
<!-- />-->
|
||||||
</el-form-item>
|
<!-- </el-form-item>-->
|
||||||
<el-form-item label="工作日期" prop="workDateArray">
|
<el-form-item label="工作日期" prop="workDateArray">
|
||||||
<el-date-picker v-model="queryParams.workDateArray" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
|
<el-date-picker v-model="queryParams.workDateArray" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
|
||||||
type="daterange"
|
type="daterange"
|
||||||
@ -105,6 +105,11 @@
|
|||||||
<span>{{ scope.$index + 1 }}</span>
|
<span>{{ scope.$index + 1 }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</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="workNo" width="180"/>
|
||||||
<el-table-column label="姓名" align="center" prop="name" 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"/>
|
<el-table-column label="角色" :show-overflow-tooltip="true" align="center" prop="roleNames" width="180"/>
|
||||||
@ -125,7 +130,6 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column :show-overflow-tooltip="true" label="个人简介" align="center" prop="content" width="180"/>
|
<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">
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180">
|
||||||
<template v-slot="scope">
|
<template v-slot="scope">
|
||||||
<el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
|
<el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
|
||||||
|
@ -87,11 +87,11 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column :show-overflow-tooltip="true" label="档案名称" align="center" prop="archivesName" width="180"/>
|
<el-table-column :show-overflow-tooltip="true" label="档案名称" align="center" prop="archivesName" width="180"/>
|
||||||
<el-table-column label="档案类别" align="center" prop="sex" width="80">
|
<!-- <el-table-column label="档案类别" align="center" prop="sex" width="80">-->
|
||||||
<template v-slot="scope">
|
<!-- <template v-slot="scope">-->
|
||||||
<dict-tag :type="DICT_TYPE.ARCHIVES_ITEM_TYPE" :value="scope.row.archivesType"/>
|
<!-- <dict-tag :type="DICT_TYPE.ARCHIVES_ITEM_TYPE" :value="scope.row.archivesType"/>-->
|
||||||
</template>
|
<!-- </template>-->
|
||||||
</el-table-column>
|
<!-- </el-table-column>-->
|
||||||
<el-table-column :show-overflow-tooltip="true" label="档案存放位置" align="center" prop="archivesPhysicsUrl" width="180"/>
|
<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="signTime" width="180"/>
|
||||||
<el-table-column v-if="activeTab === 'contract_type'" label="到期日期" align="center" prop="expireTime" width="180"/>
|
<el-table-column v-if="activeTab === 'contract_type'" label="到期日期" align="center" prop="expireTime" width="180"/>
|
||||||
|
@ -50,17 +50,17 @@
|
|||||||
</div>
|
</div>
|
||||||
<!-- 卡片内容 -->
|
<!-- 卡片内容 -->
|
||||||
<div>
|
<div>
|
||||||
<el-form-item label="档案类型" prop="archivesType">
|
<!-- <el-form-item label="档案类型" prop="archivesType">-->
|
||||||
<el-radio-group v-model="formData.archivesType">
|
<!-- <el-radio-group v-model="formData.archivesType">-->
|
||||||
<el-radio-button
|
<!-- <el-radio-button-->
|
||||||
v-for="dict in this.getDictDatas(DICT_TYPE.ARCHIVES_ITEM_TYPE)"
|
<!-- v-for="dict in this.getDictDatas(DICT_TYPE.ARCHIVES_ITEM_TYPE)"-->
|
||||||
:key="dict.value"
|
<!-- :key="dict.value"-->
|
||||||
:label="dict.value"
|
<!-- :label="dict.value"-->
|
||||||
>
|
<!-- >-->
|
||||||
{{ dict.label }}
|
<!-- {{ dict.label }}-->
|
||||||
</el-radio-button>
|
<!-- </el-radio-button>-->
|
||||||
</el-radio-group>
|
<!-- </el-radio-group>-->
|
||||||
</el-form-item>
|
<!-- </el-form-item>-->
|
||||||
<el-form-item label="文件上传" prop="archivesUrls">
|
<el-form-item label="文件上传" prop="archivesUrls">
|
||||||
<FileUpload ref="fileUpload" v-model="formData.archivesUrls" :limit="50" />
|
<FileUpload ref="fileUpload" v-model="formData.archivesUrls" :limit="50" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
@ -198,13 +198,13 @@
|
|||||||
@click="designateDriver(scope.row)"
|
@click="designateDriver(scope.row)"
|
||||||
|
|
||||||
>指派司机</el-button>
|
>指派司机</el-button>
|
||||||
<el-button
|
<!-- <el-button-->
|
||||||
size="mini"
|
<!-- size="mini"-->
|
||||||
type="text"
|
<!-- type="text"-->
|
||||||
icon="el-icon-edit"
|
<!-- icon="el-icon-edit"-->
|
||||||
@click="handleMap(scope.row)"
|
<!-- @click="handleMap(scope.row)"-->
|
||||||
|
|
||||||
>路线</el-button>
|
<!-- >路线</el-button>-->
|
||||||
<el-button
|
<el-button
|
||||||
size="mini"
|
size="mini"
|
||||||
type="text"
|
type="text"
|
||||||
@ -547,7 +547,7 @@ export default {
|
|||||||
},
|
},
|
||||||
getDriverList() {
|
getDriverList() {
|
||||||
getDriver().then(response => {
|
getDriver().then(response => {
|
||||||
this.driverList = response.rows;
|
this.driverList = response.data;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
// 取消按钮
|
// 取消按钮
|
||||||
|
Loading…
Reference in New Issue
Block a user