From 0782140a00e554ec7a1c724ecc1eb36726d994f8 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期一, 22 五月 2023 11:45:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/cause/Entry.vue |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/cause/Entry.vue b/src/views/cause/Entry.vue
index 0bfaeca..7f0713c 100644
--- a/src/views/cause/Entry.vue
+++ b/src/views/cause/Entry.vue
@@ -194,7 +194,7 @@
           <template slot="header">
             <el-form :inline="true" :model="queryInfoReport" class="demo-form-inline">
               <el-form-item label="鎶ユ浜�:">
-                <el-input placeholder="璇疯緭鍏ュ鍚嶆垨韬唤璇�" v-model="queryInfoReport.people" :style="{ width: '180px' }">
+                <el-input placeholder="璇疯緭鍏ュ鍚�" v-model="queryInfoReport.people" :style="{ width: '180px' }">
                 </el-input>
               </el-form-item>
               <el-form-item label="鎵嬫満鍙风爜:">
@@ -206,16 +206,16 @@
                   <el-option v-for="item in optionsGroup" :key="item.value" :label="item.label" :value="item.value">
                   </el-option>
                 </el-select>
-              </el-form-item>
+<!--              </el-form-item>-->
 
-              <el-form-item label="鎶ユ鏉愭枡:">
-                <el-select v-model="queryInfoReport.HavaMaterial" :style="{ width: '100px' }">
-                  <el-option v-for="item in optionsMate" :key="item.value" :label="item.label" :value="item.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
+<!--              <el-form-item label="鎶ユ鏉愭枡:">-->
+<!--                <el-select v-model="queryInfoReport.HavaMaterial" :style="{ width: '100px' }">-->
+<!--                  <el-option v-for="item in optionsMate" :key="item.value" :label="item.label" :value="item.value">-->
+<!--                  </el-option>-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
 
-              <el-form-item>
+<!--              <el-form-item>-->
                 <el-button type="primary" @click="searchByCondition">鏌ヨ</el-button>
               </el-form-item>
               <el-form-item>

--
Gitblit v1.8.0