前端后台管理修改-1220-zzy
This commit is contained in:
parent
5754232130
commit
57981b50af
|
|
@ -1,8 +1,8 @@
|
||||||
# 页面标题
|
# 页面标题
|
||||||
VUE_APP_TITLE = 若依管理系统
|
VUE_APP_TITLE = 施工装备管理系统
|
||||||
|
|
||||||
# 生产环境配置
|
# 生产环境配置
|
||||||
ENV = 'production'
|
ENV = 'production'
|
||||||
|
|
||||||
# 若依管理系统/生产环境
|
# 若依管理系统/生产环境
|
||||||
VUE_APP_BASE_API = '/prod-api'
|
VUE_APP_BASE_API = '/dev-api'
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,42 @@
|
||||||
|
import request from '@/utils/request'
|
||||||
|
//资源图片上传
|
||||||
|
export function imgUpLoad(param){
|
||||||
|
const formData = new FormData()
|
||||||
|
formData.append('file', param.file)
|
||||||
|
formData.append('fileType', param.type)
|
||||||
|
return request({
|
||||||
|
url: '/system/sys/file/upload',
|
||||||
|
method: 'post',
|
||||||
|
data: formData,
|
||||||
|
header:'multipart/form-data'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
//资源文件上传
|
||||||
|
export function fileUpLoad(param){
|
||||||
|
const formData = new FormData()
|
||||||
|
formData.append('file', param.file)
|
||||||
|
return request({
|
||||||
|
url: '/system/sys/file/upload',
|
||||||
|
method: 'post',
|
||||||
|
data: formData,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -331,8 +331,7 @@ export default {
|
||||||
},
|
},
|
||||||
// 多选框选中数据
|
// 多选框选中数据
|
||||||
handleSelectionChange(selection) {
|
handleSelectionChange(selection) {
|
||||||
this.ids = selection.map(item => item.typeId);
|
this.ids = selection.map(item => item);
|
||||||
|
|
||||||
console.log(this.ids)
|
console.log(this.ids)
|
||||||
},
|
},
|
||||||
/** 保存按钮操作 */
|
/** 保存按钮操作 */
|
||||||
|
|
@ -342,7 +341,8 @@ export default {
|
||||||
if(this.chosenPropId && this.ids.length>0){
|
if(this.chosenPropId && this.ids.length>0){
|
||||||
let param = {
|
let param = {
|
||||||
propId:this.chosenPropId,
|
propId:this.chosenPropId,
|
||||||
typeId:this.ids[0]
|
typeId:this.ids[0].typeId,
|
||||||
|
propName:this.ids[0].propName,
|
||||||
}
|
}
|
||||||
savePropInfo(param).then(response => {
|
savePropInfo(param).then(response => {
|
||||||
if(response.code == 200){
|
if(response.code == 200){
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,6 @@
|
||||||
plain
|
plain
|
||||||
icon="el-icon-edit"
|
icon="el-icon-edit"
|
||||||
size="mini"
|
size="mini"
|
||||||
:disabled="single"
|
|
||||||
@click="handlePeople"
|
@click="handlePeople"
|
||||||
>人员配置</el-button>
|
>人员配置</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
|
||||||
|
|
@ -162,20 +162,20 @@
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="开始日期" prop="planStartTime">
|
<el-form-item label="开始日期" prop="planStartTime">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
|
style="width:100%;"
|
||||||
v-model="form.planStartTime"
|
v-model="form.planStartTime"
|
||||||
style="width: 240px"
|
|
||||||
value-format="yyyy-MM-dd"
|
value-format="yyyy-MM-dd"
|
||||||
type="date"
|
type="date"
|
||||||
placeholder="开始日期"
|
placeholder="开始日期"
|
||||||
></el-date-picker>
|
></el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="租赁期限" prop="leaseDay">
|
<el-form-item label="租赁期限(天)" prop="leaseDay">
|
||||||
<el-input-number v-model="form.leaseDay" style="width:100%;" placeholder="请输入租赁期限" controls-position="right" :min="0" />
|
<el-input-number v-model="form.leaseDay" style="width:100%;" placeholder="请输入租赁期限(天)" controls-position="right" :min="0" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="签订日期" prop="signTime">
|
<el-form-item label="签订日期" prop="signTime">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="form.signTime"
|
v-model="form.signTime"
|
||||||
style="width: 240px"
|
style="width:100%;"
|
||||||
value-format="yyyy-MM-dd"
|
value-format="yyyy-MM-dd"
|
||||||
type="date"
|
type="date"
|
||||||
placeholder="开始日期"
|
placeholder="开始日期"
|
||||||
|
|
@ -399,7 +399,7 @@ export default {
|
||||||
handleDelete(row) {
|
handleDelete(row) {
|
||||||
// const agreementId = row.agreementId;
|
// const agreementId = row.agreementId;
|
||||||
let param = {
|
let param = {
|
||||||
agreementId:row.agreementId
|
agreementId:row.agreementId+''
|
||||||
}
|
}
|
||||||
this.$modal.confirm('是否确认删除该数据项?').then(function() {
|
this.$modal.confirm('是否确认删除该数据项?').then(function() {
|
||||||
return removeAgreement(param);
|
return removeAgreement(param);
|
||||||
|
|
|
||||||
|
|
@ -205,6 +205,7 @@ export default {
|
||||||
components: { Treeselect },
|
components: { Treeselect },
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
taskId:'',
|
||||||
// 遮罩层
|
// 遮罩层
|
||||||
loading: false,
|
loading: false,
|
||||||
// 选中数组
|
// 选中数组
|
||||||
|
|
@ -297,6 +298,8 @@ export default {
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
|
const taskId = this.$route.query && this.$route.query.taskId;
|
||||||
|
this.taskId = taskId;
|
||||||
this.getUserList()
|
this.getUserList()
|
||||||
// this.getList();
|
// this.getList();
|
||||||
this.equipmentType();
|
this.equipmentType();
|
||||||
|
|
|
||||||
|
|
@ -28,16 +28,15 @@
|
||||||
v-hasPermi="['store:labelType:add']"
|
v-hasPermi="['store:labelType:add']"
|
||||||
>新增</el-button>
|
>新增</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="1.5">
|
<!-- <el-col :span="1.5">
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
plain
|
plain
|
||||||
icon="el-icon-plus"
|
icon="el-icon-plus"
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="handleAdd"
|
|
||||||
v-hasPermi="['store:labelType:add']"
|
|
||||||
>发布入库</el-button>
|
>发布入库</el-button>
|
||||||
</el-col>
|
</el-col> -->
|
||||||
<!-- <el-col :span="1.5">-->
|
<!-- <el-col :span="1.5">-->
|
||||||
<!-- <el-button-->
|
<!-- <el-button-->
|
||||||
<!-- type="success"-->
|
<!-- type="success"-->
|
||||||
|
|
@ -261,6 +260,11 @@ export default {
|
||||||
// this.reset();
|
// this.reset();
|
||||||
// this.open = true;
|
// this.open = true;
|
||||||
// this.title = "添加字典类型";
|
// this.title = "添加字典类型";
|
||||||
|
},
|
||||||
|
/** 修改按钮操作 */
|
||||||
|
handleUpdate(row) {
|
||||||
|
let query = { taskId:row.taskId }
|
||||||
|
this.$router.replace({ path: "/store/newBuy/newDevicesArrival", query });
|
||||||
},
|
},
|
||||||
// 多选框选中数据
|
// 多选框选中数据
|
||||||
handleSelectionChange(selection) {
|
handleSelectionChange(selection) {
|
||||||
|
|
@ -268,17 +272,17 @@ export default {
|
||||||
this.single = selection.length!=1
|
this.single = selection.length!=1
|
||||||
this.multiple = !selection.length
|
this.multiple = !selection.length
|
||||||
},
|
},
|
||||||
/** 修改按钮操作 */
|
// /** 修改按钮操作 */
|
||||||
handleUpdate(row) {
|
// handleUpdate(row) {
|
||||||
this.$router.replace("/store/newBuy/newDevicesArrival");
|
// this.$router.replace("/store/newBuy/newDevicesArrival");
|
||||||
// this.reset();
|
// // this.reset();
|
||||||
// const dictId = row.dictId || this.ids
|
// // const dictId = row.dictId || this.ids
|
||||||
// getType(dictId).then(response => {
|
// // getType(dictId).then(response => {
|
||||||
// this.form = response.data;
|
// // this.form = response.data;
|
||||||
// this.open = true;
|
// // this.open = true;
|
||||||
// this.title = "修改字典类型";
|
// // this.title = "修改字典类型";
|
||||||
// });
|
// // });
|
||||||
},
|
// },
|
||||||
/** 提交按钮 */
|
/** 提交按钮 */
|
||||||
submitForm: function() {
|
submitForm: function() {
|
||||||
this.$refs["form"].validate(valid => {
|
this.$refs["form"].validate(valid => {
|
||||||
|
|
|
||||||
|
|
@ -66,7 +66,7 @@
|
||||||
v-hasPermi="['system:dept:edit']"
|
v-hasPermi="['system:dept:edit']"
|
||||||
>编辑</el-button>
|
>编辑</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
v-if="scope.row.deptId != 0"
|
v-if="scope.row.parentId != 0"
|
||||||
size="mini"
|
size="mini"
|
||||||
type="text"
|
type="text"
|
||||||
icon="el-icon-delete"
|
icon="el-icon-delete"
|
||||||
|
|
@ -90,8 +90,8 @@
|
||||||
|
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item label="上级组织" prop="deptId">
|
<el-form-item label="上级组织" prop="parentId">
|
||||||
<treeselect v-model="form.deptId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
|
<treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
@ -148,7 +148,7 @@ export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
// 遮罩层
|
// 遮罩层
|
||||||
loading: true,
|
loading: false,
|
||||||
// 显示搜索条件
|
// 显示搜索条件
|
||||||
showSearch: true,
|
showSearch: true,
|
||||||
// 表格树数据
|
// 表格树数据
|
||||||
|
|
@ -172,7 +172,7 @@ export default {
|
||||||
form: {},
|
form: {},
|
||||||
// 表单校验
|
// 表单校验
|
||||||
rules: {
|
rules: {
|
||||||
deptId: [
|
parentId: [
|
||||||
{ required: true, message: "上级部门不能为空", trigger: "blur" }
|
{ required: true, message: "上级部门不能为空", trigger: "blur" }
|
||||||
],
|
],
|
||||||
houseName: [
|
houseName: [
|
||||||
|
|
@ -181,13 +181,14 @@ export default {
|
||||||
sort: [
|
sort: [
|
||||||
{ required: true, message: "显示排序不能为空", trigger: "blur" }
|
{ required: true, message: "显示排序不能为空", trigger: "blur" }
|
||||||
],
|
],
|
||||||
phone: [
|
// phone: [
|
||||||
{
|
// { required: true, message: "手机号码不能为空", trigger: "blur" },
|
||||||
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
|
// // {
|
||||||
message: "请输入正确的手机号码",
|
// // pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
|
||||||
trigger: "blur"
|
// // message: "请输入正确的手机号码",
|
||||||
}
|
// // trigger: "blur"
|
||||||
]
|
// // }
|
||||||
|
// ]
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
@ -200,7 +201,7 @@ export default {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
listHouse(this.queryParams).then(response => {
|
listHouse(this.queryParams).then(response => {
|
||||||
console.log(response)
|
console.log(response)
|
||||||
this.houseList = this.handleTree(response.rows, "houseId");
|
this.houseList = this.handleTree(response.data, "houseId");
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
@ -224,7 +225,7 @@ export default {
|
||||||
reset() {
|
reset() {
|
||||||
this.form = {
|
this.form = {
|
||||||
houseId: undefined,
|
houseId: undefined,
|
||||||
deptId: undefined,
|
parentId: undefined,
|
||||||
houseName: undefined,
|
houseName: undefined,
|
||||||
sort: undefined,
|
sort: undefined,
|
||||||
concat: undefined,
|
concat: undefined,
|
||||||
|
|
@ -247,12 +248,12 @@ export default {
|
||||||
handleAdd(row) {
|
handleAdd(row) {
|
||||||
this.reset();
|
this.reset();
|
||||||
if (row != undefined) {
|
if (row != undefined) {
|
||||||
this.form.deptId = row.houseId;
|
this.form.parentId = row.houseId;
|
||||||
}
|
}
|
||||||
this.open = true;
|
this.open = true;
|
||||||
this.title = "新建";
|
this.title = "新建";
|
||||||
listHouse().then(response => {
|
listHouse().then(response => {
|
||||||
this.deptOptions = this.handleTree(response.rows, "houseId");
|
this.deptOptions = this.handleTree(response.data, "houseId");
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
/** 展开/折叠操作 */
|
/** 展开/折叠操作 */
|
||||||
|
|
|
||||||
|
|
@ -274,6 +274,9 @@
|
||||||
<script>
|
<script>
|
||||||
import {addMachine, delMachine, getMachine, listMachine, updateMachine} from "@/api/store/tools";
|
import {addMachine, delMachine, getMachine, listMachine, updateMachine} from "@/api/store/tools";
|
||||||
import { getProLists } from "@/api/base/base";
|
import { getProLists } from "@/api/base/base";
|
||||||
|
import { imgUpLoad } from "@/api/system/upload";
|
||||||
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "Dict",
|
name: "Dict",
|
||||||
dicts: ['sys_normal_disable'],
|
dicts: ['sys_normal_disable'],
|
||||||
|
|
|
||||||
|
|
@ -26,10 +26,10 @@
|
||||||
@node-click="handleNodeClick"
|
@node-click="handleNodeClick"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div style="margin:30px;">
|
<!-- <div style="margin:30px;">
|
||||||
<el-button >取 消</el-button>
|
<el-button >取 消</el-button>
|
||||||
<el-button type="primary">确 定</el-button>
|
<el-button type="primary">确 定</el-button>
|
||||||
</div>
|
</div> -->
|
||||||
|
|
||||||
|
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
|
||||||
|
|
@ -26,10 +26,10 @@
|
||||||
@node-click="handleNodeClick"
|
@node-click="handleNodeClick"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div style="margin:30px;">
|
<!-- <div style="margin:30px;">
|
||||||
<el-button >取 消</el-button>
|
<el-button >取 消</el-button>
|
||||||
<el-button type="primary">确 定</el-button>
|
<el-button type="primary">确 定</el-button>
|
||||||
</div>
|
</div> -->
|
||||||
|
|
||||||
|
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
|
||||||
|
|
@ -82,7 +82,11 @@
|
||||||
<el-table-column label="主要联系人" align="center" prop="primaryContact" :show-overflow-tooltip="true" />
|
<el-table-column label="主要联系人" align="center" prop="primaryContact" :show-overflow-tooltip="true" />
|
||||||
<el-table-column label="联系电话" align="center" prop="phone" :show-overflow-tooltip="true" />
|
<el-table-column label="联系电话" align="center" prop="phone" :show-overflow-tooltip="true" />
|
||||||
<el-table-column label="主要经营范围" align="center" prop="businessScope" :show-overflow-tooltip="true" />
|
<el-table-column label="主要经营范围" align="center" prop="businessScope" :show-overflow-tooltip="true" />
|
||||||
<el-table-column label="营业执照" align="center" prop="businessLicense" :show-overflow-tooltip="true" />
|
<el-table-column label="营业执照" align="center" prop="businessLicense" :show-overflow-tooltip="true" >
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span @click="openImg(scope.row.businessLicense)" style="color: #02A7F0;"> 查看 </span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
|
||||||
<el-table-column label="状态" align="center" prop="status" width="180">
|
<el-table-column label="状态" align="center" prop="status" width="180">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
|
|
@ -142,6 +146,19 @@
|
||||||
<el-input v-model="form.businessScope" placeholder="请输入经营范围" />
|
<el-input v-model="form.businessScope" placeholder="请输入经营范围" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="营业执照" prop="businessLicense">
|
<el-form-item label="营业执照" prop="businessLicense">
|
||||||
|
<el-upload
|
||||||
|
:http-request="(obj) => imgUpLoad(obj,'fileUrl')"
|
||||||
|
action="#"
|
||||||
|
:file-list="fileList"
|
||||||
|
:show-file-list="false"
|
||||||
|
list-type="picture-card"
|
||||||
|
:on-success="handleAvatarSuccess"
|
||||||
|
:on-preview="handlePictureCardPreview"
|
||||||
|
:on-remove="handleRemove">
|
||||||
|
<!-- <img v-if="imageUrl" :src="'http://192.168.0.14:21624/system'+imageUrl" class="avatar"> -->
|
||||||
|
<img v-if="imageUrl" :src="'http://10.40.92.140:9201'+imageUrl" class="avatar">
|
||||||
|
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
|
||||||
|
</el-upload>
|
||||||
<!-- <el-input v-model="form.businessLicense" placeholder="请上传营业执照" /> -->
|
<!-- <el-input v-model="form.businessLicense" placeholder="请上传营业执照" /> -->
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
||||||
|
|
@ -151,12 +168,17 @@
|
||||||
<el-button @click="cancel">取 消</el-button>
|
<el-button @click="cancel">取 消</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
|
<el-dialog :visible.sync="dialogVisible">
|
||||||
|
<img width="100%" :src="dialogImageUrl" alt="">
|
||||||
|
</el-dialog>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { listSupplierInfo, getSupplierInfo, addSupplier, updateSupplier, delSupplier } from "@/api/store/tools";
|
import { listSupplierInfo, getSupplierInfo, addSupplier, updateSupplier, delSupplier } from "@/api/store/tools";
|
||||||
|
import { imgUpLoad,fileUpLoad } from "@/api/system/upload";
|
||||||
export default {
|
export default {
|
||||||
name: "Dict",
|
name: "Dict",
|
||||||
dicts: ['sys_normal_disable'],
|
dicts: ['sys_normal_disable'],
|
||||||
|
|
@ -190,6 +212,12 @@ export default {
|
||||||
},
|
},
|
||||||
// 表单参数
|
// 表单参数
|
||||||
form: {},
|
form: {},
|
||||||
|
dialogImageUrl: '',
|
||||||
|
dialogVisible: false,
|
||||||
|
imageUrl:'',
|
||||||
|
imageName:'',
|
||||||
|
fileList:[],
|
||||||
|
field101fileList:[],
|
||||||
// 表单校验
|
// 表单校验
|
||||||
rules: {
|
rules: {
|
||||||
dictName: [
|
dictName: [
|
||||||
|
|
@ -288,6 +316,48 @@ export default {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
// 图片上传
|
||||||
|
imgUpLoad(param,name,index) {
|
||||||
|
console.log(param,'image')
|
||||||
|
param.type = 'ma'
|
||||||
|
imgUpLoad(param).then(res => {
|
||||||
|
if(res.code == 200) {
|
||||||
|
this.form.businessLicense = res.data.fileUrl;
|
||||||
|
// this.form.photoName = res.data.fileName;
|
||||||
|
this.imageUrl = res.data.fileUrl;
|
||||||
|
// this.imageName = res.data.fileName;
|
||||||
|
}else{
|
||||||
|
// this.$msgError(res.msg)
|
||||||
|
this.$modal.msgError(res.msg);
|
||||||
|
}
|
||||||
|
}).catch((error) => {
|
||||||
|
// this.$msgError(error)
|
||||||
|
this.$modal.msgError(error);
|
||||||
|
})
|
||||||
|
},
|
||||||
|
handleAvatarSuccess(res,file) {
|
||||||
|
console.log("success")
|
||||||
|
|
||||||
|
// this.imageUrl = URL.createObjectURL(file.raw);
|
||||||
|
// console.log(this.imageUrl)
|
||||||
|
},
|
||||||
|
handleRemove(file, fileList) {
|
||||||
|
console.log(file, fileList);
|
||||||
|
console.log(this.form,'222222')
|
||||||
|
this.form.businessLicense = "";
|
||||||
|
},
|
||||||
|
//图片点击查看
|
||||||
|
handlePictureCardPreview(file) {
|
||||||
|
console.log(file)
|
||||||
|
this.dialogImageUrl = file.url;
|
||||||
|
this.dialogVisible = true;
|
||||||
|
},
|
||||||
|
//图片查看
|
||||||
|
openImg(url){
|
||||||
|
// this.dialogImageUrl = "http://192.168.0.14:21624/system" + url;//线上
|
||||||
|
this.dialogImageUrl = "http://10.40.92.140:9201" + url;//本地
|
||||||
|
this.dialogVisible = true;
|
||||||
|
},
|
||||||
/** 删除按钮操作 */
|
/** 删除按钮操作 */
|
||||||
handleDelete(row) {
|
handleDelete(row) {
|
||||||
const supplierIds = row.supplierId || this.ids;
|
const supplierIds = row.supplierId || this.ids;
|
||||||
|
|
|
||||||
|
|
@ -99,10 +99,23 @@
|
||||||
:show-overflow-tooltip="true"/>
|
:show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="管理模式" align="center" key="manageType" prop="manageType"
|
<el-table-column label="管理模式" align="center" key="manageType" prop="manageType"
|
||||||
:show-overflow-tooltip="true"/>
|
:show-overflow-tooltip="true"/>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<el-table-column label="图片" align="center" key="photoName" prop="photoName"
|
<el-table-column label="图片" align="center" key="photoName" prop="photoName"
|
||||||
:show-overflow-tooltip="true"/>
|
:show-overflow-tooltip="true">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span @click="openImg(scope.row.photoUrl)" style="color: #02A7F0;"> {{ scope.row.photoName }} </span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column label="文档资料" align="center" key="documentName" prop="documentName"
|
<el-table-column label="文档资料" align="center" key="documentName" prop="documentName"
|
||||||
:show-overflow-tooltip="true"/>
|
:show-overflow-tooltip="true">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<!-- <a :href="'http://192.168.0.14:21624/system'+scope.row.documentUrl" style="color: #02A7F0;" :download="scope.row.documentName">{{ scope.row.documentName }}</a> -->
|
||||||
|
<a :href="'http://10.40.92.140:9201'+scope.row.documentUrl" style="color: #02A7F0;" :download="scope.row.documentName">{{ scope.row.documentName }}</a>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column label="资产属性" align="center" key="propName" prop="propName"
|
<el-table-column label="资产属性" align="center" key="propName" prop="propName"
|
||||||
:show-overflow-tooltip="true"/>
|
:show-overflow-tooltip="true"/>
|
||||||
<el-table-column label="备注信息" align="center" key="remark" prop="remark"
|
<el-table-column label="备注信息" align="center" key="remark" prop="remark"
|
||||||
|
|
@ -243,21 +256,31 @@
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="文档资料" prop="field101">
|
<el-form-item label="文档资料" prop="field101">
|
||||||
<!-- <el-upload ref="field101" :file-list="field101fileList" action=""
|
<el-upload ref="field101"
|
||||||
:before-upload="field101BeforeUpload">
|
:file-list="field101fileList"
|
||||||
|
action="#" :limit='1'
|
||||||
|
:http-request="(obj) => fileUpLoad(obj,'fileUrl')"
|
||||||
|
:on-exceed="exceedFile"
|
||||||
|
|
||||||
|
>
|
||||||
<el-button size="small" type="primary" icon="el-icon-upload">点击上传</el-button>
|
<el-button size="small" type="primary" icon="el-icon-upload">点击上传</el-button>
|
||||||
</el-upload> -->
|
</el-upload>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="图片" prop="photoName">
|
<el-form-item label="图片" prop="photoName">
|
||||||
|
|
||||||
<el-upload
|
<el-upload
|
||||||
action="https://jsonplaceholder.typicode.com/posts/"
|
:http-request="(obj) => imgUpLoad(obj,'fileUrl')"
|
||||||
|
action="#"
|
||||||
|
:file-list="fileList"
|
||||||
|
:show-file-list="false"
|
||||||
list-type="picture-card"
|
list-type="picture-card"
|
||||||
|
:on-success="handleAvatarSuccess"
|
||||||
:on-preview="handlePictureCardPreview"
|
:on-preview="handlePictureCardPreview"
|
||||||
:on-remove="handleRemove">
|
:on-remove="handleRemove">
|
||||||
<i class="el-icon-plus"></i>
|
<!-- <img v-if="imageUrl" :src="'http://192.168.0.14:21624/system'+imageUrl" class="avatar"> -->
|
||||||
|
<img v-if="imageUrl" :src="'http://10.40.92.140:9201'+imageUrl" style="width: 100px;height: 100px;" class="avatar">
|
||||||
|
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
|
||||||
</el-upload>
|
</el-upload>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
@ -318,19 +341,18 @@
|
||||||
|
|
||||||
<!-- 配置弹窗 -->
|
<!-- 配置弹窗 -->
|
||||||
<el-dialog :title="title" :visible.sync="configOpen" width="650px" append-to-body>
|
<el-dialog :title="title" :visible.sync="configOpen" width="650px" append-to-body>
|
||||||
<el-form ref="form" :model="cform" :rules="crules" label-width="100px">
|
<el-form ref="cform" :model="cform" :rules="crules" label-width="100px">
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item label="调整前价格">
|
<el-form-item label="调整前价格">
|
||||||
<el-input v-model="cform.price" placeholder="调整前价格"></el-input>
|
<el-input v-model="leasePrice" placeholder="调整前价格" disabled></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item label="调整后价格">
|
<el-form-item label="调整后价格">
|
||||||
<!-- <el-input v-model="cform.afterPrice" type="textarea" placeholder="请输入内容"></el-input>-->
|
<el-input-number v-model="cform.leasePrice" style="width: 100%;" controls-position="right" :min="1" :max="1000"></el-input-number>
|
||||||
<el-input-number v-model="cform.afterPrice" style="width: 100%;" controls-position="right" :min="1" :max="1000"></el-input-number>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
@ -338,13 +360,11 @@
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item label="开始使用日期">
|
<el-form-item label="开始使用日期">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="cform.useDate"
|
v-model="cform.effTime"
|
||||||
style="width: 240px"
|
style="width: 240px"
|
||||||
value-format="yyyy-MM-dd"
|
value-format="yyyy-MM-dd HH:mm:ss"
|
||||||
type="daterange"
|
type="datetime"
|
||||||
range-separator="-"
|
placeholder="开始使用日期"
|
||||||
start-placeholder="开始日期"
|
|
||||||
end-placeholder="结束日期"
|
|
||||||
></el-date-picker>
|
></el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
@ -377,6 +397,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
||||||
import {getListByMaType, getMaTypeList,getMaType, addMaType, updateMaType, delMaType} from "@/api/store/tools";
|
import {getListByMaType, getMaTypeList,getMaType, addMaType, updateMaType, delMaType} from "@/api/store/tools";
|
||||||
import { getUserByRoleList } from "@/api/system/user";
|
import { getUserByRoleList } from "@/api/system/user";
|
||||||
import { getProLists } from "@/api/base/base";
|
import { getProLists } from "@/api/base/base";
|
||||||
|
import { imgUpLoad,fileUpLoad } from "@/api/system/upload";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "User",
|
name: "User",
|
||||||
|
|
@ -422,6 +443,13 @@ export default {
|
||||||
roleOptions: [],
|
roleOptions: [],
|
||||||
// 表单参数
|
// 表单参数
|
||||||
form: {},
|
form: {},
|
||||||
|
chosenTypeId:'',
|
||||||
|
leasePrice:'',
|
||||||
|
uploadHeader: process.env.VUE_APP_BASE_API,
|
||||||
|
imageUrl:'',
|
||||||
|
imageName:'',
|
||||||
|
fileList:[],
|
||||||
|
field101fileList:[],
|
||||||
defaultProps: {
|
defaultProps: {
|
||||||
children: "children",
|
children: "children",
|
||||||
label: "label"
|
label: "label"
|
||||||
|
|
@ -488,12 +516,12 @@ export default {
|
||||||
useDate: "",
|
useDate: "",
|
||||||
},
|
},
|
||||||
crules: {
|
crules: {
|
||||||
afterPrice: [
|
leasePrice: [
|
||||||
{required: true, message: "用户名称不能为空", trigger: "blur"},
|
{required: true, message: "调整后价格不能为空", trigger: "blur"},
|
||||||
// { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
|
// { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
|
||||||
],
|
],
|
||||||
useDate: [
|
effTime: [
|
||||||
{required: true, message: "用户昵称不能为空", trigger: "blur"}
|
{required: true, message: "开始日期不能为空", trigger: "blur"}
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
@ -535,14 +563,6 @@ export default {
|
||||||
this.propList = response.rows;
|
this.propList = response.rows;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
//图片上传
|
|
||||||
handleRemove(file, fileList) {
|
|
||||||
console.log(file, fileList);
|
|
||||||
},
|
|
||||||
handlePictureCardPreview(file) {
|
|
||||||
this.dialogImageUrl = file.url;
|
|
||||||
this.dialogVisible = true;
|
|
||||||
},
|
|
||||||
/** 查询列表 */
|
/** 查询列表 */
|
||||||
getList() {
|
getList() {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
|
|
@ -571,8 +591,13 @@ export default {
|
||||||
// 表单重置
|
// 表单重置
|
||||||
reset() {
|
reset() {
|
||||||
this.form = {
|
this.form = {
|
||||||
|
photoUrl:"",
|
||||||
|
photoName:"",
|
||||||
|
documentUrl:"",
|
||||||
|
documentName:""
|
||||||
};
|
};
|
||||||
|
this.fileList = []
|
||||||
|
this.field101fileList = []
|
||||||
this.resetForm("form");
|
this.resetForm("form");
|
||||||
},
|
},
|
||||||
/** 搜索按钮操作 */
|
/** 搜索按钮操作 */
|
||||||
|
|
@ -620,12 +645,15 @@ export default {
|
||||||
this.$modal.msgSuccess("修改成功");
|
this.$modal.msgSuccess("修改成功");
|
||||||
this.open = false;
|
this.open = false;
|
||||||
this.getList();
|
this.getList();
|
||||||
|
this.getTreeData();
|
||||||
|
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
addMaType(this.form).then(response => {
|
addMaType(this.form).then(response => {
|
||||||
this.$modal.msgSuccess("新增成功");
|
this.$modal.msgSuccess("新增成功");
|
||||||
this.open = false;
|
this.open = false;
|
||||||
this.getList();
|
this.getList();
|
||||||
|
this.getTreeData();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -644,15 +672,103 @@ export default {
|
||||||
},
|
},
|
||||||
//配置操作
|
//配置操作
|
||||||
handleConfig(row) {
|
handleConfig(row) {
|
||||||
|
this.resetForm("cform");
|
||||||
|
this.chosenTypeId = row.typeId;
|
||||||
|
this.leasePrice = row.leasePrice;
|
||||||
|
this.cform.leasePrice = row.leasePrice;
|
||||||
this.configOpen = true;
|
this.configOpen = true;
|
||||||
this.title = "租赁价格调整"
|
this.title = "租赁价格调整"
|
||||||
},
|
},
|
||||||
submitConfig(){
|
submitConfig(){
|
||||||
this.configOpen = false;
|
let param = {
|
||||||
|
typeId:this.chosenTypeId,
|
||||||
|
effTime:this.cform.effTime,
|
||||||
|
leasePrice:this.cform.leasePrice,
|
||||||
|
}
|
||||||
|
console.log(param)
|
||||||
|
this.$refs["cform"].validate(valid => {
|
||||||
|
if (valid) {
|
||||||
|
updateMaType(param).then(response => {
|
||||||
|
this.$modal.msgSuccess("调整成功");
|
||||||
|
this.configOpen = false;
|
||||||
|
this.getList();
|
||||||
|
this.getTreeData();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
// this.configOpen = false;
|
||||||
},
|
},
|
||||||
cancelConfig(){
|
cancelConfig(){
|
||||||
this.configOpen = false;
|
this.configOpen = false;
|
||||||
},
|
},
|
||||||
|
// 图片上传
|
||||||
|
imgUpLoad(param,name,index) {
|
||||||
|
console.log(param,'image')
|
||||||
|
param.type = 'ma'
|
||||||
|
imgUpLoad(param).then(res => {
|
||||||
|
if(res.code == 200) {
|
||||||
|
this.form.photoUrl = res.data.fileUrl;
|
||||||
|
this.form.photoName = res.data.fileName;
|
||||||
|
this.imageUrl = res.data.fileUrl;
|
||||||
|
this.imageName = res.data.fileName;
|
||||||
|
}else{
|
||||||
|
// this.$msgError(res.msg)
|
||||||
|
this.$modal.msgError(res.msg);
|
||||||
|
}
|
||||||
|
}).catch((error) => {
|
||||||
|
// this.$msgError(error)
|
||||||
|
this.$modal.msgError(error);
|
||||||
|
})
|
||||||
|
},
|
||||||
|
handleAvatarSuccess(res,file) {
|
||||||
|
console.log("success")
|
||||||
|
|
||||||
|
// this.imageUrl = URL.createObjectURL(file.raw);
|
||||||
|
// console.log(this.imageUrl)
|
||||||
|
},
|
||||||
|
handleRemove(file, fileList) {
|
||||||
|
console.log(file, fileList);
|
||||||
|
console.log(this.form,'222222')
|
||||||
|
this.form.photoUrl = "";
|
||||||
|
this.form.photoName = "";
|
||||||
|
},
|
||||||
|
//图片点击查看
|
||||||
|
handlePictureCardPreview(file) {
|
||||||
|
console.log(file)
|
||||||
|
this.dialogImageUrl = file.url;
|
||||||
|
this.dialogVisible = true;
|
||||||
|
},
|
||||||
|
//图片查看
|
||||||
|
openImg(url){
|
||||||
|
// this.dialogImageUrl = "http://192.168.0.14:21624/system" + url;//线上
|
||||||
|
this.dialogImageUrl = "http://10.40.92.140:9201" + url;//本地
|
||||||
|
this.dialogVisible = true;
|
||||||
|
},
|
||||||
|
//文件上传
|
||||||
|
fileUpLoad(param,name,index) {
|
||||||
|
// // console.log(param)
|
||||||
|
param.type = 'ma'
|
||||||
|
imgUpLoad(param).then(res => {
|
||||||
|
if(res.code == 200) {
|
||||||
|
this.form.documentUrl = res.data.fileUrl;
|
||||||
|
this.form.documentName = res.data.fileName;
|
||||||
|
this.field101fileList[0] = param.file
|
||||||
|
console.log(this.form)
|
||||||
|
}else{
|
||||||
|
// this.$msgError(res.msg)
|
||||||
|
this.$modal.msgError(res.msg);
|
||||||
|
}
|
||||||
|
}).catch((error) => {
|
||||||
|
// this.$msgError(error)
|
||||||
|
this.$modal.msgError(error);
|
||||||
|
})
|
||||||
|
},
|
||||||
|
exceedFile(files, fileList) {
|
||||||
|
this.$message.warning(
|
||||||
|
`只能选择 1 个文件导入,共选择了 ${files.length + fileList.length} 个文件`
|
||||||
|
);
|
||||||
|
},
|
||||||
|
|
||||||
/** 导出按钮操作 */
|
/** 导出按钮操作 */
|
||||||
handleExport() {
|
handleExport() {
|
||||||
this.download('system/user/export', {
|
this.download('system/user/export', {
|
||||||
|
|
|
||||||
|
|
@ -84,7 +84,7 @@
|
||||||
<el-table-column label="岗位编号" align="center" prop="postId" />
|
<el-table-column label="岗位编号" align="center" prop="postId" />
|
||||||
<el-table-column label="岗位编码" align="center" prop="postCode" />
|
<el-table-column label="岗位编码" align="center" prop="postCode" />
|
||||||
<el-table-column label="岗位名称" align="center" prop="postName" />
|
<el-table-column label="岗位名称" align="center" prop="postName" />
|
||||||
<el-table-column label="岗位排序" align="center" prop="postSort" />
|
<!-- <el-table-column label="岗位排序" align="center" prop="postSort" /> -->
|
||||||
<el-table-column label="状态" align="center" prop="status">
|
<el-table-column label="状态" align="center" prop="status">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
|
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
|
||||||
|
|
@ -132,9 +132,9 @@
|
||||||
<el-form-item label="岗位编码" prop="postCode">
|
<el-form-item label="岗位编码" prop="postCode">
|
||||||
<el-input v-model="form.postCode" placeholder="请输入编码名称" />
|
<el-input v-model="form.postCode" placeholder="请输入编码名称" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="岗位顺序" prop="postSort">
|
<!-- <el-form-item label="岗位顺序" prop="postSort">
|
||||||
<el-input-number v-model="form.postSort" controls-position="right" :min="0" />
|
<el-input-number v-model="form.postSort" controls-position="right" :min="0" />
|
||||||
</el-form-item>
|
</el-form-item> -->
|
||||||
<el-form-item label="岗位状态" prop="status">
|
<el-form-item label="岗位状态" prop="status">
|
||||||
<el-radio-group v-model="form.status">
|
<el-radio-group v-model="form.status">
|
||||||
<el-radio
|
<el-radio
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue