Răsfoiți Sursa

添加列表查询中重置按钮 ,暂时隐藏详情中rules

002390 2 ani în urmă
părinte
comite
e7d30de56f

+ 16 - 17
src/views/material/basicFile/details.vue

@@ -29,7 +29,7 @@
               </el-dropdown-menu>
             </el-dropdown>
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                      <el-button size="small" @click="handleQuery">查询</el-button> -->
+                                                                                                                                                                                                                                                                                                                                                                                                                                                          <el-button size="small" @click="handleQuery">查询</el-button> -->
             <el-button size="small" @click="handleRefresh">刷新</el-button>
 
           </el-button-group>
@@ -48,7 +48,7 @@
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item :command="isInvoke(true)">启用</el-dropdown-item>
                 <el-dropdown-item :command="isInvoke(false)">停用</el-dropdown-item>
-                                                                                                                                    </el-dropdown-menu></el-dropdown> -->
+                                                                                                                                        </el-dropdown-menu></el-dropdown> -->
           </el-button-group>
         </el-col>
 
@@ -57,7 +57,7 @@
           <el-button-group>
             <el-button size="small" @click="handleQueryForm">申请单查询</el-button>
           </el-button-group>
-                                                                                                                                                                                                                                                                                                                                                                                                                                              </el-col> -->
+                                                                                                                                                                                                                                                                                                                                                                                                                                                  </el-col> -->
 
         <!-- 导入导出 -->
       <!-- <el-col :span="1.5">
@@ -65,7 +65,7 @@
             <el-button size="small" @click="handleImport">批量导入</el-button>
             <el-button size="small" @click="handleExport">批量导出</el-button>
           </el-button-group>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                </el-col> -->
+                                                                                                                                                                                                                                                                                                                                                                                                                                                    </el-col> -->
 
       </el-row>
 
@@ -111,7 +111,7 @@
           <!-- 附件管理 -->
         <!-- <el-button-group>
             <el-button size="small" icon="el-icon-paperclip" @click="handleFile"></el-button>
-                                                                                                                                                                                                                                                                                                                                                                                                                                              </el-button-group> -->
+                                                                                                                                                                                                                                                                                                                                                                                                                                                  </el-button-group> -->
 
           <!-- 切换 -->
         <!-- <el-button-group>
@@ -123,7 +123,7 @@
               @click="handleChangePage('next')" />
             <el-button size="small" icon="el-icon-d-arrow-right" :disabled="!handleBasicEdit"
               @click="handleChangePage('end')" />
-                                                                                                                                                                                                                                                                                                                                                                                                                                              </el-button-group> -->
+                                                                                                                                                                                                                                                                                                                                                                                                                                                  </el-button-group> -->
         </el-col>
       </el-row>
 
@@ -160,9 +160,8 @@
                         <!--  :disabled="!(headerParam.isEdit && f.edit)" -->
 
                         <!-- 多选框 -->
-                        <el-form-item v-if="f.attribute == 'checkbox'" style="text-align: left;" :prop="f.prop"
-
-                          :rules="[{ required: f.required, message: `请选择${f.name}`, trigger: 'change' }]">
+                        <el-form-item v-if="f.attribute == 'checkbox'" style="text-align: left;" :prop="f.prop">
+                          <!-- :rules="[{ required: f.required, message: `请选择${f.name}`, trigger: 'change' }]" -->
 
                           <el-checkbox :label="f.name" name="type" v-model="basicData.value[f.prop]" true-label="0"
                             false-label="2" :disabled="handleJudge(f)">
@@ -172,8 +171,8 @@
                         <!-- 下拉框   -->
                         <el-form-item v-else-if="f.attribute == 'select'"
                           :id="(updateButtonGroup && f.apiUrl) ? 'selected' : ''"
-                          :prop="f.apiUrl ? `${f.prop}Name` : f.prop"
-                          :rules="[{ required: f.required, message: `请选择${f.name}`, trigger: 'change' }]">
+                          :prop="f.apiUrl ? `${f.prop}Name` : f.prop">
+                          <!-- :rules="[{ required: f.required, message: `请选择${f.name}`, trigger: 'change' }]" -->
 
                           <template slot="label">
                             <el-tooltip class="item" effect="dark" placement="top-start" :disabled="f.name.length < 10">
@@ -209,8 +208,8 @@
                         </el-form-item>
 
                         <!--attribute 文本 数字 文本域 为null -->
-                        <el-form-item v-else :prop="f.prop"
-                          :rules="[{ required: f.required, message: `请输入${f.name}`, trigger: 'blur' }]">
+                        <el-form-item v-else :prop="f.prop">
+                          <!-- :rules="[{ required: f.required, message: `请输入${f.name}`, trigger: 'blur' }]" -->
 
                           <template slot="label">
                             <el-tooltip class="item" effect="dark" placement="top-start" :disabled="f.name.length < 10">
@@ -285,7 +284,7 @@
                                 @focus="m.apiUrl && handleQueryMore(m, '', { name: 'medcineData', prop: m.prop })">
 
                               <!-- <el-option v-if="m.dictId" v-for="d in m.dictValue" :key="d.dictValue"
-                                                                                                                                                                                                                                                            :label="d.dictLabel" :value="d.dictValue"></el-option> -->
+                                                                                                                                                                                                                                                                :label="d.dictLabel" :value="d.dictValue"></el-option> -->
 
                                 <div slot="empty"></div>
                               </el-select>
@@ -437,7 +436,7 @@
               <el-option v-if="mt.dictId" v-for="d in mt.dictId" :key="d.dictValue" :label="d.dictLabel"
                 :value="d.dictValue">
               </el-option>
-                                                                                                                                                                                                                                                                              </el-select> -->
+                                                                                                                                                                                                                                                                                  </el-select> -->
 
             <!-- 其他类型 -->
 
@@ -489,7 +488,7 @@
           <el-collapse-item title="物料基本信息" name="basic">
             <el-form :inline="true" label-position="right" :model="basicData.value">
             <!-- <el-form-item label="所属组织">
-                                                                                                                                                                                                                                                                                                                                      <el-input v-model="basicData.value.orgName" placeholder="所属组织"></el-input></el-form-item> -->
+                                                                                                                                                                                                                                                                                                                                          <el-input v-model="basicData.value.orgName" placeholder="所属组织"></el-input></el-form-item> -->
               <el-form-item label="物料编码">
                 <el-input v-model="basicData.value.code" size="small" readonly placeholder="物料编码"></el-input>
               </el-form-item>
@@ -500,7 +499,7 @@
                 <el-input v-model="basicData.value.enName" size="small" readonly placeholder="英文名称"></el-input>
               </el-form-item>
             <!-- <el-form-item label="版本号">
-                                                                                                                                                                                                                                                                                                                                    <el-input v-model="basicData.value.version"  placeholder="版本号"></el-input></el-form-item> -->
+                                                                                                                                                                                                                                                                                                                                        <el-input v-model="basicData.value.version"  placeholder="版本号"></el-input></el-form-item> -->
 
             </el-form>
           </el-collapse-item>

+ 12 - 4
src/views/material/basicFile/index.vue

@@ -26,7 +26,7 @@
               <el-dropdown-item :command="filterCondition('stop')">显示停用</el-dropdown-item>
               <el-dropdown-item :command="filterCondition('allot')">显示已分配</el-dropdown-item>
             </el-dropdown-menu>
-                                                                                                                                            </el-dropdown> -->
+                                                                                                                                                </el-dropdown> -->
 
           <!-- <el-button size="small" @click="handleQuery">查询</el-button> -->
           <el-button size="small" @click="handleRefresh">刷新</el-button>
@@ -45,14 +45,14 @@
             </el-dropdown-menu>
           </el-dropdown>
         </el-button-group>
-                                                                                                                                        </el-col> -->
+                                                                                                                                            </el-col> -->
 
       <!-- 申请单查询 -->
     <!-- <el-col :span="1.5">
         <el-button-group>
           <el-button size="small" @click="handleQueryForm">申请单查询</el-button>
         </el-button-group>
-                                                                                                                                        </el-col> -->
+                                                                                                                                            </el-col> -->
 
       <!-- 导入导出 -->
       <el-col :span="1.5">
@@ -74,6 +74,7 @@
 
           <el-form-item>
             <el-button size="small" type="primary" @click="handleQuery">查询</el-button>
+            <el-button size="small" @click="handleResetQuery">重置</el-button>
           </el-form-item>
         </el-form>
       </el-col>
@@ -91,7 +92,7 @@
           <template slot-scope="scope">
             {{ h.attribute == 'select' ? scope.row[`${h.prop}Name`] :
               (h.attribute == 'checkbox' ?
-                (scope.row[h.prop] == '0' ? '是' : '否')
+                (scope.row[h.prop] == '0' ? '√' : '')
                 : scope.row[h.prop])
             }}
           </template>
@@ -245,6 +246,13 @@ export default {
       console.log('查询');
       this.getMaterialList('material');
     },
+    // 重置查询条件
+    handleResetQuery() {
+      for (const key in this.queryForm) {
+
+        this.queryForm[key] = '';
+      }
+    },
     // 刷新
     handleRefresh() {
       console.log('刷新');