xignzi006 发布系统代码

app_BusinessCentral/src/locale/lanres/entities/contact/contact_en_US.ts

@@ -391,7 +391,6 @@ export default {
 			creditlimit: "信用额度", 
 			creditonhold: "信用冻结", 
 			paymenttermscode: "付款方式", 
-			transactioncurrencyid: "货币", 
 			contactid: "联系人", 
 		},
 		uiactions: {

app_BusinessCentral/src/locale/lanres/entities/contact/contact_zh_CN.ts

@@ -390,7 +390,6 @@ export default {
 			creditlimit: '信用额度', 
 			creditonhold: '信用冻结', 
 			paymenttermscode: '付款方式', 
-			transactioncurrencyid: '货币', 
 			contactid: '联系人', 
 		},
 		uiactions: {

app_BusinessCentral/src/pages/base/contact-dashboard-view/contact-dashboard-view-base.vue

 
 <template>
 <studio-view viewName="contactdashboardview" viewTitle="联系人数据看板视图" class='deportalview contact-dashboard-view'>
-    <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
-    </template>
     <view_dashboard 
                     :viewState="viewState"  
                     :viewparams="viewparams" 

app_BusinessCentral/src/store/modules/view-action/state.ts

@@ -205,7 +205,6 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                'da3f8c1f20f440f3df54d6c13a8de586',
             ],
         },
         {

app_BusinessCentral/src/widgets/contact/book-info-form/book-info-form-base.vue

 <template>
-    <i-form :model="this.data" class='app-form' ref='form'  id='contact_bookinfo' style="">
+    <i-form :model="this.data" class='app-form info-form-mode' ref='form'  id='contact_bookinfo' style="">
     <input style="display:none;" />
     <row >
             
 <i-col v-show="detailsModel.grouppanel2.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel2.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.contact.bookinfo_form.details.grouppanel2')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel2.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.contact.bookinfo_form.details.grouppanel2')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
     <row>
         <i-col v-show="detailsModel.transactioncurrencyname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='transactioncurrencyname' :itemRules="this.rules.transactioncurrencyname" class='' :caption="$t('entities.contact.bookinfo_form.details.transactioncurrencyname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.transactioncurrencyname.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.transactioncurrencyname.disabled"
-  name='transactioncurrencyname'
-  deMajorField='currencyname'
-  deKeyField='transactioncurrency'
-  :service="service"
-  :acParams="{ serviceName: 'TransactionCurrencyService', interfaceName: 'FetchDefault'}"
-  valueitem='transactioncurrencyid' 
-  :value="data.transactioncurrencyname" 
-  editortype="" 
-  :pickupView="{ viewname: 'transaction-currency-pickup-view', title: $t('entities.transactioncurrency.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'transactioncurrencies', parameterName: 'transactioncurrency' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange">
-</app-picker>
-
+<app-span name='transactioncurrencyname' :value="data.transactioncurrencyname" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.creditlimit.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='creditlimit' :itemRules="this.rules.creditlimit" class='' :caption="$t('entities.contact.bookinfo_form.details.creditlimit')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.creditlimit.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.creditlimit"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.creditlimit.disabled" type='number'  style=""></input-box>
+    
+<app-span name='creditlimit' :value="data.creditlimit" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.creditonhold.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='creditonhold' :itemRules="this.rules.creditonhold" class='' :caption="$t('entities.contact.bookinfo_form.details.creditonhold')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.creditonhold.error" :isEmptyCaption="false" labelPos="LEFT">
     
- <dropdown-list 
-  v-model="data.creditonhold" 
-  :data="data" 
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.creditonhold.disabled" 
-  style="width:100px;width: 100px;" 
-  tag='YesNo' 
-  codelistType='STATIC'
-  placeholder='请选择...'>
- </dropdown-list>
+<app-span name='creditonhold' :value="data.creditonhold" tag='YesNo' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.paymenttermscode.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='paymenttermscode' :itemRules="this.rules.paymenttermscode" class='' :caption="$t('entities.contact.bookinfo_form.details.paymenttermscode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.paymenttermscode.error" :isEmptyCaption="false" labelPos="LEFT">
     
- <dropdown-list 
-    v-model="data.paymenttermscode" 
-    :data="data" 
-    :context="context"
-    :viewparams="viewparams"
-    :localContext ='{ }' 
-    :localParam ='{ }' 
-    :disabled="detailsModel.paymenttermscode.disabled"  
-    tag='Contact__PaymentTermsCode' 
-    codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
+<app-span name='paymenttermscode' :value="data.paymenttermscode" tag='Contact__PaymentTermsCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
@@ -391,7 +349,6 @@ export default class BookInfoBase extends Vue implements ControlInterface {
         creditlimit: null,
         creditonhold: null,
         paymenttermscode: null,
-        transactioncurrencyid: null,
         contactid: null,
         contact:null,
     };
@@ -496,10 +453,10 @@ export default class BookInfoBase extends Vue implements ControlInterface {
             { required: false, type: 'number', message: '信用额度 值不能为空', trigger: 'blur' },
         ],
         creditonhold: [
-            { type: 'number', message: '信用冻结 值必须为数值类型', trigger: 'change' },
-            { type: 'number', message: '信用冻结 值必须为数值类型', trigger: 'blur' },
-            { required: false, type: 'number', message: '信用冻结 值不能为空', trigger: 'change' },
-            { required: false, type: 'number', message: '信用冻结 值不能为空', trigger: 'blur' },
+            { type: 'string', message: '信用冻结 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '信用冻结 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '信用冻结 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '信用冻结 值不能为空', trigger: 'blur' },
         ],
         paymenttermscode: [
             { type: 'string', message: '付款方式 值必须为字符串类型', trigger: 'change' },
@@ -507,12 +464,6 @@ export default class BookInfoBase extends Vue implements ControlInterface {
             { required: false, type: 'string', message: '付款方式 值不能为空', trigger: 'change' },
             { required: false, type: 'string', message: '付款方式 值不能为空', trigger: 'blur' },
         ],
-        transactioncurrencyid: [
-            { type: 'string', message: '货币 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '货币 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '货币 值不能为空', trigger: 'blur' },
-        ],
         contactid: [
             { type: 'string', message: '联系人 值必须为字符串类型', trigger: 'change' },
             { type: 'string', message: '联系人 值必须为字符串类型', trigger: 'blur' },
@@ -555,8 +506,6 @@ export default class BookInfoBase extends Vue implements ControlInterface {
         creditonhold: new FormItemModel({ caption: '信用冻结', detailType: 'FORMITEM', name: 'creditonhold', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         paymenttermscode: new FormItemModel({ caption: '付款方式', detailType: 'FORMITEM', name: 'paymenttermscode', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
-, 
-        transactioncurrencyid: new FormItemModel({ caption: '货币', detailType: 'FORMITEM', name: 'transactioncurrencyid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         contactid: new FormItemModel({ caption: '联系人', detailType: 'FORMITEM', name: 'contactid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 1 })
 , 
@@ -706,18 +655,6 @@ export default class BookInfoBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'paymenttermscode', newVal: newVal, oldVal: oldVal });
     }
 
-    /**
-     * 监控表单属性 transactioncurrencyid 值
-     *
-     * @param {*} newVal
-     * @param {*} oldVal
-     * @memberof BookInfo
-     */
-    @Watch('data.transactioncurrencyid')
-    onTransactioncurrencyidChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'transactioncurrencyid', newVal: newVal, oldVal: oldVal });
-    }
-
     /**
      * 监控表单属性 contactid 值
      *
@@ -781,7 +718,6 @@ export default class BookInfoBase extends Vue implements ControlInterface {
 
 
 
-
     }
 
     /**

app_BusinessCentral/src/widgets/contact/book-info-form/book-info-form-model.ts

@@ -75,11 +75,6 @@ export default class BookInfoModel {
         prop: 'paymenttermscode',
         dataType: 'SSCODELIST',
       },
-      {
-        name: 'transactioncurrencyid',
-        prop: 'transactioncurrencyid',
-        dataType: 'PICKUP',
-      },
       {
         name: 'contactid',
         prop: 'contactid',

app_BusinessCentral/src/widgets/contact/book-info-form/book-info-form-service.ts

@@ -2,7 +2,6 @@ import { Http,Util,Errorlog } from '@/utils';
 import ControlService from '@/widgets/control-service';
 import ContactService from '@/service/contact/contact-service';
 import BookInfoModel from './book-info-form-model';
-import TransactionCurrencyService from '@/service/transaction-currency/transaction-currency-service';
 
 
 /**
@@ -42,14 +41,6 @@ export default class BookInfoService extends ControlService {
         this.model = new BookInfoModel();
     }
 
-    /**
-     * 货币服务对象
-     *
-     * @type {TransactionCurrencyService}
-     * @memberof BookInfoService
-     */
-    public transactioncurrencyService: TransactionCurrencyService = new TransactionCurrencyService();
-
     /**
      * 处理数据
      *
@@ -89,9 +80,6 @@ export default class BookInfoService extends ControlService {
      */
     @Errorlog
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
-        if (Object.is(serviceName, 'TransactionCurrencyService') && Object.is(interfaceName, 'FetchDefault')) {
-            return this.doItems(this.transactioncurrencyService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'transactioncurrencyid', 'transactioncurrency');
-        }
 
         return Promise.reject([])
     }

app_BusinessCentral/src/widgets/contact/tab-exp-viewtabexppanel-tabexppanel/tab-exp-viewtabexppanel-tabexppanel-base.vue

@@ -39,7 +39,7 @@
                             'margin-right' : '2px'
                         }
                     }),
-                    h('span', '详细信息'),
+                    h('span', '潜在顾客'),
                     h('Badge', {
                         props: {
                             count: undefined,

app_BusinessCentral/src/widgets/opportunity/main-grid/main-grid-base.vue

@@ -36,7 +36,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('parentaccountname')">
-                <el-table-column show-overflow-tooltip :prop="'parentaccountname'" :label="$t('entities.opportunity.main_grid.columns.parentaccountname')" :width="100"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'parentaccountname'" :label="$t('entities.opportunity.main_grid.columns.parentaccountname')" :width="150"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.opportunity.main_grid.columns.parentaccountname')}}
@@ -48,7 +48,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('parentcontactname')">
-                <el-table-column show-overflow-tooltip :prop="'parentcontactname'" :label="$t('entities.opportunity.main_grid.columns.parentcontactname')" :width="100"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'parentcontactname'" :label="$t('entities.opportunity.main_grid.columns.parentcontactname')" :width="140"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.opportunity.main_grid.columns.parentcontactname')}}
@@ -60,7 +60,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('estimatedclosedate')">
-                <el-table-column show-overflow-tooltip :prop="'estimatedclosedate'" :label="$t('entities.opportunity.main_grid.columns.estimatedclosedate')" :width="100"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'estimatedclosedate'" :label="$t('entities.opportunity.main_grid.columns.estimatedclosedate')" :width="160"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.opportunity.main_grid.columns.estimatedclosedate')}}
@@ -72,7 +72,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('closeprobability')">
-                <el-table-column show-overflow-tooltip :prop="'closeprobability'" :label="$t('entities.opportunity.main_grid.columns.closeprobability')" :width="100"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'closeprobability'" :label="$t('entities.opportunity.main_grid.columns.closeprobability')" :width="120"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.opportunity.main_grid.columns.closeprobability')}}
@@ -84,7 +84,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('estimatedvalue')">
-                <el-table-column show-overflow-tooltip :prop="'estimatedvalue'" :label="$t('entities.opportunity.main_grid.columns.estimatedvalue')" :width="100"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'estimatedvalue'" :label="$t('entities.opportunity.main_grid.columns.estimatedvalue')" :width="150"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.opportunity.main_grid.columns.estimatedvalue')}}