From c900c0914a81a1f373ad18e0fa7458b35eb6502c Mon Sep 17 00:00:00 2001
From: TreeWish <1131093754@qq.com>
Date: 星期二, 28 二月 2023 22:12:56 +0800
Subject: [PATCH] Merge branches 'master' and 'master' of http://103.85.165.99:8989/r/LFWEB_NEW

---
 src/views/datamanage/dataUpdata.vue |   58 +++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index d0bd145..724103e 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -955,7 +955,7 @@
         </el-form-item>
         <el-form-item
           v-show="formCheckAll.isDiZai"
-          label="鎵�灞炰笓涓�"
+          label="鍦扮伨绫诲瀷"
         >
 
           <el-select
@@ -1515,6 +1515,7 @@
         selectFileType: "*.*",
         coordinateId: null,
         path: null,
+        verid: null,
       },
       cascader: {
         label: "name",
@@ -1603,6 +1604,7 @@
       metaDataTable: [],
       queryMetaFlag1: false,
       metaDataTable1: [],
+      getCheckedKeys: null
     };
   },
 
@@ -1893,6 +1895,7 @@
         this.$message.error("瀛楁鍒楄〃璋冪敤澶辫触");
         return;
       }
+
       var val = data1.result;
       for (var i in val) {
         val[i].createuser = val[i].createName;
@@ -1909,6 +1912,29 @@
       }
       this.dbTableData = data1.result;
       this.count1 = data1.count;
+    },
+
+    changetimeLayer(res) {
+      var time = new Date(res);
+      var y = time.getFullYear();
+      var m = time.getMonth() + 1;
+      var d = time.getDate();
+      var h = time.getHours();
+      var mm = time.getMinutes();
+      var s = time.getSeconds();
+      return (
+        y +
+        '-' +
+        this.add0(m) +
+        '-' +
+        this.add0(d) +
+        ' ' +
+        h +
+        ':' +
+        mm +
+        ':' +
+        s
+      );
     },
     //鑷姩鍖归厤鍙栨秷
     setInsrtWareTableClose() {
@@ -2135,9 +2161,9 @@
     //鏁翠綋鏂囦欢璐ㄦ鎻愪氦
     commonTestQuay() {
       this.testQuayVisible = false;
-      if (this.formCheckAll.diZaiType != "NO") {
-        this.formCheckAll.isDiZai = "YES";
-      }
+      // if (this.formCheckAll.diZaiType != "NO") {
+      //   this.formCheckAll.isDiZai = "YES";
+      // }
       this.loading = true;
       this.getStartTestQuayTaskStatus();
     },
@@ -2197,8 +2223,8 @@
         this.getStartTaskStatus();
       } else {
         this.quayTestForms.names = this.pathBak;
-        var value = this.$refs["selectcascader"].getCheckedNodes();
-        var bak = value[0].data.fullName.split("\\");
+        var value = this.getCheckedKeys
+        var bak = value.data.fullName.split("\\");
         this.quayTestForms.xmmc = bak[this.taskStatus];
         this.quayTestForms.sjzy = this.formInline.specialtyId;
         this.quayTestForms.zipPath =
@@ -2534,7 +2560,7 @@
           return rs;
         }
       });
-      this.pathBak = val[0].bak;
+      this.pathBak = val[0].checks;
       this.formInline.dirid = val[0].id;
       this.getselectVerByDirid();
     },
@@ -2613,8 +2639,9 @@
         return this.$message("璇烽�夋嫨闇�瑕佽川妫�鐨勬枃浠�");
       }
       if (this.formInline.uploadType == "v1") {
-        var value = this.$refs["selectcascader"].getCheckedNodes();
-        var fileType = value[0].data.fullName;
+
+        var value = this.getCheckedKeys
+        var fileType = value.data.fullName;
         this.quayTestForms.names = fileType;
         this.quayTestForms.sjzy = this.formInline.specialtyId;
         this.quayTestVisible = true;
@@ -2647,10 +2674,10 @@
         this.formCheckAll.xmmc = val[0].name;
         this.formCheckAll.sjzy = this.formInline.specialtyId;
         if (this.formCheckAll.sjzy.indexOf("鍦扮伨") != -1) {
-          this.formCheckAll.isDiZai = true;
+          this.formCheckAll.isDiZai = "YES";
           this.formCheckAll.diZaiType = this.disOptions[0].value;
         } else {
-          this.formCheckAll.isDiZai = false;
+          this.formCheckAll.isDiZai = "NO";
           this.formCheckAll.diZaiType = "NO";
         }
         this.testQuayVisible = true;
@@ -2829,7 +2856,7 @@
         this.formInline.entryId = this.entryOption[0].name;
         this.formInline.dirid = this.entryOption[0].id;
         this.getselectVerByDirid();
-        this.pathBak = this.entryOption[0].bak;
+        this.pathBak = this.entryOption[0].checks;
       } else {
         this.getStartDirChecked(this.catalogOption);
         this.getselectVerByDirid();
@@ -2840,7 +2867,7 @@
     //鐗堟湰鍙疯幏鍙�
     async getselectVerByDirid() {
       this.verOption = [];
-      this.formInline.verid = "";
+
       const res = await dataUploadSelectVerByDirid({
         dirid: this.formInline.dirid,
       });
@@ -2912,7 +2939,8 @@
       // this.$refs['selectcascader'].dropDownVisible = false
       // var value = this.$refs['selectcascader'].getCheckedNodes();
 
-      var bak = node.data.bak;
+      var bak = node.data.checks;
+      this.getCheckedKeys = node
       this.pathBak = bak;
       if (bak != null) {
         for (var key in this.quayTestShow) {
@@ -2921,7 +2949,7 @@
           }
         }
       }
-      var fileType = node.data.code;
+      var fileType = node.data.exts;
       if (fileType == null) {
         fileType = "*.*";
       }

--
Gitblit v1.9.3