From 358f12562a20fb4f8cb50a6ff7de1dc4f72ee4fe Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期二, 27 六月 2023 16:24:16 +0800
Subject: [PATCH] fjl

---
 Source/UBCS-WEB/src/mixins/codeApply.js |  483 +----------------------------------------------------
 1 files changed, 12 insertions(+), 471 deletions(-)

diff --git a/Source/UBCS-WEB/src/mixins/codeApply.js b/Source/UBCS-WEB/src/mixins/codeApply.js
index 98234c6..2dac60e 100644
--- a/Source/UBCS-WEB/src/mixins/codeApply.js
+++ b/Source/UBCS-WEB/src/mixins/codeApply.js
@@ -46,7 +46,7 @@
   methods: {
     // 鑾峰彇鐮佸�肩敵璇锋暟鎹�
     getCodeRule() {
-      getCodeRule({ codeClassifyOid: '1673234841140858880' }).then((res) => {
+      getCodeRule({ codeClassifyOid: this.codeClassifyOid }).then((res) => {
         if (res.data && res.data.code === 200) {
           const typeList = [
             "codefixedsec",
@@ -54,473 +54,14 @@
             "codevariablesec",
             "coderefersec",
           ];
-          this.secVOList = (res.data.data.secVOList || []).filter((item) =>
-            typeList.includes(item.sectype)
+          this.secVOList = res.data.data.secVOList || []
+          let localSecVOList = (res.data.data.secVOList || []).filter((item) =>
+            typeList.includes(item.secType)
           );
-          this.secVOList = [
-            {
-              "oid": "1673235191453323264",
-              "id": "gdmd",
-              "name": "鍥哄畾鐮佹",
-              "tenantId": "",
-              "description": "",
-              "revisionOid": "1673235191453323267",
-              "nameOid": "1673235191453323265",
-              "btmname": "codebasicsec",
-              "lastR": "1",
-              "firstR": "1",
-              "lastV": "1",
-              "firstV": "1",
-              "creator": "0",
-              "createTime": "2023-06-26 15:42:11",
-              "lastModifier": "0",
-              "lastModifyTime": "2023-06-26 15:42:11",
-              "revisionRule": "",
-              "revisionSeq": 1,
-              "revisionValue": "",
-              "versionRule": "0",
-              "versionSeq": 1,
-              "versionValue": "1",
-              "lctid": "",
-              "lcStatus": "",
-              "lcStatusText": "",
-              "ts": "2023-06-26 15:42:11.506",
-              "owner": "1",
-              "copyFromVersion": "",
-              "secretGrade": -1,
-              "secretGradeText": "",
-              "data": {},
-              "sectype": "codefixedsec",
-              "secTypeText": "鍥哄畾鐮佹",
-              "pkCodeRule": "1673234841140858880",
-              "orderNum": 1,
-              "codeSecLengthType": "code_sec_length_variable",
-              "codeSecLengthTypeText": "鍙彉闀垮害",
-              "codeSecLength": "10",
-              "referAttributeName": "",
-              "referAttributeId": "",
-              "getValueClass": "",
-              "codeDateFormatStr": "",
-              "codeLevelType": "",
-              "codeLevelTypeText": "",
-              "codeLevelValue": -1,
-              "valueCutLength": -1,
-              "valueCutType": "",
-              "valueCutTypeText": "",
-              "codeGetValueType": "",
-              "codeGetValueTypeText": "",
-              "referCodeClassifyOid": "",
-              "referCodeClassifyOidName": "",
-              "referBtmId": "",
-              "referBtmName": "",
-              "referConfig": "",
-              "referValueInfo": "",
-              "filterSql": "",
-              "serialStart": "",
-              "serialStep": -1,
-              "codeFillType": "",
-              "codeFillTypeText": "",
-              "codeFillSeparator": "0",
-              "codeFillLength": "",
-              "codeFillLimit": -1,
-              "codeFillFlag": "false",
-              "customCodeSerialClass": "",
-              "matchClassifyValueFlag": "false",
-              "parentClassifySecOid": "",
-              "parentClassifySecText": "",
-              "nullableFlag": "false",
-              "componentCodeFlag": "false",
-              "serialDependFlag": "false",
-              "displayFlag": "false",
-              "serialDependOrder": 0,
-              "fixedValueVOList": [
-                {
-                  "oid": "1673235247598276608",
-                  "id": "001",
-                  "name": "",
-                  "tenantId": "",
-                  "description": "",
-                  "revisionOid": "1673235247615053824",
-                  "nameOid": "1673235247598276609",
-                  "btmname": "codefixedvalue",
-                  "lastR": "1",
-                  "firstR": "1",
-                  "lastV": "1",
-                  "firstV": "1",
-                  "creator": "0",
-                  "createTime": "2023-06-26 15:42:24",
-                  "lastModifier": "0",
-                  "lastModifyTime": "2023-06-26 15:42:24",
-                  "revisionRule": "",
-                  "revisionSeq": 1,
-                  "revisionValue": "",
-                  "versionRule": "0",
-                  "versionSeq": 1,
-                  "versionValue": "1",
-                  "lctid": "",
-                  "lcStatus": "",
-                  "lcStatusText": "",
-                  "ts": "2023-06-26 15:42:24.892",
-                  "owner": "1",
-                  "copyFromVersion": "",
-                  "secretGrade": -1,
-                  "secretGradeText": "",
-                  "data": {},
-                  "codeFixedSecOid": "1673235191453323264",
-                  "codefixedsecoidName": "",
-                  "orderNum": 1
-                },
-                {
-                  "oid": "1673235273523269632",
-                  "id": "002",
-                  "name": "",
-                  "tenantId": "",
-                  "description": "",
-                  "revisionOid": "1673235273535852544",
-                  "nameOid": "1673235273523269633",
-                  "btmname": "codefixedvalue",
-                  "lastR": "1",
-                  "firstR": "1",
-                  "lastV": "1",
-                  "firstV": "1",
-                  "creator": "0",
-                  "createTime": "2023-06-26 15:42:31",
-                  "lastModifier": "0",
-                  "lastModifyTime": "2023-06-26 15:42:31",
-                  "revisionRule": "",
-                  "revisionSeq": 1,
-                  "revisionValue": "",
-                  "versionRule": "0",
-                  "versionSeq": 1,
-                  "versionValue": "1",
-                  "lctid": "",
-                  "lcStatus": "",
-                  "lcStatusText": "",
-                  "ts": "2023-06-26 15:42:31.073",
-                  "owner": "1",
-                  "copyFromVersion": "",
-                  "secretGrade": -1,
-                  "secretGradeText": "",
-                  "data": {},
-                  "codeFixedSecOid": "1673235191453323264",
-                  "codefixedsecoidName": "",
-                  "orderNum": 2
-                }
-              ]
-            },
-            {
-              "oid": "1673235394948370432",
-              "id": "flmdf",
-              "name": "鍒嗙被鐮佹鐖�",
-              "tenantId": "",
-              "description": "",
-              "revisionOid": "1673235394948370435",
-              "nameOid": "1673235394948370433",
-              "btmname": "codebasicsec",
-              "lastR": "1",
-              "firstR": "1",
-              "lastV": "1",
-              "firstV": "1",
-              "creator": "0",
-              "createTime": "2023-06-26 15:43:00",
-              "lastModifier": "0",
-              "lastModifyTime": "2023-06-26 15:43:00",
-              "revisionRule": "",
-              "revisionSeq": 1,
-              "revisionValue": "",
-              "versionRule": "0",
-              "versionSeq": 1,
-              "versionValue": "1",
-              "lctid": "",
-              "lcStatus": "",
-              "lcStatusText": "",
-              "ts": "2023-06-26 15:43:00.023",
-              "owner": "1",
-              "copyFromVersion": "",
-              "secretGrade": -1,
-              "secretGradeText": "",
-              "data": {},
-              "sectype": "codeclassifysec",
-              "secTypeText": "鍒嗙被鐮佹",
-              "pkCodeRule": "1673234841140858880",
-              "orderNum": 2,
-              "codeSecLengthType": "code_sec_length_variable",
-              "codeSecLengthTypeText": "鍙彉闀垮害",
-              "codeSecLength": "10",
-              "referAttributeName": "",
-              "referAttributeId": "",
-              "getValueClass": "",
-              "codeDateFormatStr": "",
-              "codeLevelType": "",
-              "codeLevelTypeText": "",
-              "codeLevelValue": -1,
-              "valueCutLength": -1,
-              "valueCutType": "",
-              "valueCutTypeText": "",
-              "codeGetValueType": "",
-              "codeGetValueTypeText": "",
-              "referCodeClassifyOid": "",
-              "referCodeClassifyOidName": "",
-              "referBtmId": "",
-              "referBtmName": "",
-              "referConfig": "",
-              "referValueInfo": "",
-              "filterSql": "",
-              "serialStart": "",
-              "serialStep": -1,
-              "codeFillType": "",
-              "codeFillTypeText": "",
-              "codeFillSeparator": "0",
-              "codeFillLength": "",
-              "codeFillLimit": -1,
-              "codeFillFlag": "false",
-              "customCodeSerialClass": "",
-              "matchClassifyValueFlag": "false",
-              "parentClassifySecOid": "",
-              "parentClassifySecText": "",
-              "nullableFlag": "false",
-              "componentCodeFlag": "false",
-              "serialDependFlag": "false",
-              "displayFlag": "false",
-              "serialDependOrder": 0,
-              "fixedValueVOList": []
-            },
-            {
-              "oid": "1673235616541839360",
-              "id": "flmdz",
-              "name": "鍒嗙被鐮佹瀛�",
-              "tenantId": "",
-              "description": "",
-              "revisionOid": "1673235616541839363",
-              "nameOid": "1673235616541839361",
-              "btmname": "codebasicsec",
-              "lastR": "1",
-              "firstR": "1",
-              "lastV": "1",
-              "firstV": "1",
-              "creator": "0",
-              "createTime": "2023-06-26 15:43:52",
-              "lastModifier": "0",
-              "lastModifyTime": "2023-06-26 15:43:52",
-              "revisionRule": "",
-              "revisionSeq": 1,
-              "revisionValue": "",
-              "versionRule": "0",
-              "versionSeq": 1,
-              "versionValue": "1",
-              "lctid": "",
-              "lcStatus": "",
-              "lcStatusText": "",
-              "ts": "2023-06-26 15:43:52.855",
-              "owner": "1",
-              "copyFromVersion": "",
-              "secretGrade": -1,
-              "secretGradeText": "",
-              "data": {},
-              "sectype": "codeclassifysec",
-              "secTypeText": "鍒嗙被鐮佹",
-              "pkCodeRule": "1673234841140858880",
-              "orderNum": 3,
-              "codeSecLengthType": "code_sec_length_variable",
-              "codeSecLengthTypeText": "鍙彉闀垮害",
-              "codeSecLength": "10",
-              "referAttributeName": "",
-              "referAttributeId": "",
-              "getValueClass": "",
-              "codeDateFormatStr": "",
-              "codeLevelType": "",
-              "codeLevelTypeText": "",
-              "codeLevelValue": -1,
-              "valueCutLength": -1,
-              "valueCutType": "",
-              "valueCutTypeText": "",
-              "codeGetValueType": "",
-              "codeGetValueTypeText": "",
-              "referCodeClassifyOid": "",
-              "referCodeClassifyOidName": "",
-              "referBtmId": "",
-              "referBtmName": "",
-              "referConfig": "",
-              "referValueInfo": "",
-              "filterSql": "",
-              "serialStart": "",
-              "serialStep": -1,
-              "codeFillType": "",
-              "codeFillTypeText": "",
-              "codeFillSeparator": "0",
-              "codeFillLength": "",
-              "codeFillLimit": -1,
-              "codeFillFlag": "false",
-              "customCodeSerialClass": "",
-              "matchClassifyValueFlag": "false",
-              "parentClassifySecOid": "1673235394948370432",
-              "parentClassifySecText": "鍒嗙被鐮佹鐖�",
-              "nullableFlag": "false",
-              "componentCodeFlag": "false",
-              "serialDependFlag": "false",
-              "displayFlag": "false",
-              "serialDependOrder": 0,
-              "fixedValueVOList": []
-            },
-            {
-              "oid": "1673235886290112512",
-              "id": "kbmd",
-              "name": "鍙彉鐮佹",
-              "tenantId": "",
-              "description": "",
-              "revisionOid": "1673235886290112515",
-              "nameOid": "1673235886290112513",
-              "btmname": "codebasicsec",
-              "lastR": "1",
-              "firstR": "1",
-              "lastV": "1",
-              "firstV": "1",
-              "creator": "0",
-              "createTime": "2023-06-26 15:44:57",
-              "lastModifier": "0",
-              "lastModifyTime": "2023-06-26 15:44:57",
-              "revisionRule": "",
-              "revisionSeq": 1,
-              "revisionValue": "",
-              "versionRule": "0",
-              "versionSeq": 1,
-              "versionValue": "1",
-              "lctid": "",
-              "lcStatus": "",
-              "lcStatusText": "",
-              "ts": "2023-06-26 15:44:57.168",
-              "owner": "1",
-              "copyFromVersion": "",
-              "secretGrade": -1,
-              "secretGradeText": "",
-              "data": {},
-              "sectype": "codevariablesec",
-              "secTypeText": "鍙彉鐮佹",
-              "pkCodeRule": "1673234841140858880",
-              "orderNum": 4,
-              "codeSecLengthType": "code_sec_length_variable",
-              "codeSecLengthTypeText": "鍙彉闀垮害",
-              "codeSecLength": "10",
-              "referAttributeName": "",
-              "referAttributeId": "",
-              "getValueClass": "",
-              "codeDateFormatStr": "",
-              "codeLevelType": "",
-              "codeLevelTypeText": "",
-              "codeLevelValue": -1,
-              "valueCutLength": -1,
-              "valueCutType": "",
-              "valueCutTypeText": "",
-              "codeGetValueType": "",
-              "codeGetValueTypeText": "",
-              "referCodeClassifyOid": "",
-              "referCodeClassifyOidName": "",
-              "referBtmId": "",
-              "referBtmName": "",
-              "referConfig": "",
-              "referValueInfo": "",
-              "filterSql": "",
-              "serialStart": "",
-              "serialStep": -1,
-              "codeFillType": "code_fill_left",
-              "codeFillTypeText": "",
-              "codeFillSeparator": "0",
-              "codeFillLength": "",
-              "codeFillLimit": -1,
-              "codeFillFlag": "false",
-              "customCodeSerialClass": "",
-              "matchClassifyValueFlag": "false",
-              "parentClassifySecOid": "",
-              "parentClassifySecText": "",
-              "nullableFlag": "false",
-              "componentCodeFlag": "false",
-              "serialDependFlag": "false",
-              "displayFlag": "false",
-              "serialDependOrder": 0,
-              "fixedValueVOList": []
-            },
-            {
-              "oid": "1673236217442996224",
-              "id": "yymd",
-              "name": "寮曠敤鐮佹",
-              "tenantId": "",
-              "description": "",
-              "revisionOid": "1673236217442996227",
-              "nameOid": "1673236217442996225",
-              "btmname": "codebasicsec",
-              "lastR": "1",
-              "firstR": "1",
-              "lastV": "1",
-              "firstV": "1",
-              "creator": "0",
-              "createTime": "2023-06-26 15:46:16",
-              "lastModifier": "0",
-              "lastModifyTime": "2023-06-26 15:46:16",
-              "revisionRule": "",
-              "revisionSeq": 1,
-              "revisionValue": "",
-              "versionRule": "0",
-              "versionSeq": 1,
-              "versionValue": "1",
-              "lctid": "",
-              "lcStatus": "",
-              "lcStatusText": "",
-              "ts": "2023-06-26 15:46:16.121",
-              "owner": "1",
-              "copyFromVersion": "",
-              "secretGrade": -1,
-              "secretGradeText": "",
-              "data": {},
-              "sectype": "coderefersec",
-              "secTypeText": "寮曠敤鐮佹",
-              "pkCodeRule": "1673234841140858880",
-              "orderNum": 5,
-              "codeSecLengthType": "code_sec_length_variable",
-              "codeSecLengthTypeText": "鍙彉闀垮害",
-              "codeSecLength": "",
-              "referAttributeName": "",
-              "referAttributeId": "",
-              "getValueClass": "",
-              "codeDateFormatStr": "",
-              "codeLevelType": "",
-              "codeLevelTypeText": "",
-              "codeLevelValue": -1,
-              "valueCutLength": -1,
-              "valueCutType": "",
-              "valueCutTypeText": "",
-              "codeGetValueType": "",
-              "codeGetValueTypeText": "",
-              "referCodeClassifyOid": "",
-              "referCodeClassifyOidName": "",
-              "referBtmId": "referconfig",
-              "referBtmName": "鍙傜収閰嶇疆琛�",
-              "referConfig": "{\"codeSrchCondConfigVOS\":[],\"codeShowFieldConfigVOS\":[{\"field\":\"displaytable\",\"title\":\"displaytable\",\"sort\":false,\"attrSortField\":\"displaytable\",\"isquery\":false,\"$cellEdit\":false,\"$index\":0,\"$fieldTypeText\":\"\",\"$fixedPosition\":\"\"},{\"field\":\"mapfields\",\"title\":\"mapfields\",\"sort\":false,\"attrSortField\":\"mapfields\",\"isquery\":false,\"$cellEdit\":false,\"$index\":1,\"$fieldTypeText\":\"\",\"$fixedPosition\":\"\"},{\"field\":\"displaytable\",\"title\":\"displaytable\",\"sort\":false,\"attrSortField\":\"displaytable\",\"isquery\":false,\"$cellEdit\":false,\"$index\":2,\"$fieldTypeText\":\"\",\"$fixedPosition\":\"\"}],\"referTypeName\":\"鍙傜収閰嶇疆琛╘",\"referType\":\"referconfig\",\"textField\":\"name\",\"valueField\":\"oid\",\"type\":\"default\",\"url\":\"\",\"backPath\":\"\",\"method\":\"GET\",\"height\":\"\",\"useFormKey\":\"\",\"paramForFormKey\":\"\",\"isMuti\":false,\"mapFields\":\"\",\"isOpenGlobal\":true,\"isPersistence\":true,\"id\":\"004\",\"name\":\"娴嬭瘯寮曠敤鐮佹\",\"limit\":\"\",\"sortField\":\"\",\"sortType\":\"\"}",
-              "referValueInfo": "{\"codeSrchCondConfigVOS\":[],\"codeShowFieldConfigVOS\":[{\"field\":\"displaytable\",\"title\":\"displaytable\",\"sort\":false,\"attrSortField\":\"displaytable\",\"isquery\":false,\"$cellEdit\":false,\"$index\":0,\"$fieldTypeText\":\"\",\"$fixedPosition\":\"\"},{\"field\":\"mapfields\",\"title\":\"mapfields\",\"sort\":false,\"attrSortField\":\"mapfields\",\"isquery\":false,\"$cellEdit\":false,\"$index\":1,\"$fieldTypeText\":\"\",\"$fixedPosition\":\"\"},{\"field\":\"displaytable\",\"title\":\"displaytable\",\"sort\":false,\"attrSortField\":\"displaytable\",\"isquery\":false,\"$cellEdit\":false,\"$index\":2,\"$fieldTypeText\":\"\",\"$fixedPosition\":\"\"}],\"referTypeName\":\"鍙傜収閰嶇疆琛╘",\"referType\":\"referconfig\",\"textField\":\"name\",\"valueField\":\"oid\",\"type\":\"default\",\"url\":\"\",\"backPath\":\"\",\"method\":\"GET\",\"height\":\"\",\"useFormKey\":\"\",\"paramForFormKey\":\"\",\"isMuti\":false,\"mapFields\":\"\",\"isOpenGlobal\":true,\"isPersistence\":true,\"id\":\"004\",\"name\":\"娴嬭瘯寮曠敤鐮佹\",\"limit\":\"\",\"sortField\":\"\",\"sortType\":\"\"}",
-              "filterSql": "",
-              "serialStart": "",
-              "serialStep": -1,
-              "codeFillType": "",
-              "codeFillTypeText": "",
-              "codeFillSeparator": "0",
-              "codeFillLength": "",
-              "codeFillLimit": -1,
-              "codeFillFlag": "false",
-              "customCodeSerialClass": "",
-              "matchClassifyValueFlag": "false",
-              "parentClassifySecOid": "",
-              "parentClassifySecText": "",
-              "nullableFlag": "false",
-              "componentCodeFlag": "false",
-              "serialDependFlag": "false",
-              "displayFlag": "false",
-              "serialDependOrder": 0,
-              "fixedValueVOList": []
-            }
-          ]
-          if (this.secVOList.length > 0) {
+          if (localSecVOList.length > 0) {
             this.showCodeApply = true
             this.$nextTick(() => {
-              this.$refs.CodeApply.templateRender(this.secVOList);
+              this.$refs.CodeApply.templateRender(localSecVOList);
             });
           }
 
@@ -531,12 +72,12 @@
       this.codeApplyForm = codeApplyForm;
     },
     getType(item) {
-      console.log(item.sectype, 'item.sectype');
-      return this.selfColumnType[item.sectype];
+      console.log(item.secType, 'item.secType');
+      return this.selfColumnType[item.secType];
     },
     getReferConfig(item) {
       let params = {};
-      if (item.sectype == "codeclassifysec") {
+      if (item.secType == "codeclassifysec") {
         params = {
           isMuti: false,
           type: "grid",
@@ -580,13 +121,13 @@
               : "",
           },
         };
-      } else if (item.sectype == "coderefersec") {
-        params = JSON.parse(item.referValueInfo);
+      } else if (item.secType == "coderefersec") {
+        params = JSON.parse(item.referConfig);
       }
       return params;
     },
     getDisabled(item) {
-      if (item.sectype === "codeclassifysec") {
+      if (item.secType === "codeclassifysec") {
         if (item.parentClassifySecOid) {
           if (!this.codeApplyForm[item.parentClassifySecOid]) {
             return true;

--
Gitblit v1.9.3