From 8e6c58eec222c4bbea613e02703d9af22da72bee Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 15 六月 2023 18:17:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/modeling/Version.vue |  110 ++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 89 insertions(+), 21 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/modeling/Version.vue b/Source/UBCS-WEB/src/views/modeling/Version.vue
index 3941b86..2aaa39c 100644
--- a/Source/UBCS-WEB/src/views/modeling/Version.vue
+++ b/Source/UBCS-WEB/src/views/modeling/Version.vue
@@ -11,36 +11,41 @@
                @row-del="rowDel"
                @refresh-change="refreshChange"
                @search-reset="searchChange"
-               @search-change="searchChange">
+               @search-change="searchChange"
+               @row-click="rowClick">
       <template slot="menuLeft">
         <el-tooltip class="item" effect="dark" content="鏌ユ壘鐗堟湰瑙勫垯浣跨敤鑼冨洿" placement="top">
           <el-button size="small"
                      plain
                      type="primary"
                      icon="el-icon-zoom-in"
-                     @click="handleSearch">鏌ョ湅浣跨敤鑼冨洿
+                     @click="applyRangeSearch">鏌ョ湅浣跨敤鑼冨洿
           </el-button>
         </el-tooltip>
-      </template>>
+      </template>
+      <template slot="radio"
+                  slot-scope="{row}">
+                      <el-radio v-model="selectRow"
+                          :label="row.$index">&nbsp;
+                      </el-radio>
+                </template>
     </avue-crud>
-    <el-dialog title="鏌ョ湅浣跨敤鑼冨洿"
-               append-to-body
-               :visible.sync="packageSearchBox"
-               width="1200px">
-      <versionpackage></versionpackage>
-    </el-dialog>
+    <versionpackage :rangeData="applyRangeData" ref="applyRange"></versionpackage>
   </basic-container>
 
 </template>
 
 <script>
-import { getPage,add,update,remove } from '../../api/omd/revisionRule';
+import { getPage,add,update,remove,getAppayRange } from '../../api/omd/revisionRule';
 export default {
   name: "Version",
   data(){
     return {
       //鏌ョ湅浣跨敤鑼冨洿
       packageSearchBox:false,
+      // 鐐瑰嚮鏁版嵁
+      selectRow: '',
+      selectRowData: {},
       //鍒嗛〉鏁版嵁
       page: {
         pageSize: 10,
@@ -56,15 +61,40 @@
         border: true,
         index: true,
         searchMenuSpan:5,
+        highlightCurrentRow: true,
+        stripe:true,
+        viewBtn:false,
+        columnBtn:false,
         column:[
           {
+            label: '閫夋嫨',
+            prop: 'radio',
+            width: 120,
+            display:false
+          },
+          {
             label:'鑻辨枃鍚嶇О',
-            prop: 'id'
+            prop: 'id',
+            rules: [
+              {
+                required: true,
+                message: '鑻辨枃鍚嶇О涓嶈兘涓虹┖',
+                trigger: 'blur'
+              }
+            ]
           },
           {
             label:"涓枃鍚嶇О",
             prop:"name",
             search:true,
+            required: true,
+            rules: [
+              {
+                required: true,
+                message: '涓枃鍚嶇О涓嶈兘涓虹┖',
+                trigger: 'blur'
+              }
+            ]
           },
           {
             label:"璺宠穬瀛楃",
@@ -72,11 +102,25 @@
           },
           {
             label: "鍒濆鍊�",
-            prop:"startCode"
+            prop:"startCode",
+            rules: [
+              {
+                required: true,
+                message: '鍒濆鍊间笉鑳戒负绌�',
+                trigger: 'blur'
+              }
+            ]
           },
           {
             label: "姝ラ暱",
-            prop: "serialStep"
+            prop: "serialStep",
+            rules: [
+              {
+                required: true,
+                message: '姝ラ暱涓嶈兘涓虹┖',
+                trigger: 'blur'
+              }
+            ]
           },
           {
             label: "鍓嶇紑",
@@ -92,12 +136,31 @@
             type:"textarea"
           }
         ]
-      }
+      },
+      applyRangeData: []
     }
   },
   methods:{
-    handleSearch(){
-      this.packageSearchBox=true
+    // 琛岀偣鍑�
+    rowClick(row){
+      this.selectRow = row.$index;
+      this.selectRowData = row;
+    },
+    // 鏌ョ湅搴旂敤鑼冨洿
+    applyRangeSearch(){
+      if (!this.selectRow && this.selectRow != 0){
+        console.log(this.selectRow);
+          this.$message({
+            type:"warning",
+            message: "璇峰厛閫夋嫨灞炴��"
+          })
+        }
+      getAppayRange(this.selectRowData.id).then(res => {
+         this.applyRangeData = res.data.data;
+         this.$refs.applyRange.rangeData = this.applyRangeData;
+         this.$refs.applyRange.showDialog = true;
+      })
+      // this.packageSearchBox=true
     },
     getList() {
       this.loading = true;
@@ -140,11 +203,16 @@
       })
     },
     searchChange(params, done) {
-      if (done) done();
-      this.params = params;
-      this.page.currentPage = 1;
-      this.getList();
-      this.$message.success('鎼滅储鎴愬姛')
+      var p = {"name_like" : params.name}
+      getPage(this.page.currentPage,this.page.pageSize,p).then(res => {
+        const data = res.data.data
+        this.loading = false;
+        this.page.total = data.total;
+        this.data = data.records;
+      });
+      if (done) {
+       done(); 
+      }
     },
     refreshChange() {
       this.getList();

--
Gitblit v1.9.3