cloud-web-corejs 1.0.17 → 1.0.19

package/src/views/user/role/list.vue

@@ -1,32 +1,40 @@
 <template>
   <div id="containt">
     <el-tabs v-model="activeName" class="tab-box">
-      <el-tab-pane label="常规" name="first">
-        <editView v-if="showEdit" visible-key="showEdit" :_dataId.sync="dataId" :parent-target="_self" @reload="$reloadHandle"></editView>
+      <el-tab-pane :label="$t1('常规')" name="first">
+        <editView v-if="showEdit" visible-key="showEdit" :_dataId.sync="dataId" :parent-target="_self"
+                  @reload="$reloadHandle"></editView>
       </el-tab-pane>
-      <el-tab-pane label="列表" name="second">
+      <el-tab-pane :label="$t1('列表')" name="second">
         <div class="grid-height">
-          <vxe-grid ref="table-m1" v-bind="vxeOption" @resizable-change="$vxeTableUtil.onColumnWitchChange" @custom="$vxeTableUtil.customHandle">
+          <vxe-grid ref="table-m1" v-bind="vxeOption" @resizable-change="$vxeTableUtil.onColumnWitchChange"
+                    @custom="$vxeTableUtil.customHandle">
             <template #form>
               <div class="clearfix screen-btns">
                 <div class="fl">
-                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">新增</vxe-button>
-                  <base-table-export :option="{ title: '用户角色导出', targetRef: 'table-m1'}" :parent-target="_self" />
+                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">新增
+                  </vxe-button>
+                  <base-table-export :option="{ title: '用户角色导出', targetRef: 'table-m1'}" :parent-target="_self"/>
                 </div>
                 <div class="fr">
-                  <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary" plain>重置</vxe-button>
-                  <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索</vxe-button>
+                  <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
+                              plain>{{ $t1('重置') }}
+                  </vxe-button>
+                  <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
+                    {{ $t1('搜索') }}
+                  </vxe-button>
                 </div>
               </div>
-              <vxe-form ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData" @submit="searchEvent" @reset="searchEvent">
+              <vxe-form ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData"
+                        @submit="searchEvent" @reset="searchEvent">
                 <vxe-form-item title="用户角色:" field="name">
                   <template v-slot>
-                    <el-input v-model="formData.name" size="small" clearable />
+                    <el-input v-model="formData.name" size="small" clearable/>
                   </template>
                 </vxe-form-item>
                 <vxe-form-item title="角色编码:" field="code">
                   <template v-slot>
-                    <el-input v-model="formData.code" size="small" clearable />
+                    <el-input v-model="formData.code" size="small" clearable/>
                   </template>
                 </vxe-form-item>
               </vxe-form>
@@ -40,120 +48,123 @@
 
 <script>
 import editView from './edit.vue';
+
 export default {
-	name: 'role:list',
-	components: {
-		editView
-	},
-	created() {},
-	mounted() {
-		this.initTableList();
-	},
-	data() {
-		return {
-			activeName: 'second',
-			dataId: 0,
-			showEdit: false,
-			vxeOption: {},
-			formData: {}
-		};
-	},
-	methods: {
-		searchEvent() {
-			this.$refs['table-m1'].commitProxy('reload');
-		},
-		resetEvent() {
-			this.formData = {};
-			this.$refs['table-m1'].commitProxy('reload');
-		},
-		openEditDialog(id) {
-			this.dataId = !id || typeof id == 'object' ? '' : id;
-			this.activeName = 'first';
-			this.$openEditView('showEdit');
-		},
-		initTableList() {
-			let tableOption = {
-				vue: this,
-				tableRef: 'table-m1',
-				tableName: 'basic_role_list-m1',
-				path: USER_PREFIX + '/role/listCurrentPage',
-				param: () => {
-					return this.formData;
-				},
-				columns: [
-					{
-						type: 'checkbox',
-						fixed: 'left',
-						width: 48,
-						resizable: false
-					},
-					{
-						title: '用户角色',
-						field: 'name',
-						width: 150,
-						sortable: true,
-						fixed: 'left'
-					},
+  name: 'role:list',
+  components: {
+    editView
+  },
+  created() {
+  },
+  mounted() {
+    this.initTableList();
+  },
+  data() {
+    return {
+      activeName: 'second',
+      dataId: 0,
+      showEdit: false,
+      vxeOption: {},
+      formData: {}
+    };
+  },
+  methods: {
+    searchEvent() {
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    resetEvent() {
+      this.formData = {};
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    openEditDialog(id) {
+      this.dataId = !id || typeof id == 'object' ? '' : id;
+      this.activeName = 'first';
+      this.$openEditView('showEdit');
+    },
+    initTableList() {
+      let tableOption = {
+        vue: this,
+        tableRef: 'table-m1',
+        tableName: 'basic_role_list-m1',
+        path: USER_PREFIX + '/role/listCurrentPage',
+        param: () => {
+          return this.formData;
+        },
+        columns: [
+          {
+            type: 'checkbox',
+            fixed: 'left',
+            width: 48,
+            resizable: false
+          },
           {
-          	title: '角色编码',
-          	field: 'code',
-          	width: 150
+            title: '用户角色',
+            field: 'name',
+            width: 150,
+            sortable: true,
+            fixed: 'left'
           },
-					{
-						title: '角色描述',
-						field: 'description',
+          {
+            title: '角色编码',
+            field: 'code',
+            width: 150
+          },
+          {
+            title: '角色描述',
+            field: 'description',
 
-					},
-					{
-						title: '是否内置',
+          },
+          {
+            title: '是否内置',
             field: 'systems',
             width: 150,
-						slots: {
-							default: ({ row }) => {
-                if(row.systems){
+            slots: {
+              default: ({row}) => {
+                if (row.systems) {
                   return "是";
-                }else{
+                } else {
                   return "否";
                 }
               }
-						}
+            }
+          },
+          {title: '所属组织', field: 'companyName', width: 150},
+          {
+            field: 'createDate',
+            title: '创建时间',
+            width: 150
           },
-					{ title: '所属组织', field: 'companyName', width: 150 },
-					{
-						field: 'createDate',
-						title: '创建时间',
-						width: 150
-					},
-					{
-						width: 47,
-						fixed: 'right',
-						title: '',
-						sortable: false,
-						slots: {
-							default: ({ row }) => {
-								return [
-									<a
-										href="javascript:void(0);"
-										class="a-link"
-										onclick={() => {
-											this.openEditDialog(row.id);
-										}}
-									>
-										<el-tooltip enterable={false} effect="dark" content="查看" placement="top" popper-class="tooltip-skin">
-											<i class="el-icon-edit" />
-										</el-tooltip>
-									</a>
-								];
-							}
-						}
-					}
-				]
-			};
-			this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
-				this.vxeOption = opts;
-			});
-		}
-	}
+          {
+            width: 47,
+            fixed: 'right',
+            title: '',
+            sortable: false,
+            slots: {
+              default: ({row}) => {
+                return [
+                  <a
+                    href="javascript:void(0);"
+                    class="a-link"
+                    onclick={() => {
+                      this.openEditDialog(row.id);
+                    }}
+                  >
+                    <el-tooltip enterable={false} effect="dark" content="查看" placement="top"
+                                popper-class="tooltip-skin">
+                      <i class="el-icon-edit"/>
+                    </el-tooltip>
+                  </a>
+                ];
+              }
+            }
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        this.vxeOption = opts;
+      });
+    }
+  }
 };
 </script>
 

package/src/views/user/sale_org/dialog.vue

@@ -63,14 +63,14 @@
       </div>
     </div>
     <span slot="footer" class="dialog-footer">
-      <span class="fl tips" v-if="!selectMulti">{{ $t2('注：双击确认选择（单选）', 'saleOrg.clickNote') }}</span>
+      <span class="fl tips" v-if="!selectMulti">{{ $t1('注：双击确认选择（单选）') }}</span>
       <el-button type="primary" plain class="button-sty" @click="dialogClose">
         <i class="el-icon-close el-icon"></i>
-      {{ $t2('取 消', 'system.button.cancel2') }}
+      {{ $t1('取 消') }}
       </el-button>
       <el-button type="primary" @click="dialogPrimary" class="button-sty">
         <i class="el-icon-check el-icon"></i>
-      	{{ $t2('确 定', 'system.button.confirm2') }}
+      	{{ $t1('确 定') }}
       </el-button>
     </span>
   </el-dialog>

package/src/views/user/sale_org/list.vue

@@ -10,7 +10,7 @@
                 <div class="fl"></div>
                 <div class="fr">
                   <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                              plain>重置
+                              plain>{{$t1('重置')}}
                   </vxe-button>
                   <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索
                   </vxe-button>
@@ -162,11 +162,11 @@
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" plain class="button-sty" @click="showChangeParentDialog = false">
           <i class="el-icon-close el-icon"></i>
-          取 消
+          {{ $t1('取 消') }}
         </el-button>
         <el-button type="primary" @click="changeRowParent" class="button-sty">
           <i class="el-icon-check el-icon"></i>
-          确 定
+          {{ $t1('确 定') }}
         </el-button>
       </span>
     </el-dialog>
@@ -189,11 +189,11 @@
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" plain class="button-sty" @click="showSortRowDialog = false">
           <i class="el-icon-close el-icon"></i>
-          取 消
+          {{ $t1('取 消') }}
         </el-button>
         <el-button type="primary" @click="saveSort" class="button-sty">
           <i class="el-icon-check el-icon"></i>
-          确 定
+          {{ $t1('确 定') }}
         </el-button>
       </span>
     </el-dialog>
@@ -217,7 +217,7 @@ import areaDialog from '../../../views/user/area/dialog'
 
 export default {
   name: 'sale_org:list',
-  components: {saleOrgDialog, userDialog, roleDialog,areaDialog},
+  components: {saleOrgDialog, userDialog, roleDialog, areaDialog},
   mixins: [tableTreeMixins],
   mounted() {
     this.initTableList();
@@ -243,7 +243,7 @@ export default {
       showDirectorDialog: false,
       operateIndex: null,
       showRoleDialog: false,
-      showAreaDialog:false
+      showAreaDialog: false
     };
   },
   beforeDestroy() {
@@ -552,7 +552,7 @@ export default {
     },
     openDirectorDialog(row) {
       let tableData = this.$refs['table-m1'].getTableData().tableData;
-      let index = tableData.findIndex(item=>item._X_ROW_KEY == row._X_ROW_KEY);
+      let index = tableData.findIndex(item => item._X_ROW_KEY == row._X_ROW_KEY);
       this.operateIndex = index;
       this.showDirectorDialog = true;
     },
@@ -567,7 +567,7 @@ export default {
     },
     openRoleDialog(row) {
       let tableData = this.$refs['table-m1'].getTableData().tableData;
-      let index = tableData.findIndex(item=>item._X_ROW_KEY == row._X_ROW_KEY);
+      let index = tableData.findIndex(item => item._X_ROW_KEY == row._X_ROW_KEY);
       this.operateIndex = index;
       this.showRoleDialog = true;
     },
@@ -582,7 +582,7 @@ export default {
     },
     openAreaDialog(row) {
       let tableData = this.$refs['table-m1'].getTableData().tableData;
-      let index = tableData.findIndex(item=>item._X_ROW_KEY == row._X_ROW_KEY);
+      let index = tableData.findIndex(item => item._X_ROW_KEY == row._X_ROW_KEY);
       this.operateIndex = index;
       this.showAreaDialog = true;
     },
@@ -593,7 +593,7 @@ export default {
         let fullData = $grid.getTableData().tableData;
         let item = fullData[this.operateIndex];
         item.areaId = row.id;
-        this.$set(item,"areaName",row.name)
+        this.$set(item, "areaName", row.name)
       }
     }
   }

package/src/views/user/sale_org/moveDialog.vue

@@ -50,11 +50,11 @@
     <span slot="footer" class="dialog-footer">
 		<el-button type="primary" plain class="button-sty" @click="dialogClose">
 			<i class="el-icon-close el-icon"></i>
-			取 消
+			{{ $t1('取 消') }}
 		</el-button>
 		<el-button type="primary" class="button-sty" @click="dialogPrimary">
 			<i class="el-icon-check el-icon"></i>
-			确 定
+			{{ $t1('确 定') }}
 		</el-button>
 	</span>
   </el-dialog>

package/src/views/user/sale_org_net/list.vue

@@ -10,7 +10,7 @@
                 <div class="fl"></div>
                 <div class="fr">
                   <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                              plain>重置
+                              plain>{{$t1('重置')}}
                   </vxe-button>
                   <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索
                   </vxe-button>
@@ -148,11 +148,11 @@
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" plain class="button-sty" @click="showChangeParentDialog = false">
           <i class="el-icon-close el-icon"></i>
-          取 消
+          {{$t1('取 消')}}
         </el-button>
         <el-button type="primary" @click="changeRowParent" class="button-sty">
           <i class="el-icon-check el-icon"></i>
-          确 定
+          {{$t1('确 定')}}
         </el-button>
       </span>
     </el-dialog>
@@ -175,11 +175,11 @@
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" plain class="button-sty" @click="showSortRowDialog = false">
           <i class="el-icon-close el-icon"></i>
-          取 消
+          {{$t1('取 消')}}
         </el-button>
         <el-button type="primary" @click="saveSort" class="button-sty">
           <i class="el-icon-check el-icon"></i>
-          确 定
+          {{$t1('确 定')}}
         </el-button>
       </span>
     </el-dialog>
@@ -525,7 +525,7 @@ export default {
     },
     openDirectorDialog(row) {
       let tableData = this.$refs['table-m1'].getTableData().tableData;
-      let index = tableData.findIndex(item=>item._X_ROW_KEY == row._X_ROW_KEY);
+      let index = tableData.findIndex(item => item._X_ROW_KEY == row._X_ROW_KEY);
       this.operateIndex = index;
       this.showDirectorDialog = true;
     },
@@ -540,7 +540,7 @@ export default {
     },
     openRoleDialog(row) {
       let tableData = this.$refs['table-m1'].getTableData().tableData;
-      let index = tableData.findIndex(item=>item._X_ROW_KEY == row._X_ROW_KEY);
+      let index = tableData.findIndex(item => item._X_ROW_KEY == row._X_ROW_KEY);
       this.operateIndex = index;
       this.showRoleDialog = true;
     },
@@ -555,7 +555,7 @@ export default {
     },
     openAreaDialog(row) {
       let tableData = this.$refs['table-m1'].getTableData().tableData;
-      let index = tableData.findIndex(item=>item._X_ROW_KEY == row._X_ROW_KEY);
+      let index = tableData.findIndex(item => item._X_ROW_KEY == row._X_ROW_KEY);
       this.operateIndex = index;
       this.showAreaDialog = true;
     },
@@ -566,7 +566,7 @@ export default {
         let fullData = $grid.getTableData().tableData;
         let item = fullData[this.operateIndex];
         item.areaId = row.id;
-        this.$set(item,"areaName",row.name)
+        this.$set(item, "areaName", row.name)
       }
     }
   }