xignzi006 发布系统代码

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

@@ -846,6 +846,63 @@
             }
         ]
     }, 
+    {
+        "srfkey": "Lead__PurchaseTimeFrame",
+        "emptytext": "未定义",
+        "codelisttype":"static",
+        "items": [
+             {
+                "id": "0",
+                "label": "Immediate",
+                "text": "Immediate",
+                "data":"",
+                "codename":"Item_0",
+                "value": "0",
+                
+                "disabled": false
+            }
+            , {
+                "id": "2",
+                "label": "Next Quarter",
+                "text": "Next Quarter",
+                "data":"",
+                "codename":"Item_2",
+                "value": "2",
+                
+                "disabled": false
+            }
+            , {
+                "id": "1",
+                "label": "This Quarter",
+                "text": "This Quarter",
+                "data":"",
+                "codename":"Item_1",
+                "value": "1",
+                
+                "disabled": false
+            }
+            , {
+                "id": "3",
+                "label": "This Year",
+                "text": "This Year",
+                "data":"",
+                "codename":"Item_3",
+                "value": "3",
+                
+                "disabled": false
+            }
+            , {
+                "id": "4",
+                "label": "Unknown",
+                "text": "Unknown",
+                "data":"",
+                "codename":"Item_4",
+                "value": "4",
+                
+                "disabled": false
+            }
+        ]
+    }, 
     {
         "srfkey": "Account__AccountRatingCode",
         "emptytext": "未定义",

app_BusinessCentral/public/assets/json/view-config.json

@@ -521,7 +521,7 @@
     },
     "opportunitygridview": {
         "title": "商机表格视图",
-        "caption": "商机",
+        "caption": "商机信息",
         "viewtype": "DEGRIDVIEW",
         "viewmodule": "Sales",
         "viewname": "OpportunityGridView",

app_BusinessCentral/src/locale/lanres/codelist/codelist_en_US.ts

@@ -109,6 +109,14 @@ export default {
         '1': "Normal",
         empty: "",
     },
+    Lead__PurchaseTimeFrame: {
+        '0': "Immediate",
+        '2': "Next Quarter",
+        '1': "This Quarter",
+        '3': "This Year",
+        '4': "Unknown",
+        empty: "",
+    },
     Account__AccountRatingCode: {
         '1': "Default Value",
         empty: "",

app_BusinessCentral/src/locale/lanres/codelist/codelist_zh_CN.ts

@@ -109,6 +109,14 @@ export default {
         '1': "Normal",
         empty: "",
     },
+    Lead__PurchaseTimeFrame: {
+        '0': "Immediate",
+        '2': "Next Quarter",
+        '1': "This Quarter",
+        '3': "This Year",
+        '4': "Unknown",
+        empty: "",
+    },
     Account__AccountRatingCode: {
         '1': "Default Value",
         empty: "",

app_BusinessCentral/src/locale/lanres/entities/lead/lead_en_US.ts

@@ -216,9 +216,12 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			subject: "主题", 
+			budgetamount: "预算金额", 
+			purchasetimeframe: "购买时间范围", 
+			leadsourcecode: "潜在顾客来源", 
 			fullname: "姓名", 
+			companyname: "公司名称", 
 			jobtitle: "职务", 
-			telephone1: "商务电话", 
 			mobilephone: "移动电话", 
 			emailaddress1: "电子邮件", 
 			leadid: "潜在顾客", 

app_BusinessCentral/src/locale/lanres/entities/lead/lead_zh_CN.ts

@@ -215,9 +215,12 @@ export default {
 			srfdeid: '', 
 			srfsourcekey: '', 
 			subject: '主题', 
+			budgetamount: '预算金额', 
+			purchasetimeframe: '购买时间范围', 
+			leadsourcecode: '潜在顾客来源', 
 			fullname: '姓名', 
+			companyname: '公司名称', 
 			jobtitle: '职务', 
-			telephone1: '商务电话', 
 			mobilephone: '移动电话', 
 			emailaddress1: '电子邮件', 
 			leadid: '潜在顾客', 

app_BusinessCentral/src/locale/lanres/entities/opportunity/opportunity_en_US.ts

@@ -119,7 +119,7 @@ export default {
       title: '商机数据看板视图',
 		},
 		gridview: {
-			caption: "商机",
+			caption: "商机信息",
       title: '商机表格视图',
 		},
 		info_abstract: {

app_BusinessCentral/src/locale/lanres/entities/opportunity/opportunity_zh_CN.ts

@@ -118,7 +118,7 @@ export default {
       title: '商机数据看板视图',
 		},
 		gridview: {
-			caption: '商机',
+			caption: '商机信息',
       title: '商机表格视图',
 		},
 		info_abstract: {

app_BusinessCentral/src/mock/codelist/codelist.ts

@@ -854,6 +854,63 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
             },
         ]
     },
+    {
+        srfkey: 'Lead__PurchaseTimeFrame',
+        emptytext: '未定义',
+        "codelisttype":"static",
+        items: [
+            {
+                id: '0',
+                label: "Immediate",
+                text: "Immediate",
+                "data":"",
+                "codename":"Item_0",
+                value: '0',
+                
+                disabled: false,
+            },
+            {
+                id: '2',
+                label: "Next Quarter",
+                text: "Next Quarter",
+                "data":"",
+                "codename":"Item_2",
+                value: '2',
+                
+                disabled: false,
+            },
+            {
+                id: '1',
+                label: "This Quarter",
+                text: "This Quarter",
+                "data":"",
+                "codename":"Item_1",
+                value: '1',
+                
+                disabled: false,
+            },
+            {
+                id: '3',
+                label: "This Year",
+                text: "This Year",
+                "data":"",
+                "codename":"Item_3",
+                value: '3',
+                
+                disabled: false,
+            },
+            {
+                id: '4',
+                label: "Unknown",
+                text: "Unknown",
+                "data":"",
+                "codename":"Item_4",
+                value: '4',
+                
+                disabled: false,
+            },
+        ]
+    },
     {
         srfkey: 'Account__AccountRatingCode',
         emptytext: '未定义',

app_BusinessCentral/src/mock/viewconfig/viewconfig.ts

@@ -425,7 +425,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
         },
         "opportunitygridview": {
             "title": "商机表格视图",
-            "caption": "商机",
+            "caption": "商机信息",
             "viewtype": "DEGRIDVIEW",
             "viewmodule": "Sales",
             "viewname": "OpportunityGridView",

app_BusinessCentral/src/pages/sales/lead-grid-view/lead-grid-view-base.vue

@@ -565,7 +565,7 @@ export default class LeadGridViewBase extends GridViewBase {
         const view: any = {
             viewname: 'lead-quick-create', 
             height: 0, 
-            width: 0,  
+            width: 450,  
             title: this.$t('entities.lead.views.quickcreate.title'),
             placement: 'DRAWER_RIGHT',
         };

app_BusinessCentral/src/pages/sales/opportunity-grid-view/opportunity-grid-view-base.vue

 <template>
 <studio-view-style2 viewName="opportunitygridview" viewTitle="商机表格视图" class='degridview opportunity-grid-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    </template>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" search @on-search="onSearch($event)"/>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click"/>    </template>

app_BusinessCentral/src/uiservice/lead/lead-ui-service-base.ts

@@ -158,7 +158,7 @@ export default class LeadUIServiceBase extends UIService {
             const view: any = {
                 viewname: 'lead-quick-create', 
                 height: 0, 
-                width: 0,  
+                width: 450,  
                 title: actionContext.$t('entities.lead.views.quickcreate.title'),
                 placement: 'DRAWER_RIGHT',
             };

app_BusinessCentral/src/widgets/lead/quick-create-form/quick-create-form-model.ts

@@ -60,19 +60,34 @@ export default class QuickCreateModel {
         prop: 'subject',
         dataType: 'TEXT',
       },
+      {
+        name: 'budgetamount',
+        prop: 'budgetamount',
+        dataType: 'BIGDECIMAL',
+      },
+      {
+        name: 'purchasetimeframe',
+        prop: 'purchasetimeframe',
+        dataType: 'SSCODELIST',
+      },
+      {
+        name: 'leadsourcecode',
+        prop: 'leadsourcecode',
+        dataType: 'SSCODELIST',
+      },
       {
         name: 'fullname',
         prop: 'fullname',
         dataType: 'TEXT',
       },
       {
-        name: 'jobtitle',
-        prop: 'jobtitle',
+        name: 'companyname',
+        prop: 'companyname',
         dataType: 'TEXT',
       },
       {
-        name: 'telephone1',
-        prop: 'telephone1',
+        name: 'jobtitle',
+        prop: 'jobtitle',
         dataType: 'TEXT',
       },
       {

app_BusinessCentral/src/widgets/product/quick-create-form/quick-create-form-base.vue

@@ -32,7 +32,9 @@
 </i-col>
 <i-col v-show="detailsModel.description.visible" :style="{}"  :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
     <app-form-item name='description' :itemRules="this.rules.description" class='' :caption="$t('entities.product.quickcreate_form.details.description')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.description.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.description"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.description.disabled" type='text'  style=""></input-box>
+    <div class="ivu-input-wrapper ivu-input-wrapper-default ivu-input-type">
+    <textarea class="ivu-input" :rows="10" v-model="data.description" :disabled="detailsModel.description.disabled" style="height:200px;"></textarea>
+</div>
 </app-form-item>
 
 </i-col>

app_BusinessCentral/src/widgets/product/quick-create-form/quick-create-form-model.ts

@@ -78,7 +78,7 @@ export default class QuickCreateModel {
       {
         name: 'description',
         prop: 'description',
-        dataType: 'TEXT',
+        dataType: 'LONGTEXT_1000',
       },
       {
         name: 'productid',

businesscentral-app/businesscentral-app-businesscentral/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /businesscentral-app-businesscentral.jar
 
-EXPOSE 10320
+EXPOSE 8080
 
 ADD businesscentral-app-businesscentral.jar /businesscentral-app-businesscentral.jar

businesscentral-app/businesscentral-app-businesscentral/src/main/docker/businesscentral-app-businesscentral.yaml

@@ -3,23 +3,9 @@ services:
   businesscentral-app-businesscentral:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-app-businesscentral:latest
     ports:
-      - "10320:10320"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=10320
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=127.0.0.1
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
-      - SPRING_DATASOURCE_PASSWORD=b1@@@772
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:8848
     deploy:
       resources:
            limits:

config.xml

@@ -37,11 +37,6 @@
 	  git clone -b master $para2 ibizbusinesscentral/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibizbusinesscentral/
-      mvn clean package -Pbusinesscentral
-      cd businesscentral-app/businesscentral-app-businesscentral
-      mvn -Pbusinesscentral docker:build
-      mvn -Pbusinesscentral docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/businesscentral-app-businesscentral.yaml iBizEE --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>