基本信息查询条件保存注释，列表查询调整

src/store/material/query.js

@@ -1,3 +1,8 @@
+/**
+ * 物料基础信息列表查询参数
+ * name:物料名称
+ * code：物料编码
+ * */ 
 const query = {
 
   state: {

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,8 +160,9 @@
                         <!--  :disabled="!(headerParam.isEdit && f.edit)" -->
 
                         <!-- 多选框 -->
-                        <el-form-item v-if="f.attribute == 'checkbox'" style="text-align: left;"
-                          :rules="[{ required: f.required, message: `请选择${f.name}`, trigger: 'change' }]" :prop="f.prop">
+                        <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)">
@@ -183,13 +184,14 @@
                             </el-tooltip>
                           </template>
 
+                          <!-- 参照 -->
                           <el-select v-if="f.apiUrl" v-model="basicData.value[`${f.prop}Name`]" :placeholder="f.name"
                             :key="basicData.value[f.prop]" :disabled="handleJudge(f)"
                             @focus="f.apiUrl && handleQueryMore(f, '', { name: 'basicData', prop: f.prop })">
                             <div slot="empty"></div>
                           </el-select>
 
-
+                          <!-- 字典 -->
                           <el-select v-if="f.dictId" v-model="basicData.value[f.prop]" :placeholder="f.name"
                             :key="basicData.value[f.prop]" :disabled="handleJudge(f)">
                             <el-option v-if="f.dictId" v-for="d in f.dictValue" :key="d.dictValue" :label="d.dictLabel"
@@ -200,8 +202,8 @@
                         </el-form-item>
 
                         <!-- 图片 -->
-                        <el-form-item v-else-if="f.attribute == 'image'" :label="f.name">
-                          <el-image :src="basicData.value[f.prop]" fit="contain" @clicks="handleUpImage"></el-image>
+                        <el-form-item v-else-if="f.attribute == 'image'" :label="f.name" @clicks="handleUpImage">
+                          <el-image :src="basicData.value[f.prop]" fit="contain"></el-image>
                           <!-- <img :src="basicData.value[f.prop]" @clicks="handleUpImage" alt="加载失败"> -->
 
                         </el-form-item>
@@ -283,7 +285,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>
@@ -435,7 +437,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> -->
 
             <!-- 其他类型 -->
 
@@ -487,7 +489,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>
@@ -498,7 +500,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>

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">
@@ -65,12 +65,13 @@
       <!-- 查询框 -->
       <el-col :span="1.5">
         <el-form :inline="true" :model="queryForm" class="mb-query" @submit.native.prevent>
-          <el-form-item label="物料名称">
-            <el-input size="small" v-model="queryForm.name" placeholder="物料名称" clearable></el-input>
-          </el-form-item>
           <el-form-item label="物料编码">
             <el-input size="small" v-model="queryForm.code" placeholder="物料编码" clearable></el-input>
           </el-form-item>
+          <el-form-item label="物料名称">
+            <el-input size="small" v-model="queryForm.name" placeholder="物料名称" clearable></el-input>
+          </el-form-item>
+
           <el-form-item>
             <el-button size="small" type="primary" @click="handleQuery">查询</el-button>
           </el-form-item>
@@ -113,7 +114,7 @@
     </el-dialog>
 
     <!-- 导入弹窗 -->
-    <el-dialog title="批量导入" :visible.sync="importData.show" width="30%" center @before-close="handlefileDialogColse">
+    <el-dialog title="批量导入" :visible.sync="importData.show" width="35%" center @before-close="handlefileDialogColse">
       <div class="mb-import">
 
         <el-upload class="upload-demo" accept=".xls, .xlsx" ref="upload" action="#" :on-remove="handleFileRemove"
@@ -123,6 +124,7 @@
           <div slot="tip" class="el-upload__tip">只能上传Excel文件</div>
         </el-upload>
         <el-button type="success" @click="handleDownTemplate">下载模板</el-button>
+
       </div>
       <span slot="footer">
         <el-button @click="handleImportData('cancal')">取 消</el-button>