xignzi006 发布系统代码

app_CRM/src/locale/lanres/entities/account/account_en_US.ts

@@ -765,7 +765,29 @@ export default {
 			tip: "关闭",
 		},
 	},
-	gridviewtoolbar_toolbar: {
+	treegridexviewtoolbar_toolbar: {
+		deuiaction1: {
+			caption: "New",
+			tip: "New",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+	},
+	usablegridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",
 			tip: "新建",
@@ -802,34 +824,20 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem19: {
-			caption: "Filter",
-			tip: "Filter",
-		},
-	},
-	treegridexviewtoolbar_toolbar: {
-		deuiaction1: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem2: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem4: {
-			caption: "Edit",
-			tip: "Edit {0}",
+		tbitem14_inactive: {
+			caption: "停用",
+			tip: "停用",
 		},
-		tbitem7: {
+		tbitem15: {
 			caption: "-",
 			tip: "",
 		},
-		tbitem8: {
-			caption: "Remove",
-			tip: "Remove {0}",
+		tbitem19: {
+			caption: "Filter",
+			tip: "Filter",
 		},
 	},
-	usablegridviewtoolbar_toolbar: {
+	stopgridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",
 			tip: "新建",
@@ -866,9 +874,9 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem14_inactive: {
-			caption: "停用",
-			tip: "停用",
+		tbitem14_active: {
+			caption: "激活",
+			tip: "激活",
 		},
 		tbitem15: {
 			caption: "-",
@@ -879,7 +887,7 @@ export default {
 			tip: "Filter",
 		},
 	},
-	stopgridviewtoolbar_toolbar: {
+	gridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",
 			tip: "新建",
@@ -916,14 +924,6 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem14_active: {
-			caption: "激活",
-			tip: "激活",
-		},
-		tbitem15: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem19: {
 			caption: "Filter",
 			tip: "Filter",
@@ -931,11 +931,9 @@ export default {
 	},
 	gradation_treeview: {
 		nodes: {
+			root: "默认根节点",
 		},
 		uiactions: {
-        account_openmaineditview: "编辑",
-        account_inactive: "停用",
-        account_remove: "删除",
 		},
 	},
 };
\ No newline at end of file

app_CRM/src/locale/lanres/entities/account/account_zh_CN.ts

@@ -764,7 +764,29 @@ export default {
 			tip: "关闭",
 		},
 	},
-	gridviewtoolbar_toolbar: {
+	treegridexviewtoolbar_toolbar: {
+		deuiaction1: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+	},
+	usablegridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",
 			tip: "新建",
@@ -801,34 +823,20 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem19: {
-			caption: "过滤",
-			tip: "过滤",
-		},
-	},
-	treegridexviewtoolbar_toolbar: {
-		deuiaction1: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem2: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem4: {
-			caption: "编辑",
-			tip: "编辑",
+		tbitem14_inactive: {
+			caption: "停用",
+			tip: "停用",
 		},
-		tbitem7: {
+		tbitem15: {
 			caption: "-",
 			tip: "",
 		},
-		tbitem8: {
-			caption: "删除",
-			tip: "删除",
+		tbitem19: {
+			caption: "过滤",
+			tip: "过滤",
 		},
 	},
-	usablegridviewtoolbar_toolbar: {
+	stopgridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",
 			tip: "新建",
@@ -865,9 +873,9 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem14_inactive: {
-			caption: "停用",
-			tip: "停用",
+		tbitem14_active: {
+			caption: "激活",
+			tip: "激活",
 		},
 		tbitem15: {
 			caption: "-",
@@ -878,7 +886,7 @@ export default {
 			tip: "过滤",
 		},
 	},
-	stopgridviewtoolbar_toolbar: {
+	gridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",
 			tip: "新建",
@@ -915,14 +923,6 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem14_active: {
-			caption: "激活",
-			tip: "激活",
-		},
-		tbitem15: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem19: {
 			caption: "过滤",
 			tip: "过滤",
@@ -930,18 +930,13 @@ export default {
 	},
 	gradation_treeview: {
 		nodes: {
+			root: "默认根节点",
 		},
 		uiactions: {
-			account_openmaineditview: "编辑",
-			account_inactive: "停用",
-			account_remove: "删除",
 		},
 	},
 	gradation_treegridex: {
 		uiactions: {
-			account_openmaineditview: "编辑",
-			account_inactive: "停用",
-			account_remove: "删除",
 		},
 	},
 };
\ No newline at end of file

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

@@ -382,135 +382,6 @@ export default class AccountUIServiceBase extends UIService {
         backend();
     }
 
-    /**
-     * 编辑
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} context 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @param {*} [srfParentDeName] 父实体名称
-     * @returns {Promise<any>}
-     */
-    public async Account_OpenMainEditView(args: any[], context:any = {} ,params: any={}, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-    
-        let data: any = {};
-        let parentContext:any = {};
-        let parentViewParam:any = {};
-        const _this: any = actionContext;
-        const _args: any[] = Util.deepCopy(args);
-        const actionTarget: string | null = 'SINGLEKEY';
-        Object.assign(context, { account: '%account%' });
-        Object.assign(params, { accountid: '%account%' });
-        Object.assign(params, { accountname: '%accountname%' });
-        if(_this.context){
-            parentContext = _this.context;
-        }
-        if(_this.viewparams){
-            parentViewParam = _this.viewparams;
-        }
-        context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
-        data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
-        context = Object.assign({},actionContext.context,context);
-        let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
-        Object.assign(data,parentObj);
-        Object.assign(context,parentObj);
-        let deResParameters: any[] = [];
-        const parameters: any[] = [
-            { pathName: 'accounts', parameterName: 'account' },
-            { pathName: 'editview', parameterName: 'editview' },
-        ];
-        const openIndexViewTab = (data: any) => {
-            const routePath = actionContext.$viewTool.buildUpRoutePath(actionContext.$route, context, deResParameters, parameters, _args, data);
-            actionContext.$router.push(routePath);
-            if (xData && xData.refresh && xData.refresh instanceof Function) {
-                xData.refresh(args);
-            }
-            return null;
-        }
-        openIndexViewTab(data);
-    }
-
-    /**
-     * 删除
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} context 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @param {*} [srfParentDeName] 父实体名称
-     * @returns {Promise<any>}
-     */
-    public async Account_Remove(args: any[],context:any = {}, params:any = {}, $event?: any, xData?: any,actionContext?: any,srfParentDeName?:string){
-        let confirmResult:boolean = await new Promise((resolve: any, reject: any) => {
-          actionContext.$Modal.confirm({
-              title: '警告',
-              content: '确认删除？',
-              onOk: () => {resolve(true);},
-              onCancel: () => {resolve(false);}
-          });
-        });
-        if(!confirmResult){
-            return;
-        }
-        let data: any = {};
-        let parentContext:any = {};
-        let parentViewParam:any = {};
-        const _this: any = actionContext;
-        const _args: any[] = Util.deepCopy(args);
-        const actionTarget: string | null = 'SINGLEKEY';
-        Object.assign(context, { account: '%account%' });
-        Object.assign(params, { accountid: '%account%' });
-        Object.assign(params, { accountname: '%accountname%' });
-        if(_this.context){
-            parentContext = _this.context;
-        }
-        if(_this.viewparams){
-            parentViewParam = _this.viewparams;
-        }
-        context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
-        data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
-        context = Object.assign({},actionContext.context,context);
-        let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
-        Object.assign(data,parentObj);
-        Object.assign(context,parentObj);
-        // 直接调实体服务需要转换的数据
-        if(context && context.srfsessionid){
-          context.srfsessionkey = context.srfsessionid;
-            delete context.srfsessionid;
-        }
-        const backend = () => {
-            const curService:AccountService =  new AccountService();
-            curService.Remove(context,data, true).then((response: any) => {
-                if (!response || response.status !== 200) {
-                    actionContext.$Notice.error({ title: '错误', desc: response.message });
-                    return;
-                }
-                actionContext.$Notice.success({ title: '成功', desc: '删除成功' });
-
-                const _this: any = actionContext;
-                if (xData && xData.refresh && xData.refresh instanceof Function) {
-                    xData.refresh(args);
-                }
-                return response;
-            }).catch((response: any) => {
-                if (!response || !response.status || !response.data) {
-                    actionContext.$Notice.error({ title: '错误', desc: '系统异常！' });
-                    return;
-                }
-                if (response.status === 401) {
-                    return;
-                }
-                return response;
-            });
-        };
-        backend();
-    }
-
     /**
      * 编辑
      *

app_CRM/src/widgets/account/gradation-treegridex/gradation-treegridex-base.tsx

@@ -3,7 +3,6 @@ import { Subject, Subscription } from 'rxjs';
 import { Watch, MainControlBase } from '@/studio-core';
 import AccountService from '@/service/account/account-service';
 import GradationService from './gradation-treegridex-service';
-import AccountUIService from '@/uiservice/account/account-ui-service';
 
 
 /**
@@ -49,218 +48,6 @@ export class GradationTreegridexBase extends MainControlBase {
      */
     protected appDeName: string = 'account';
 
-    /**
-     * childaccount_cm 部件 click 事件
-     *
-     * @param {*} [args={}]
-     * @param {*} $event
-     * @memberof GradationTreegridexBase
-     */
-    public childaccount_cm_click($event: any, $event2?: any) {
-        if (Object.is($event.tag, 'deuiaction1')) {
-            this.childaccount_cm_deuiaction1_click(null, 'childaccount_cm', $event2);
-        }
-        if (Object.is($event.tag, 'deuiaction3')) {
-            this.childaccount_cm_deuiaction3_click(null, 'childaccount_cm', $event2);
-        }
-        if (Object.is($event.tag, 'deuiaction2')) {
-            this.childaccount_cm_deuiaction2_click(null, 'childaccount_cm', $event2);
-        }
-    }
-
-    /**
-     * rootaccount_cm 部件 click 事件
-     *
-     * @param {*} [args={}]
-     * @param {*} $event
-     * @memberof GradationTreegridexBase
-     */
-    public rootaccount_cm_click($event: any, $event2?: any) {
-        if (Object.is($event.tag, 'deuiaction1')) {
-            this.rootaccount_cm_deuiaction1_click(null, 'rootaccount_cm', $event2);
-        }
-        if (Object.is($event.tag, 'deuiaction3')) {
-            this.rootaccount_cm_deuiaction3_click(null, 'rootaccount_cm', $event2);
-        }
-        if (Object.is($event.tag, 'deuiaction2')) {
-            this.rootaccount_cm_deuiaction2_click(null, 'rootaccount_cm', $event2);
-        }
-    }
-
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public rootaccount_cm_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
-        // 参数
-        // 取数
-        let datas: any[] = [];
-        let xData: any = null;
-        // _this 指向容器对象
-        const _this: any = this;
-        let paramJO:any = {};
-        let contextJO:any = {};
-        xData = this;
-        if (_this.getDatas && _this.getDatas instanceof Function) {
-            datas = [..._this.getDatas()];
-        }
-        if(params){
-          datas = [params];
-        }
-        // 界面行为
-        const curUIService:AccountUIService  = new AccountUIService();
-        curUIService.Account_OpenMainEditView(datas,contextJO, paramJO,  $event, xData,this,"Account");
-    }
-
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public rootaccount_cm_deuiaction3_click(params: any = {}, tag?: any, $event?: any) {
-        // 参数
-        // 取数
-        let datas: any[] = [];
-        let xData: any = null;
-        // _this 指向容器对象
-        const _this: any = this;
-        let paramJO:any = {};
-        let contextJO:any = {};
-        xData = this;
-        if (_this.getDatas && _this.getDatas instanceof Function) {
-            datas = [..._this.getDatas()];
-        }
-        if(params){
-          datas = [params];
-        }
-        // 界面行为
-        const curUIService:AccountUIService  = new AccountUIService();
-        curUIService.Account_Inactive(datas,contextJO, paramJO,  $event, xData,this,"Account");
-    }
-
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public rootaccount_cm_deuiaction2_click(params: any = {}, tag?: any, $event?: any) {
-        // 参数
-        // 取数
-        let datas: any[] = [];
-        let xData: any = null;
-        // _this 指向容器对象
-        const _this: any = this;
-        let paramJO:any = {};
-        let contextJO:any = {};
-        xData = this;
-        if (_this.getDatas && _this.getDatas instanceof Function) {
-            datas = [..._this.getDatas()];
-        }
-        if(params){
-          datas = [params];
-        }
-        // 界面行为
-        const curUIService:AccountUIService  = new AccountUIService();
-        curUIService.Account_Remove(datas,contextJO, paramJO,  $event, xData,this,"Account");
-    }
-
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public childaccount_cm_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
-        // 参数
-        // 取数
-        let datas: any[] = [];
-        let xData: any = null;
-        // _this 指向容器对象
-        const _this: any = this;
-        let paramJO:any = {};
-        let contextJO:any = {};
-        xData = this;
-        if (_this.getDatas && _this.getDatas instanceof Function) {
-            datas = [..._this.getDatas()];
-        }
-        if(params){
-          datas = [params];
-        }
-        // 界面行为
-        const curUIService:AccountUIService  = new AccountUIService();
-        curUIService.Account_OpenMainEditView(datas,contextJO, paramJO,  $event, xData,this,"Account");
-    }
-
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public childaccount_cm_deuiaction3_click(params: any = {}, tag?: any, $event?: any) {
-        // 参数
-        // 取数
-        let datas: any[] = [];
-        let xData: any = null;
-        // _this 指向容器对象
-        const _this: any = this;
-        let paramJO:any = {};
-        let contextJO:any = {};
-        xData = this;
-        if (_this.getDatas && _this.getDatas instanceof Function) {
-            datas = [..._this.getDatas()];
-        }
-        if(params){
-          datas = [params];
-        }
-        // 界面行为
-        const curUIService:AccountUIService  = new AccountUIService();
-        curUIService.Account_Inactive(datas,contextJO, paramJO,  $event, xData,this,"Account");
-    }
-
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public childaccount_cm_deuiaction2_click(params: any = {}, tag?: any, $event?: any) {
-        // 参数
-        // 取数
-        let datas: any[] = [];
-        let xData: any = null;
-        // _this 指向容器对象
-        const _this: any = this;
-        let paramJO:any = {};
-        let contextJO:any = {};
-        xData = this;
-        if (_this.getDatas && _this.getDatas instanceof Function) {
-            datas = [..._this.getDatas()];
-        }
-        if(params){
-          datas = [params];
-        }
-        // 界面行为
-        const curUIService:AccountUIService  = new AccountUIService();
-        curUIService.Account_Remove(datas,contextJO, paramJO,  $event, xData,this,"Account");
-    }
-
     /**
      * 显示处理提示
      *
@@ -331,6 +118,9 @@ export class GradationTreegridexBase extends MainControlBase {
      * @memberof Gradation
      */
     public getColumnValue(task: any, field: string) {
+        if(Object.is(task.id.split(';')[0], 'ROOT')) {
+            return task[field];
+        }
         if(Object.is(task.id.split(';')[0], 'RootAccount')) {
             return task[field];
         }

app_CRM/src/widgets/account/gradation-treegridex/gradation-treegridex-model.ts

@@ -52,10 +52,6 @@ export default class GradationModel {
                     name: 'id',
                     prop: 'accountid'
                   },
-                  {
-                    name: 'telephone1',
-                    prop: 'telephone1'
-                  },
                   {
                     name: 'accountname',
                     prop: 'accountname'
@@ -72,10 +68,6 @@ export default class GradationModel {
                     name: 'accountname',
                     prop: 'accountname'
                   },
-                  {
-                    name: 'telephone1',
-                    prop: 'telephone1'
-                  },
               ];
               break;
       }

app_CRM/src/widgets/account/gradation-treegridex/gradation-treegridex.html

@@ -10,14 +10,9 @@
     :select-on-indeterminate="isSingleSelect"
     @current-change="select.apply(_self, arguments)"
     >
-    <el-table-column show-overflow-tooltip prop="accountname" label="客户名称" :width="50"  :align="''">
+    <el-table-column show-overflow-tooltip prop="accountname" label="" :width="50"  :align="''">
     <template v-slot="{ row }">
         <span>{{ getColumnValue(row, 'accountname') }}</span>
     </template>
     </el-table-column>
-    <el-table-column show-overflow-tooltip prop="telephone1" label="主要电话" :width="100"  :align="''">
-    <template v-slot="{ row }">
-        <span>{{ getColumnValue(row, 'telephone1') }}</span>
-    </template>
-    </el-table-column>
 </el-table>
\ No newline at end of file