From 4a2835ddadb796c69f180097b95f971dbab4687d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 13 九月 2023 09:09:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/modeling/originalAdd.vue |   46 ++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/modeling/originalAdd.vue b/Source/UBCS-WEB/src/views/modeling/originalAdd.vue
index 73f633b..c6b6974 100644
--- a/Source/UBCS-WEB/src/views/modeling/originalAdd.vue
+++ b/Source/UBCS-WEB/src/views/modeling/originalAdd.vue
@@ -111,7 +111,20 @@
             <!-- 閫夋嫨鏋氫妇鏃剁殑寮圭獥 -->
             <el-dialog title="鏋氫妇鍒楄〃" :visible.sync="enumRefer.show" append-to-body @close="closeEnumDialog" width="70%"
                 style="height: 115vh;">
-                <avue-crud ref="eunmTable" :option="enumRefer.option" :data="enumRefer.data" class="enumTable"
+                <div>
+                  <el-form :inline="true" :model="form" class="demo-form-inline" size="small">
+                    <el-form-item label="鏋氫妇浠ｅ彿">
+                      <el-input v-model="form.name" placeholder="鏋氫妇浠ｅ彿"></el-input>
+                    </el-form-item>
+                    <el-form-item label="鏋氫妇鍚嶇О">
+                        <el-input v-model="form.label" placeholder="鏋氫妇鍚嶇О"></el-input>
+                    </el-form-item>
+                    <el-form-item>
+                      <el-button type="primary" @click="onSubmit">鏌ヨ</el-button>
+                    </el-form-item>
+                  </el-form>
+                </div>
+                <avue-crud ref="eunmTable" :option="enumRefer.option"  @on-load="enumOnLoad" :data="enumRefer.data" class="enumTable"
                     @row-click="enumReferClick" :page.sync="enumRefer.enumPage">
                     <template slot="radio" slot-scope="{row}">
                         <el-radio v-model="enumRefer.selectRow" :label="row.$index">&nbsp;
@@ -141,6 +154,10 @@
     },
     data() {
         return {
+            form:{
+              name:'',
+              label:''
+            },
             showSubmitDialog: false,
             // 榛樿鐨勯〉绛�
             activeName: 'referTab',
@@ -229,7 +246,8 @@
                     border: true,
                     reserveSelection: true,
                     searchMenuSpan: 32,
-                    searchShowBtn: false,
+                    // searchShowBtn: false,
+                    // search:true,
                     highlightCurrentRow: true,
                     column: [{
                         label: '',
@@ -241,13 +259,13 @@
                         prop: 'name',
                         align: 'center',
                         searchSpan: 8,
-                        search: true,
+                        // search: true,
                     }, {
                         label: '鏋氫妇鍚嶇О',
                         prop: 'label',
                         align: 'center',
                         searchSpan: 8,
-                        search: true,
+                        // search: true,
                     }]
                 },
                 // 鏋氫妇鍙傜収琛ㄦ牸鏁版嵁
@@ -281,6 +299,26 @@
         this.initAttributeReferTypeList();
     },
     methods: {
+      onSubmit() {
+        const conditionMap = {};
+        if (this.form.name) {
+          conditionMap[`conditionMap['name_like']`] = this.form.name;
+        }
+        if (this.form.label) {
+          conditionMap[`conditionMap['label_like']`] = this.form.label;
+        }
+        getParentList(this.enumRefer.enumPage.currentPage, this.enumRefer.enumPage.pageSize, conditionMap)
+          .then((res) => {
+            this.enumRefer.enumPage.total = res.data.data.total;
+            this.enumRefer.data = res.data.data.records;
+          });
+      },
+        enumOnLoad(){
+          getParentList(this.enumRefer.enumPage.currentPage, this.enumRefer.enumPage.pageSize).then(res => {
+            this.enumRefer.enumPage.total = res.data.data.total;
+            this.enumRefer.data = res.data.data.records;
+          })
+        },
         closeSubmitDialog() {
             this.resetAttributeForm();
             this.showSubmitDialog = false;

--
Gitblit v1.9.3