This commit is contained in:
bb_pan 2025-12-01 09:43:58 +08:00
parent a639e635cf
commit 5f008d206a
20 changed files with 124 additions and 124 deletions

View File

@ -4,10 +4,10 @@
<!-- 表单搜索 -->
<el-card class="search-box">
<el-row>
<el-form-item prop="orderCreateUser" label="申请人">
<el-form-item prop="orderCreateUser" label="申请人">
<el-input clearable style="width: 200px" placeholder="请输入内容" v-model.trim="queryParams.orderCreateUser" />
</el-form-item>
<el-form-item label="申请时间" prop="orderCreateTime">
<el-form-item label="申请时间" prop="orderCreateTime">
<el-date-picker type="daterange" style="width: 200px" unlink-panels range-separator=""
start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd"
v-model="queryParams.orderCreateTime" />
@ -21,32 +21,32 @@
</el-select>
</el-form-item>
<el-form-item prop="name" label="装备名称">
<el-form-item prop="name" label="装备名称">
<el-input clearable style="width: 200px" placeholder="请输入内容" v-model.trim="queryParams.name" />
</el-form-item>
<el-form-item prop="specificationModel" label="规格型号">
<el-form-item prop="specificationModel" label="规格型号">
<el-input clearable style="width: 200px" placeholder="请输入内容"
v-model.trim="queryParams.specificationModel" />
</el-form-item>
<el-form-item prop="originalCode" label="装备原始编码">
<el-form-item prop="originalCode" label="装备原始编码">
<el-input clearable style="width: 200px" placeholder="请输入内容" v-model.trim="queryParams.originalCode" />
</el-form-item>
<el-form-item prop="manufacturerId" label="生产厂家">
<el-form-item prop="manufacturerId" label="生产厂家">
<el-select v-model="queryParams.manufacturerId" placeholder="请选择生产厂家" clearable style="width: 100%">
<el-option v-for="item in manufacturerList" :key="item.id" :label="item.label" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item prop="productionDate" label="出厂日期">
<el-form-item prop="productionDate" label="出厂日期">
<el-date-picker type="daterange" style="width: 200px" unlink-panels range-separator=""
start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd"
v-model="queryParams.productionDate" />
</el-form-item>
<!-- <el-form-item prop="keyword" label="采购日期">
<!-- <el-form-item prop="keyword" label="采购日期">
<el-date-picker
type="date"
style="width: 240px"
@ -56,7 +56,7 @@
/>
</el-form-item>-->
<el-form-item prop="minOriginalValue" label="资产原值">
<el-form-item prop="minOriginalValue" label="资产原值">
<el-input clearable style="width: 90px" placeholder="请输入" v-model.trim="queryParams.minOriginalValue" />
</el-form-item>

View File

@ -5,7 +5,7 @@
<el-card class="search-box">
<el-row>
<el-col :span="18">
<el-form-item prop="createUser" label="申请人">
<el-form-item prop="createUser" label="申请人">
<el-input clearable style="width: 240px" placeholder="请输入关键字" v-model.trim="queryParams.createUser" />
</el-form-item>

View File

@ -27,7 +27,7 @@
>
<el-card class="search-box">
<el-row>
<el-form-item prop="orderCreateUser" label="申请人">
<el-form-item prop="orderCreateUser" label="申请人">
<el-input
clearable
style="width: 200px"
@ -35,7 +35,7 @@
v-model.trim="queryParams.orderCreateUser"
/>
</el-form-item>
<el-form-item label="申请时间" prop="orderCreateTime">
<el-form-item label="申请时间" prop="orderCreateTime">
<el-date-picker
type="daterange"
style="width: 200px"
@ -61,7 +61,7 @@
</el-select>
</el-form-item>
<el-form-item prop="name" label="装备名称">
<el-form-item prop="name" label="装备名称">
<el-input
clearable
style="width: 200px"
@ -70,7 +70,7 @@
/>
</el-form-item>
<el-form-item prop="specificationModel" label="规格型号">
<el-form-item prop="specificationModel" label="规格型号">
<el-input
clearable
style="width: 200px"
@ -79,7 +79,7 @@
/>
</el-form-item>
<el-form-item prop="originalCode" label="装备原始编码">
<el-form-item prop="originalCode" label="装备原始编码">
<el-input
clearable
style="width: 200px"
@ -88,7 +88,7 @@
/>
</el-form-item>
<el-form-item prop="manufacturerId" label="生产厂家">
<el-form-item prop="manufacturerId" label="生产厂家">
<el-select
v-model="queryParams.manufacturerId"
placeholder="请选择生产厂家"
@ -104,7 +104,7 @@
</el-select>
</el-form-item>
<el-form-item prop="productionDate" label="出厂日期">
<el-form-item prop="productionDate" label="出厂日期">
<el-date-picker
type="daterange"
style="width: 200px"
@ -117,7 +117,7 @@
/>
</el-form-item>
<!-- <el-form-item prop="keyword" label="采购日期">
<!-- <el-form-item prop="keyword" label="采购日期">
<el-date-picker
type="date"
style="width: 240px"
@ -127,7 +127,7 @@
/>
</el-form-item>-->
<el-form-item prop="minBuyPrice" label="资产原值">
<el-form-item prop="minBuyPrice" label="资产原值">
<el-input
clearable
style="width: 90px"

View File

@ -10,7 +10,7 @@
<!-- 表单搜索 -->
<el-card class="search-box">
<el-row>
<el-form-item prop="orderCreateUser" label="申请人">
<el-form-item prop="orderCreateUser" label="申请人">
<el-input
clearable
style="width: 240px"
@ -18,7 +18,7 @@
v-model.trim="queryParams.orderCreateUser"
/>
</el-form-item>
<el-form-item label="申请时间" prop="orderCreateTime">
<el-form-item label="申请时间" prop="orderCreateTime">
<el-date-picker
type="daterange"
style="width: 240px"
@ -43,7 +43,7 @@
</el-select>
</el-form-item>
<el-form-item prop="name" label="装备名称">
<el-form-item prop="name" label="装备名称">
<el-input
clearable
style="width: 240px"
@ -52,7 +52,7 @@
/>
</el-form-item>
<el-form-item prop="specificationModel" label="规格型号">
<el-form-item prop="specificationModel" label="规格型号">
<el-input
clearable
style="width: 240px"
@ -61,7 +61,7 @@
/>
</el-form-item>
<el-form-item prop="originalCode" label="装备原始编码">
<el-form-item prop="originalCode" label="装备原始编码">
<el-input
clearable
style="width: 240px"
@ -70,7 +70,7 @@
/>
</el-form-item>
<el-form-item prop="manufacturerId" label="生产厂家">
<el-form-item prop="manufacturerId" label="生产厂家">
<el-select
v-model="queryParams.manufacturerId"
placeholder="请选择生产厂家"
@ -86,7 +86,7 @@
</el-select>
</el-form-item>
<el-form-item prop="productionDate" label="出厂日期">
<el-form-item prop="productionDate" label="出厂日期">
<el-date-picker
type="daterange"
style="width: 240px"
@ -99,7 +99,7 @@
/>
</el-form-item>
<!-- <el-form-item prop="keyword" label="采购日期">
<!-- <el-form-item prop="keyword" label="采购日期">
<el-date-picker
type="date"
style="width: 240px"
@ -110,7 +110,7 @@
</el-form-item>-->
<el-col :span="6">
<el-form-item prop="originalValue" label="资产原值">
<el-form-item prop="originalValue" label="资产原值">
<el-input
clearable
style="width: 105px"

View File

@ -19,7 +19,7 @@
>
<!-- 表单搜索 -->
<el-row>
<el-form-item prop="orderCreateUser" label="申请人">
<el-form-item prop="orderCreateUser" label="申请人">
<el-input
clearable
style="width: 240px"
@ -27,7 +27,7 @@
v-model.trim="queryParams.orderCreateUser"
/>
</el-form-item>
<el-form-item label="申请时间" prop="orderCreateTime">
<el-form-item label="申请时间" prop="orderCreateTime">
<el-date-picker
type="daterange"
style="width: 240px"
@ -54,7 +54,7 @@
</el-select>
</el-form-item>
<el-form-item prop="name" label="装备名称">
<el-form-item prop="name" label="装备名称">
<el-input
clearable
style="width: 240px"
@ -63,7 +63,7 @@
/>
</el-form-item>
<el-form-item prop="specificationModel" label="规格型号">
<el-form-item prop="specificationModel" label="规格型号">
<el-input
clearable
style="width: 240px"
@ -72,7 +72,7 @@
/>
</el-form-item>
<el-form-item prop="originalCode" label="装备原始编码">
<el-form-item prop="originalCode" label="装备原始编码">
<el-input
clearable
style="width: 240px"
@ -81,7 +81,7 @@
/>
</el-form-item>
<el-form-item prop="manufacturer" label="生产厂家">
<el-form-item prop="manufacturer" label="生产厂家">
<el-input
clearable
style="width: 240px"
@ -90,7 +90,7 @@
/>
</el-form-item>
<el-form-item prop="productionDate" label="出厂日期">
<el-form-item prop="productionDate" label="出厂日期">
<el-date-picker
type="daterange"
style="width: 240px"
@ -103,7 +103,7 @@
/>
</el-form-item>
<!-- <el-form-item prop="keyword" label="采购日期">
<!-- <el-form-item prop="keyword" label="采购日期">
<el-date-picker
type="date"
style="width: 240px"
@ -114,7 +114,7 @@
</el-form-item>-->
</el-row>
<el-row>
<el-form-item prop="minBuyPrice" label="资产原值">
<el-form-item prop="minBuyPrice" label="资产原值">
<el-input
clearable
style="width: 105px"

View File

@ -19,7 +19,7 @@
<el-option v-for="item in propertyUnitList" :key="item.id" :label="item.label" :value="item.id"/>
</el-select>
</el-form-item>
<el-form-item label="使用项目" prop="proCode">
<el-form-item label="使用项目" prop="proCode">
<el-select
clearable
style="width: 240px"
@ -30,22 +30,22 @@
<el-option :key="item.proCode" :label="item.proName" :value="item.proCode" v-for="item in useProjectList"/>
</el-select>
</el-form-item>
<el-form-item label="项目类型" prop="proType">
<el-form-item label="项目类型" prop="proType">
<el-input style="width: 240px" disabled v-model="proTypeName"/>
</el-form-item>
<el-form-item label="电压等级" prop="voltageLevel">
<el-form-item label="电压等级" prop="voltageLevel">
<el-input style="width: 240px" disabled v-model="voltageLevel"/>
</el-form-item>
<el-form-item label="项目所在省" prop="proProvince">
<el-form-item label="项目所在省" prop="proProvince">
<el-input style="width: 240px" disabled v-model="outForm.proProvince"/>
</el-form-item>
<el-form-item label="项目所在市" prop="proCity">
<el-form-item label="项目所在市" prop="proCity">
<el-input style="width: 240px" disabled v-model="outForm.proCity"/>
</el-form-item>
<el-form-item label="项目所在区/县" prop="proCounty">
<el-form-item label="项目所在区/县" prop="proCounty">
<el-input style="width: 240px" disabled v-model="outForm.proCounty"/>
</el-form-item>
<el-form-item label="详细地址" prop="proLocation">
<el-form-item label="详细地址" prop="proLocation">
<el-input v-model="outForm.proLocation" placeholder="请输入详细地址" clearable style="width: 240px"/>
</el-form-item>
</el-form>

View File

@ -25,12 +25,12 @@
</el-row>
<el-row :gutter="20" type="flex">
<el-col>
<el-form-item label="需求单位" prop="useUint">
<el-form-item label="需求单位" prop="useUint">
<el-input v-model="outForm.useUint" placeholder="请输入需求单位" :disabled="outForm.status=='0'" clearable/>
</el-form-item>
</el-col>
<el-col>
<el-form-item label="使用项目" prop="proCode">
<el-form-item label="使用项目" prop="proCode">
<el-select
clearable
style="width: 100%"
@ -48,7 +48,7 @@
</el-form-item>
</el-col>
<el-col>
<el-form-item label="项目类型" prop="proType">
<el-form-item label="项目类型" prop="proType">
<el-select clearable style="width: 100%" placeholder="请选择项目类型" v-model="outForm.proType">
<el-option value="0" label="线路"/>
<el-option value="1" label="电缆"/>
@ -57,11 +57,11 @@
</el-form-item>
</el-col>
<el-col>
<el-form-item label="电压等级" prop="voltageLevel">
<el-form-item label="电压等级" prop="voltageLevel">
<el-select
clearable
style="width: 100%"
placeholder="请选择电压等级"
placeholder="请选择电压等级"
v-model="outForm.voltageLevel"
>
<el-option
@ -76,7 +76,7 @@
</el-row>
<el-row :gutter="20" type="flex">
<el-col>
<el-form-item label="项目所在省" prop="proProvince">
<el-form-item label="项目所在省" prop="proProvince">
<el-select
clearable
style="width: 100%"
@ -94,7 +94,7 @@
</el-form-item>
</el-col>
<el-col>
<el-form-item label="项目所在市" prop="proCity">
<el-form-item label="项目所在市" prop="proCity">
<el-select
clearable
style="width: 100%"
@ -112,7 +112,7 @@
</el-form-item>
</el-col>
<el-col>
<el-form-item label="项目所在区/县" prop="proCounty">
<el-form-item label="项目所在区/县" prop="proCounty">
<el-select
clearable
style="width: 100%"
@ -129,7 +129,7 @@
</el-form-item>
</el-col>
<el-col>
<el-form-item label="详细地址" prop="proLocation">
<el-form-item label="详细地址" prop="proLocation">
<el-input v-model="outForm.proLocation" placeholder="请输入详细地址" clearable/>
</el-form-item>
</el-col>
@ -139,12 +139,12 @@
<el-row :gutter="20" type="flex">
<el-col :span="6">
<el-form-item label="联系人" prop="userName">
<el-form-item label="联系人" prop="userName">
<el-input v-model="outForm.userName" placeholder="请输入联系人" clearable/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="联系方式" prop="userPhone">
<el-form-item label="联系方式" prop="userPhone">
<el-input v-model="outForm.userPhone" placeholder="请输入联系方式" clearable maxlength="11"/>
</el-form-item>
</el-col>

View File

@ -3,7 +3,7 @@
<div class="app-container">
<el-card v-show="showSearch" style="margin-bottom: 20px">
<el-form :model="queryParams" ref="queryForm" inline label-width="100px">
<el-form-item label="项目名称" prop="proCode">
<el-form-item label="项目名称" prop="proCode">
<el-select
clearable
placeholder="请选择项目名称"

View File

@ -3,7 +3,7 @@
<div class="app-container">
<el-card v-show="showSearch" style="margin-bottom: 20px">
<el-form :model="queryParams" ref="queryForm" label-width="100px" inline @submit.native.prevent>
<el-form-item label="项目名称" prop="proCode">
<el-form-item label="项目名称" prop="proCode">
<el-select
clearable
placeholder="请选择项目名称"

View File

@ -16,10 +16,10 @@
:disabled="formType == 1"
>
<TitleTip :titleText="`公司信息`" />
<el-form-item label="公司名称" prop="deptName">
<el-form-item label="公司名称" prop="deptName">
<el-input v-model="addOrEditForm.deptName" clearable />
</el-form-item>
<el-form-item label="公司地址" prop="province">
<el-form-item label="公司地址" prop="province">
<el-row>
<el-col :span="6">
<el-form-item prop="province">
@ -89,13 +89,13 @@
</el-col>
</el-row>
</el-form-item>
<el-form-item label="公司简称" prop="deptAbbreviation">
<el-form-item label="公司简称" prop="deptAbbreviation">
<el-input
v-model="addOrEditForm.deptAbbreviation"
clearable
/>
</el-form-item>
<el-form-item label="公司概述" prop="remark">
<el-form-item label="公司概述" prop="remark">
<el-input
v-model="addOrEditForm.remark"
type="textarea"
@ -104,7 +104,7 @@
/>
</el-form-item>
<el-form-item
label="公司状态"
label="公司状态"
prop="status"
v-if="formType == 2"
>
@ -115,10 +115,10 @@
</el-radio-group>
</el-form-item>
<!-- <TitleTip :titleText="`基础设置`" /> -->
<el-form-item label="默认密码" prop="initPassword">
<el-form-item label="默认密码" prop="initPassword">
<el-input v-model="addOrEditForm.initPassword" clearable />
</el-form-item>
<el-form-item label="LOGO设置" prop="logo">
<el-form-item label="LOGO设置" prop="logo">
<div class="upload-container" v-if="formType != 1">
<el-upload
:limit="1"
@ -161,7 +161,7 @@
</div>
</el-form-item>
<TitleTip :titleText="`默认管理员`" />
<el-form-item label="姓名" prop="nickName">
<el-form-item label="姓名" prop="nickName">
<el-input v-model="addOrEditForm.nickName" clearable />
</el-form-item>
<el-form-item prop="phonenumber" class="user-phone-number">
@ -173,7 +173,7 @@
</template>
<el-input v-model="addOrEditForm.phonenumber" clearable />
</el-form-item>
<el-form-item label="权限模板" prop="menuTemplateId">
<el-form-item label="权限模板" prop="menuTemplateId">
<el-select
filterable
clearable
@ -189,7 +189,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="角色" prop="roles">
<el-form-item label="角色" prop="roles">
<el-input disabled v-model="addOrEditForm.roles" />
</el-form-item>
<el-form-item class="handle" v-if="formType !== 1">

View File

@ -140,7 +140,7 @@
>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="合同模板名称" prop="contractName">
<el-form-item label="合同模板名称" prop="contractName">
<el-input
autocomplete="off"
style="width: 350px"

View File

@ -517,7 +517,7 @@ export default {
toBeRepairList: toBeRepairListWithDevType
}
console.log("提交内容", payload)
console.log("提交内容", payload)
this.isLoading = true
try {

View File

@ -27,7 +27,7 @@
</div>
<el-form :model="formData" ref="dForm" :rules="rules" size="small" :inline="true" label-width="140px" style="margin-left: 40px;margin-bottom: 20px;width: 80%;">
<el-row :gutter="24" class="mb8">
<el-form-item label="装备名称" prop="deviceName">
<el-form-item label="装备名称" prop="deviceName">
<el-input
v-model="formData.deviceName"
placeholder="请输入装备名称"
@ -36,7 +36,7 @@
/>
</el-form-item>
</el-row>
<el-form-item label="装备类目" prop="deviceTypeList">
<el-form-item label="装备类目" prop="deviceTypeList">
<el-cascader
v-model="formData.deviceTypeList"
:key="propsKey"
@ -52,7 +52,7 @@
@change="deviceTypeChange"
></el-cascader>
</el-form-item>
<el-form-item label="设备数量" prop="deviceCount">
<el-form-item label="设备数量" prop="deviceCount">
<el-input
@input="(v)=>(formData.deviceCount=v.replace(/[^\d.]/g,''))"
v-model="formData.deviceCount"
@ -61,7 +61,7 @@
style="width: 450px;" :disabled="countDisabled"
/>
</el-form-item>
<el-form-item label="装备单位" prop="unitName">
<el-form-item label="装备单位" prop="unitName">
<el-input
v-model="formData.unitName"
placeholder="请输入装备单位"
@ -69,7 +69,7 @@
style="width: 450px;" disabled
/>
</el-form-item>
<el-form-item label="装备编号" prop="code">
<el-form-item label="装备编号" prop="code">
<el-input
v-model="formData.code"
placeholder="请输入装备编号"
@ -77,7 +77,7 @@
style="width: 450px;"
/>
</el-form-item>
<el-form-item label="所属公司" prop="companyId">
<el-form-item label="所属公司" prop="companyId">
<el-select
v-model="formData.companyId"
placeholder="请选择所属公司"
@ -90,7 +90,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="装备品牌" prop="brand">
<el-form-item label="装备品牌" prop="brand">
<el-input
v-model="formData.brand"
placeholder="请输入装备品牌"
@ -98,7 +98,7 @@
style="width: 450px;"
/>
</el-form-item>
<el-form-item label="出厂日期" prop="productionDate">
<el-form-item label="出厂日期" prop="productionDate">
<el-date-picker
v-model="formData.productionDate"
placeholder="请选择出厂日期"
@ -106,7 +106,7 @@
type="date" style="width: 450px;">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="租赁价格(天/元)" prop="dayLeasePrice" style="display: none">-->
<!-- <el-form-item label="租赁价格(天/元)" prop="dayLeasePrice" style="display: none">-->
<!-- <el-input-->
<!-- @input="(v)=>(formData.dayLeasePrice=v.replace(/[^\d.]/g,''))"-->
<!-- v-model="formData.dayLeasePrice"-->
@ -115,7 +115,7 @@
<!-- style="width: 450px;"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="联系人" prop="person">
<el-form-item label="联系人" prop="person">
<el-input
v-model="formData.person"
placeholder="请输入联系人"
@ -123,7 +123,7 @@
style="width: 450px;"
/>
</el-form-item>
<el-form-item label="联系电话" prop="personPhone">
<el-form-item label="联系电话" prop="personPhone">
<el-input
v-model="formData.personPhone"
placeholder="请输入联系电话"
@ -131,7 +131,7 @@
style="width: 450px;"
/>
</el-form-item>
<el-form-item label="整机重量(KG)" prop="deviceWeight">
<el-form-item label="整机重量(KG)" prop="deviceWeight">
<el-input
@input="(v)=>(formData.deviceWeight=v.replace(/[^\d.]/g,''))"
v-model="formData.deviceWeight"

View File

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="装备名称" prop="deviceName">
<el-form-item label="装备名称" prop="deviceName">
<el-input
v-model="queryParams.deviceName"
placeholder="请输入装备名称"
@ -10,7 +10,7 @@
maxlength="20"
/>
</el-form-item>
<el-form-item label="装备编码" prop="code">
<el-form-item label="装备编码" prop="code">
<el-input
v-model="queryParams.code"
placeholder="请输入装备编码"
@ -19,7 +19,7 @@
maxlength="20"
/>
</el-form-item>
<el-form-item label="装备状态" prop="maStatus">
<el-form-item label="装备状态" prop="maStatus">
<el-select
v-model="queryParams.maStatus"
placeholder="请选择装备状态"
@ -35,7 +35,7 @@
</el-select>
</el-form-item>
<br>
<el-form-item label="装备类目" prop="deviceTypeList">
<el-form-item label="装备类目" prop="deviceTypeList">
<el-cascader
v-model="deviceTypeList"
:key="propsKey"
@ -51,7 +51,7 @@
@change="deviceTypeChange"
></el-cascader>
</el-form-item>
<el-form-item label="更新时间" prop="dateRange">
<el-form-item label="更新时间" prop="dateRange">
<el-date-picker
v-model="dateRange"
type="datetimerange"

View File

@ -8,7 +8,7 @@
v-show="showSearch"
label-width="90px"
>
<el-form-item label="类型规格" prop="typeId">
<el-form-item label="类型规格" prop="typeId">
<el-select
v-model="queryParams.typeId"
placeholder="请选择类型规格"
@ -22,7 +22,7 @@
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="机具厂家" prop="supplierId">
<!-- <el-form-item label="机具厂家" prop="supplierId">
<el-select v-model="queryParams.supplierId" placeholder="请选择机具厂家" clearable>
<el-option
v-for="dict in supplierList"
@ -32,7 +32,7 @@
/>
</el-select>
</el-form-item> -->
<el-form-item label="出厂日期" prop="productionTime">
<el-form-item label="出厂日期" prop="productionTime">
<el-date-picker
v-model="queryParams.productionTime"
placeholder="请选择出厂日期"

View File

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
<el-form-item label="类型规格" prop="typeId" >
<el-form-item label="类型规格" prop="typeId" >
<el-select v-model="queryParams.typeId" placeholder="请选择类型规格" clearable>
<el-option
v-for="dict in materialModelList"
@ -11,7 +11,7 @@
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="机具厂家" prop="supplierId">
<!-- <el-form-item label="机具厂家" prop="supplierId">
<el-select v-model="queryParams.supplierId" placeholder="请选择机具厂家" clearable>
<el-option
v-for="dict in supplierList"
@ -21,7 +21,7 @@
/>
</el-select>
</el-form-item> -->
<el-form-item label="出厂日期" prop="productionTime">
<el-form-item label="出厂日期" prop="productionTime">
<el-date-picker
v-model="queryParams.productionTime"
placeholder="请选择出厂日期"

View File

@ -245,36 +245,36 @@
<el-form ref="form" :model="form" label-width="120px" size="mini">
<el-row>
<el-col :span="12">
<el-form-item label="任务编号">{{ form.jobId }}</el-form-item>
<el-form-item label="任务名称">{{ form.jobName }}</el-form-item>
<el-form-item label="任务编号">{{ form.jobId }}</el-form-item>
<el-form-item label="任务名称">{{ form.jobName }}</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="任务分组">{{ jobGroupFormat(form) }}</el-form-item>
<el-form-item label="创建时间">{{ form.createTime }}</el-form-item>
<el-form-item label="任务分组">{{ jobGroupFormat(form) }}</el-form-item>
<el-form-item label="创建时间">{{ form.createTime }}</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="cron表达式">{{ form.cronExpression }}</el-form-item>
<el-form-item label="cron表达式">{{ form.cronExpression }}</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="下次执行时间">{{ parseTime(form.nextValidTime) }}</el-form-item>
<el-form-item label="下次执行时间">{{ parseTime(form.nextValidTime) }}</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="调用目标方法">{{ form.invokeTarget }}</el-form-item>
<el-form-item label="调用目标方法">{{ form.invokeTarget }}</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="任务状态">
<el-form-item label="任务状态">
<div v-if="form.status == 0">正常</div>
<div v-else-if="form.status == 1">暂停</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否并发">
<el-form-item label="是否并发">
<div v-if="form.concurrent == 0">允许</div>
<div v-else-if="form.concurrent == 1">禁止</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="执行策略">
<el-form-item label="执行策略">
<div v-if="form.misfirePolicy == 0">默认策略</div>
<div v-else-if="form.misfirePolicy == 1">立即执行</div>
<div v-else-if="form.misfirePolicy == 2">执行一次</div>

View File

@ -148,27 +148,27 @@
<el-form ref="form" :model="form" label-width="100px" size="mini">
<el-row>
<el-col :span="12">
<el-form-item label="日志序号">{{ form.jobLogId }}</el-form-item>
<el-form-item label="任务名称">{{ form.jobName }}</el-form-item>
<el-form-item label="日志序号">{{ form.jobLogId }}</el-form-item>
<el-form-item label="任务名称">{{ form.jobName }}</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="任务分组">{{ form.jobGroup }}</el-form-item>
<el-form-item label="执行时间">{{ form.createTime }}</el-form-item>
<el-form-item label="任务分组">{{ form.jobGroup }}</el-form-item>
<el-form-item label="执行时间">{{ form.createTime }}</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="调用方法">{{ form.invokeTarget }}</el-form-item>
<el-form-item label="调用方法">{{ form.invokeTarget }}</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="日志信息">{{ form.jobMessage }}</el-form-item>
<el-form-item label="日志信息">{{ form.jobMessage }}</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="执行状态">
<el-form-item label="执行状态">
<div v-if="form.status == 0">正常</div>
<div v-else-if="form.status == 1">失败</div>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="异常信息" v-if="form.status == 1">{{ form.exceptionInfo }}</el-form-item>
<el-form-item label="异常信息" v-if="form.status == 1">{{ form.exceptionInfo }}</el-form-item>
</el-col>
</el-row>
</el-form>

View File

@ -70,7 +70,7 @@
>
<el-row>
<el-col :span="24">
<el-form-item label="外部链接" prop="slideLink">
<el-form-item label="外部链接" prop="slideLink">
<el-input
placeholder="请输入外部链接"
v-model="addSwiperForm.slideLink"
@ -78,7 +78,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="是否激活" prop="delFlag">
<el-form-item label="是否激活" prop="delFlag">
<el-switch
active-text="激活"
inactive-text="禁用"
@ -87,7 +87,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="轮播图上传" prop="fileList">
<el-form-item label="轮播图上传" prop="fileList">
<el-upload
:limit="1"
:headers="headers"

View File

@ -164,38 +164,38 @@
<el-form ref="form" :model="form" label-width="100px" size="mini">
<el-row>
<el-col :span="12">
<el-form-item label="操作模块">{{ form.title }} / {{ typeFormat(form) }}</el-form-item>
<el-form-item label="操作模块">{{ form.title }} / {{ typeFormat(form) }}</el-form-item>
<el-form-item
label="登录信息"
label="登录信息"
>{{ form.operName }} / {{ form.operIp }}</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="请求地址">{{ form.operUrl }}</el-form-item>
<el-form-item label="请求方式">{{ form.requestMethod }}</el-form-item>
<el-form-item label="请求地址">{{ form.operUrl }}</el-form-item>
<el-form-item label="请求方式">{{ form.requestMethod }}</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="操作方法">{{ form.method }}</el-form-item>
<el-form-item label="操作方法">{{ form.method }}</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="请求参数">{{ form.operParam }}</el-form-item>
<el-form-item label="请求参数">{{ form.operParam }}</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="返回参数">{{ form.jsonResult }}</el-form-item>
<el-form-item label="返回参数">{{ form.jsonResult }}</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="操作状态">
<el-form-item label="操作状态">
<div v-if="form.status === 0">正常</div>
<div v-else-if="form.status === 1">失败</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="消耗时间">{{ form.costTime }}毫秒</el-form-item>
<el-form-item label="消耗时间">{{ form.costTime }}毫秒</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="操作时间">{{ parseTime(form.operTime) }}</el-form-item>
<el-form-item label="操作时间">{{ parseTime(form.operTime) }}</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="异常信息" v-if="form.status === 1">{{ form.errorMsg }}</el-form-item>
<el-form-item label="异常信息" v-if="form.status === 1">{{ form.errorMsg }}</el-form-item>
</el-col>
</el-row>
</el-form>