From dac9088c332ddfb6c9076e85fa1986d83b192141 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 05 六月 2023 16:56:55 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS-WEB/src/components/transfer/index.vue                   |   17 
 Source/UBCS-WEB/src/views/integration/applicationForm.vue           |    0 
 Source/UBCS-WEB/src/components/FormTemplate/ResembleQueryDialog.vue |   96 +++
 Source/UBCS-WEB/src/components/FormTemplate/CodeApply.vue           |    3 
 Source/UBCS-WEB/vue.config.js                                       |    4 
 Source/UBCS-WEB/src/views/integration/integrationIndex.vue          |  269 +++++++--
 Source/UBCS-WEB/src/api/formTemplate.js                             |   19 
 Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue        |  977 ++++++++++++++++++--------------------
 Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue       |   23 
 Source/UBCS-WEB/src/components/FormTemplate/index.vue               |   48 +
 Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue           |   20 
 Source/UBCS-WEB/src/views/flow/flowPath.vue                         |   11 
 Source/UBCS-WEB/src/components/transfer/transfer-panel.vue          |    1 
 13 files changed, 852 insertions(+), 636 deletions(-)

diff --git a/Source/UBCS-WEB/src/api/formTemplate.js b/Source/UBCS-WEB/src/api/formTemplate.js
index acbb3d4..992b2df 100644
--- a/Source/UBCS-WEB/src/api/formTemplate.js
+++ b/Source/UBCS-WEB/src/api/formTemplate.js
@@ -2,7 +2,7 @@
 import request from "@/router/axios";
 
 // 鑾峰彇琛ㄥ崟妯℃澘鏁版嵁
-export const getFormTemplate = (params) => {
+export function getFormTemplate(params) {
   return request({
     url: 'api/ubcs-code/ubcs-code/mdmEngineController/getFormDefineByTemplateOid',
     method: 'get',
@@ -10,7 +10,7 @@
   })
 }
 // 琛ㄥ崟鏁版嵁鎵ц浠g爜
-export const executeCode = (params) => {
+export function executeCode(params) {
   return request({
     url: 'api/ubcs-code/ubcs-code/mdmEngineController/getFormDefineByTemplateOid',
     method: 'get',
@@ -18,7 +18,7 @@
   })
 }
 // 鐩镐技椤规煡璇�
-export const findLike = (data) => {
+export function findLike(data) {
   return request({
     url: 'api/ubcs-code/ubcs-code/mdmEngineController/resembleQuery',
     method: 'post',
@@ -26,11 +26,20 @@
   })
 }
 
-// 鑾峰彇鏁版嵁
-export const getCodeRule = (params) => {
+// 鑾峰彇鐮佸�肩敵璇锋暟鎹�
+export function getCodeRule(params) {
   return request({
     url: 'api/ubcs-code/ubcs-code/mdmEngineController/getCodeRuleByClassifyOid',
     method: 'get',
     params
   })
+}
+
+// 鑾峰彇璇︽儏
+export function getFormDetail(params) {
+  return request({
+    url: 'api/ubcs-code/ubcs-code/mdmEngineController/getDataByOid',
+    method: 'get',
+    params
+  })
 }
\ No newline at end of file
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/CodeApply.vue b/Source/UBCS-WEB/src/components/FormTemplate/CodeApply.vue
index 242fbac..8b84cca 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/CodeApply.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/CodeApply.vue
@@ -113,6 +113,9 @@
         return [];
       }
     },
+    async validate() {
+      return await this.$refs.FormTempalte.validate()
+    }
   },
   watch: {
   },
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
index 13d0aee..ec78c2f 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
@@ -1,34 +1,46 @@
+<!-- eslint-disable vue/valid-v-for -->
+<!-- eslint-disable vue/require-v-for-key -->
 <template>
   <div>
-  <avue-form v-model="form" :option="option" v-loading="loading" ref="form"  :style="{minHeight: loading ? '300px' : ''}">
-    <template :slot="item.prop + 'Label'" v-for="item in slotColumnList">
-      <span>
-        <span>{{ item.label }} </span>
-        <el-tooltip
-          v-if="item.keyAttr"
-          class="item"
-          effect="dark"
-          content="璇ュ睘鎬т负鍏抽敭灞炴��"
-          placement="top-start"
-        >
-          <i class="el-icon-star-on key_attr_icon"></i>
-        </el-tooltip>
-      </span>
-    </template>
-    <template :slot="item.prop + ''" v-for="item in slotColumnList">
-      <vciWebRefer v-if="item.type=='refer'" :value="item.value" :options="item.referConfig"></vciWebRefer>
-    </template>
-  </avue-form>
+    <avue-form
+      v-model="form"
+      :option="option"
+      v-loading="loading"
+      ref="form"
+      :style="{ minHeight: loading ? '300px' : '' }"
+    >
+      <template :slot="item.prop + 'Label'" v-for="item in slotColumnList">
+        <span>
+          <span>{{ item.label }} </span>
+          <el-tooltip
+            v-if="item.keyAttr"
+            class="item"
+            effect="dark"
+            content="璇ュ睘鎬т负鍏抽敭灞炴��"
+            placement="top-start"
+          >
+            <i class="el-icon-star-on key_attr_icon"></i>
+          </el-tooltip>
+        </span>
+      </template>
+      <template :slot="item.prop + ''" v-for="item in slotColumnList">
+        <vciWebRefer
+          v-if="item.type == 'refer'"
+          :value="item.value"
+          :options="item.referConfig || {}"
+        ></vciWebRefer>
+      </template>
+    </avue-form>
   </div>
 </template>
 
 <script>
-import { getFormTemplate } from "@/api/formTemplate";
+import { getFormTemplate, getFormDetail } from "@/api/formTemplate";
 import { getDictionary } from "../../api/system/dict";
 import vciWebRefer from "../refer/vciWebRefer.vue";
 export default {
   name: "FormTemplate",
-  components: { vciWebRefer},
+  components: { vciWebRefer },
   props: {
     // 榛樿绂佺敤鍏冪礌
     disabledProp: {
@@ -43,10 +55,10 @@
       type: String,
       default: "",
     },
-    // 淇敼鍥炴樉鐨勬暟鎹�
-    editForm: {
-      type: Object,
-      default: () => ({}),
+    // 鍒楄〃鏁版嵁oid
+    rowOid: {
+      type: String,
+      default: "",
     },
     // 琛ㄥ崟绫诲瀷锛坅dd, edit, detail锛�
     type: {
@@ -71,7 +83,7 @@
       option: {
         emptyBtn: false,
         submitBtn: false,
-        labelWidth: "130",
+        labelWidth: "140",
         column: [],
         group: [],
       },
@@ -84,480 +96,408 @@
         textarea: "textarea",
         datetime: "datetime",
         date: "date",
-        refer:"refer"
+        refer: "refer",
       },
       // 鍋囨暟鎹�
-      // testItems: [
-      //   {
-      //     comboxKey: null,
-      //     customClass: null,
-      //     data: null,
-      //     dateFormate: "",
-      //     defaultValue: "",
-      //     displayExtension: null,
-      //     extendAttrMap: null,
-      //     extendAttrString: null,
-      //     field: "id",
-      //     hidden: false,
-      //     keyAttr: false,
-      //     prefix: "",
-      //     readOnly: false,
-      //     referConfig: null,
-      //     required: false,
-      //     selectLibFlag: "",
-      //     showField: null,
-      //     suffix: "",
-      //     text: "浼犲�肩鐢ㄥ姛鑳�",
-      //     tooltips: "",
-      //     type: "combox",
-      //     unique: false,
-      //     verify: "",
-      //   },
-      //   {
-      //     customClass: null,
-      //     data: null,
-      //     dateFormate: "",
-      //     defaultValue: "",
-      //     displayExtension: null,
-      //     extendAttrMap: null,
-      //     extendAttrString: null,
-      //     field: "state",
-      //     hidden: false,
-      //     keyAttr: false,
-      //     prefix: "",
-      //     readOnly: true,
-      //     referConfig: null,
-      //     required: false,
-      //     selectLibFlag: "",
-      //     showField: null,
-      //     suffix: "",
-      //     text: "鎺ュ彛绂佺敤鍔熻兘",
-      //     tooltips: "",
-      //     type: "combox",
-      //     unique: false,
-      //     verify: "",
-      //   },
-      //   {
-      //     comboxKey: null,
-      //     customClass: null,
-      //     data: null,
-      //     dateFormate: "",
-      //     defaultValue: "",
-      //     displayExtension: null,
-      //     extendAttrMap: null,
-      //     extendAttrString: null,
-      //     field: "oldcode",
-      //     hidden: false,
-      //     keyAttr: false,
-      //     prefix: "el-icon-search",
-      //     readOnly: false,
-      //     referConfig: null,
-      //     required: false,
-      //     selectLibFlag: "",
-      //     showField: null,
-      //     suffix: "鏂囨湰鍚庣紑娴嬭瘯",
-      //     text: "鍓嶅悗缂�鍔熻兘",
-      //     tooltips: "",
-      //     type: "text",
-      //     unique: false,
-      //     verify: "",
-      //   },
-      //   {
-      //     comboxKey: null,
-      //     customClass: null,
-      //     data: null,
-      //     dateFormate: "",
-      //     defaultValue: "",
-      //     displayExtension: null,
-      //     extendAttrMap: null,
-      //     extendAttrString: null,
-      //     field: "materialname",
-      //     hidden: false,
-      //     keyAttr: false,
-      //     prefix: "",
-      //     readOnly: false,
-      //     referConfig: null,
-      //     required: true,
-      //     selectLibFlag: "",
-      //     showField: null,
-      //     suffix: "",
-      //     text: "姝e垯鏍¢獙鍔熻兘",
-      //     tooltips: "璇疯緭鍏ユ暟瀛�",
-      //     type: "text",
-      //     unique: false,
-      //     verify: "/[0-9]/",
-      //   },
-      //   {
-      //     comboxKey: null,
-      //     customClass: null,
-      //     data: [
-      //       {
-      //         attributes: {},
-      //         key: "model_type",
-      //         value: "妯″瀷",
-      //       },
-      //       {
-      //         attributes: {},
-      //         key: "part_type",
-      //         value: "闆朵欢",
-      //       },
-      //     ],
-      //     dateFormate: "",
-      //     defaultValue: "",
-      //     displayExtension: null,
-      //     extendAttrMap: null,
-      //     extendAttrString: null,
-      //     field: "dataSelect",
-      //     hidden: false,
-      //     keyAttr: false,
-      //     prefix: "",
-      //     readOnly: false,
-      //     referConfig: null,
-      //     required: false,
-      //     selectLibFlag: "",
-      //     showField: null,
-      //     suffix: "",
-      //     text: "鐩存帴杩斿洖涓嬫媺",
-      //     tooltips: "",
-      //     type: "combox",
-      //     unique: false,
-      //     verify: "",
-      //   },
-      //   {
-      //     comboxKey: "formTemplateTest",
-      //     customClass: null,
-      //     data: [],
-      //     dateFormate: "",
-      //     defaultValue: "",
-      //     displayExtension: null,
-      //     extendAttrMap: null,
-      //     extendAttrString: null,
-      //     field: "dictSelect",
-      //     hidden: false,
-      //     keyAttr: false,
-      //     prefix: "",
-      //     readOnly: false,
-      //     referConfig: null,
-      //     required: false,
-      //     selectLibFlag: "",
-      //     showField: null,
-      //     suffix: "",
-      //     text: "瀛楀吀杩斿洖涓嬫媺",
-      //     tooltips: "",
-      //     type: "combox",
-      //     unique: false,
-      //     verify: "",
-      //   },
-      //   {
-      //     comboxKey: null,
-      //     customClass: null,
-      //     data: null,
-      //     dateFormate: "",
-      //     defaultValue: "",
-      //     displayExtension: null,
-      //     extendAttrMap: null,
-      //     extendAttrString: null,
-      //     field: "firstfl",
-      //     hidden: false,
-      //     keyAttr: false,
-      //     prefix: "",
-      //     readOnly: false,
-      //     referConfig: null,
-      //     required: false,
-      //     selectLibFlag: "",
-      //     showField: null,
-      //     suffix: "",
-      //     text: "鏁板瓧杈撳叆妗�",
-      //     tooltips: "",
-      //     type: "number",
-      //     unique: false,
-      //     verify: "",
-      //   },
-      //   {
-      //     comboxKey: null,
-      //     customClass: null,
-      //     data: null,
-      //     dateFormate: "yyyy-MM-dd HH:mm:ss",
-      //     defaultValue: "",
-      //     displayExtension: null,
-      //     extendAttrMap: null,
-      //     extendAttrString: null,
-      //     field: "datetime",
-      //     hidden: false,
-      //     keyAttr: false,
-      //     prefix: "",
-      //     readOnly: false,
-      //     referConfig: null,
-      //     required: false,
-      //     selectLibFlag: "",
-      //     showField: null,
-      //     suffix: "",
-      //     text: "鏃ユ湡鏃堕棿閫夋嫨鍣�",
-      //     tooltips: "",
-      //     type: "datetime",
-      //     unique: false,
-      //     verify: "",
-      //   },
-      //   {
-      //     comboxKey: null,
-      //     customClass: null,
-      //     data: null,
-      //     dateFormate: "",
-      //     defaultValue: "",
-      //     displayExtension: null,
-      //     extendAttrMap: null,
-      //     extendAttrString: null,
-      //     field: "time",
-      //     hidden: false,
-      //     keyAttr: false,
-      //     prefix: "",
-      //     readOnly: false,
-      //     referConfig: null,
-      //     required: false,
-      //     selectLibFlag: "",
-      //     showField: null,
-      //     suffix: "",
-      //     text: "鏃堕棿閫夋嫨鍣�",
-      //     tooltips: "",
-      //     type: "date",
-      //     unique: false,
-      //     verify: "",
-      //   },
-      //   {
-      //     comboxKey: null,
-      //     customClass: null,
-      //     data: null,
-      //     dateFormate: "",
-      //     defaultValue: "false",
-      //     displayExtension: null,
-      //     extendAttrMap: null,
-      //     extendAttrString: null,
-      //     field: "xiaoshouwl",
-      //     hidden: false,
-      //     keyAttr: false,
-      //     prefix: "",
-      //     readOnly: false,
-      //     referConfig: null,
-      //     required: false,
-      //     selectLibFlag: "",
-      //     showField: null,
-      //     suffix: "",
-      //     text: "寮�鍏�",
-      //     tooltips: "",
-      //     type: "truefalse",
-      //     unique: false,
-      //     verify: "",
-      //   },
-      //   {
-      //     comboxKey: null,
-      //     customClass: null,
-      //     data: null,
-      //     dateFormate: "",
-      //     defaultValue: "鎴戞槸榛樿鍊�",
-      //     displayExtension: null,
-      //     extendAttrMap: null,
-      //     extendAttrString: null,
-      //     field: "tuhao",
-      //     hidden: false,
-      //     keyAttr: false,
-      //     prefix: "",
-      //     readOnly: false,
-      //     referConfig: null,
-      //     required: false,
-      //     selectLibFlag: "",
-      //     showField: null,
-      //     suffix: "",
-      //     text: "榛樿鍊煎姛鑳�",
-      //     tooltips: "鎻愮ず",
-      //     type: "text",
-      //     unique: false,
-      //     verify: "",
-      //   },
-      //   {
-      //     comboxKey: null,
-      //     customClass: null,
-      //     data: null,
-      //     dateFormate: "",
-      //     defaultValue: "",
-      //     displayExtension: null,
-      //     extendAttrMap: null,
-      //     extendAttrString: null,
-      //     field: "xinghaoguige",
-      //     hidden: false,
-      //     keyAttr: true,
-      //     prefix: "",
-      //     readOnly: false,
-      //     referConfig: null,
-      //     required: false,
-      //     selectLibFlag: "",
-      //     showField: null,
-      //     suffix: "",
-      //     text: "灞炴�у叧閿��",
-      //     tooltips: "",
-      //     type: "text",
-      //     unique: false,
-      //     verify: "",
-      //   },
-      //   {
-      //     comboxKey: null,
-      //     customClass: null,
-      //     data: null,
-      //     dateFormate: "",
-      //     defaultValue: "",
-      //     displayExtension: null,
-      //     extendAttrMap: null,
-      //     extendAttrString: null,
-      //     field: "jiliangdw",
-      //     hidden: false,
-      //     keyAttr: false,
-      //     prefix: "",
-      //     readOnly: false,
-      //     tip: "鎴戞槸鎻愮ず鍔熻兘",
-      //     required: false,
-      //     selectLibFlag: "",
-      //     showField: "jiliangdwname",
-      //     suffix: "",
-      //     text: "鎻愮ず鍔熻兘",
-      //     tooltips: "",
-      //     type: "text",
-      //     unique: false,
-      //     verify: "",
-      //   },
-      //   {
-      //     comboxKey: null,
-      //     customClass: null,
-      //     data: null,
-      //     dateFormate: "",
-      //     defaultValue: "",
-      //     displayExtension: "this.form.sum = this.form.fun1 + this.form.fun2",
-      //     extendAttrMap: null,
-      //     extendAttrString: null,
-      //     field: "fun1",
-      //     hidden: false,
-      //     keyAttr: false,
-      //     prefix: "",
-      //     readOnly: false,
-      //     referConfig: null,
-      //     required: false,
-      //     selectLibFlag: "",
-      //     showField: null,
-      //     suffix: "",
-      //     text: "鍙傛暟1娴嬭瘯js",
-      //     tooltips: "",
-      //     type: "text",
-      //     unique: false,
-      //     verify: "",
-      //   },
-      //   {
-      //     comboxKey: null,
-      //     customClass: null,
-      //     data: null,
-      //     dateFormate: "",
-      //     defaultValue: "",
-      //     displayExtension: "this.form.sum = this.form.fun1 + this.form.fun2",
-      //     extendAttrMap: null,
-      //     extendAttrString: null,
-      //     field: "fun2",
-      //     hidden: false,
-      //     keyAttr: false,
-      //     prefix: "",
-      //     readOnly: false,
-      //     required: false,
-      //     selectLibFlag: "",
-      //     showField: "hesuanfenleiname",
-      //     suffix: "",
-      //     text: "鍙傛暟2娴嬭瘯js",
-      //     tooltips: "",
-      //     type: "text",
-      //     unique: false,
-      //     verify: "",
-      //   },
-      //   {
-      //     comboxKey: null,
-      //     customClass: null,
-      //     data: null,
-      //     dateFormate: "",
-      //     defaultValue: "",
-      //     displayExtension: "",
-      //     extendAttrMap: null,
-      //     extendAttrString: null,
-      //     field: "sum",
-      //     hidden: false,
-      //     keyAttr: false,
-      //     prefix: "",
-      //     readOnly: true,
-      //     required: false,
-      //     selectLibFlag: "",
-      //     showField: "",
-      //     suffix: "",
-      //     text: "鍙傛暟1鍙傛暟2姹傚拰",
-      //     tooltips: "",
-      //     type: "text",
-      //     unique: false,
-      //     verify: "",
-      //   },
-      //   {
-      //     comboxKey: null,
-      //     customClass: null,
-      //     data: null,
-      //     dateFormate: "",
-      //     defaultValue: "",
-      //     displayExtension: null,
-      //     extendAttrMap: null,
-      //     extendAttrString: null,
-      //     field: "textarea",
-      //     hidden: false,
-      //     keyAttr: false,
-      //     prefix: "",
-      //     readOnly: false,
-      //     referConfig: null,
-      //     required: false,
-      //     selectLibFlag: "",
-      //     showField: null,
-      //     suffix: "",
-      //     text: "鏂囨湰鍩�",
-      //     tooltips: "",
-      //     type: "textarea",
-      //     unique: false,
-      //     verify: "",
-      //   },
-      //   {
-      //     comboxKey: null,
-      //     customClass: null,
-      //     data: null,
-      //     dateFormate: "",
-      //     defaultValue: "",
-      //     displayExtension: null,
-      //     extendAttrMap: null,
-      //     extendAttrString: null,
-      //     field: "cz",
-      //     hidden: false,
-      //     keyAttr: false,
-      //     prefix: "",
-      //     readOnly: true,
-      //     referConfig: true,
-      //     required: false,
-      //     selectLibFlag: "",
-      //     showField: "depId",
-      //     suffix: "",
-      //     text: "鍙傜収",
-      //     tooltips: "",
-      //     type: "text",
-      //     unique: false,
-      //     verify: "",
-      //   },
-      // ],
+      testItems: [
+        {
+          comboxKey: null,
+          customClass: null,
+          data: null,
+          dateFormate: "",
+          defaultValue: "",
+          displayExtension: null,
+          extendAttrMap: null,
+          extendAttrString: null,
+          field: "id",
+          hidden: false,
+          keyAttr: false,
+          prefix: "",
+          readOnly: false,
+          referConfig: null,
+          required: false,
+          selectLibFlag: "",
+          showField: null,
+          suffix: "",
+          text: "浼犲�肩鐢ㄥ姛鑳�",
+          tooltips: "",
+          type: "combox",
+          unique: false,
+          verify: "",
+        },
+        {
+          customClass: null,
+          data: null,
+          dateFormate: "",
+          defaultValue: "",
+          displayExtension: null,
+          extendAttrMap: null,
+          extendAttrString: null,
+          field: "state",
+          hidden: false,
+          keyAttr: false,
+          prefix: "",
+          readOnly: true,
+          referConfig: null,
+          required: false,
+          selectLibFlag: "",
+          showField: null,
+          suffix: "",
+          text: "鎺ュ彛绂佺敤鍔熻兘",
+          tooltips: "",
+          type: "combox",
+          unique: false,
+          verify: "",
+        },
+        {
+          comboxKey: null,
+          customClass: null,
+          data: null,
+          dateFormate: "",
+          defaultValue: "",
+          displayExtension: null,
+          extendAttrMap: null,
+          extendAttrString: null,
+          field: "oldcode",
+          hidden: false,
+          keyAttr: false,
+          prefix: "el-icon-search",
+          readOnly: false,
+          referConfig: null,
+          required: false,
+          selectLibFlag: "",
+          showField: null,
+          suffix: "鏂囨湰鍚庣紑娴嬭瘯",
+          text: "鍓嶅悗缂�鍔熻兘",
+          tooltips: "",
+          type: "text",
+          unique: false,
+          verify: "",
+        },
+        {
+          comboxKey: null,
+          customClass: null,
+          data: null,
+          dateFormate: "",
+          defaultValue: "",
+          displayExtension: null,
+          extendAttrMap: null,
+          extendAttrString: null,
+          field: "materialname",
+          hidden: false,
+          keyAttr: false,
+          prefix: "",
+          readOnly: false,
+          referConfig: null,
+          required: true,
+          selectLibFlag: "",
+          showField: null,
+          suffix: "",
+          text: "姝e垯鏍¢獙鍔熻兘",
+          tooltips: "璇疯緭鍏ユ暟瀛�",
+          type: "text",
+          unique: false,
+          verify: "/[0-9]/",
+        },
+        {
+          comboxKey: null,
+          customClass: null,
+          data: [
+            {
+              attributes: {},
+              key: "model_type",
+              value: "妯″瀷",
+            },
+            {
+              attributes: {},
+              key: "part_type",
+              value: "闆朵欢",
+            },
+          ],
+          dateFormate: "",
+          defaultValue: "",
+          displayExtension: null,
+          extendAttrMap: null,
+          extendAttrString: null,
+          field: "dataSelect",
+          hidden: false,
+          keyAttr: false,
+          prefix: "",
+          readOnly: false,
+          referConfig: null,
+          required: false,
+          selectLibFlag: "",
+          showField: null,
+          suffix: "",
+          text: "鐩存帴杩斿洖涓嬫媺",
+          tooltips: "",
+          type: "combox",
+          unique: false,
+          verify: "",
+        },
+        {
+          comboxKey: "formTemplateTest",
+          customClass: null,
+          data: [],
+          dateFormate: "",
+          defaultValue: "",
+          displayExtension: null,
+          extendAttrMap: null,
+          extendAttrString: null,
+          field: "dictSelect",
+          hidden: false,
+          keyAttr: false,
+          prefix: "",
+          readOnly: false,
+          referConfig: null,
+          required: false,
+          selectLibFlag: "",
+          showField: null,
+          suffix: "",
+          text: "瀛楀吀杩斿洖涓嬫媺",
+          tooltips: "",
+          type: "combox",
+          unique: false,
+          verify: "",
+        },
+        {
+          comboxKey: null,
+          customClass: null,
+          data: null,
+          dateFormate: "",
+          defaultValue: "",
+          displayExtension: null,
+          extendAttrMap: null,
+          extendAttrString: null,
+          field: "firstfl",
+          hidden: false,
+          keyAttr: false,
+          prefix: "",
+          readOnly: false,
+          referConfig: null,
+          required: false,
+          selectLibFlag: "",
+          showField: null,
+          suffix: "",
+          text: "鏁板瓧杈撳叆妗�",
+          tooltips: "",
+          type: "number",
+          unique: false,
+          verify: "",
+        },
+        {
+          comboxKey: null,
+          customClass: null,
+          data: null,
+          dateFormate: "yyyy-MM-dd HH:mm:ss",
+          defaultValue: "",
+          displayExtension: null,
+          extendAttrMap: null,
+          extendAttrString: null,
+          field: "datetime",
+          hidden: false,
+          keyAttr: false,
+          prefix: "",
+          readOnly: false,
+          referConfig: null,
+          required: false,
+          selectLibFlag: "",
+          showField: null,
+          suffix: "",
+          text: "鏃ユ湡鏃堕棿閫夋嫨鍣�",
+          tooltips: "",
+          type: "datetime",
+          unique: false,
+          verify: "",
+        },
+        {
+          comboxKey: null,
+          customClass: null,
+          data: null,
+          dateFormate: "",
+          defaultValue: "",
+          displayExtension: null,
+          extendAttrMap: null,
+          extendAttrString: null,
+          field: "time",
+          hidden: false,
+          keyAttr: false,
+          prefix: "",
+          readOnly: false,
+          referConfig: null,
+          required: false,
+          selectLibFlag: "",
+          showField: null,
+          suffix: "",
+          text: "鏃堕棿閫夋嫨鍣�",
+          tooltips: "",
+          type: "date",
+          unique: false,
+          verify: "",
+        },
+        {
+          comboxKey: null,
+          customClass: null,
+          data: null,
+          dateFormate: "",
+          defaultValue: "false",
+          displayExtension: null,
+          extendAttrMap: null,
+          extendAttrString: null,
+          field: "xiaoshouwl",
+          hidden: false,
+          keyAttr: false,
+          prefix: "",
+          readOnly: false,
+          referConfig: null,
+          required: false,
+          selectLibFlag: "",
+          showField: null,
+          suffix: "",
+          text: "寮�鍏�",
+          tooltips: "",
+          type: "truefalse",
+          unique: false,
+          verify: "",
+        },
+        {
+          comboxKey: null,
+          customClass: null,
+          data: null,
+          dateFormate: "",
+          defaultValue: "鎴戞槸榛樿鍊�",
+          displayExtension: null,
+          extendAttrMap: null,
+          extendAttrString: null,
+          field: "tuhao",
+          hidden: false,
+          keyAttr: false,
+          prefix: "",
+          readOnly: false,
+          referConfig: null,
+          required: false,
+          selectLibFlag: "",
+          showField: null,
+          suffix: "",
+          text: "榛樿鍊煎姛鑳�",
+          tooltips: "鎻愮ず",
+          type: "text",
+          unique: false,
+          verify: "",
+        },
+        {
+          comboxKey: null,
+          customClass: null,
+          data: null,
+          dateFormate: "",
+          defaultValue: "",
+          displayExtension: null,
+          extendAttrMap: null,
+          extendAttrString: null,
+          field: "xinghaoguige",
+          hidden: false,
+          keyAttr: true,
+          prefix: "",
+          readOnly: false,
+          referConfig: null,
+          required: false,
+          selectLibFlag: "",
+          showField: null,
+          suffix: "",
+          text: "灞炴�у叧閿��",
+          tooltips: "",
+          type: "text",
+          unique: false,
+          verify: "",
+        },
+        {
+          comboxKey: null,
+          customClass: null,
+          data: null,
+          dateFormate: "",
+          defaultValue: "",
+          displayExtension: null,
+          extendAttrMap: null,
+          extendAttrString: null,
+          field: "jiliangdw",
+          hidden: false,
+          keyAttr: false,
+          prefix: "",
+          readOnly: false,
+          tip: "鎴戞槸鎻愮ず鍔熻兘",
+          required: false,
+          selectLibFlag: "",
+          showField: "jiliangdwname",
+          suffix: "",
+          text: "鎻愮ず鍔熻兘",
+          tooltips: "",
+          type: "text",
+          unique: false,
+          verify: "",
+        },
+        {
+          comboxKey: null,
+          customClass: null,
+          data: null,
+          dateFormate: "",
+          defaultValue: "",
+          displayExtension: null,
+          extendAttrMap: null,
+          extendAttrString: null,
+          field: "textarea",
+          hidden: false,
+          keyAttr: false,
+          prefix: "",
+          readOnly: false,
+          referConfig: null,
+          required: false,
+          selectLibFlag: "",
+          showField: null,
+          suffix: "",
+          text: "鏂囨湰鍩�",
+          tooltips: "",
+          type: "textarea",
+          unique: false,
+          verify: "",
+        },
+        {
+          comboxKey: null,
+          customClass: null,
+          data: null,
+          dateFormate: "",
+          defaultValue: "",
+          displayExtension: null,
+          extendAttrMap: null,
+          extendAttrString: null,
+          field: "cz",
+          hidden: false,
+          keyAttr: false,
+          prefix: "",
+          readOnly: true,
+          referConfig: {},
+          required: false,
+          selectLibFlag: "",
+          showField: "depId",
+          suffix: "",
+          text: "鍙傜収",
+          tooltips: "",
+          type: "refer",
+          unique: false,
+          verify: "",
+        },
+      ],
       trendsSpan: 8,
       defaultValue: {},
       // 琛ㄥ崟灞炴��
       attributes: [],
-      slotColumnList: []
+      slotColumnList: [],
     };
   },
   mounted() {
     this.handleResize();
   },
   methods: {
+    // 鍒濆鍖�
     init(columnList) {
       if (Array.isArray(columnList)) {
         this.templateRender(columnList);
@@ -565,6 +505,7 @@
         this.getFormTemplate();
       }
     },
+    // 鎺ュ彛鑾峰彇琛ㄥ崟鏁版嵁
     getFormTemplate() {
       getFormTemplate({
         templateOid: this.templateOid,
@@ -581,12 +522,13 @@
           console.log(err);
         });
     },
+    // 娓叉煋琛ㄥ崟妯℃澘
     templateRender(formItemList) {
       // 鏃犻渶鍒嗙粍鏁版嵁
       let column = [];
       let group = [];
       let dictKeys = [];
-      let slotColumnList = []
+      let slotColumnList = [];
       formItemList.forEach((formItem) => {
         formItem = this.resetFormConfig(formItem);
         if (formItem.type === "line") {
@@ -605,10 +547,7 @@
           dictKeys.push({ dictKey: formItem.comboxKey, field: formItem.field });
         }
         // 绂佺敤閮ㄥ垎灞炴�э紙澶栭儴浼犲�肩鐢ㄥ拰鍙傜収绂佺敤锛�
-        if (
-          this.disabledProp.includes(formItem.field) //||
-          //this.$utilFunc.isValuableObj(formItem.referConfig)
-        ) {
+        if (this.disabledProp.includes(formItem.field)) {
           formItem.readOnly = true;
         }
         // 璁剧疆琛ㄥ崟鏍¢獙鐨勮鍒欙紝鏂囨湰
@@ -636,8 +575,9 @@
           format: formItem.dateFormate,
           keyAttr: formItem.keyAttr,
           value: formItem.defaultValue,
-          tip: formItem.tooltips,
-          tipPlacement: "right",
+          // tip: formItem.tooltips,
+          // tipPlacement: "right",
+          placeholder: formItem.inputTip,
           comboxKey: formItem.comboxKey,
           display: !formItem.hidden,
           maxlength: formItem.maxlength,
@@ -647,9 +587,6 @@
             this.changeFun(formItem.displayExtension, formItem.prop);
           },
           span: formItem.type === "textarea" ? 24 : this.trendsSpan,
-          click: () => {
-            this.clickFun(formItem.referConfig)
-          },
           rules: [
             {
               required: formItem.required,
@@ -668,7 +605,7 @@
             value: "key",
           },
         };
-        slotColumnList.push(columnItem)
+        slotColumnList.push(columnItem);
         if (group.length === 0) {
           column.push(columnItem);
         } else {
@@ -679,8 +616,9 @@
       this.$set(this.option, "column", column);
       this.$set(this.option, "group", group);
       this.formIndex++;
-      this.loading = false
+      this.loading = false;
       this.geDictData(dictKeys);
+      this.getFormDetail()
     },
     // 浣跨敤浼犲叆鐨勮〃鍗曟暟鎹厤缃�
     resetFormConfig(formItem) {
@@ -713,6 +651,7 @@
       }
       return formItem;
     },
+    // 鏍规嵁灞忓箷鍔ㄦ�侀厤缃〃鍗曞竷灞�
     handleResize() {
       let windowWidth = document.body.clientWidth;
       this.trendsSpan = 24 / Math.floor(windowWidth / 500);
@@ -730,12 +669,6 @@
       // executeCode({displayExtension, data: this.form}).then(res => {
       //   this.form[prop] = res.data.data
       // })
-    },
-    clickFun(referConfig) {
-      console.log(123123);
-      if (this.type === "detail") {
-        return;
-      }
     },
     // 鑾峰彇swich鍜屽凡鎷垮埌鐨勪笅鎷夋暟鎹�
     getDataList(type, dicData) {
@@ -755,7 +688,7 @@
       }
       return [];
     },
-    // 鑾峰彇瀛楀吀鏁版嵁
+    // 寮傛鑾峰彇瀛楀吀鏁版嵁
     geDictData(dictKeys) {
       dictKeys.forEach((dictObj) => {
         getDictionary({ code: dictObj.dictKey }).then((res) => {
@@ -775,8 +708,30 @@
         });
       });
     },
+    // 琛ㄥ崟鏍¢獙
+     validate() {
+      return new Promise((resolve) => {
+        this.$refs.form.validate((valid, done, msg) => {
+          console.error(msg, valid)
+        if (valid) {
+          resolve(true)
+        } else {
+          resolve(false);
+        }
+      });
+      })
+      
+    },
+    // 鑾峰彇琛ㄥ崟鏁版嵁
+    getFormDetail() {
+      if (this.type === 'add') return
+      getFormDetail({templateOid: this.templateOid, oid: this.rowOid}).then(res => {
+        console.log(res, 'res');
+      })
+    }
   },
   watch: {
+    // 琛ㄥ崟鏁版嵁淇敼鍙嶉鍒扮埗缁勪欢
     form: {
       deep: true,
       immediate: true,
@@ -788,4 +743,10 @@
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="scss" scoped>
+.key_attr_icon {
+  font-size: 20px !important;
+  vertical-align: baseline;
+  color: red;
+}
+</style>
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue b/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue
index 86dce48..3aaf6fe 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue
@@ -1,7 +1,14 @@
 <template>
   <div>
-    <el-table :data="tableData" v-loading="loading" height="250" :border="true">
+    <el-table
+      :data="tableData"
+      v-loading="loading"
+      height="250"
+      :border="true"
+      size="small"
+    >
       <el-table-column
+        v-if="column.length > 0"
         type="index"
         width="60"
         label="搴忓彿"
@@ -55,6 +62,10 @@
       type: String,
       default: "",
     },
+    codeRuleOid: {
+      type: String,
+      default: "",
+    },
     type: {
       type: String,
       default: "add",
@@ -63,14 +74,9 @@
       type: Object,
       default: () => ({}),
     },
-    codeRuleOid: {
-      type: String,
-      default: "",
-    },
   },
   data() {
     return {
-      tableVisible: true,
       formTemplateVisible: false,
       activeName: "findlike",
       tableData: [],
@@ -114,8 +120,6 @@
       formItems: [],
     };
   },
-  created() {},
-  computed: {},
   methods: {
     // 鐩镐技椤规煡璇�
     resembleQuery(form) {
@@ -127,10 +131,9 @@
         codeClassifyOid: this.codeClassifyOid,
         codeRuleOid: this.codeRuleOid,
         templateOid: this.templateOid,
-        data: formValue
+        data: formValue,
       };
       params = Object.assign(params, defaultValue);
-      this.tableVisible = true;
       findLike(params).then((res) => {
         this.loading = false;
         this.tableData = res.data.data || [];
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/ResembleQueryDialog.vue b/Source/UBCS-WEB/src/components/FormTemplate/ResembleQueryDialog.vue
new file mode 100644
index 0000000..9741d14
--- /dev/null
+++ b/Source/UBCS-WEB/src/components/FormTemplate/ResembleQueryDialog.vue
@@ -0,0 +1,96 @@
+<template>
+  <el-dialog
+    :visible.sync="dialogVisible"
+    v-dialogDrag
+    top="0vh"
+    title="鐩镐技椤规煡璇�"
+    :width="width"
+    append-to-body
+    @opened="openDialog"
+    class="avue-dialog avue-dialog--top"
+  >
+    <ResembleQuery
+      v-loading="loading"
+      ref="ResembleQuery"
+      v-bind="$attrs"
+      :column="column"
+      :templateOid="templateOid"
+      :codeRuleOid="codeRuleOid"
+      :codeClassifyOid="codeClassifyOid"
+    ></ResembleQuery>
+  </el-dialog>
+</template>
+
+<script>
+import { getFormTemplate } from "@/api/formTemplate";
+import ResembleQuery from "./ResembleQuery";
+export default {
+  name: "ResembleQueryDialog",
+  components: { ResembleQuery },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+    codeClassifyOid: {
+      type: String,
+      default: "",
+    },
+    templateOid: {
+      type: String,
+      default: "",
+    },
+    codeRuleOid: {
+      type: String,
+      default: "",
+    },
+    type: {
+      type: String,
+      default: "add",
+    },
+    form: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  data() {
+    return {
+      column: [],
+      loading: false
+    };
+  },
+  computed: {
+    dialogVisible: {
+      get() {
+        return this.visible;
+      },
+      set(val) {
+        this.$emit("update:visible", val);
+      },
+    },
+  },
+  methods: {
+    openDialog() {
+      this.loading = true
+      getFormTemplate({
+        templateOid: this.templateOid,
+        codeClassifyOid: this.codeClassifyOid,
+      }).then((res) => {
+        this.loading = false
+        if (
+          res.data &&
+          res.data.resembleTableVO.cols &&
+          res.data.resembleTableVO.cols.length > 0
+        ) {
+          this.column = res.data.resembleTableVO.cols;
+          this.$refs.ResembleQuery.resembleQuery();
+        } else {
+          this.column = [];
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped></style>
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 23edc8f..d04ed50 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -19,10 +19,14 @@
       @getFormData="getFormData"
     ></FormTempalte>
 
-    <div class="tab_box" v-if="type !== 'detail' && dialogVisible">
-      <el-tabs v-model="activeName" type="card">
+    <div class="tab_box" v-if="type !== 'detail' && dialogVisible && (showCodeApply || showResembleQuery)">
+      <el-tabs v-model="activeName" type="border-card">
         <el-tab-pane label="鐮佸�肩敵璇�" name="codeApply" v-if="showCodeApply">
-          <CodeApply ref="CodeApply" v-bind="$attrs" @getCodeRuleOid="getCodeRuleOid"></CodeApply>
+          <CodeApply
+            ref="CodeApply"
+            v-bind="$attrs"
+            @getCodeRuleOid="getCodeRuleOid"
+          ></CodeApply>
         </el-tab-pane>
         <el-tab-pane
           label="鐩镐技椤规煡璇�"
@@ -35,17 +39,16 @@
             :hasResemble="this.hasResemble"
             :column="this.resembleTableColumn"
             :form="this.form"
-            :codeRuleOid="codeRuleOid"
           ></ResembleQuery>
         </el-tab-pane>
       </el-tabs>
     </div>
     <div class="avue-dialog__footer" v-if="type !== 'detail'">
       <el-button @click="close()">鍙� 娑�</el-button>
-      <el-button @click="close()" type="primary" :loading="submitBtnLoading"
+      <el-button @click="submit()" type="primary" :loading="submitBtnLoading"
         >纭� 瀹�</el-button
       >
-      <el-button @click="resembleQuerySubmit" type="primary" v-if="hasResemble"
+      <el-button @click="resembleQuerySubmit" type="primary" v-if="showResembleQuery"
         >鐩镐技鍍忔煡璇�</el-button
       >
     </div>
@@ -70,7 +73,7 @@
     },
     title: {
       type: String,
-      default: "琛ㄥ崟妯℃澘",
+      default: "缂栫爜鐢宠",
     },
     width: {
       type: String,
@@ -84,9 +87,7 @@
       hasResemble: false,
       resembleTableColumn: [],
       secVOList: [],
-      activeName: "resembleQuery",
-      codeRuleOid: '',
-      form: {}
+      form: {},
     };
   },
   created() {},
@@ -105,29 +106,31 @@
           return false;
         }
       } else {
-        if (this.hasResemble) {
-          return false;
-        }
+        return false;
       }
       return true;
     },
     showResembleQuery() {
       return this.hasResemble;
     },
+    activeName() {
+      return (
+        (this.showCodeApply && "codeApply") ||
+        (this.showResembleQuery && "resembleQuery")
+      );
+    },
   },
   methods: {
     openDialog() {
       this.$nextTick(() => {
-        this.$refs.FormTempalte.init()
-        this.$refs.CodeApply.getCodeRule()
-      })
+        this.$refs.FormTempalte.init();
+      });
     },
     close() {
       this.dialogVisible = false;
     },
     getCodeRuleOid(data) {
-      this.codeRuleOid = data.oid
-      this.secVOList = data.secVOList
+      this.secVOList = data.secVOList;
     },
     getFormTemplate(data) {
       this.hasResemble =
@@ -137,11 +140,18 @@
       this.resembleTableColumn = data.resembleTableVO.cols || [];
     },
     getFormData(form) {
-      this.form = form
+      this.form = form;
     },
     resembleQuerySubmit() {
       this.$refs.resembleQueryRef.resembleQuery(this.form);
     },
+    async submit() {
+      const formValidate = await this.$refs.FormTempalte.validate();
+      if (this.showCodeApply) {
+        const codeValidate = this.$refs.CodeApply.validate();
+        console.log(formValidate, codeValidate);
+      }
+    },
   },
 };
 </script>
diff --git a/Source/UBCS-WEB/src/components/transfer/index.vue b/Source/UBCS-WEB/src/components/transfer/index.vue
index f8af0ec..99639fd 100644
--- a/Source/UBCS-WEB/src/components/transfer/index.vue
+++ b/Source/UBCS-WEB/src/components/transfer/index.vue
@@ -123,13 +123,16 @@
         },
 
         sourceData() {
-            return this.data.filter(item => this.value.indexOf(item[this.props.key]) === -1);
+            return this.data.filter(item => this.value.indexOf(item) === -1);
         },
 
         targetData() {
             if (this.targetOrder === 'original') {
-                return this.data.filter(item => this.value.indexOf(item[this.props.key]) > -1);
+                console.log('11111')
+                return this.data.filter(item =>  this.value.indexOf(item) > -1
+                );
             } else {
+                console.log('22222')
                 return this.value.reduce((arr, cur) => {
                     const val = this.dataObj[cur];
                     if (val) {
@@ -198,15 +201,13 @@
                     this.leftChecked.indexOf(itemKey) > -1 &&
                     this.value.indexOf(itemKey) === -1
                 ) {
-                    // itemsToBeMoved.push(itemKey)
-                    itemsToBeMoved = [itemKey]
+                    // itemsToBeMoved = [itemKey]
+                    itemsToBeMoved = [item]
                     console.log(itemsToBeMoved)
                 }
             });
-            // currentValue = this.targetOrder === 'unshift'
-            //     ? itemsToBeMoved.concat(currentValue)
-            //     : currentValue.concat(itemsToBeMoved);
-            currentValue = itemsToBeMoved
+            // currentValue = itemsToBeMoved
+             currentValue = itemsToBeMoved
             this.$emit('input', currentValue);
             this.$emit('change', currentValue, 'right', this.leftChecked);
         },
diff --git a/Source/UBCS-WEB/src/components/transfer/transfer-panel.vue b/Source/UBCS-WEB/src/components/transfer/transfer-panel.vue
index 4cde3a8..232be18 100644
--- a/Source/UBCS-WEB/src/components/transfer/transfer-panel.vue
+++ b/Source/UBCS-WEB/src/components/transfer/transfer-panel.vue
@@ -147,7 +147,6 @@
     computed: {
         filteredData() {
             return this.data.filter(item => {
-                console.log(item)
                 if (typeof this.filterMethod === 'function') {
                     return this.filterMethod(this.query, item);
                 } else {
diff --git a/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue b/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
index 31fe475..1122205 100644
--- a/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
@@ -1,33 +1,43 @@
 <template>
   <div>
     <el-button @click="visible = true">娴嬭瘯</el-button>
+    <el-button @click="visible1 = true">鐩镐技椤规煡璇�</el-button>
     <FormTemplateDialog
       :visible.sync="visible"
-      :FormTemplateProp="FormTemplateProp"
       :type="this.type"
-      :editForm="editForm"
       :templateOid="this.templateOid"
       :codeClassifyOid="this.codeClassifyOid"
+      :codeRuleOid="this.codeRuleOid"
       :disabledProp="disabledProp"
+      :rowOid="rowOid"
     ></FormTemplateDialog>
+    <ResembleQueryDialog
+      :visible.sync="visible1"
+      :type="this.type"
+      :templateOid="this.templateOid"
+      :codeClassifyOid="this.codeClassifyOid"
+      :codeRuleOid="this.codeRuleOid"
+    ></ResembleQueryDialog>
   </div>
 </template>
-codeClassifyOid
 
 <script>
+import ResembleQueryDialog from '@/components/FormTemplate/ResembleQueryDialog.vue';
 export default {
   name: "FormTempalteTest",
+  components: { ResembleQueryDialog },
   data() {
     return {
       visible: false,
+      visible1: false,
       // 榛樿绂佺敤鐨勮〃鍏冪礌
       disabledProp: ["id"],
-      // 淇敼鍥炴樉鐨勬暟鎹�
-      editForm: {},
       // 琛ㄥ崟绫诲瀷
       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'
     };
   },
 };
diff --git a/Source/UBCS-WEB/src/views/flow/flowPath.vue b/Source/UBCS-WEB/src/views/flow/flowPath.vue
index 8a034ed..81b8442 100644
--- a/Source/UBCS-WEB/src/views/flow/flowPath.vue
+++ b/Source/UBCS-WEB/src/views/flow/flowPath.vue
@@ -178,14 +178,15 @@
         width: 20%;
     }
 }
-
-/deep/ .el-upload,
-/deep/ .el-upload-dragger {
+::v-deep(.el-upload){
     width: 100%;
     height: 120px;
 }
-
-/deep/ .el-upload-dragger .el-icon-upload {
+::v-deep(.el-upload-dragger){
+    width: 100%;
+    height: 120px;
+}
+::v-deep(.el-upload-dragger .el-icon-upload) {
     margin: 15px 0 16px;
 }
 </style>
\ No newline at end of file
diff --git a/Source/UBCS-WEB/src/views/integration/applicationForm.vue b/Source/UBCS-WEB/src/views/integration/applicationForm.vue
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Source/UBCS-WEB/src/views/integration/applicationForm.vue
diff --git a/Source/UBCS-WEB/src/views/integration/integrationIndex.vue b/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
index 9e65713..c4ab675 100644
--- a/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
+++ b/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
@@ -29,9 +29,11 @@
                     </el-form>
                     <el-card>
                         <avue-crud :table-loading="loading" :data="mappingData" :option="optionMapping" ref="crudMapping"
-                            @row-update="handleUpdate" @row-click="handleMapingRowClick">
+                            @row-update="handleMapingUpdate" @row-click="handleMapingClick"
+                            @row-dblclick="handleMapingRowClick" @selection-change="selectionChange"
+                            @select="setCurrentRow" @select-all="handleSelectAll">
                             <template slot="menuLeft">
-                                <el-button icon="el-icon-plus" size="small" type="primary" @click="dialogPush = true">鏂� 澧�
+                                <el-button icon="el-icon-plus" size="small" type="primary" :disabled="disabledPush" @click="dialogPush = true">鏂� 澧�
                                 </el-button>
                                 <el-button icon="el-icon-check" size="small" type="primary" @click="handleSave">淇� 瀛�
                                 </el-button>
@@ -57,10 +59,10 @@
             </el-form>
             <p class="text_tip">*閫夋嫨鍒嗙被杩涜灞炴�ц繃婊�, 鎴栬�呰緭鍏ュ睘鎬х殑鍏ㄦ嫾鎴栬�呯畝鎷艰繘琛屾煡璇�! 濡�: 濮撳悕 (鍙緭鍏m鎴杧inming )</p>
             <transfer v-model="transferValue" :data="transferData" :filter-method="filterMethod"
-                filter-placeholder="璇疯緭鍏ユ嫾闊冲叏鎷兼垨鑰呮嫾闊崇缉鍐�" @left-check-change="handelLeftCheck"></transfer>
+                filter-placeholder="璇疯緭鍏ユ嫾闊冲叏鎷兼垨鑰呮嫾闊崇缉鍐�" :props="transferProps"></transfer>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogPush = false">鍙� 娑�</el-button>
-                <el-button type="primary" @click="dialogPush = false">淇� 瀛�</el-button>
+                <el-button type="primary" @click="handelTransferSave">淇� 瀛�</el-button>
             </span>
         </el-dialog>
     </div>
@@ -73,21 +75,50 @@
     components: {
         transfer
     },
+    name:'Integration',
     data() {
-        const generateData = () => {
-            pinyin.setOptions({ checkPolyphone: false, charCase: 1 });
-            const data = [];
-            const cities = ['涓婃捣', '鍖椾含', '骞垮窞', '娣卞湷', '鍗椾含', '瑗垮畨', '鎴愰兘'];
-            cities.forEach((city, index) => {
-                data.push({
-                    label: city,
-                    key: index,
-                    pinyin: pinyin.getFullChars(city),
-                    pinyins: pinyin.getCamelChars(city),
-                });
-            });
-            return data;
-        };
+        const mappingData = [
+            { "oid": "38CF1759-FBF3-44E7-AC45-F6E9A9C3B322", "id": "", "name": "", "description": "", "revisionOid": "b9065e46-6d03-4d11-b1a6-6cffc54e6835", "nameOid": "e6e429f2-0539-4ada-8174-43b37625e7d9", "btmname": "japplyform", "lastR": "1", "firstR": "1", "lastV": "1", "firstV": "1", "creator": "0", "createTime": "2023-06-02 10:57:58", "lastModifier": "0", "lastModifyTime": "2023-06-02 10:57:58", "revisionRule": "", "revisionSeq": 1, "revisionValue": "", "versionRule": "0", "versionSeq": 1, "versionValue": "1", "lcStatus": "", "lcStatusText": "", "ts": "2023-06-02 10:57:58.648", "owner": "1", "copyFromVersion": "", "secretGrade": -1, "secretGradeText": "", "lctid": "", "data": {}, "defaultValue": "", "metaListId": "XJ-799D8-6721-3D79-8EE3-75DAF0680B7E", "sourceClassifyId": "XJ-FC9B6-FE27-241F-5FCA-ED4DC17CF95B", "sourceClassifyName": "浜у搧", "targetAttrId": "", "targetClassifyId": "D2DC11DD-B28A-8874-B656-10A1E0569FF3", "viewModeId": "XJ-B5416-4928-CFB8-84F5-1955AA890764", "viewModeName": "", "targetAttrKey": "", "targetAttrName": "", "sourceAttrKey": "createtime", "sourceAttrName": "鍒涘缓鏃堕棿", "viewModelName": "", "viewName": "閿�鍞鍥�", "targetClassifyName": "铻烘爴", "dockingPreAttrRangeVoList": [], "$cellEdit": false, "$index": 0 }, { "oid": "BB3FAA38-636E-410F-A995-F9BC38EBFF01", "id": "", "name": "", "description": "", "revisionOid": "c4500a61-0c5b-4d3e-b0ea-439203273255", "nameOid": "74d13371-e8b7-49c2-b184-f9b8339a4855", "btmname": "japplyform", "lastR": "1", "firstR": "1", "lastV": "1", "firstV": "1", "creator": "0", "createTime": "2023-06-02 10:57:58", "lastModifier": "0", "lastModifyTime": "2023-06-02 10:57:58", "revisionRule": "", "revisionSeq": 1, "revisionValue": "", "versionRule": "0", "versionSeq": 1, "versionValue": "1", "lcStatus": "", "lcStatusText": "", "ts": "2023-06-02 10:57:58.648", "owner": "1", "copyFromVersion": "", "secretGrade": -1, "secretGradeText": "", "lctid": "", "data": {}, "defaultValue": "", "metaListId": "XJ-9368E-9BA8-38E8-73F3-7D0531A22009", "sourceClassifyId": "XJ-FC9B6-FE27-241F-5FCA-ED4DC17CF95B", "sourceClassifyName": "浜у搧", "targetAttrId": "", "targetClassifyId": "D2DC11DD-B28A-8874-B656-10A1E0569FF3", "viewModeId": "XJ-B5416-4928-CFB8-84F5-1955AA890764", "viewModeName": "", "targetAttrKey": "", "targetAttrName": "", "sourceAttrKey": "lastmodifier", "sourceAttrName": "鏈�鍚庝慨鏀逛汉", "viewModelName": "", "viewName": "閿�鍞鍥�", "targetClassifyName": "铻烘爴", "dockingPreAttrRangeVoList": [], "$cellEdit": false, "$index": 1 }, { "oid": "B730F997-9D98-46DA-B783-ABF256898B2C", "id": "", "name": "", "description": "", "revisionOid": "df82c828-5c88-4725-b362-88863d28c273", "nameOid": "132ed359-3464-41cb-89bf-e36b30fb7b5e", "btmname": "japplyform", "lastR": "1", "firstR": "1", "lastV": "1", "firstV": "1", "creator": "0", "createTime": "2023-06-02 10:57:58", "lastModifier": "0", "lastModifyTime": "2023-06-02 10:57:58", "revisionRule": "", "revisionSeq": 1, "revisionValue": "", "versionRule": "0", "versionSeq": 1, "versionValue": "1", "lcStatus": "", "lcStatusText": "", "ts": "2023-06-02 10:57:58.648", "owner": "1", "copyFromVersion": "", "secretGrade": -1, "secretGradeText": "", "lctid": "", "data": {}, "defaultValue": "", "metaListId": "XJ-B5416-4928-CFB8-84F5-1955AA890762", "sourceClassifyId": "XJ-FC9B6-FE27-241F-5FCA-ED4DC17CF95B", "sourceClassifyName": "浜у搧", "targetAttrId": "", "targetClassifyId": "D2DC11DD-B28A-8874-B656-10A1E0569FF3", "viewModeId": "XJ-B5416-4928-CFB8-84F5-1955AA890762", "viewModeName": "", "targetAttrKey": "", "targetAttrName": "", "sourceAttrKey": "lastmodifytime", "sourceAttrName": "鏈�鍚庝慨鏀规椂闂�", "viewModelName": "", "viewName": "鍩烘湰瑙嗗浘", "targetClassifyName": "铻烘爴", "dockingPreAttrRangeVoList": [], "$cellEdit": false, "$index": 2 }, { "oid": "354864DA-D613-4013-AEE5-803F1A972F77", "id": "", "name": "", "description": "", "revisionOid": "2e819333-6af0-4cc5-bc35-27494f825d46", "nameOid": "21b1d215-20b2-47e1-9225-a6b5b8b825b5", "btmname": "japplyform", "lastR": "1", "firstR": "1", "lastV": "1", "firstV": "1", "creator": "0", "createTime": "2023-06-02 10:57:58", "lastModifier": "0", "lastModifyTime": "2023-06-02 10:57:58", "revisionRule": "", "revisionSeq": 1, "revisionValue": "", "versionRule": "0", "versionSeq": 1, "versionValue": "1", "lcStatus": "", "lcStatusText": "", "ts": "2023-06-02 10:57:58.648", "owner": "1", "copyFromVersion": "", "secretGrade": -1, "secretGradeText": "", "lctid": "", "data": {}, "defaultValue": "", "metaListId": "XJ-0FED7-90B6-BAF8-B558-2A4693CAAD83", "sourceClassifyId": "XJ-FC9B6-FE27-241F-5FCA-ED4DC17CF95B", "sourceClassifyName": "浜у搧", "targetAttrId": "", "targetClassifyId": "D2DC11DD-B28A-8874-B656-10A1E0569FF3", "viewModeId": "XJ-B5416-4928-CFB8-84F5-1955AA890762", "viewModeName": "", "targetAttrKey": "", "targetAttrName": "", "sourceAttrKey": "createcompany", "sourceAttrName": "鍒涘缓鍏徃", "viewModelName": "", "viewName": "鍩烘湰瑙嗗浘", "targetClassifyName": "铻烘爴", "dockingPreAttrRangeVoList": [], "$cellEdit": false, "$index": 3 }, { "oid": "D8EDCA74-E0CB-452A-9E3C-7194061B9E8F", "id": "", "name": "", "description": "", "revisionOid": "d3474951-f35d-437b-818d-24dc1bd71e79", "nameOid": "b44b9c81-644f-47cb-babe-b19a9d532354", "btmname": "japplyform", "lastR": "1", "firstR": "1", "lastV": "1", "firstV": "1", "creator": "0", "createTime": "2023-06-02 10:57:58", "lastModifier": "0", "lastModifyTime": "2023-06-02 10:57:58", "revisionRule": "", "revisionSeq": 1, "revisionValue": "", "versionRule": "0", "versionSeq": 1, "versionValue": "1", "lcStatus": "", "lcStatusText": "", "ts": "2023-06-02 10:57:58.648", "owner": "1", "copyFromVersion": "", "secretGrade": -1, "secretGradeText": "", "lctid": "", "data": {}, "defaultValue": "", "metaListId": "XJ-1469D-F1E9-6A31-21B9-E5FF7A03BBEA", "sourceClassifyId": "XJ-FC9B6-FE27-241F-5FCA-ED4DC17CF95B", "sourceClassifyName": "浜у搧", "targetAttrId": "", "targetClassifyId": "D2DC11DD-B28A-8874-B656-10A1E0569FF3", "viewModeId": "XJ-B5416-4928-CFB8-84F5-1955AA890762", "viewModeName": "", "targetAttrKey": "", "targetAttrName": "", "sourceAttrKey": "kucunwl", "sourceAttrName": "搴撳瓨鐗╂枡", "viewModelName": "", "viewName": "鍩烘湰瑙嗗浘", "targetClassifyName": "铻烘爴", "dockingPreAttrRangeVoList": [], "$cellEdit": false, "$index": 4 }, { "oid": "471DAA41-AD8B-4289-BDF0-023D6F9CB36C", "id": "", "name": "", "description": "", "revisionOid": "a54eb585-727c-41e3-b171-398a7458743b", "nameOid": "75bd7a1e-498c-4f7a-b70b-5741e4af0109", "btmname": "japplyform", "lastR": "1", "firstR": "1", "lastV": "1", "firstV": "1", "creator": "0", "createTime": "2023-06-02 10:57:58", "lastModifier": "0", "lastModifyTime": "2023-06-02 10:57:58", "revisionRule": "", "revisionSeq": 1, "revisionValue": "", "versionRule": "0", "versionSeq": 1, "versionValue": "1", "lcStatus": "", "lcStatusText": "", "ts": "2023-06-02 10:57:58.648", "owner": "1", "copyFromVersion": "", "secretGrade": -1, "secretGradeText": "", "lctid": "", "data": {}, "defaultValue": "", "metaListId": "XJ-07512-3fff-4ff0-bf25-f13fcd2a4acf", "sourceClassifyId": "XJ-FC9B6-FE27-241F-5FCA-ED4DC17CF95B", "sourceClassifyName": "浜у搧", "targetAttrId": "", "targetClassifyId": "D2DC11DD-B28A-8874-B656-10A1E0569FF3", "viewModeId": "XJ-B5416-4928-CFB8-84F5-1955AA890762", "viewModeName": "", "targetAttrKey": "", "targetAttrName": "", "sourceAttrKey": "id", "sourceAttrName": "缂栫爜", "viewModelName": "", "viewName": "鍩烘湰瑙嗗浘", "targetClassifyName": "铻烘爴", "dockingPreAttrRangeVoList": [], "$cellEdit": false, "$index": 5 }, { "oid": "E53F6F6A-2F50-4C54-960B-B4FD428B375C", "id": "", "name": "", "description": "", "revisionOid": "0b01fc2f-a342-4177-bf6a-570aa8ac529c", "nameOid": "e2ee62eb-4508-41ec-8f5a-067e5ad81c16", "btmname": "japplyform", "lastR": "1", "firstR": "1", "lastV": "1", "firstV": "1", "creator": "0", "createTime": "2023-06-02 10:57:58", "lastModifier": "0", "lastModifyTime": "2023-06-02 10:57:58", "revisionRule": "", "revisionSeq": 1, "revisionValue": "", "versionRule": "0", "versionSeq": 1, "versionValue": "1", "lcStatus": "", "lcStatusText": "", "ts": "2023-06-02 10:57:58.648", "owner": "1", "copyFromVersion": "", "secretGrade": -1, "secretGradeText": "", "lctid": "", "data": {}, "defaultValue": "", "metaListId": "XJ-1fe09-da6f-4412-b92f-f411d341e92d", "sourceClassifyId": "XJ-FC9B6-FE27-241F-5FCA-ED4DC17CF95B", "sourceClassifyName": "浜у搧", "targetAttrId": "", "targetClassifyId": "D2DC11DD-B28A-8874-B656-10A1E0569FF3", "viewModeId": "XJ-B5416-4928-CFB8-84F5-1955AA890762", "viewModeName": "", "targetAttrKey": "", "targetAttrName": "", "sourceAttrKey": "lcstatus", "sourceAttrName": "鐘舵��", "viewModelName": "", "viewName": "鍩烘湰瑙嗗浘", "targetClassifyName": "铻烘爴", "dockingPreAttrRangeVoList": [], "$cellEdit": false, "$index": 6 }, { "oid": "A929D6F9-88DB-43BE-BE9C-E079E980A69B", "id": "", "name": "", "description": "", "revisionOid": "76a72660-8f93-46d8-8d3c-3f88baf60108", "nameOid": "96b675b6-3a3a-415b-873c-fc8bc014c699", "btmname": "japplyform", "lastR": "1", "firstR": "1", "lastV": "1", "firstV": "1", "creator": "0", "createTime": "2023-06-02 10:57:58", "lastModifier": "0", "lastModifyTime": "2023-06-02 10:57:58", "revisionRule": "", "revisionSeq": 1, "revisionValue": "", "versionRule": "0", "versionSeq": 1, "versionValue": "1", "lcStatus": "", "lcStatusText": "", "ts": "2023-06-02 10:57:58.648", "owner": "1", "copyFromVersion": "", "secretGrade": -1, "secretGradeText": "", "lctid": "", "data": {}, "defaultValue": "", "metaListId": "XJ-F8C09-A123-391B-E119-748B70028952", "sourceClassifyId": "XJ-FC9B6-FE27-241F-5FCA-ED4DC17CF95B", "sourceClassifyName": "浜у搧", "targetAttrId": "", "targetClassifyId": "D2DC11DD-B28A-8874-B656-10A1E0569FF3", "viewModeId": "XJ-B5416-4928-CFB8-84F5-1955AA890762", "viewModeName": "", "targetAttrKey": "", "targetAttrName": "", "sourceAttrKey": "oldcode", "sourceAttrName": "鍘嗗彶缂栧彿", "viewModelName": "", "viewName": "鍩烘湰瑙嗗浘", "targetClassifyName": "铻烘爴", "dockingPreAttrRangeVoList": [], "$cellEdit": false, "$index": 7 }, { "oid": "1CCC00C8-572A-40BC-AC6F-49A28D55FF4E", "id": "", "name": "", "description": "", "revisionOid": "6daea0b1-fe5c-460e-9541-c0ffffe894af", "nameOid": "98b38f61-a53a-425d-bb32-c9b8c05ce488", "btmname": "japplyform", "lastR": "1", "firstR": "1", "lastV": "1", "firstV": "1", "creator": "0", "createTime": "2023-06-02 10:57:58", "lastModifier": "0", "lastModifyTime": "2023-06-02 10:57:58", "revisionRule": "", "revisionSeq": 1, "revisionValue": "", "versionRule": "0", "versionSeq": 1, "versionValue": "1", "lcStatus": "", "lcStatusText": "", "ts": "2023-06-02 10:57:58.648", "owner": "1", "copyFromVersion": "", "secretGrade": -1, "secretGradeText": "", "lctid": "", "data": {}, "defaultValue": "", "metaListId": "XJ-9ab10-a3bf-4b51-b8c5-337132018f1d", "sourceClassifyId": "XJ-FC9B6-FE27-241F-5FCA-ED4DC17CF95B", "sourceClassifyName": "浜у搧", "targetAttrId": "", "targetClassifyId": "D2DC11DD-B28A-8874-B656-10A1E0569FF3", "viewModeId": "XJ-B5416-4928-CFB8-84F5-1955AA890762", "viewModeName": "", "targetAttrKey": "", "targetAttrName": "", "sourceAttrKey": "name", "sourceAttrName": "鐗╂枡鍚嶇О", "viewModelName": "", "viewName": "鍩烘湰瑙嗗浘", "targetClassifyName": "铻烘爴", "dockingPreAttrRangeVoList": [], "$cellEdit": false, "$index": 8 }, { "oid": "8968D5C3-4AE6-4A7B-9DCA-90382170C200", "id": "", "name": "", "description": "", "revisionOid": "e409f2df-88e5-4ee4-838e-3562d3e57625", "nameOid": "144d88b5-acd6-4235-be14-f3d1907eef1a", "btmname": "japplyform", "lastR": "1", "firstR": "1", "lastV": "1", "firstV": "1", "creator": "0", "createTime": "2023-06-02 10:57:58", "lastModifier": "0", "lastModifyTime": "2023-06-02 10:57:58", "revisionRule": "", "revisionSeq": 1, "revisionValue": "", "versionRule": "0", "versionSeq": 1, "versionValue": "1", "lcStatus": "", "lcStatusText": "", "ts": "2023-06-02 10:57:58.648", "owner": "1", "copyFromVersion": "", "secretGrade": -1, "secretGradeText": "", "lctid": "", "data": {}, "defaultValue": "", "metaListId": "XJ-F0DDF-C5DB-8616-D752-20360970AFB6", "sourceClassifyId": "XJ-FC9B6-FE27-241F-5FCA-ED4DC17CF95B", "sourceClassifyName": "浜у搧", "targetAttrId": "", "targetClassifyId": "D2DC11DD-B28A-8874-B656-10A1E0569FF3", "viewModeId": "XJ-B5416-4928-CFB8-84F5-1955AA890763", "viewModeName": "", "targetAttrKey": "", "targetAttrName": "", "sourceAttrKey": "materialclassify", "sourceAttrName": "鐗╂枡鍒嗙被", "viewModelName": "", "viewName": "閲囪喘瑙嗗浘", "targetClassifyName": "铻烘爴", "dockingPreAttrRangeVoList": [], "$cellEdit": false, "$index": 9 }, { "oid": "55CBC959-7DF1-4B3B-83BC-1BD6484CA967", "id": "", "name": "", "description": "", "revisionOid": "eef610b7-5c56-4357-a6ff-677f99388300", "nameOid": "def770a7-3a5a-4c8f-85a4-36519de4b77e", "btmname": "japplyform", "lastR": "1", "firstR": "1", "lastV": "1", "firstV": "1", "creator": "0", "createTime": "2023-06-02 10:57:58", "lastModifier": "0", "lastModifyTime": "2023-06-02 10:57:58", "revisionRule": "", "revisionSeq": 1, "revisionValue": "", "versionRule": "0", "versionSeq": 1, "versionValue": "1", "lcStatus": "", "lcStatusText": "", "ts": "2023-06-02 10:57:58.648", "owner": "1", "copyFromVersion": "", "secretGrade": -1, "secretGradeText": "", "lctid": "", "data": {}, "defaultValue": "", "metaListId": "XJ-329e5-b881-4128-aea4-f1b8f67eb5e7", "sourceClassifyId": "XJ-FC9B6-FE27-241F-5FCA-ED4DC17CF95B", "sourceClassifyName": "浜у搧", "targetAttrId": "", "targetClassifyId": "D2DC11DD-B28A-8874-B656-10A1E0569FF3", "viewModeId": "XJ-B5416-4928-CFB8-84F5-1955AA890763", "viewModeName": "", "targetAttrKey": "", "targetAttrName": "", "sourceAttrKey": "firstfl", "sourceAttrName": "涓�绾х鐞嗗垎绫�", "viewModelName": "", "viewName": "閲囪喘瑙嗗浘", "targetClassifyName": "铻烘爴", "dockingPreAttrRangeVoList": [], "$cellEdit": false, "$index": 10 }, { "oid": "BD0CA234-065B-43A1-AFEE-555368DF927D", "id": "", "name": "", "description": "", "revisionOid": "34b0de1a-634a-495f-8a2b-51fec7c4d502", "nameOid": "0d8563c8-7c4d-4adf-95ff-a583e8594a63", "btmname": "japplyform", "lastR": "1", "firstR": "1", "lastV": "1", "firstV": "1", "creator": "0", "createTime": "2023-06-02 10:57:58", "lastModifier": "0", "lastModifyTime": "2023-06-02 10:57:58", "revisionRule": "", "revisionSeq": 1, "revisionValue": "", "versionRule": "0", "versionSeq": 1, "versionValue": "1", "lcStatus": "", "lcStatusText": "", "ts": "2023-06-02 10:57:58.648", "owner": "1", "copyFromVersion": "", "secretGrade": -1, "secretGradeText": "", "lctid": "", "data": {}, "defaultValue": "", "metaListId": "XJ-43fc3-a604-4fd8-a2c9-482712301285", "sourceClassifyId": "XJ-FC9B6-FE27-241F-5FCA-ED4DC17CF95B", "sourceClassifyName": "浜у搧", "targetAttrId": "", "targetClassifyId": "D2DC11DD-B28A-8874-B656-10A1E0569FF3", "viewModeId": "XJ-B5416-4928-CFB8-84F5-1955AA890763", "viewModeName": "", "targetAttrKey": "", "targetAttrName": "", "sourceAttrKey": "secondfl", "sourceAttrName": "浜岀骇绠$悊鍒嗙被", "viewModelName": "", "viewName": "閲囪喘瑙嗗浘", "targetClassifyName": "铻烘爴", "dockingPreAttrRangeVoList": [], "$cellEdit": false, "$index": 11 }, { "oid": "C2F69279-BAD6-45B2-98A0-69F1E1DBD6E7", "id": "", "name": "", "description": "", "revisionOid": "4cb208a9-8e78-4d67-8498-c9a0f8430ad2", "nameOid": "2d14dfe4-272a-4884-9bb6-bb2461d37d5a", "btmname": "japplyform", "lastR": "1", "firstR": "1", "lastV": "1", "firstV": "1", "creator": "0", "createTime": "2023-06-02 10:57:58", "lastModifier": "0", "lastModifyTime": "2023-06-02 10:57:58", "revisionRule": "", "revisionSeq": 1, "revisionValue": "", "versionRule": "0", "versionSeq": 1, "versionValue": "1", "lcStatus": "", "lcStatusText": "", "ts": "2023-06-02 10:57:58.648", "owner": "1", "copyFromVersion": "", "secretGrade": -1, "secretGradeText": "", "lctid": "", "data": {}, "defaultValue": "", "metaListId": "XJ-8e06b-b297-4738-ad6d-0b1b0064ae3e", "sourceClassifyId": "XJ-FC9B6-FE27-241F-5FCA-ED4DC17CF95B", "sourceClassifyName": "浜у搧", "targetAttrId": "", "targetClassifyId": "D2DC11DD-B28A-8874-B656-10A1E0569FF3", "viewModeId": "XJ-B5416-4928-CFB8-84F5-1955AA890763", "viewModeName": "", "targetAttrKey": "", "targetAttrName": "", "sourceAttrKey": "thrifl", "sourceAttrName": "涓夌骇绠$悊鍒嗙被", "viewModelName": "", "viewName": "閲囪喘瑙嗗浘", "targetClassifyName": "铻烘爴", "dockingPreAttrRangeVoList": [], "$cellEdit": false, "$index": 12 }, { "oid": "75FDBBFD-A69F-4B09-925D-583C1AF96307", "id": "", "name": "", "description": "", "revisionOid": "5a64c3be-bf36-41ce-8feb-34eac91ff3d4", "nameOid": "06a63d3a-db67-4b97-970a-403f1db18021", "btmname": "japplyform", "lastR": "1", "firstR": "1", "lastV": "1", "firstV": "1", "creator": "0", "createTime": "2023-06-02 10:57:58", "lastModifier": "0", "lastModifyTime": "2023-06-02 10:57:58", "revisionRule": "", "revisionSeq": 1, "revisionValue": "", "versionRule": "0", "versionSeq": 1, "versionValue": "1", "lcStatus": "", "lcStatusText": "", "ts": "2023-06-02 10:57:58.648", "owner": "1", "copyFromVersion": "", "secretGrade": -1, "secretGradeText": "", "lctid": "", "data": {}, "defaultValue": "", "metaListId": "XJ-618cd-475b-4235-8783-20fd3e19e397", "sourceClassifyId": "XJ-FC9B6-FE27-241F-5FCA-ED4DC17CF95B", "sourceClassifyName": "浜у搧", "targetAttrId": "", "targetClassifyId": "D2DC11DD-B28A-8874-B656-10A1E0569FF3", "viewModeId": "XJ-B5416-4928-CFB8-84F5-1955AA890763", "viewModeName": "", "targetAttrKey": "", "targetAttrName": "", "sourceAttrKey": "xiaoshouwl", "sourceAttrName": "閿�鍞墿鏂�", "viewModelName": "", "viewName": "閲囪喘瑙嗗浘", "targetClassifyName": "铻烘爴", "dockingPreAttrRangeVoList": [], "$cellEdit": false, "$index": 13 }, { "oid": "6118CBF1-E0F1-4DE4-8801-4BB0E6C4F4EB", "id": "", "name": "", "description": "", "revisionOid": "b7216ddc-56bd-4f74-a247-b47c8fcbb661", "nameOid": "9772d9f8-93fa-4995-9802-79255bbbc6db", "btmname": "japplyform", "lastR": "1", "firstR": "1", "lastV": "1", "firstV": "1", "creator": "0", "createTime": "2023-06-02 10:57:58", "lastModifier": "0", "lastModifyTime": "2023-06-02 10:57:58", "revisionRule": "", "revisionSeq": 1, "revisionValue": "", "versionRule": "0", "versionSeq": 1, "versionValue": "1", "lcStatus": "", "lcStatusText": "", "ts": "2023-06-02 10:57:58.648", "owner": "1", "copyFromVersion": "", "secretGrade": -1, "secretGradeText": "", "lctid": "", "data": {}, "defaultValue": "", "metaListId": "XJ-3de12-01e3-4a96-9323-ee025f57fe75", "sourceClassifyId": "XJ-FC9B6-FE27-241F-5FCA-ED4DC17CF95B", "sourceClassifyName": "浜у搧", "targetAttrId": "", "targetClassifyId": "D2DC11DD-B28A-8874-B656-10A1E0569FF3", "viewModeId": "XJ-B5416-4928-CFB8-84F5-1955AA890763", "viewModeName": "", "targetAttrKey": "", "targetAttrName": "", "sourceAttrKey": "xinghaoguige", "sourceAttrName": "瑙勬牸鍨嬪彿", "viewModelName": "", "viewName": "閲囪喘瑙嗗浘", "targetClassifyName": "铻烘爴", "dockingPreAttrRangeVoList": [], "$cellEdit": false, "$index": 14 }, { "oid": "614E51BE-C77F-4723-9E3D-E6C73C85E4DA", "id": "", "name": "", "description": "", "revisionOid": "97b1e20e-ed0e-42a8-bf29-a009df5b5b08", "nameOid": "05626bfd-48f6-4401-b1fb-0b8ce5d4628b", "btmname": "japplyform", "lastR": "1", "firstR": "1", "lastV": "1", "firstV": "1", "creator": "0", "createTime": "2023-06-02 10:57:58", "lastModifier": "0", "lastModifyTime": "2023-06-02 10:57:58", "revisionRule": "", "revisionSeq": 1, "revisionValue": "", "versionRule": "0", "versionSeq": 1, "versionValue": "1", "lcStatus": "", "lcStatusText": "", "ts": "2023-06-02 10:57:58.648", "owner": "1", "copyFromVersion": "", "secretGrade": -1, "secretGradeText": "", "lctid": "", "data": {}, "defaultValue": "", "metaListId": "XJ-059FA-B513-114A-318C-9D7FB3E06736", "sourceClassifyId": "XJ-FC9B6-FE27-241F-5FCA-ED4DC17CF95B", "sourceClassifyName": "浜у搧", "targetAttrId": "", "targetClassifyId": "D2DC11DD-B28A-8874-B656-10A1E0569FF3", "viewModeId": "XJ-B5416-4928-CFB8-84F5-1955AA890763", "viewModeName": "", "targetAttrKey": "", "targetAttrName": "", "sourceAttrKey": "jiliangdw", "sourceAttrName": "璁¢噺鍗曚綅", "viewModelName": "", "viewName": "閲囪喘瑙嗗浘", "targetClassifyName": "铻烘爴", "dockingPreAttrRangeVoList": [], "$cellEdit": false, "$index": 15 }, { "oid": "D8FF1A88-D9E9-4585-A82F-B36B61EB89BF", "id": "", "name": "", "description": "", "revisionOid": "aaa415b8-3220-41b2-aeea-35dfe1d0f660", "nameOid": "6f167320-b672-45ba-985f-53bd2be5a7f6", "btmname": "japplyform", "lastR": "1", "firstR": "1", "lastV": "1", "firstV": "1", "creator": "0", "createTime": "2023-06-02 10:57:58", "lastModifier": "0", "lastModifyTime": "2023-06-02 10:57:58", "revisionRule": "", "revisionSeq": 1, "revisionValue": "", "versionRule": "0", "versionSeq": 1, "versionValue": "1", "lcStatus": "", "lcStatusText": "", "ts": "2023-06-02 10:57:58.648", "owner": "1", "copyFromVersion": "", "secretGrade": -1, "secretGradeText": "", "lctid": "", "data": {}, "defaultValue": "", "metaListId": "XJ-4C611-FC2A-C4EB-D85E-74B008515EAB", "sourceClassifyId": "XJ-FC9B6-FE27-241F-5FCA-ED4DC17CF95B", "sourceClassifyName": "浜у搧", "targetAttrId": "", "targetClassifyId": "D2DC11DD-B28A-8874-B656-10A1E0569FF3", "viewModeId": "XJ-B5416-4928-CFB8-84F5-1955AA890763", "viewModeName": "", "targetAttrKey": "", "targetAttrName": "", "sourceAttrKey": "chukufangshi", "sourceAttrName": "鍑哄簱鏂瑰紡", "viewModelName": "", "viewName": "閲囪喘瑙嗗浘", "targetClassifyName": "铻烘爴", "dockingPreAttrRangeVoList": [], "$cellEdit": false, "$index": 16 }, { "oid": "EF4ABCFB-755A-4F16-858E-43CF52FE6629", "id": "", "name": "", "description": "", "revisionOid": "589992f1-b6a9-4380-bab5-59f70c76b010", "nameOid": "57515957-02ed-40df-a0ad-745a59f87a67", "btmname": "japplyform", "lastR": "1", "firstR": "1", "lastV": "1", "firstV": "1", "creator": "0", "createTime": "2023-06-02 10:57:58", "lastModifier": "0", "lastModifyTime": "2023-06-02 10:57:58", "revisionRule": "", "revisionSeq": 1, "revisionValue": "", "versionRule": "0", "versionSeq": 1, "versionValue": "1", "lcStatus": "", "lcStatusText": "", "ts": "2023-06-02 10:57:58.648", "owner": "1", "copyFromVersion": "", "secretGrade": -1, "secretGradeText": "", "lctid": "", "data": {}, "defaultValue": "", "metaListId": "XJ-43953-2216-4171-b1a6-139244e63a95", "sourceClassifyId": "XJ-FC9B6-FE27-241F-5FCA-ED4DC17CF95B", "sourceClassifyName": "浜у搧", "targetAttrId": "", "targetClassifyId": "D2DC11DD-B28A-8874-B656-10A1E0569FF3", "viewModeId": "XJ-B5416-4928-CFB8-84F5-1955AA890763", "viewModeName": "", "targetAttrKey": "", "targetAttrName": "", "sourceAttrKey": "description", "sourceAttrName": "澶囨敞璇存槑", "viewModelName": "", "viewName": "閲囪喘瑙嗗浘", "targetClassifyName": "铻烘爴", "dockingPreAttrRangeVoList": [], "$cellEdit": false, "$index": 17 }, { "oid": "7EED66A2-9A94-4CDA-A475-964DA724F722", "id": "", "name": "", "description": "", "revisionOid": "70483c08-8c9a-4dc9-bd82-01f35bcebab1", "nameOid": "a568101c-6b70-4a3b-9022-7849c4167189", "btmname": "japplyform", "lastR": "1", "firstR": "1", "lastV": "1", "firstV": "1", "creator": "0", "createTime": "2023-06-02 10:57:58", "lastModifier": "0", "lastModifyTime": "2023-06-02 10:57:58", "revisionRule": "", "revisionSeq": 1, "revisionValue": "", "versionRule": "0", "versionSeq": 1, "versionValue": "1", "lcStatus": "", "lcStatusText": "", "ts": "2023-06-02 10:57:58.648", "owner": "1", "copyFromVersion": "", "secretGrade": -1, "secretGradeText": "", "lctid": "", "data": {}, "defaultValue": "", "metaListId": "XJ-D6882-1BA9-BBA6-2344-B433A6FDCA39", "sourceClassifyId": "XJ-FC9B6-FE27-241F-5FCA-ED4DC17CF95B", "sourceClassifyName": "浜у搧", "targetAttrId": "", "targetClassifyId": "D2DC11DD-B28A-8874-B656-10A1E0569FF3", "viewModeId": "XJ-B5416-4928-CFB8-84F5-1955AA890763", "viewModeName": "", "targetAttrKey": "", "targetAttrName": "", "sourceAttrKey": "hesuanfenlei", "sourceAttrName": "鏍哥畻鍒嗙被", "viewModelName": "", "viewName": "閲囪喘瑙嗗浘", "targetClassifyName": "铻烘爴", "dockingPreAttrRangeVoList": [], "$cellEdit": false, "$index": 18 }, { "oid": "2A6DA1F1-AD1C-46D2-BC81-1BB116F790BD", "id": "", "name": "", "description": "", "revisionOid": "1b50dd67-638a-467d-b315-608007e7e440", "nameOid": "5ff49028-0e07-4ab3-bcfd-0a1469435696", "btmname": "japplyform", "lastR": "1", "firstR": "1", "lastV": "1", "firstV": "1", "creator": "0", "createTime": "2023-06-02 10:57:58", "lastModifier": "0", "lastModifyTime": "2023-06-02 10:57:58", "revisionRule": "", "revisionSeq": 1, "revisionValue": "", "versionRule": "0", "versionSeq": 1, "versionValue": "1", "lcStatus": "", "lcStatusText": "", "ts": "2023-06-02 10:57:58.648", "owner": "1", "copyFromVersion": "", "secretGrade": -1, "secretGradeText": "", "lctid": "", "data": {}, "defaultValue": "", "metaListId": "XJ-E34DA-ABF6-9813-8AB0-7651E4B2D54B", "sourceClassifyId": "XJ-FC9B6-FE27-241F-5FCA-ED4DC17CF95B", "sourceClassifyName": "浜у搧", "targetAttrId": "", "targetClassifyId": "D2DC11DD-B28A-8874-B656-10A1E0569FF3", "viewModeId": "XJ-B5416-4928-CFB8-84F5-1955AA890764", "viewModeName": "", "targetAttrKey": "", "targetAttrName": "", "sourceAttrKey": "materialtype", "sourceAttrName": "鐗╂枡绫诲瀷", "viewModelName": "", "viewName": "閿�鍞鍥�", "targetClassifyName": "铻烘爴", "dockingPreAttrRangeVoList": [], "$cellEdit": false, "$index": 19 }, { "oid": "B6F71DAA-CAD0-498C-988D-6D14DDA55DED", "id": "", "name": "", "description": "", "revisionOid": "fb74ab8e-8f63-4542-925e-9d6c4ac9bc4c", "nameOid": "6e2ac133-2ac8-4739-b50b-6b4247f77881", "btmname": "japplyform", "lastR": "1", "firstR": "1", "lastV": "1", "firstV": "1", "creator": "0", "createTime": "2023-06-02 10:57:58", "lastModifier": "0", "lastModifyTime": "2023-06-02 10:57:58", "revisionRule": "", "revisionSeq": 1, "revisionValue": "", "versionRule": "0", "versionSeq": 1, "versionValue": "1", "lcStatus": "", "lcStatusText": "", "ts": "2023-06-02 10:57:58.648", "owner": "1", "copyFromVersion": "", "secretGrade": -1, "secretGradeText": "", "lctid": "", "data": {}, "defaultValue": "", "metaListId": "XJ-38D7E-E51A-81B3-558D-FF1212DFC757", "sourceClassifyId": "XJ-FC9B6-FE27-241F-5FCA-ED4DC17CF95B", "sourceClassifyName": "浜у搧", "targetAttrId": "", "targetClassifyId": "D2DC11DD-B28A-8874-B656-10A1E0569FF3", "viewModeId": "XJ-B5416-4928-CFB8-84F5-1955AA890764", "viewModeName": "", "targetAttrKey": "", "targetAttrName": "", "sourceAttrKey": "tuhao", "sourceAttrName": "鍥惧彿", "viewModelName": "", "viewName": "閿�鍞鍥�", "targetClassifyName": "铻烘爴", "dockingPreAttrRangeVoList": [], "$cellEdit": false, "$index": 20 }, { "oid": "1EE65761-7C78-4D1B-95FD-6CFEEA7A941E", "id": "", "name": "", "description": "", "revisionOid": "02a2f43f-e752-49d1-9abd-a67bbc563f67", "nameOid": "70937fe4-ca24-4afa-9517-09140811e4f7", "btmname": "japplyform", "lastR": "1", "firstR": "1", "lastV": "1", "firstV": "1", "creator": "0", "createTime": "2023-06-02 10:57:58", "lastModifier": "0", "lastModifyTime": "2023-06-02 10:57:58", "revisionRule": "", "revisionSeq": 1, "revisionValue": "", "versionRule": "0", "versionSeq": 1, "versionValue": "1", "lcStatus": "", "lcStatusText": "", "ts": "2023-06-02 10:57:58.648", "owner": "1", "copyFromVersion": "", "secretGrade": -1, "secretGradeText": "", "lctid": "", "data": {}, "defaultValue": "", "metaListId": "XJ-BF978-7354-CE66-415B-16ABD3ED036D", "sourceClassifyId": "XJ-FC9B6-FE27-241F-5FCA-ED4DC17CF95B", "sourceClassifyName": "浜у搧", "targetAttrId": "", "targetClassifyId": "D2DC11DD-B28A-8874-B656-10A1E0569FF3", "viewModeId": "XJ-B5416-4928-CFB8-84F5-1955AA890764", "viewModeName": "", "targetAttrKey": "", "targetAttrName": "", "sourceAttrKey": "zhibaoqi", "sourceAttrName": "璐ㄤ繚鏈�", "viewModelName": "", "viewName": "閿�鍞鍥�", "targetClassifyName": "铻烘爴", "dockingPreAttrRangeVoList": [], "$cellEdit": false, "$index": 21 }, { "oid": "6D33C42D-3754-427E-8963-C4BB381A7B30", "id": "", "name": "", "description": "", "revisionOid": "5060a52a-d967-47c8-af78-c7aadb453bc4", "nameOid": "710d539e-a753-4d3b-83da-d51906879f4c", "btmname": "japplyform", "lastR": "1", "firstR": "1", "lastV": "1", "firstV": "1", "creator": "0", "createTime": "2023-06-02 10:57:58", "lastModifier": "0", "lastModifyTime": "2023-06-02 10:57:58", "revisionRule": "", "revisionSeq": 1, "revisionValue": "", "versionRule": "0", "versionSeq": 1, "versionValue": "1", "lcStatus": "", "lcStatusText": "", "ts": "2023-06-02 10:57:58.648", "owner": "1", "copyFromVersion": "", "secretGrade": -1, "secretGradeText": "", "lctid": "", "data": {}, "defaultValue": "", "metaListId": "XJ-46119-D74B-4818-9A89-6235E2234395", "sourceClassifyId": "XJ-FC9B6-FE27-241F-5FCA-ED4DC17CF95B", "sourceClassifyName": "浜у搧", "targetAttrId": "", "targetClassifyId": "D2DC11DD-B28A-8874-B656-10A1E0569FF3", "viewModeId": "XJ-B5416-4928-CFB8-84F5-1955AA890764", "viewModeName": "", "targetAttrKey": "", "targetAttrName": "", "sourceAttrKey": "revisionvalue", "sourceAttrName": "鐗堟湰", "viewModelName": "", "viewName": "閿�鍞鍥�", "targetClassifyName": "铻烘爴", "dockingPreAttrRangeVoList": [], "$cellEdit": false, "$index": 22 }, { "oid": "4BE71AA3-F86B-4E7B-B1A8-60C77D6D0F9D", "id": "", "name": "", "description": "", "revisionOid": "79c57b17-8856-42da-8336-f7cc90c08ba0", "nameOid": "e8b61f38-9fd3-4344-9bec-45989173da90", "btmname": "japplyform", "lastR": "1", "firstR": "1", "lastV": "1", "firstV": "1", "creator": "0", "createTime": "2023-06-02 10:57:58", "lastModifier": "0", "lastModifyTime": "2023-06-02 10:57:58", "revisionRule": "", "revisionSeq": 1, "revisionValue": "", "versionRule": "0", "versionSeq": 1, "versionValue": "1", "lcStatus": "", "lcStatusText": "", "ts": "2023-06-02 10:57:58.648", "owner": "1", "copyFromVersion": "", "secretGrade": -1, "secretGradeText": "", "lctid": "", "data": {}, "defaultValue": "", "metaListId": "XJ-752FC-DC6E-361E-B960-607D7FF908E6", "sourceClassifyId": "XJ-FC9B6-FE27-241F-5FCA-ED4DC17CF95B", "sourceClassifyName": "浜у搧", "targetAttrId": "", "targetClassifyId": "D2DC11DD-B28A-8874-B656-10A1E0569FF3", "viewModeId": "XJ-B5416-4928-CFB8-84F5-1955AA890764", "viewModeName": "", "targetAttrKey": "", "targetAttrName": "", "sourceAttrKey": "creator", "sourceAttrName": "鍒涘缓浜�", "viewModelName": "", "viewName": "閿�鍞鍥�", "targetClassifyName": "铻烘爴", "dockingPreAttrRangeVoList": [], "$cellEdit": false, "$index": 23 }
+        ]
+        const rangeData = [
+            {
+                "oid": "2023022114232",
+                "id": "",
+                "name": "",
+                "description": "",
+                "revisionOid": "097DC30F-CC8F-595D-0530-7C86C176FC61",
+                "nameOid": "D3FB491C-0571-3BB2-604E-563CC579CCAC",
+                "btmname": "jrange",
+                "lastR": "1",
+                "firstR": "1",
+                "lastV": "1",
+                "firstV": "1",
+                "creator": "1",
+                "createTime": "2023-03-30 23:35:13",
+                "lastModifier": "1",
+                "lastModifyTime": "2023-03-30 23:35:13",
+                "revisionRule": "",
+                "revisionSeq": 1,
+                "revisionValue": "",
+                "versionRule": "0",
+                "versionSeq": 1,
+                "versionValue": "1",
+                "lcStatus": "Exist",
+                "lcStatusText": "",
+                "ts": "2023-03-30 23:35:13.027",
+                "owner": "1",
+                "copyFromVersion": "",
+                "secretGrade": -1,
+                "secretGradeText": "",
+                "lctid": "defaultLC",
+                "data": {},
+                "metaListId": "XJ-752FC-DC6E-361E-B960-607D7FF908E6",
+                "numText": "鏉愭枡",
+                "numTextValue": "1001",
+                "targetNumText": "鏉愭枡",
+                "targetNumTextValue": "7"
+            }
+        ]
         const options = {
             menu: false,
             delBtn: false,
@@ -101,25 +132,35 @@
             cellBtn: true,
             border: true,
             searchMenuSpan: 8,
+            highlightCurrentRow:true,
         }
         return {
+            // 琛ㄥ崟鍊�
             form: {
+                // 鏂板灞炴�ф煡璇㈠��
                 name: '',
+                // 闆嗗洟鏍戞樉绀哄��
                 groupValue: ''
             },
+            // 妫�娴嬫柊澧炴寜閽姸鎬�
+            disabledPush:true,
+            // 琛ㄦ牸鍔犺浇涓�
             loading: false,
-            ishowTree: false,
-            search: '',
-            transferData: generateData(),
+            // 绌挎妗嗘暟鎹�
+            transferData: [],
+            // 绌挎妗嗗弻鍚戠粦瀹氭暟鎹�
             transferValue: [],
+            // dialog寮圭獥寮�鍏�
             dialogPush: false,
-            mappingData: [],
-            rangeData: [],
+            // 灞炴�ф槧灏勮〃鏁版嵁
+            mappingData: mappingData,
+            // 灞炴�ф槧灏勫彇鍊艰〃鏁版嵁
+            rangeData: rangeData,
+            // 涓绘暟鎹爲鎼滅储杩囨护
             filterText: '',
-            tableRowIndex: null,
-            tableColumnIndex: null,
+            // 灞炴�ф槧灏勫彇鍊艰〃閰嶇疆
             optinoRange: {
-                title: '闆嗗洟灞炴��',
+                title: '灞炴�ф槧灏勫彇鍊艰寖鍥�',
                 maxHeight: '300px',
                 header: false,
                 rowKey: 'oid',
@@ -131,37 +172,61 @@
                 ],
                 ...options
             },
+            // 灞炴�ф槧灏勮〃閰嶇疆
             optionMapping: {
                 maxHeight: '500px',
                 header: true,
                 rowKey: 'oid',
+                selection: false,
                 column: [
                     { label: '闆嗗洟鍒嗙被', prop: 'sourceClassifyName', minWidth: 80 },
                     { label: '鎵�灞炶鍥�', prop: 'viewName', minWidth: 80 },
                     { label: '闆嗗洟灞炴��', prop: 'sourceAttrName', minWidth: 80 },
                     { label: '鍒嗙被鍚嶇О', prop: 'targetClassifyName', minWidth: 80 },
-                    { label: '灞炴�у悕绉�', prop: 'targetAttrName', minWidth: 80 },
-                    { label: '榛樿鍊�', prop: 'defaultValue', minWidth: 140, cell: true, blur: (value) => window.handleBlur(value, 'mapping') },
+                    {
+                        label: '灞炴�у悕绉�',
+                        prop: 'targetAttrName',
+                        minWidth: 80,
+                    },
+                    {
+                        label: '榛樿鍊�',
+                        prop: 'defaultValue',
+                        minWidth: 140,
+                        cell: true,
+                        blur: (value) => window.handleBlur(value, 'mapping')
+                    },
                 ],
                 ...options
             },
+            // 涓绘暟鎹垎绫绘爲
             treeData: [],
+            // 闆嗗洟鍒嗙被鏍�
             groupTreeData: [],
+            // 鏍憄opos鏇挎崲鍊�
             defaultProps: {
                 children: 'children',
                 label: 'name',
                 id: 'oid',
                 isLeaf: ''
             },
+            transferProps: {
+                key: 'value',
+                label: 'label'
+
+            },
+            // 闆嗗洟鍒嗙被鏍戝��
             groupVal: '',
+            // 宸︿晶鏍戦�夋嫨鐨刬d鍊�
             treeParam: {},
+            // 琛ㄦ牸閫夋嫨鐨勮
             rangeForm: {},
             mappingForm: {},
+            // 瀹氭椂鍣�
+            times: null,
         }
     },
     watch: {
         filterText(val) {
-            console.log(this.$refs.tree)
             this.$refs.tree.filter(val);
         }
     },
@@ -170,11 +235,14 @@
         pinyin.setOptions({ checkPolyphone: false, charCase: 1 });
     },
     mounted() {
-        window.handleBlur = this.handleBlur
+        let that = this
+        window.handleBlur = that.handleBlur
+
     },
     methods: {
         // 鎺ュ彛宸︿晶鏍�
         async getReferCodeClassifyTree() {
+            this.treeData = []
             const param = {
                 parentBtmName: "jclass",
                 valueField: "oid",
@@ -182,7 +250,6 @@
                 parentFieldName: "id"
             }
             const response = await referCodeClassifyTree(param)
-            console.log(response)
             if (response.status === 200) {
                 let data = response.data;
                 this.treeData = data.map(item => item.children ? { ...item, ...{ isLeaf: false } } : { ...item, ...{ isLeaf: true } })
@@ -190,10 +257,9 @@
         },
         // 鎺ュ彛鑾峰彇灞炴�ф槧灏�
         async getGridAttrMapping(oid) {
+            this.mappingData = []
             this.loading = true
-            console.log(this.treeParam)
             const response = await gridAttrMapping({ sourceClassifyId: oid, ...this.treeParam })
-            console.log(response)
             if (response.status === 200) {
                 this.loading = false
                 this.mappingData = response.data.data
@@ -201,24 +267,35 @@
         },
         // 鎺ュ彛鑾峰彇灞炴�ф槧灏勫彇鍊艰寖鍥�
         async getGridAttrRanges(oid) {
-            this.tablesData = []
+            this.rangeData = []
             const response = await gridAttrRanges({ meatId: oid })
-            console.log(response)
             if (response.status === 200) {
                 this.rangeData = response.data
             }
         },
         // 鎺ュ彛鑾峰彇涓绘暟鎹垎绫诲睘鎬т俊鎭�
         async getListCodeByClassId(oid) {
-            // this.tablesData = []
+            this.transferData = []
+            pinyin.setOptions({ checkPolyphone: false, charCase: 1 });
             const response = await listCodeAttributeByClassId({ codeClassifyId: oid })
-            console.log(response)
+            if (response.status === 200) {
+                const data = response.data.data
+                let objs = data.map(item => {
+                    let pinYin = pinyin.getFullChars(item.name)
+                    let renPing = pinyin.getCamelChars(item.name)
+                    const { name, oid } = item
+                    const obj = { pinyins: pinYin, renPing: renPing, disabled: false, label: name, value: oid }
+                    return obj
+                })
+                this.transferData = objs
+                this.optionMapping.column[4].dicData = objs
+                console.log(objs)
+            }
         },
         // 鎺ュ彛鑾峰彇闆嗗洟鍒嗙被鏍�
         async referTree(oid, checked) {
             this.groupTreeData = []
             const response = await referTree({ 'conditionMap[codeclsfid]': oid, parentOid: null })
-            console.log(response)
             if (response.status === 200) {
                 if (checked) {
                     let items = response.data.map(item => {
@@ -248,17 +325,34 @@
         // 鍚屾鏁版嵁
         async handleSync() {
             const response = await syncClassifyModel({ dockingPreAttrMappingVOList: this.tableData })
-            console.log(response)
-        },
-        handelLeftCheck(event) {
-            console.log(event)
         },
         // 鏂板寮圭獥鏌ヨ鎸夐挳
         handleQuery(event) {
-            console.log(event)
             this.form.name = event
         },
-        filterMethod(item) {
+        handelTransferSave() {
+            let that = this
+            console.log(that.mappingForm)
+            if (Object.keys(that.mappingForm).length==0) {
+                this.$message({
+                    type: "error",
+                    message: "璇烽�夋嫨涓�鏉℃暟鎹�!"
+                });
+            } else {
+                const findRow = that.mappingData.findIndex(item => item.metaListId === that.mappingForm.metaListId)
+                const findtra = that.transferData.findIndex(item => item.value === that.transferValue[0].value)
+                console.log(findRow)
+                that.mappingData[findRow].targetAttrName = that.transferValue[0].label
+                that.mappingData[findRow].targetAttrId = that.transferValue[0].value
+                that.transferData[findtra].disabled = true
+                that.transferValue = []
+                that.form.name = ''
+                that.dialogPush = false
+            }
+
+        },
+        // 绌挎妗嗘煡璇㈡暟鎹繃婊�
+        filterMethod(query, item) {
             return item.pinyins.indexOf(this.form.name) > -1;
         },
         // 宸︿晶鏍戠偣鍑�
@@ -274,46 +368,47 @@
         },
         // 闆嗗洟鍒嗙被鏍戠偣鍑�
         handleNodeClick(data) {
-            console.log(data)
             this.form.groupValue = data.name
             this.groupVal = data.name
             this.$refs.selectTree.blur()
             this.getGridAttrMapping(data.oid)
         },
+        // 闆嗗洟鍒嗙被澶卞幓鐒︾偣
         inputBlur() {
             this.tableColumnIndex = ''
             this.tableRowIndex = null
         },
-        // 灞炴�ф槧灏勭偣鍑绘瘡琛�
-        handleCellClick(event) {
-            console.log('鍗曞嚮', event)
-            // this.tableRowIndex = row.index
-            // this.tableColumnIndex = column.index
-            // this.getGridAttrRanges(event.metaListId)
-        },
+        // 澶卞幓鐒︾偣
         handleBlur(value, event) {
-            console.log(value)
             if (event === 'range') this.$refs.crudRange.rowCell(this.rangeForm, this.rangeForm.$index)
             if (event === 'mapping') this.$refs.crudMapping.rowCell(this.mappingForm, this.mappingForm.$index)
         },
-        // 灞炴�у彇鍊艰寖鍥村崟鍏冩牸缂栬緫
+        // 闆嗗洟鏄犲皠灞炴�ц閫夋嫨鍗曞厓鏍肩紪杈戯紙鍙屽嚮锛�
         handleMapingRowClick(row, column, cell, event) {
+            console.log(row)
+            clearTimeout(this.times)
             this.mappingForm = row
-            if (column.label === '榛樿鍊�') this.$refs.crudMapping.rowCell(row, row.$index)
-            else this.getGridAttrRanges(row.metaListId)
-
+            if (column.label === '榛樿鍊�' || column.label === '灞炴�у悕绉�') this.$refs.crudMapping.rowCell(row, row.$index)
         },
-        // 灞炴�у彇鍊艰寖鍥村崟鍏冩牸缂栬緫
+        // 闆嗗洟鏄犲皠灞炴�ц閫夋嫨锛堝崟鍑伙級
+        handleMapingClick(row, column, cell, event) {
+            clearTimeout(this.times)
+            this.mappingForm = row
+            this.times = setTimeout(() => {
+                this.$refs.crudMapping.toggleSelection([row]);
+            }, 300)
+        },
+        // 灞炴�у彇鍊艰寖鍥村崟鍏冩牸缂栬緫锛堝弻鍑伙級
         handleRowClick(row, column, cell, event) {
             this.rangeForm = row
-            console.log('鍗曞嚮', row)
             this.$refs.crudRange.rowCell(row, row.$index)
         },
-        // 灞炴�у彇鍊艰寖鍥村崟鍏冩牸缂栬緫
+        // 灞炴�у彇鍊艰寖鍥村崟鍏冩牸缂栬緫鍚�
         handleUpdate(row, index, done, loading) {
+            console.log(row)
+            console.log(index)
             const findRow = this.mappingData.findIndex(item => item.metaListId === row.metaListId)
-            console.log(findRow)
-            this.mappingData[0].dockingPreAttrRangeVoList = [row]
+            this.mappingData[findRow].dockingPreAttrRangeVoList = [row]
             console.log('淇敼鍚�', row)
             this.$message({
                 showClose: true,
@@ -321,6 +416,37 @@
                 type: "success",
             });
             done();
+        },
+        // 灞炴�у彇鍊艰寖鍥村崟鍏冩牸缂栬緫鍚�
+        handleMapingUpdate(row, index, done, loading) {
+            console.log(row)
+            console.log('淇敼鍚�', row)
+            this.$message({
+                showClose: true,
+                message: "淇敼鎴愬姛",
+                type: "success",
+            });
+            done();
+        },
+        // 闆嗗洟鏄犲皠灞炴�ч�夋嫨锛堝崟閫夛級
+        selectionChange(selection) {
+            if (selection.length > 1) {
+                const nowVal = selection.shift();
+                this.$refs.crudMapping.toggleRowSelection(nowVal, false);
+            } else if (selection.length === 1) {
+                // 瀵瑰崟閫夋暟鎹殑鎿嶄綔鍐欏湪杩欓噷
+                this.disabledPush = false
+                // this.getGridAttrRanges(row.metaListId)
+            }
+        },
+        setCurrentRow(selection, row) {
+            console.log(row)
+            this.mappingForm = row
+            this.disabledPush = false
+        },
+        handleSelectAll(selection) {
+            console.log(selection)
+            this.$refs.crudMapping.toggleSelection()
         }
     }
 }
@@ -339,23 +465,20 @@
     cursor: default !important;
 }
 
-/deep/ .el-transfer-panel__list {
+::v-deep(.el-transfer-panel__list) {
     width: 100%;
+    height: 370px;
 }
 
-/deep/ .el-input {
+::v-deep(.el-transfer-panel__body) {
+    height: 370px;
+}
+
+::v-deep(.el-input) {
     width: auto;
 }
 
-/deep/ .el-transfer-panel {
+::v-deep(.el-transfer-panel) {
     width: 270px;
-}
-
-/deep/ .el-transfer-panel__list {
-    height: 370px;
-}
-
-/deep/ .el-transfer-panel__body {
-    height: 370px;
 }
 </style>
\ No newline at end of file
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 794ea25..c58d274 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,10 +26,10 @@
     proxy: {
       '/api': {
         //鏈湴鏈嶅姟鎺ュ彛鍦板潃
-         target: 'http://localhost:37000',
+        //  target: 'http://localhost:37000',
         // target: 'http://192.168.1.63:37000',
         //target: 'http://192.168.3.7:37000',
-        // target: 'http://dev.vci-tech.com:37000',
+        target: 'http://dev.vci-tech.com:37000',
         //target: 'http://192.168.1.51:37000/',
         //杩滅▼婕旂ず鏈嶅姟鍦板潃,鍙敤浜庣洿鎺ュ惎鍔ㄩ」鐩�
         // target: 'https://saber.bladex.vip/api',

--
Gitblit v1.9.3