Эх сурвалжийг харах

物料基本信息-四级分类展示编码加名称

002390 1 жил өмнө
parent
commit
ab57cc60cd

+ 32 - 14
src/views/material/basicFile/details.vue

@@ -676,28 +676,38 @@
       :before-close="handleCloseRefer"
     >
       <div>
-        <el-row>
-          <el-col :span="1.5">
-            <el-input v-model="MoreDataDialog.key" placeholder="过滤" size="mini" @change="handleFilterRefer"/>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-input 
+              v-model="MoreDataDialog.key" 
+              placeholder="过滤" 
+              :size="size" 
+              clearable
+              @clear="handleClear"
+              @keyup.enter.native="handleFilterRefer"
+            />
+          </el-col>
+          <el-col :span="6">
+            <el-button type="primary" :size="size" @click.stop="handleFilterRefer">搜索</el-button>
           </el-col>
         </el-row>
         <!-- 树形 -->
         <el-tree 
-          class="referTree" 
-          v-loading="MoreDataDialog.loading" 
           v-if="MoreDataDialog.type == 'tree'"
-          :data="MoreDataDialog.list" 
-          @node-click="handleNodeClick" 
+          v-loading="MoreDataDialog.loading" 
           :key="refer"
-          :props="MoreDataDialog.msg.apiUrl == 'queryMedcineItemDrug' ? drugProps : defaultProps" 
           node-key="id"
+          class="referTree" 
+          :data="MoreDataDialog.list" 
+          @node-click="handleNodeClick" 
+          :props="(MoreDataDialog.msg.apiUrl == 'queryMedcineItemDrug' || MoreDataDialog.msg.apiUrl =='queryMaterialClassify') ? drugProps : defaultProps" 
         >
         </el-tree>
+        
         <!-- queryMedcineItemDrug -->
         <!-- 列表 -->
         <div v-else>
           <el-table  
-            border 
             :data="MoreDataDialog.list"
             v-loading="MoreDataDialog.loading" 
             style="width: 100%"
@@ -706,7 +716,12 @@
             highlight-current-row
           >
             <el-table-column type="index" label="序号" width="55" align="center"/>
-            <el-table-column v-for="m in MoreDataDialog.form" v-if="m.show" :prop="m.prop" :label="m.name"/>
+            <el-table-column 
+              v-for="m in MoreDataDialog.form" 
+              v-if="m.show" 
+              :prop="m.prop" 
+              :label="m.name"
+            />
           </el-table>
 
           <el-pagination 
@@ -748,6 +763,7 @@
     },
     data() {
       return {
+        size:'mini',
         count: 1,
         refer: 1,
         loading: false,
@@ -1061,7 +1077,6 @@
 
         this.getExecuteMethods(msg.apiUrl, par, (data) => {
 
-          console.log(data, '编辑状态下,弹窗显示查询数据');
           _this.MoreDataDialog.type = data.type;
           if (data.type == 'tree') {
 
@@ -1071,9 +1086,7 @@
             _this.MoreDataDialog.form = data.tableHeader;
           }
           this.refer++;
-          // this.count++;s
-          console.log(_this.MoreDataDialog.list, 'this.MoreDataDialog.list');
-          console.log(_this.MoreDataDialog.form, 'this.MoreDataDialog.form');
+          // this.count++;
 
 
         })
@@ -2062,6 +2075,11 @@
           this.handleRefresh();
         }
       },
+      handleClear(){
+        this.MoreDataDialog.key = '';
+        this.handleFilterRefer();
+
+      },
       // 参照弹窗过滤
       handleFilterRefer() {
         // this.MoreDataDialog.key =