Merge remote-tracking branch 'origin/dev' into dev

src/views/wastematerials/ProcessWasteMaterialsList.vue

@@ -22,7 +22,8 @@
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="核算属性">
-                <a-input placeholder="请输入核算属性" v-model="queryParam.accountingAttributes"></a-input>
+                <j-dict-select-tag placeholder="请输入核算属性" v-model="queryParam.accountingAttributes" dictCode="material_type"></j-dict-select-tag>
+<!--                <a-input placeholder="请输入核算属性" v-model="queryParam.accountingAttributes" dictCode="material_type"></a-input>-->
               </a-form-item>
             </a-col>
 <!--            <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
@@ -40,7 +41,6 @@
 
       <!-- 操作按钮区域 -->
       <div class="table-operator">
-        <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
         <a-button type="primary" icon="download" @click="handleExportXls('账外物资库')">导出</a-button>
         <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
           <a-button type="primary" icon="import">导入</a-button>
@@ -118,6 +118,8 @@
   import { httpAction, getAction } from '@/api/manage'
   import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
   import ProcessWasteMaterialsLists from '@views/wastematerials/ProcessWasteMaterialsLists'
+  import { ajaxGetDictItems, getDictItemsFromCache } from '@api/api'
+  import {initDictOptions, filterDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'ProcessWasteMaterialsList',
@@ -207,6 +209,7 @@
     },
     created() {
     this.getSuperFieldList();
+    this.initDictConfig();
     },
     computed: {
       importExcelUrl: function(){
@@ -218,6 +221,19 @@
         this.$router.push({name:'src-views-wastematerials-ProcessWasteMaterialsLists',params:{material: record.material}})
       },
       initDictConfig(){
+        //优先从缓存中读取字典配置
+        if(getDictItemsFromCache(this.dictCode)){
+          this.dictOptions = getDictItemsFromCache(this.dictCode);
+          return
+        }
+
+        //根据字典Code, 初始化字典数组
+        ajaxGetDictItems(this.dictCode, null).then((res) => {
+          if (res.success) {
+//                console.log(res.result);
+            this.dictOptions = res.result;
+          }
+        })
       },
       getSuperFieldList(){
         // let fieldList=[];
@@ -246,16 +262,13 @@
         getAction(this.url.queryLibraryName,item).then((res)=>{
           if(res.success){
             this.libraryNames = res.result.records;
-            console.log("222222")
             console.log(res.result.records);
           }
         });
         getAction(this.url.queryListmaterials).then((res)=>{
           if(res.success){
             this.Listmaterials = res.result;
-            console.log("1111111")
             console.log(res.result);
-            console.log("22222-22")
           }
         });
       }

src/views/wastematerials/ProcessWasteMaterialsLists.vue

@@ -20,11 +20,11 @@
                 <a-input placeholder="请输入物料组" v-model="queryParam.materialGroup"></a-input>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="物料">
-                <a-input placeholder="请输入物料" v-model="queryParam.material" :read-only="true"></a-input>
-              </a-form-item>
-            </a-col>
+<!--            <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+<!--              <a-form-item label="物料">-->
+<!--                <a-input placeholder="请输入物料" v-model="queryParam.material" :read-only="true"></a-input>-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="物料描述">
                 <a-input placeholder="请输入物料描述" v-model="queryParam.materialDescription"></a-input>
@@ -60,7 +60,7 @@
       </div>
       <div class="table-operator">
         <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-        <a-button type="primary" @click="searchReset" icon="reload">重置{{material}}</a-button>
+        <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
 
       </div>
       <!-- 查询区域-END -->
@@ -123,6 +123,8 @@
   import JDate from '@/components/jeecg/JDate.vue'
   import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
   import ProcessWasteMaterialsList from '@views/wastematerials/ProcessWasteMaterialsList'
+  import {filterDictTextByCache} from '@/components/dict/JDictSelectUtil'
+  import { ajaxGetDictItems, getDictItemsFromCache } from '@api/api'
 
   export default {
     name: 'ProcessWasteMaterialsLists',
@@ -243,9 +245,9 @@
             dataIndex: 'warehousePeople'
           },
           {
-            title:'核算属性',
-            align:"center",
-            dataIndex: 'accountingAttributes'
+            title: '核算属性',
+            align: "center",
+            dataIndex: 'accountingAttributes_dictText',
           }
         ],
         url: {
@@ -340,9 +342,6 @@
         fieldList.push({type:'string',value:'warehousePeople',text:'入库人',dictCode:''})
         fieldList.push({type:'string',value:'accountingAttributes',text:'核算属性',dictCode:''})
         this.superFieldList = fieldList
-        console.log("superFieldList : ")
-        console.log(this.superFieldList)
-
       }
     }
   }