dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
齐天大圣 2024-04-03 10:36:38 +08:00
commit aa935c4946
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fuintAdmin_zt/src/views/tag/oilTag/index.vue
View File

@ -1,10 +1,10 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="二维码SN号" prop="tagCodeSn"> <el-form-item label="二维码ID" prop="tagCodeSn">
<el-input <el-input
v-model="queryParams.tagCodeSn" v-model="queryParams.tagCodeSn"
placeholder="请输入二维码SN号" placeholder="请输入二维码ID"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@ -73,7 +73,7 @@
<el-table-column label="序号" type="index" width="55" align="center" /> <el-table-column label="序号" type="index" width="55" align="center" />
<el-table-column label="厂家名字" align="center" prop="companyName" /> <el-table-column label="厂家名字" align="center" prop="companyName" />
<el-table-column label="二维码SN号" align="center" prop="tagCodeSn" /> <el-table-column label="二维码ID" align="center" prop="tagCodeSn" />
<el-table-column label="码牌SN号" align="center" prop="snCode" /> <el-table-column label="码牌SN号" align="center" prop="snCode" />
<el-table-column label="码牌终端号" align="center" prop="terminalNumber" /> <el-table-column label="码牌终端号" align="center" prop="terminalNumber" />
<el-table-column label="是否已绑定油站" align="center" prop="status" > <el-table-column label="是否已绑定油站" align="center" prop="status" >
@ -133,8 +133,8 @@
<el-input v-model="form.companyName" placeholder="请输入厂家名字" /> <el-input v-model="form.companyName" placeholder="请输入厂家名字" />
</el-form-item> </el-form-item>
<el-form-item label="二维码SN号" prop="tagCodeSn"> <el-form-item label="二维码ID" prop="tagCodeSn">
<el-input v-model="form.tagCodeSn" placeholder="请输入二维码SN号" /> <el-input v-model="form.tagCodeSn" placeholder="请输入二维码ID" />
</el-form-item> </el-form-item>
<el-form-item label="码牌SN号" prop="snCode"> <el-form-item label="码牌SN号" prop="snCode">
<el-input v-model="form.snCode" placeholder="请输入码牌SN号" /> <el-input v-model="form.snCode" placeholder="请输入码牌SN号" />
@ -232,7 +232,7 @@ export default {
{ required: true, message: "公司名称不能为空", trigger: "blur" }, { required: true, message: "公司名称不能为空", trigger: "blur" },
], ],
tagCodeSn: [ tagCodeSn: [
{ required: true, message: "二维码SN不能为空", trigger: "blur" }, { required: true, message: "二维码ID不能为空", trigger: "blur" },
], ],
snCode: [ snCode: [
{ required: true, message: "码牌SN不能为空", trigger: "blur" }, { required: true, message: "码牌SN不能为空", trigger: "blur" },

8
fuintAdmin_zt/src/views/tag/tagCode/index.vue
View File

@ -1,10 +1,10 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="二维码SN号" prop="tagCodeSn"> <el-form-item label="二维码ID" prop="tagCodeSn">
<el-input <el-input
v-model="queryParams.tagCodeSn" v-model="queryParams.tagCodeSn"
placeholder="二维码SN号" placeholder="二维码ID"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@ -62,8 +62,8 @@
<el-table-column label="序号" type="index" > <el-table-column label="序号" type="index" >
</el-table-column> </el-table-column>
<!-- <el-table-column label="码牌二维码：域名+字符串" align="center" prop="tagCodeSn" />--> <!-- <el-table-column label="码牌二维码：域名+字符串" align="center" prop="tagCodeSn" />-->
<el-table-column label="二维码ID" align="center" prop="id" /> <!-- <el-table-column label="二维码ID" align="center" prop="id" />-->
<el-table-column label="二维码SN号" align="center" prop="tagCodeSn" /> <el-table-column label="二维码ID" align="center" prop="tagCodeSn" />
<el-table-column label="二维码" align="center" prop="imageUrl" > <el-table-column label="二维码" align="center" prop="imageUrl" >
<template slot-scope="scope"> <template slot-scope="scope">