From 913aa4023ab076b641589671dcebf738c6baff64 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 09 五月 2025 13:55:15 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/business/inoutRecord.vue | 12 +++++++++---
admin/src/views/timer/timer.vue | 6 +++---
admin/.env.development | 4 ++--
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/admin/.env.development b/admin/.env.development
index 1c93555..577bf1c 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -2,7 +2,7 @@
NODE_ENV = 'development'
# VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface'
-VUE_APP_API_URL = 'http://192.168.0.104:10010'
-# VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface'
+#VUE_APP_API_URL = 'http://192.168.0.104:10010'
+ VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface'
# VUE_APP_API_URL = 'http://10.50.250.253:8088/gateway_interface'
diff --git a/admin/src/views/business/inoutRecord.vue b/admin/src/views/business/inoutRecord.vue
index 63c90c2..a5c74a6 100644
--- a/admin/src/views/business/inoutRecord.vue
+++ b/admin/src/views/business/inoutRecord.vue
@@ -4,6 +4,12 @@
<div slot="search-form">
<el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
<el-form-item label="" prop="inOrOut">
+ <el-select v-model="searchForm.type" style="width: 130px" clearable @change="search" placeholder="浜嬩欢绫诲瀷">
+ <el-option label="杞﹁締浜嬩欢" value="0">杞﹁締浜嬩欢</el-option>
+ <el-option label="浜哄憳浜嬩欢" value="1">浜哄憳浜嬩欢</el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="" prop="inOrOut">
<el-select v-model="searchForm.inOrOut" style="width: 130px" clearable @change="search" placeholder="杩涘嚭绫诲瀷">
<el-option label="杩�" value="0"></el-option>
<el-option label="鍑�" value="1"></el-option>
@@ -129,14 +135,13 @@
<script>
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
-import SearchFormCollapse from '@/components/common/SearchFormCollapse'
import Pagination from '@/components/common/Pagination'
import OperaInoutRecordWindow from '@/components/business/OperaInoutRecordWindow'
import { timeForMat } from '@/utils/util'
export default {
name: 'InoutRecord',
extends: BaseTable,
- components: { SearchFormCollapse, TableLayout, Pagination, OperaInoutRecordWindow },
+ components: { TableLayout, Pagination, OperaInoutRecordWindow },
data () {
return {
// 鎼滅储
@@ -150,7 +155,8 @@
companyName: '',
startDate: null,
endDate: null,
- radio: '0'
+ radio: '0',
+ type: null
},
time: [],
bizTypeList: [{ key: 0, name: '璁垮杞﹁締' },
diff --git a/admin/src/views/timer/timer.vue b/admin/src/views/timer/timer.vue
index 06fe4cf..c854de5 100644
--- a/admin/src/views/timer/timer.vue
+++ b/admin/src/views/timer/timer.vue
@@ -3,13 +3,13 @@
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
<el-form-item label="Bean鍚嶇О" prop="beanName">
- <el-input v-model="searchForm.beanName" placeholder="璇疯緭鍏ュ彂甯冧汉" @keypress.enter.native="search"></el-input>
+ <el-input v-model="searchForm.beanName" placeholder="璇疯緭鍏ean鍚嶇О" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="妯″潡鍚嶇О" prop="module">
- <el-input v-model="searchForm.module" placeholder="璇疯緭鍏ュ彂甯冧汉" @keypress.enter.native="search"></el-input>
+ <el-input v-model="searchForm.module" placeholder="璇疯緭鍏ユā鍧楀悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="searchForm.remark" placeholder="璇疯緭鍏ュ彂甯冧汉" @keypress.enter.native="search"></el-input>
+ <el-input v-model="searchForm.remark" placeholder="璇疯緭鍏ュ娉�" @keypress.enter.native="search"></el-input>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
--
Gitblit v1.9.3