From df18b23b4569828d6be32fb64c80492241e1fc46 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 16 十月 2023 20:31:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/modeling/Version.vue |   78 ++++++++++++++++++++++++++++++--------
 1 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/modeling/Version.vue b/Source/UBCS-WEB/src/views/modeling/Version.vue
index 5898873..a401e5e 100644
--- a/Source/UBCS-WEB/src/views/modeling/Version.vue
+++ b/Source/UBCS-WEB/src/views/modeling/Version.vue
@@ -63,20 +63,39 @@
         searchMenuSpan:5,
         highlightCurrentRow: true,
         stripe:true,
+        viewBtn:false,
+        columnBtn:false,
         column:[
           {
-            label: '',
+            label: '閫夋嫨',
             prop: 'radio',
-            width: 120
+            width: 120,
+            display:false
           },
           {
             label:'鑻辨枃鍚嶇О',
-            prop: 'id'
+            prop: 'id',
+            editDisabled: true,
+            rules: [
+              {
+                required: true,
+                message: '鑻辨枃鍚嶇О涓嶈兘涓虹┖',
+                trigger: 'blur'
+              }
+            ]
           },
           {
             label:"涓枃鍚嶇О",
             prop:"name",
             search:true,
+            required: true,
+            rules: [
+              {
+                required: true,
+                message: '涓枃鍚嶇О涓嶈兘涓虹┖',
+                trigger: 'blur'
+              }
+            ]
           },
           {
             label:"璺宠穬瀛楃",
@@ -84,11 +103,25 @@
           },
           {
             label: "鍒濆鍊�",
-            prop:"startCode"
+            prop:"startCode",
+            rules: [
+              {
+                required: true,
+                message: '鍒濆鍊间笉鑳戒负绌�',
+                trigger: 'blur'
+              }
+            ]
           },
           {
             label: "姝ラ暱",
-            prop: "serialStep"
+            prop: "serialStep",
+            rules: [
+              {
+                required: true,
+                message: '姝ラ暱涓嶈兘涓虹┖',
+                trigger: 'blur'
+              }
+            ]
           },
           {
             label: "鍓嶇紑",
@@ -149,13 +182,19 @@
       })
     },
     rowUpdate(row, index, done, loading) {
-      update(row).then(() => {
-        this.$message.success('淇敼鎴愬姛')
-        done()
-        this.getList();
-      }).catch(() => {
-        loading()
-      })
+      console.log(row);
+      const date = new Date(row.ts);
+      const formattedDate = `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')} ${date.getHours().toString().padStart(2, '0')}:${date.getMinutes().toString().padStart(2, '0')}:${date.getSeconds().toString().padStart(2, '0')}.${date.getMilliseconds().toString().padStart(3, '0')}`;
+      row.ts = formattedDate;
+      update(row)
+        .then(() => {
+          this.$message.success('淇敼鎴愬姛');
+          done();
+          this.getList();
+        })
+        .catch(() => {
+          loading();
+        });
     },
     rowDel(row) {
       this.$confirm('姝ゆ搷浣滃皢姘镐箙鍒犻櫎, 鏄惁缁х画?', '鎻愮ず', {
@@ -171,11 +210,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