This commit is contained in:
13218645326 2023-12-09 21:38:25 +08:00
parent 2dac5e60a1
commit 10743074ff
36 changed files with 160 additions and 132 deletions

2
env/.env.dev vendored
View File

@ -5,5 +5,5 @@ VITE_BUILD_MODE = 'dev'
# 开发环境接口地址
VITE_API_URL = '/proxyApi'
VITE_proxyTarget = 'http://10.40.92.16:9206'
VITE_proxyTarget = 'http://10.40.92.16:9502'
# 9502 9206

View File

@ -1,7 +1,7 @@
<template>
<div style="border: 1px solid #ccc">
<Toolbar style="border-bottom: 1px solid #ccc" :editor="editorRef" :defaultConfig="toolbarConfig" :mode="mode" />
<Editor style="height: 500px; overflow-y: hidden;" v-model="valueHtml" :defaultConfig="editorConfig" :mode="mode"
<Editor style="height: 500px; overflow-y: hidden;" v-model.trim="valueHtml" :defaultConfig="editorConfig" :mode="mode"
@onCreated="handleCreated" />
</div>
</template>

View File

@ -39,11 +39,11 @@
<el-form>
<el-form-item>
<el-input v-model="loginForm.username" placeholder="账号" clearable />
<el-input v-model.trim="loginForm.username" placeholder="账号" clearable />
</el-form-item>
<el-form-item>
<el-input
v-model="loginForm.password"
v-model.trim="loginForm.password"
placeholder="密码"
clearable
type="password"

View File

@ -24,7 +24,7 @@
<el-select
placeholder="请选择企业类型"
clearable
v-model="applyParams.companyType"
v-model.trim="applyParams.companyType"
@change="changeProvince">
<el-option
v-for="item in selcompanyTypeList"
@ -41,7 +41,7 @@
<el-select
placeholder="请选择企业所属"
clearable
v-model="applyParams.companyLtd"
v-model.trim="applyParams.companyLtd"
@change="changeProvince">
<el-option
v-for="item in selcompanyLtdList"
@ -67,7 +67,7 @@
<el-select
placeholder="请选择省份"
clearable
v-model="applyParams.registerAddress"
v-model.trim="applyParams.registerAddress"
@change="changeProvince">
<el-option
v-for="item in selProvinceList"
@ -78,7 +78,7 @@
</el-col>
<el-col :span="5">
<el-select
v-model="applyParams.registerAddressProvince"
v-model.trim="applyParams.registerAddressProvince"
placeholder="请选择市"
@change="changeMarket"
clearable>
@ -91,7 +91,7 @@
</el-col>
<el-col :span="5">
<el-select
v-model="applyParams.registerAddressArea"
v-model.trim="applyParams.registerAddressArea"
placeholder="请选择区"
clearable
@change="changeArea">
@ -104,7 +104,7 @@
</el-col>
<el-col :span="6">
<el-input
v-model="applyParams.registerRealityAddress"
v-model.trim="applyParams.registerRealityAddress"
placeholder="请输入实际办公地址"
clearable></el-input>
</el-col>
@ -117,7 +117,7 @@
<el-select
placeholder="请选择省份"
clearable
v-model="applyParams.operateAddress"
v-model.trim="applyParams.operateAddress"
@change="opeChangeProvince">
<el-option
v-for="item in selProvinceList"
@ -128,7 +128,7 @@
</el-col>
<el-col :span="5">
<el-select
v-model="applyParams.operateAddressProvince"
v-model.trim="applyParams.operateAddressProvince"
placeholder="请选择市"
@change="opeChangeMarket"
clearable>
@ -141,7 +141,7 @@
</el-col>
<el-col :span="5">
<el-select
v-model="applyParams.operateAddressArea"
v-model.trim="applyParams.operateAddressArea"
placeholder="请选择区"
@change="opeChangeArea"
clearable>
@ -154,7 +154,7 @@
</el-col>
<el-col :span="6">
<el-input
v-model="applyParams.operateRealityAddress"
v-model.trim="applyParams.operateRealityAddress"
clearable
placeholder="请输入实际办公地址"></el-input>
</el-col>
@ -165,7 +165,7 @@
<el-col :span="5">
<el-form-item label="法人证件类型">
<el-select
v-model="applyParams.certificatetype"
v-model.trim="applyParams.certificatetype"
clearable
placeholder="请选法人证件类型">
<el-option
@ -415,7 +415,7 @@
<el-table border :data="bankTableList">
<el-table-column align="center" label="开户行">
<template #default="{ row }">
<el-input v-model="row.v_kaihu"></el-input>
<el-input v-model.trim="row.v_kaihu"></el-input>
</template>
</el-table-column>
<el-table-column align="center" label="账号名称">
@ -460,7 +460,7 @@
</el-form-item>
</el-row>
<el-dialog v-model="picItemVisible" title="图片示例" width="40%">
<el-dialog v-model.trim="picItemVisible" title="图片示例" width="40%">
<el-image :src="previewPicUrl" fit="cover" style="display: block; margin: 0 auto" />
</el-dialog>
</div>

View File

@ -1,11 +1,11 @@
<template>
<el-dialog v-model="addShow" :title="title" width="1200px" draggable :close-on-click-modal="false" >
<el-dialog v-model.trim="addShow" :title="title" width="1200px" draggable :close-on-click-modal="false" >
<el-form :model="form" ref="ruleFormRef" label-width="102px" :rules="formRules" style="padding: 0 80px 0px 0;">
<el-form-item label="模版编号:" prop="title">
<el-input v-model.trim="form.title" placeholder="请输入模版编号" clearable maxlength="30" />
</el-form-item>
<el-form-item label="应用模块" prop="applyModel">
<el-select v-model="form.applyModel" placeholder="Select" clearable filterable style="width: 100%;">
<el-select v-model.trim="form.applyModel" placeholder="Select" clearable filterable style="width: 100%;">
<el-option v-for="item in applyModelList.list" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>

View File

@ -3,7 +3,7 @@
<el-form :inline="true" :model="filterForm" class="demo-form-inline">
<el-form-item label="是否启用">
<el-select v-model="filterForm.isEnable" placeholder="请选择是否启用" clearable filterable >
<el-select v-model.trim="filterForm.isEnable" placeholder="请选择是否启用" clearable filterable >
<el-option v-for="item in isEnableList.list" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>

View File

@ -11,7 +11,7 @@
<el-table-column prop="v_attachment" label="附件" min-width="120" />
<el-table-column prop="v_isEnable" label="是否启用" min-width="220">
<template #default="scope">
<el-switch v-model="scope.row.v_isEnable" :before-change="beforeChange" />
<el-switch v-model.trim="scope.row.v_isEnable" :before-change="beforeChange" />
</template>
</el-table-column>
<el-table-column label="操作" width="210" align="center">

View File

@ -1,11 +1,11 @@
<template>
<el-dialog v-model="addShow" :title="title" width="1200px" draggable :close-on-click-modal="false" >
<el-dialog v-model.trim="addShow" :title="title" width="1200px" draggable :close-on-click-modal="false" >
<el-form :model="form" ref="ruleFormRef" label-width="88px" :rules="formRules" style="padding: 0 80px 0px 0;">
<el-form-item label="标题:" prop="title">
<el-input v-model.trim="form.title" placeholder="请输入标题" clearable maxlength="30" />
</el-form-item>
<el-form-item label="分类" prop="category">
<el-select v-model="form.category" placeholder="Select" clearable filterable>
<el-select v-model.trim="form.category" placeholder="Select" clearable filterable>
<el-option v-for="item in categoryList.list" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>

View File

@ -3,15 +3,15 @@
<el-form :inline="true" :model="filterForm" class="demo-form-inline">
<el-form-item label="分类">
<el-select v-model="filterForm.category" placeholder="Select" clearable filterable >
<el-select v-model.trim="filterForm.category" placeholder="Select" clearable filterable >
<el-option v-for="item in categoryList.list" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="关键字">
<el-input v-model="filterForm.keyword" placeholder="请输入关键字" clearable />
<el-input v-model.trim="filterForm.keyword" placeholder="请输入关键字" clearable />
</el-form-item>
<el-form-item label="时间范围">
<el-date-picker v-model="filterForm.dataRange" type="daterange" range-separator="To"
<el-date-picker v-model.trim="filterForm.dataRange" type="daterange" range-separator="To"
start-placeholder="Start date" end-placeholder="End date" />
</el-form-item>
<el-form-item>

View File

@ -1,5 +1,5 @@
<template>
<el-dialog v-model="addShow" :title="title" width="30%" draggable :close-on-click-modal="false" >
<el-dialog v-model.trim="addShow" :title="title" width="30%" draggable :close-on-click-modal="false" >
<el-form :model="form" ref="ruleFormRef" label-width="88px" :rules="formRules" style="padding: 0 80px 0px 0;" >
<el-form-item label="标题:" prop="title">
<el-input v-model.trim="form.title" placeholder="请输入标题" clearable maxlength="30" />

View File

@ -3,10 +3,10 @@
<el-form :inline="true" :model="filterForm" class="demo-form-inline">
<el-form-item label="关键字">
<el-input v-model="filterForm.keyword" placeholder="请输入关键字" clearable />
<el-input v-model.trim="filterForm.keyword" placeholder="请输入关键字" clearable />
</el-form-item>
<el-form-item label="时间范围">
<el-date-picker v-model="filterForm.dataRange" type="daterange" range-separator="To" start-placeholder="Start date"
<el-date-picker v-model.trim="filterForm.dataRange" type="daterange" range-separator="To" start-placeholder="Start date"
end-placeholder="End date" />
</el-form-item>
<el-form-item>

View File

@ -1,5 +1,5 @@
<template>
<el-dialog v-model="addShow" :title="title" width="1200px" draggable :close-on-click-modal="false">
<el-dialog v-model.trim="addShow" :title="title" width="1200px" draggable :close-on-click-modal="false">
<el-form :model="form" ref="ruleFormRef" :inline="true" label-width="106px" :rules="formRules"
style="padding: 0 0px 0px 0;">
<el-form-item label="企业名称:" prop="enterprise">

View File

@ -3,20 +3,20 @@
<el-form :inline="true" :model="filterForm" class="demo-form-inline">
<!-- <el-form-item label="关键字">
<el-input v-model="filterForm.keyword" placeholder="请输入关键字" clearable />
<el-input v-model.trim="filterForm.keyword" placeholder="请输入关键字" clearable />
</el-form-item> -->
<el-form-item label="编码">
<el-input v-model="filterForm.code" placeholder="请输入编码" clearable />
<el-input v-model.trim="filterForm.code" placeholder="请输入编码" clearable />
</el-form-item>
<el-form-item label="装备名称">
<el-input v-model="filterForm.name" placeholder="请输入装备名称" clearable />
<el-input v-model.trim="filterForm.name" placeholder="请输入装备名称" clearable />
</el-form-item>
<el-form-item label="企业名称">
<el-input v-model="filterForm.companyName" placeholder="请输入企业名称" clearable />
<el-input v-model.trim="filterForm.companyName" placeholder="请输入企业名称" clearable />
</el-form-item>
<el-form-item label="装备类型">
<el-cascader :options="treeList" filterable v-model="filterForm.typeId" clearable :props="{
<el-cascader :options="treeList" filterable v-model.trim="filterForm.typeId" clearable :props="{
label: 'name',
value: 'id'
@ -53,7 +53,7 @@ const filterForm = reactive({
code: "",
name: '',
companyName: "",
typeId: ''
typeId: []
})
const treeList = ref([])
@ -66,7 +66,7 @@ const resetFn = () => {
filterForm.code = ""
filterForm.name = ''
filterForm.companyName = ""
filterForm.typeId = ''
filterForm.typeId = []
emits('reset', filterForm)
}

View File

@ -1,14 +1,14 @@
<template>
<headerTop @search="searchFn" @reset="resetFn" @export="exportFn" @deleteBatch="deleteBatchFn" @auditBatch="auditBatchFn" :selectItemList="selectItemList"></headerTop>
<headerTop @search="searchFn" @reset="resetFn" @export="exportFn" @deleteBatch="deleteBatchFn"
@auditBatch="auditBatchFn" :selectItemList="selectItemList"></headerTop>
<addCom ref="addComRef" @send="initTableList"></addCom>
<el-card shadow="always" class="content_body_row">
<el-table :data="tableListInfo.list" border style="width: 100%" show-overflow-tooltip
:max-height="'calc(100vh - 72px - 48px - 65px - 12px - 60px - 88px)'"
:height="'calc(100vh - 72px - 48px - 65px - 12px - 60px - 88px)'"
:row-key="getRowKeys" @selection-change="handleSelectionChange"
:header-cell-style="{ background: '#F2F3F5' }">
:height="'calc(100vh - 72px - 48px - 65px - 12px - 60px - 88px)'" :row-key="getRowKeys"
@selection-change="handleSelectionChange" :header-cell-style="{ background: '#F2F3F5' }">
<el-table-column type="selection" width="55" :reserve-selection="true" />
<el-table-column type="index" width="72" label="序号" />
<el-table-column type="index" width="72" label="序号" />
<el-table-column prop="companyName" label="企业名称" min-width="150" />
<el-table-column prop="code" label="编码" min-width="160">
</el-table-column>
@ -16,35 +16,35 @@
</el-table-column>
<el-table-column prop="parentDevType" label="装备类型" min-width="160">
</el-table-column>
<el-table-column prop="devName" label="装备名称" min-width="160">
</el-table-column>
<el-table-column prop="v_money" label="租金" min-width="160">
<template #default="scope">
<div>
{{scope.row.monthLeasePrice }}
{{ scope.row.monthLeasePrice }}
</div>
</template>
</el-table-column>
<el-table-column label="状态" min-width="160">
<el-table-column label="状态" min-width="160">
<template #default="scope">
<div class="todo_status_c" v-if="scope.row.maStatus=='15'">
<div class="todo_status_c" v-if="scope.row.maStatus == '15'">
待上架
</div>
<div class="pass_status_c" v-else-if="scope.row.maStatus=='16'">
待租
<div class="pass_status_c" v-else-if="scope.row.maStatus == '16'">
待租
</div>
<div class="pass_status_c" v-else-if="scope.row.maStatus=='17'">
<div class="pass_status_c" v-else-if="scope.row.maStatus == '17'">
在租
</div>
<div class="reject_status_c" v-else-if="scope.row.maStatus=='18'">
下架
<div class="reject_status_c" v-else-if="scope.row.maStatus == '18'">
下架
</div>
<div class="pass_status_c" v-else-if="scope.row.maStatus=='331'">
<div class="pass_status_c" v-else-if="scope.row.maStatus == '331'">
待审批
</div>
<div class="pass_status_c" v-else-if="scope.row.maStatus=='332'">
<div class="pass_status_c" v-else-if="scope.row.maStatus == '332'">
上架驳回
</div>
</template>
@ -75,7 +75,8 @@
import headerTop from "./com/headerTop.vue"
import addCom from "./com/addCom.vue"
import { ElConfirmBeforeOpert } from "utils/elementCom"
import { apiOffList, apiUpOffList } from "http/api/equip"
import { apiOffList, apiOff } from "http/api/equip"
import {ElMessage} from "element-plus"
const addComRef = ref()
const paginationInfo = reactive({
pageNum: 1,
@ -85,8 +86,10 @@ let total = ref(0)
let tableListInfo = reactive({
list: []
})
let searchParams: any = {}
const selectItemList =ref([])
let searchParams: any = {
typeId: []
}
const selectItemList = ref([])
const editRowFn = (row: any) => {
@ -113,25 +116,26 @@ const deleteRowFn = (row: any) => {
}
const searchFn = (params:any) => {
const searchFn = (params: any) => {
searchParams = params
initTableList()
}
const resetFn = (val:any) => {
const resetFn = (params: any) => {
searchParams = params
initTableList()
}
const exportFn = (val:any) => {
const exportFn = (val: any) => {
}
const auditFn = (row: any) => {
addComRef.value.edit(row)
}
const showFn = (row: any) => {
addComRef.value.open(row)
addComRef.value.open(row)
}
@ -144,7 +148,8 @@ const getPageFn = (val: any) => {
const initTableList = async () => {
const params = {
...searchParams,
...paginationInfo
...paginationInfo,
typeId: searchParams.typeId.pop()
}
const res: any = await apiOffList(params)
console.log("apiGetCompanyInfoSelectList", res)
@ -153,24 +158,24 @@ const initTableList = async () => {
total.value = res.total
}
const getRowKeys =(row:any)=>{
const getRowKeys = (row: any) => {
return row.maId
}
const handleSelectionChange =(val:any)=>{
console.log("valhandleSelectionChange",val)
selectItemList.value=val
const handleSelectionChange = (val: any) => {
console.log("valhandleSelectionChange", val)
selectItemList.value = val
}
const deleteBatchFn =()=>{
const selectList = selectItemList.value
const deleteBatchFn = () => {
const selectList = selectItemList.value
console.log("selectList",)
}
const auditBatchFn =()=>{
const selectList = selectItemList.value
const auditBatchFn = () => {
const selectList = selectItemList.value
ElConfirmBeforeOpert(
'操作确认',
'是否确定下架',
'是否确定审批',
batchFn,
'确定',
'取消',
@ -178,8 +183,25 @@ const auditBatchFn =()=>{
)
}
const batchFn=(ev:any)=>{
const batchFn = async (ev: any) => {
console.log("batchFn", ev)
const params = ev.map((ele: any) => {
return {
maId: ele.maId,
id: ele.creator,
applyCompany: ele.companyName,
type: "1",
status: '1'
}
})
const res = await apiOff(params)
console.log("apiOff", res)
ElMessage({
type: 'success',
message: "审批成功"
})
initTableList()
}

View File

@ -1,5 +1,5 @@
<template>
<el-dialog v-model="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
<el-dialog v-model.trim="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
<el-form :model="form" ref="ruleFormRef" label-width="120px" :rules="formRules" style="padding: 0 80px 0px 0;" :readonly="readOnlyFlag">
<el-form-item label="iot设备名称" prop="deviceName">
<el-input v-model.trim="form.deviceName" placeholder="请输入iot设备名称" clearable maxlength="30" />

View File

@ -3,11 +3,11 @@
<el-form :inline="true" :model="filterForm" class="demo-form-inline">
<el-form-item label="关键字">
<el-input v-model="filterForm.keyword" placeholder="请输入设备名称" clearable />
<el-input v-model.trim="filterForm.keyword" placeholder="请输入设备名称" clearable />
</el-form-item>
<el-form-item label="编码">
<el-input v-model="filterForm.code" placeholder="请输入规格型号" clearable />
<el-input v-model.trim="filterForm.code" placeholder="请输入规格型号" clearable />
</el-form-item>
<el-form-item >

View File

@ -1,11 +1,11 @@
<template>
<el-dialog v-model="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
<el-dialog v-model.trim="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
<el-form :model="form" ref="ruleFormRef" label-width="102px" :rules="formRules" style="padding: 0 80px 0px 0;">
<el-form-item label="企业类型:" prop="enterprise">
<el-input v-model.trim="form.enterprise" placeholder="请输入企业类型" clearable maxlength="30" />
</el-form-item>
<el-form-item label="是否启用:" prop="isEnable">
<el-switch v-model="form.isEnable" :before-change="beforeChange" />
<el-switch v-model.trim="form.isEnable" :before-change="beforeChange" />
</el-form-item>
</el-form>
<template #footer>

View File

@ -3,19 +3,19 @@
<el-form :inline="true" :model="filterForm" class="demo-form-inline">
<!-- <el-form-item label="关键字">
<el-input v-model="filterForm.keyword" placeholder="请输入关键字" clearable />
<el-input v-model.trim="filterForm.keyword" placeholder="请输入关键字" clearable />
</el-form-item> -->
<el-form-item label="企业名称">
<el-input v-model="filterForm.companyName" placeholder="请输入企业名称" clearable />
<el-input v-model.trim="filterForm.companyName" placeholder="请输入企业名称" clearable />
</el-form-item>
<el-form-item label="统一社会信用代码">
<el-input v-model="filterForm.creditCode" placeholder="请输入统一社会信用代码" clearable />
<el-input v-model.trim="filterForm.creditCode" placeholder="请输入统一社会信用代码" clearable />
</el-form-item>
<el-form-item label="用户名">
<el-input v-model="filterForm.userName" placeholder="请输入用户名" clearable />
<el-input v-model.trim="filterForm.userName" placeholder="请输入用户名" clearable />
</el-form-item>
<el-form-item label="申请日期范围">
<el-date-picker v-model="filterForm.dataRange" type="daterange" range-separator="To" start-placeholder="Start date"
<el-date-picker v-model.trim="filterForm.dataRange" type="daterange" range-separator="To" start-placeholder="Start date"
end-placeholder="End date" />
</el-form-item>
<el-form-item style="float: right;margin-top: 12px;">

View File

@ -1,11 +1,11 @@
<template>
<el-dialog v-model="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
<el-dialog v-model.trim="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
<el-form :model="form" ref="ruleFormRef" label-width="102px" :rules="formRules" style="padding: 0 80px 0px 0;">
<el-form-item label="企业类型:" prop="enterprise">
<el-input v-model.trim="form.enterprise" placeholder="请输入企业类型" clearable maxlength="30" />
</el-form-item>
<el-form-item label="是否启用:" prop="isEnable">
<el-switch v-model="form.isEnable" :before-change="beforeChange" />
<el-switch v-model.trim="form.isEnable" :before-change="beforeChange" />
</el-form-item>
</el-form>
<template #footer>

View File

@ -3,16 +3,16 @@
<el-form :inline="true" :model="filterForm" class="demo-form-inline">
<el-form-item label="企业名称">
<el-input v-model="filterForm.companyName" placeholder="请输入企业名称" clearable />
<el-input v-model.trim="filterForm.companyName" placeholder="请输入企业名称" clearable />
</el-form-item>
<el-form-item label="统一社会信用代码">
<el-input v-model="filterForm.creditCode" placeholder="请输入统一社会信用代码" clearable />
<el-input v-model.trim="filterForm.creditCode" placeholder="请输入统一社会信用代码" clearable />
</el-form-item>
<el-form-item label="用户名">
<el-input v-model="filterForm.userName" placeholder="请输入用户名" clearable />
<el-input v-model.trim="filterForm.userName" placeholder="请输入用户名" clearable />
</el-form-item>
<el-form-item label="发布时间">
<el-date-picker v-model="filterForm.dataRange" type="daterange" range-separator="To"
<el-date-picker v-model.trim="filterForm.dataRange" type="daterange" range-separator="To"
start-placeholder="Start date" end-placeholder="End date" />
</el-form-item>
<el-form-item>

View File

@ -34,6 +34,12 @@
<div class="reject_status_c" v-else-if="scope.row.status == '2'">
已驳回
</div>
<div class="reject_status_c" v-else-if="scope.row.status == '3'">
已下架
</div>
<div class="reject_status_c" v-else-if="scope.row.status == '4'">
已注销
</div>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="160">

View File

@ -1,11 +1,11 @@
<template>
<el-dialog v-model="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
<el-dialog v-model.trim="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
<el-form :model="form" ref="ruleFormRef" label-width="102px" :rules="formRules" style="padding: 0 80px 0px 0;">
<el-form-item label="企业类型:" prop="enterprise">
<el-input v-model.trim="form.enterprise" placeholder="请输入企业类型" clearable maxlength="30" />
</el-form-item>
<el-form-item label="是否启用:" prop="isEnable">
<el-switch v-model="form.isEnable" :before-change="beforeChange" />
<el-switch v-model.trim="form.isEnable" :before-change="beforeChange" />
</el-form-item>
</el-form>
<template #footer>

View File

@ -3,16 +3,16 @@
<el-form :inline="true" :model="filterForm" class="demo-form-inline">
<el-form-item label="企业名称">
<el-input v-model="filterForm.companyName" placeholder="请输入企业名称" clearable />
<el-input v-model.trim="filterForm.companyName" placeholder="请输入企业名称" clearable />
</el-form-item>
<el-form-item label="统一社会信用代码">
<el-input v-model="filterForm.creditCode" placeholder="请输入统一社会信用代码" clearable />
<el-input v-model.trim="filterForm.creditCode" placeholder="请输入统一社会信用代码" clearable />
</el-form-item>
<el-form-item label="用户名">
<el-input v-model="filterForm.userName" placeholder="请输入用户名" clearable />
<el-input v-model.trim="filterForm.userName" placeholder="请输入用户名" clearable />
</el-form-item>
<el-form-item label="入驻日期">
<el-date-picker v-model="filterForm.dataRange" type="daterange" range-separator="To" start-placeholder="Start date"
<el-date-picker v-model.trim="filterForm.dataRange" type="daterange" range-separator="To" start-placeholder="Start date"
end-placeholder="End date" />
</el-form-item>
<el-form-item style="margin-top:12px;float:right;">

View File

@ -1,11 +1,11 @@
<template>
<el-dialog v-model="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
<el-dialog v-model.trim="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
<el-form :model="form" ref="ruleFormRef" label-width="102px" :rules="formRules" style="padding: 0 80px 0px 0;">
<el-form-item label="企业类型:" prop="name">
<el-input v-model.trim="form.name" placeholder="请输入企业类型" clearable maxlength="30" />
</el-form-item>
<el-form-item label="是否启用:" prop="status">
<el-switch v-model="form.status" :before-change="beforeChange" />
<el-switch v-model.trim="form.status" :before-change="beforeChange" />
</el-form-item>
</el-form>
<template #footer>

View File

@ -5,7 +5,7 @@
<el-input v-model.trim="filterForm.name" placeholder="请输入企业类型" clearable maxlength="30" />
</el-form-item>
<el-form-item label="是否启用">
<el-select v-model="filterForm.status" placeholder="请选择是否启用" clearable filterable>
<el-select v-model.trim="filterForm.status" placeholder="请选择是否启用" clearable filterable>
<el-option v-for="item in isEnableList.list" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
@ -28,12 +28,12 @@ const formRef = ref()
const isEnableList = reactive({
list: [{
value: 'Option1',
label: 'Option1',
value: '1',
label: '启用',
},
{
value: 'Option2',
label: 'Option2',
value: '0',
label: '禁用',
}]
})

View File

@ -10,7 +10,7 @@
<el-table-column prop="name" label="企业类型" min-width="150" />
<el-table-column prop="status" label="是否启用" min-width="220">
<template #default="scope">
<el-switch v-model="scope.row.status" :before-change="beforeChange.bind(this, scope.row)" />
<el-switch v-model.trim="scope.row.status" :before-change="beforeChange.bind(this, scope.row)" />
<!-- 1 启用
0 禁用 -->
</template>

View File

@ -1,5 +1,5 @@
<template>
<el-dialog v-model="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
<el-dialog v-model.trim="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
<el-form :model="form" ref="ruleFormRef" label-width="102px" :rules="formRules" style="padding: 0 80px 0px 0;">
<el-form-item label="地址名称:" prop="v_addressName">
<el-input v-model.trim="form.v_addressName" placeholder="请输入企业类型" clearable maxlength="30" />
@ -11,7 +11,7 @@
<el-input v-model.trim="form.v_lat" placeholder="请输入企业类型" clearable maxlength="30" />
</el-form-item>
<el-form-item label="装备类型:" prop="deviceType">
<el-select placeholder="请选择装备类型" clearable v-model="form.deviceType" @change="changeType">
<el-select placeholder="请选择装备类型" clearable v-model.trim="form.deviceType" @change="changeType">
<el-option v-for="item in deviceTypeInfo.list" :key="item.id" :label="item.name" :value="item.name"></el-option>
</el-select>
</el-form-item>
@ -22,7 +22,7 @@
<el-input v-model.trim="form.deviceStatus" placeholder="请输入企业类型" clearable maxlength="30" />
</el-form-item>
<el-form-item label="GPS编号" prop="GPScode">
<el-radio-group v-model="GPScode">
<el-radio-group v-model.trim="GPScode">
<el-radio :label="3">Option A</el-radio>
<el-radio :label="6">Option B</el-radio>
<el-radio :label="9">Option C</el-radio>

View File

@ -2,13 +2,13 @@
<el-card shadow="always" class="search_header_top_row1">
<el-form :inline="true" :model="filterForm" class="demo-form-inline">
<el-form-item label="地址搜索:">
<el-select v-model="filterForm.address" placeholder="请输入地址" clearable filterable>
<el-select v-model.trim="filterForm.address" placeholder="请输入地址" clearable filterable>
<el-option v-for="item in addressList.list" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="经纬度:">
<el-input v-model="filterForm.lngLat" placeholder="请输入经纬度" clearable />
<el-input v-model.trim="filterForm.lngLat" placeholder="请输入经纬度" clearable />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="serachFn">保存地点</el-button>

View File

@ -3,25 +3,25 @@
<el-form :inline="true" :model="filterForm" class="demo-form-inline">
<el-form-item label="关键字">
<el-input v-model="filterForm.keyword" placeholder="请输入关键字" clearable />
<el-input v-model.trim="filterForm.keyword" placeholder="请输入关键字" clearable />
</el-form-item>
<el-form-item label="装备名称">
<el-input v-model="filterForm.equipment" placeholder="请输入装备名称" clearable />
<el-input v-model.trim="filterForm.equipment" placeholder="请输入装备名称" clearable />
</el-form-item>
<el-form-item label="装备编号">
<el-input v-model="filterForm.equipment_code" placeholder="请输装备编号" clearable />
<el-input v-model.trim="filterForm.equipment_code" placeholder="请输装备编号" clearable />
</el-form-item>
<el-form-item label="订单编号">
<el-input v-model="filterForm.order_code" placeholder="请输入订单编号" clearable />
<el-input v-model.trim="filterForm.order_code" placeholder="请输入订单编号" clearable />
</el-form-item>
<el-form-item label="求租方企业">
<el-input v-model="filterForm.q_company" placeholder="请输入求租方企业名称" clearable />
<el-input v-model.trim="filterForm.q_company" placeholder="请输入求租方企业名称" clearable />
</el-form-item>
<el-form-item label="出租方企业">
<el-input v-model="filterForm.c_company" placeholder="请输入出租方企业名称" clearable />
<el-input v-model.trim="filterForm.c_company" placeholder="请输入出租方企业名称" clearable />
</el-form-item>
<el-form-item label="时间范围">
<el-date-picker v-model="filterForm.dataRange" type="daterange" range-separator="To" start-placeholder="Start date"
<el-date-picker v-model.trim="filterForm.dataRange" type="daterange" range-separator="To" start-placeholder="Start date"
end-placeholder="End date" />
</el-form-item>
<el-form-item >

View File

@ -1,5 +1,5 @@
<template>
<el-dialog v-model="addShow" :title="title" width="1000px" draggable :close-on-click-modal="false">
<el-dialog v-model.trim="addShow" :title="title" width="1000px" draggable :close-on-click-modal="false">
<div class="sub_title">
订单信息
</div>

View File

@ -1,11 +1,11 @@
<template>
<el-dialog v-model="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
<el-dialog v-model.trim="addShow" :title="title" width="30%" draggable :close-on-click-modal="false">
<el-form :model="form" ref="ruleFormRef" label-width="102px" :rules="formRules" style="padding: 0 80px 0px 0;">
<el-form-item label="企业类型:" prop="enterprise">
<el-input v-model.trim="form.enterprise" placeholder="请输入企业类型" clearable maxlength="30" />
</el-form-item>
<el-form-item label="是否启用:" prop="isEnable">
<el-switch v-model="form.isEnable" :before-change="beforeChange" />
<el-switch v-model.trim="form.isEnable" :before-change="beforeChange" />
</el-form-item>
</el-form>
<template #footer>

View File

@ -3,10 +3,10 @@
<el-form :inline="true" :model="filterForm" class="demo-form-inline">
<el-form-item label="用户ID">
<el-input v-model="filterForm.keyword" placeholder="请输入关键字" clearable />
<el-input v-model.trim="filterForm.keyword" placeholder="请输入关键字" clearable />
</el-form-item>
<el-form-item label="操作时间">
<el-date-picker v-model="filterForm.dataRange" type="daterange" range-separator="To"
<el-date-picker v-model.trim="filterForm.dataRange" type="daterange" range-separator="To"
start-placeholder="Start date" end-placeholder="End date" />
</el-form-item>
<el-form-item >

View File

@ -1,11 +1,11 @@
<template>
<el-dialog v-model="addShow" :title="title" width="1200px" draggable :close-on-click-modal="false" >
<el-dialog v-model.trim="addShow" :title="title" width="1200px" draggable :close-on-click-modal="false" >
<el-form :model="form" ref="ruleFormRef" label-width="120px" :rules="formRules" style="padding: 0 80px 0px 0;">
<el-form-item label="版本号:" prop="versionName">
<el-input v-model.trim="form.versionName" placeholder="请输入版本号" clearable maxlength="30" />
</el-form-item>
<el-form-item label="系统类型:" prop="systemType">
<el-select v-model="form.systemType" placeholder="请选择系统类型" clearable filterable>
<el-select v-model.trim="form.systemType" placeholder="请选择系统类型" clearable filterable>
<el-option v-for="item in systemTypeList.list" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>

View File

@ -3,13 +3,13 @@
<el-form :inline="true" :model="filterForm" class="demo-form-inline">
<el-form-item label="系统类型">
<el-input v-model="filterForm.systemType" placeholder="请选择系统类型" clearable />
<el-input v-model.trim="filterForm.systemType" placeholder="请选择系统类型" clearable />
</el-form-item>
<el-form-item label="版本号">
<el-input v-model="filterForm.versionCode" placeholder="请输入版本号" clearable />
<el-input v-model.trim="filterForm.versionCode" placeholder="请输入版本号" clearable />
</el-form-item>
<el-form-item label="部署时间范围">
<el-date-picker v-model="filterForm.dataRange" type="daterange" range-separator="To" start-placeholder="Start date"
<el-date-picker v-model.trim="filterForm.dataRange" type="daterange" range-separator="To" start-placeholder="Start date"
end-placeholder="End date" />
</el-form-item>
<el-form-item >

View File

@ -1,5 +1,5 @@
<template>
<el-dialog v-model="addShow" :title="title" width="660px" draggable :close-on-click-modal="false">
<el-dialog v-model.trim="addShow" :title="title" width="660px" draggable :close-on-click-modal="false">
<el-form :model="form" ref="ruleFormRef" label-width="102px" :rules="formRules" style="padding: 0 80px 0px 0;">
<el-form-item label="姓名:" prop="userName">
<el-input v-model.trim="form.userName" placeholder="请输入姓名" clearable maxlength="30" />
@ -8,7 +8,7 @@
<el-input v-model.trim="form.IDCard" placeholder="请输入身份证" clearable maxlength="30" />
</el-form-item>
<el-form-item label="性别:" prop="sex">
<el-select v-model="form.sex" placeholder="请选择性别" clearable filterable style="width:100%;">
<el-select v-model.trim="form.sex" placeholder="请选择性别" clearable filterable style="width:100%;">
<el-option v-for="item in sexInfo.list" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
@ -16,12 +16,12 @@
<el-input v-model.trim="form.contactgWays" placeholder="请输入联系方式" clearable maxlength="30" />
</el-form-item>
<el-form-item label="所属岗位:" prop="position">
<el-select v-model="form.position" placeholder="请选择所属岗位" clearable filterable style="width:100%;">
<el-select v-model.trim="form.position" placeholder="请选择所属岗位" clearable filterable style="width:100%;">
<el-option v-for="item in positionIfo.list" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="系统角色:" prop="roleType">
<el-select v-model="form.roleType" placeholder="请选择系统角色" clearable filterable style="width:100%;">
<el-select v-model.trim="form.roleType" placeholder="请选择系统角色" clearable filterable style="width:100%;">
<el-option v-for="item in roleTypeInfo.list" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>

View File

@ -3,10 +3,10 @@
<el-form :inline="true" :model="filterForm" class="demo-form-inline">
<el-form-item label="姓名/身份证/联系方式">
<el-input v-model="filterForm.keyword" placeholder="请输入姓名/身份证/联系方式" clearable style="width:250px;" />
<el-input v-model.trim="filterForm.keyword" placeholder="请输入姓名/身份证/联系方式" clearable style="width:250px;" />
</el-form-item>
<el-form-item label="系统角色" prop="roleType">
<el-select v-model="filterForm.roleType" placeholder="请选择系统角色" clearable filterable>
<el-select v-model.trim="filterForm.roleType" placeholder="请选择系统角色" clearable filterable>
<el-option v-for="item in roleTypeInfo.list" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>