From 32ef44c18209c8d75b17ceba0decf2637bb3ebd2 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Mon, 28 Nov 2022 18:27:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9,?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessMaterialsDeliveryRecord.vue        |  2 +-
 .../ProcessMaterialStorageList.vue            |  6 ++--
 .../ProcessUnitWasteWarehouseCodeList.vue     | 34 ++++++++++++++++---
 .../ProcessWasteMaterialsList.vue             |  4 +--
 4 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue b/src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue
index 7f26694..4b3bab2 100644
--- a/src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue
+++ b/src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue
@@ -16,7 +16,7 @@
             </a-form-item>
           </a-col>
           <a-col :xl="8" :lg="7" :md="8" :sm="24">
-            <a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button>
+            <a-button type="primary" icon="download" @click="handleExportXls('出库记录')">导出</a-button>
             <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px">查询</a-button>
             <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
           </a-col>
diff --git a/src/views/materialstorage/ProcessMaterialStorageList.vue b/src/views/materialstorage/ProcessMaterialStorageList.vue
index 555468f..eda81f5 100644
--- a/src/views/materialstorage/ProcessMaterialStorageList.vue
+++ b/src/views/materialstorage/ProcessMaterialStorageList.vue
@@ -16,8 +16,8 @@
 <!--          </a-col>-->
 
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="物料组名称">
-                <a-input placeholder="请输入物料组名称" v-model="queryParam.descriptionId"></a-input>
+              <a-form-item label="物料组编号">
+                <a-input placeholder="请输入物料组编号" v-model="queryParam.descriptionId"></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -187,7 +187,7 @@
             dataIndex: 'merchandiseNewsId'
           },
           {
-            title:'物料组名称',
+            title:'物料组编号',
             align:"center",
             dataIndex: 'descriptionId'
           },
diff --git a/src/views/unitwaste/ProcessUnitWasteWarehouseCodeList.vue b/src/views/unitwaste/ProcessUnitWasteWarehouseCodeList.vue
index 2edfe4f..fd14ccd 100644
--- a/src/views/unitwaste/ProcessUnitWasteWarehouseCodeList.vue
+++ b/src/views/unitwaste/ProcessUnitWasteWarehouseCodeList.vue
@@ -10,20 +10,35 @@
 <!--            </a-form-item>-->
 <!--          </a-col>-->
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
+<!--            <a-form-item label="单位">-->
+<!--              <j-select-depart v-model="queryParam.unit" :trigger-change="true"  ></j-select-depart>-->
+<!--            </a-form-item>-->
             <a-form-item label="单位">
-              <j-select-depart v-model="queryParam.unit" :trigger-change="true"  ></j-select-depart>
+              <a-select v-model="queryParam.unit" placeholder="请输入单位"  @mouseenter="getUnit" >
+                <a-select-option v-for="(item,index) in queryParamsUntil" :key="index" :value="item.unit">{{item.unit_dictText}}</a-select-option>
+              </a-select>
             </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.libraryAssociationIdInvisible"></a-input>
+              <a-select v-model="queryParam.libraryAssociationIdInvisible" placeholder="请输入账外物资编码"  @mouseenter="getUnit" >
+                <a-select-option v-for="(item,index) in queryParamsUntil" :key="index" :value="item.libraryAssociationIdInvisible">{{item.libraryAssociationIdInvisible}}</a-select-option>
+              </a-select>
             </a-form-item>
+<!--            <a-form-item label="账外物资编码">-->
+<!--              <a-input placeholder="请输入账外物资编码" v-model="queryParam.libraryAssociationIdInvisible"></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.libraryAssociationIdWaste"></a-input>
+                <a-select v-model="queryParam.libraryAssociationIdWaste" placeholder="请输入废旧物资编码"  @mouseenter="getUnit" >
+                  <a-select-option v-for="(item,index) in queryParamsUntil" :key="index" :value="item.libraryAssociationIdWaste">{{item.libraryAssociationIdWaste}}</a-select-option>
+                </a-select>
               </a-form-item>
+<!--              <a-form-item label="废旧物资编码">-->
+<!--                <a-input placeholder="请输入废旧物资编码" v-model="queryParam.libraryAssociationIdWaste"></a-input>-->
+<!--              </a-form-item>-->
             </a-col>
           <template v-if="toggleSearchStatus">
           </template>
@@ -138,6 +153,8 @@
   import ProcessUnitWasteWarehouseCodeModal from './modules/ProcessUnitWasteWarehouseCodeModal'
   import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
   import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
+  import { httpAction, getAction } from '@/api/manage'
+
 
   export default {
     name: 'ProcessUnitWasteWarehouseCodeList',
@@ -195,10 +212,11 @@
           deleteBatch: "/unitwaste/processUnitWasteWarehouseCode/deleteBatch",
           exportXlsUrl: "/unitwaste/processUnitWasteWarehouseCode/exportXls",
           importExcelUrl: "unitwaste/processUnitWasteWarehouseCode/importExcel",
-
+          listByuntil: '/unitwaste/processUnitWasteWarehouseCode/list',
         },
         dictOptions:{},
         superFieldList:[],
+        queryParamsUntil:[],
       }
     },
     created() {
@@ -210,6 +228,14 @@
       },
     },
     methods: {
+      //加載項目部
+      getUnit(){
+        getAction(this.url.listByuntil).then((res) => {
+          if (res.success) {
+            this.queryParamsUntil =  res.result.records||res.result;
+          }
+        })
+      },
       initDictConfig(){
       },
       getSuperFieldList(){
diff --git a/src/views/wastematerials/ProcessWasteMaterialsList.vue b/src/views/wastematerials/ProcessWasteMaterialsList.vue
index a2e8fa3..a8b31af 100644
--- a/src/views/wastematerials/ProcessWasteMaterialsList.vue
+++ b/src/views/wastematerials/ProcessWasteMaterialsList.vue
@@ -17,8 +17,8 @@
               </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.materialNumber"></a-input>
+              <a-form-item label="物料号">
+                <a-input placeholder="请输入物料号" v-model="queryParam.materialNumber"></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">