From cfededd9721be4322e660fc879f11a806fcc7963 Mon Sep 17 00:00:00 2001
From: weidy <lastanimals@163.com>
Date: 星期二, 20 六月 2023 17:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue |  131 +++++++++++++++++++++++++++----------------
 1 files changed, 81 insertions(+), 50 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue b/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
index bcf3281..d10dae1 100644
--- a/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
@@ -1,50 +1,81 @@
-<template>
-  <div>
-    <el-button @click="visible = true">娴嬭瘯</el-button>
-    <el-button @click="visible1 = true">鐩镐技椤规煡璇�</el-button>
-    <FormTemplateDialog
-      :visible.sync="visible"
-      :type="this.type"
-      :templateOid="this.templateOid"
-      :codeClassifyOid="this.codeClassifyOid"
-      :codeRuleOid="this.codeRuleOid"
-      :disabledProp="disabledProp"
-      :rowOid="rowOid"
-      @submit="submit"
-    ></FormTemplateDialog>
-    <ResembleQueryDialog
-      :visible.sync="visible1"
-      :type="this.type"
-      :templateOid="this.templateOid"
-      :codeClassifyOid="this.codeClassifyOid"
-      :codeRuleOid="this.codeRuleOid"
-    ></ResembleQueryDialog>
-  </div>
-</template>
-
-<script>
-import ResembleQueryDialog from '@/components/FormTemplate/ResembleQueryDialog.vue';
-export default {
-  name: "FormTempalteTest",
-  components: { ResembleQueryDialog },
-  data() {
-    return {
-      visible: false,
-      visible1: false,
-      // 榛樿绂佺敤鐨勮〃鍏冪礌
-      disabledProp: ["id", 'lcstatus'],
-      // 琛ㄥ崟绫诲瀷
-      type: "add",
-      templateOid: "78B8C7C5-A042-0B96-FE6D-65421451782A",
-      codeClassifyOid: "4524E801-6CC6-92E8-1AC3-2AB9604E8F96",
-      codeRuleOid: "B95872A6-9CEA-D490-8F1B-9D26548CAF96",
-      rowOid: '6EF696C3-CD87-0E7C-1EA1-8DE3913A95C9'
-    };
-  },
-  methods: {
-    submit(data) {
-      console.log(data);
-    }
-  }
-};
-</script>
+<template>
+  <div>
+    <el-button @click="visible = true">娴嬭瘯</el-button>
+    <el-button @click="visible1 = true">鐩镐技椤规煡璇�</el-button>
+    <el-button @click="visible3 = true">鎵归噺瀵煎叆</el-button>
+    <el-button @click="visible2 = true">闄勪欢绠$悊dialog</el-button>
+    <FormTemplateDialog
+      :visible.sync="visible"
+      :type="type"
+      :templateOid="templateOid"
+      :codeClassifyOid="codeClassifyOid"
+      :codeRuleOid="codeRuleOid"
+      :disabledProp="disabledProp"
+      :rowOid="rowOid"
+      @submit="submit"
+    ></FormTemplateDialog>
+    <ResembleQueryDialog
+      :visible.sync="visible1"
+      :type="type"
+      :templateOid="templateOid"
+      :codeClassifyOid="codeClassifyOid"
+      :rowOid="rowOid"
+      :codeRuleOid="codeRuleOid"
+    ></ResembleQueryDialog>
+    <BatchImport
+      :visible.sync="visible3"
+      type="historyImport"
+      :downloadTemplateFun="downloadTemplateFun"
+      :codeClassifyOid="codeClassifyOid"
+    ></BatchImport>
+    <fileInHtml :options="fileOptions"></fileInHtml>
+    <fileinDialog
+      :visible="visible2"
+      :options="fileOptions"
+      @close="visible2 = false"
+    ></fileinDialog>
+  </div>
+</template>
+
+<script>
+import ResembleQueryDialog from "@/components/FormTemplate/ResembleQueryDialog.vue";
+import fileInHtml from "@/components/file/inHtml.vue";
+import fileinDialog from "@/components/file/inDialog.vue";
+import BatchImport from "@/components/BatchImport";
+export default {
+  name: "FormTempalteTest",
+  components: { ResembleQueryDialog, fileInHtml, fileinDialog, BatchImport },
+  data() {
+    return {
+      visible: false,
+      visible1: false,
+      visible2: false,
+      visible3: false,
+      // 榛樿绂佺敤鐨勮〃鍏冪礌
+      disabledProp: ["id", "lcstatus"],
+      // 琛ㄥ崟绫诲瀷
+      type: "add",
+      templateOid: "f441b131-5ea0-4672-ab74-735b11161928",
+      codeClassifyOid: "535FC9B6-FE27-241F-5FCA-ED4DC17CF95B",
+      codeRuleOid: "B95872A6-9CEA-D490-8F1B-9D26548CAF96",
+      rowOid: "551FBA49-9A94-2F83-9126-9DD4F9BB14B5",
+      fileOptions:{
+        ownbizOid:"6EF696C3-CD87-0E7C-1EA1-8DE3913A95C9",
+        ownbizBtm:"wupin",
+        fileDocClassify:'!=processAuditSuggest',
+        fileDocClassifyName:'',
+        hasDownload:true,
+        hasUpload:true
+      }
+    };
+  },
+  methods: {
+    submit(data) {
+      console.log(data);
+    },
+    downloadTemplateFun() {
+
+    }
+  },
+};
+</script>

--
Gitblit v1.9.3