lab_gzf 发布系统代码

app_CRM/public/assets/json/data-dictionary.json

@@ -144,7 +144,7 @@
                 "text": "已关闭",
                 "data":"",
                 "codename":"Item_3",
-                "value": "3",
+                "value": 3,
                 
                 "disabled": false
             }
@@ -154,7 +154,7 @@
                 "text": "有效",
                 "data":"",
                 "codename":"Item_1",
-                "value": "1",
+                "value": 1,
                 
                 "disabled": false
             }
@@ -164,7 +164,7 @@
                 "text": "草稿",
                 "data":"",
                 "codename":"Item_0",
-                "value": "0",
+                "value": 0,
                 
                 "disabled": false
             }
@@ -174,7 +174,7 @@
                 "text": "赢单",
                 "data":"",
                 "codename":"Item_2",
-                "value": "2",
+                "value": 2,
                 
                 "disabled": false
             }
@@ -191,7 +191,7 @@
                 "text": "已取消",
                 "data":"",
                 "codename":"Item_2",
-                "value": "2",
+                "value": 2,
                 
                 "disabled": false
             }
@@ -201,7 +201,7 @@
                 "text": "已完成",
                 "data":"",
                 "codename":"Item_3",
-                "value": "3",
+                "value": 3,
                 
                 "disabled": false
             }
@@ -211,7 +211,7 @@
                 "text": "已开发票",
                 "data":"",
                 "codename":"Item_4",
-                "value": "4",
+                "value": 4,
                 
                 "disabled": false
             }
@@ -221,7 +221,7 @@
                 "text": "已提交",
                 "data":"",
                 "codename":"Item_1",
-                "value": "1",
+                "value": 1,
                 
                 "disabled": false
             }
@@ -231,7 +231,7 @@
                 "text": "有效",
                 "data":"",
                 "codename":"Item_0",
-                "value": "0",
+                "value": 0,
                 
                 "disabled": false
             }

app_CRM/src/mock/codelist/codelist.ts

@@ -152,7 +152,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 text: "已关闭",
                 "data":"",
                 "codename":"Item_3",
-                value: "3",
+                value: 3,
                 
                 disabled: false,
             },
@@ -162,7 +162,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 text: "有效",
                 "data":"",
                 "codename":"Item_1",
-                value: "1",
+                value: 1,
                 
                 disabled: false,
             },
@@ -172,7 +172,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 text: "草稿",
                 "data":"",
                 "codename":"Item_0",
-                value: "0",
+                value: 0,
                 
                 disabled: false,
             },
@@ -182,7 +182,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 text: "赢单",
                 "data":"",
                 "codename":"Item_2",
-                value: "2",
+                value: 2,
                 
                 disabled: false,
             },
@@ -199,7 +199,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 text: "已取消",
                 "data":"",
                 "codename":"Item_2",
-                value: "2",
+                value: 2,
                 
                 disabled: false,
             },
@@ -209,7 +209,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 text: "已完成",
                 "data":"",
                 "codename":"Item_3",
-                value: "3",
+                value: 3,
                 
                 disabled: false,
             },
@@ -219,7 +219,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 text: "已开发票",
                 "data":"",
                 "codename":"Item_4",
-                value: "4",
+                value: 4,
                 
                 disabled: false,
             },
@@ -229,7 +229,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 text: "已提交",
                 "data":"",
                 "codename":"Item_1",
-                value: "1",
+                value: 1,
                 
                 disabled: false,
             },
@@ -239,7 +239,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 text: "有效",
                 "data":"",
                 "codename":"Item_0",
-                value: "0",
+                value: 0,
                 
                 disabled: false,
             },

app_CRM/src/uiservice/competitor/competitor-ui-service-base.ts

@@ -251,14 +251,29 @@ export default class CompetitorUIServiceBase extends UIService {
         let deResParameters: any[] = [];
         const parameters: any[] = [
             { pathName: 'competitors', parameterName: 'competitor' },
-            { pathName: 'edit_datapanelview', parameterName: 'edit_datapanelview' },
         ];
-        const openIndexViewTab = (data: any) => {
-            const routePath = actionContext.$viewTool.buildUpRoutePath(actionContext.$route, context, deResParameters, parameters, _args, data);
-            actionContext.$router.push(routePath);
-            return null;
-        }
-        openIndexViewTab(data);
+            const openPopOver = (view: any, data: any) => {
+                let container: Subject<any> = actionContext.$apppopover.openPop($event, view, context,data);
+                container.subscribe((result: any) => {
+                    if (!result || !Object.is(result.ret, 'OK')) {
+                        return;
+                    }
+                    const _this: any = actionContext;
+                    if(window.opener){
+                        window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
+                        window.close();
+                    }
+                    return result.datas;
+                });
+            }
+            const view: any = {
+                viewname: 'competitor-edit-data-panel-view', 
+                height: 300, 
+                width: 300,  
+                title: actionContext.$t('entities.competitor.views.edit_datapanelview.title'),
+                placement: 'POPOVER',
+            };
+            openPopOver(view, data);
     }
 
 

businesscentral-core/src/main/resources/liquibase/h2_table.xml

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[ACCOUNT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-account-594-1">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-account-596-1">
         <createTable tableName="ACCOUNT">
                 <column name="ADDRESS1_PRIMARYCONTACTNAME" remarks="" type="VARCHAR(100)">
                 </column>
@@ -2419,7 +2419,7 @@
 
 
     <!--输出实体[COMPETITOR]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-competitor-72-32">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-competitor-74-32">
         <createTable tableName="COMPETITOR">
                 <column name="ENTITYIMAGE" remarks="" type="VARCHAR(100)">
                 </column>
@@ -10987,31 +10987,31 @@
     </changeSet>
 
         <!--输出实体[ACCOUNT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-594-135">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-596-135">
        <addForeignKeyConstraint baseColumnNames="PARENTACCOUNTID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__ACCOUNT__PARENT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ACCOUNTID" referencedTableName="ACCOUNT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-594-136">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-596-136">
        <addForeignKeyConstraint baseColumnNames="PRIMARYCONTACTID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__CONTACT__PRIMAR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTACTID" referencedTableName="CONTACT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-594-137">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-596-137">
        <addForeignKeyConstraint baseColumnNames="PREFERREDEQUIPMENTID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__EQUIPMENT__PREF" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EQUIPMENTID" referencedTableName="EQUIPMENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-594-138">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-596-138">
        <addForeignKeyConstraint baseColumnNames="ORIGINATINGLEADID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__LEAD__ORIGINATI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="LEADID" referencedTableName="LEAD" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-594-139">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-596-139">
        <addForeignKeyConstraint baseColumnNames="DEFAULTPRICELEVELID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__PRICELEVEL__DEF" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRICELEVELID" referencedTableName="PRICELEVEL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-594-140">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-596-140">
        <addForeignKeyConstraint baseColumnNames="PREFERREDSERVICEID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__SERVICE__PREFER" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SERVICEID" referencedTableName="SERVICE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-594-141">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-596-141">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-594-142">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-596-142">
        <addForeignKeyConstraint baseColumnNames="TERRITORYID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__TERRITORY__TERR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TERRITORYID" referencedTableName="TERRITORY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-594-143">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-596-143">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__TRANSACTIONCURR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[ACTIVITYMIMEATTACHMENT]外键关系 -->
@@ -11159,7 +11159,7 @@
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="CHARACTERISTIC" constraintName="DER1N_CHARACTERISTIC__TRANSACT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[COMPETITOR]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-competitor-72-190">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-competitor-74-190">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="COMPETITOR" constraintName="DER1N_COMPETITOR__TRANSACTIONC" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[COMPETITORPRODUCT]外键关系 -->