cloud-web-corejs 1.0.18 → 1.0.19

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

@@ -1,134 +1,143 @@
 <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>
-			<el-tab-pane label="列表" name="second">
-				<div class="grid-height">
-					<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-download" @click="importExcel">导入</vxe-button> -->
-								</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>
-								</div>
-							</div>
-							<vxe-form ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData" @submit="searchEvent" @reset="searchEvent">
-								<vxe-form-item title="国家名称:" field="countryName">
-									<template v-slot>
-										<el-input v-model="formData.countryName" size="small" clearable />
-									</template>
-								</vxe-form-item>
+  <div id="containt">
+    <el-tabs v-model="activeName" class="tab-box">
+      <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="$t1('列表')" name="second">
+        <div class="grid-height">
+          <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-download" @click="importExcel">导入</vxe-button> -->
+                </div>
+                <div class="fr">
+                  <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-item title="国家名称:" field="countryName">
+                  <template v-slot>
+                    <el-input v-model="formData.countryName" size="small" clearable/>
+                  </template>
+                </vxe-form-item>
                 <vxe-form-item title="国家简称:" field="simpleName">
                   <template v-slot>
-                    <el-input v-model="formData.simpleName" size="small" clearable />
+                    <el-input v-model="formData.simpleName" size="small" clearable/>
                   </template>
                 </vxe-form-item>
-								<vxe-form-item title="国家编码:" field="countryCode">
-									<template v-slot>
-										<el-input v-model="formData.countryCode" size="small" clearable />
-									</template>
-								</vxe-form-item>
-							</vxe-form>
-						</template>
-					</vxe-grid>
-				</div>
-			</el-tab-pane>
-		</el-tabs>
-	</div>
+                <vxe-form-item title="国家编码:" field="countryCode">
+                  <template v-slot>
+                    <el-input v-model="formData.countryCode" size="small" clearable/>
+                  </template>
+                </vxe-form-item>
+              </vxe-form>
+            </template>
+          </vxe-grid>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
 </template>
 
 <script>
 import editView from './edit.vue';
+
 export default {
-	name: 'country:list',
-	components: { editView },
-	data() {
-		return {
-			activeName: 'second',
-			dataId: 0,
-			showEdit: false,
-			vxeOption: {},
-			formData: {}
-		};
-	},
-	mounted() {
-		this.initTableList();
-	},
-	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' ? 0 : id;
-			this.activeName = 'first';
-			this.$openEditView('showEdit');
-		},
-		initTableList() {
-			let that = this;
-			let tableOption = {
-				vue: this,
-				tableRef: 'table-m1',
-				tableName: 'user_country_list-m1',
-				path: USER_PREFIX + '/country/listPage',
-				param: () => {
-					return this.formData;
-				},
-				columns: [
-					{ type: 'checkbox', width: 48, resizable: false, fixed: 'left' },
-					{
-						title: '国家名称',
-						field: 'countryName',
-						width: 250,
-						fixed: 'left'
-					},
+  name: 'country:list',
+  components: {editView},
+  data() {
+    return {
+      activeName: 'second',
+      dataId: 0,
+      showEdit: false,
+      vxeOption: {},
+      formData: {}
+    };
+  },
+  mounted() {
+    this.initTableList();
+  },
+  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' ? 0 : id;
+      this.activeName = 'first';
+      this.$openEditView('showEdit');
+    },
+    initTableList() {
+      let that = this;
+      let tableOption = {
+        vue: this,
+        tableRef: 'table-m1',
+        tableName: 'user_country_list-m1',
+        path: USER_PREFIX + '/country/listPage',
+        param: () => {
+          return this.formData;
+        },
+        columns: [
+          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          {
+            title: '国家名称',
+            field: 'countryName',
+            width: 250,
+            fixed: 'left'
+          },
           {
             field: 'simpleName',
             title: '国家简称',
             width: 150
           },
-					{
-						field: 'countryCode',
-						title: '国家编码',
-						width: 150
-					},
-					{
-						field: 'enabled',
-						title: '是否启用',
-						width: 150,
-						slots: {
-							default: ({ row }) => {
-								if (row.enabled) {
-									return [
-										<div class="txt-status">
-											<span>启用</span>
-										</div>
-									];
-								} else {
-									return [
-										<div class="txt-status disable">
-											<span>禁用</span>
-										</div>
-									];
-								}
-							}
-						}
-					},
-					{
-						field: 'createDate',
-						title: '创建时间',
-						width: 150
-					},
+          {
+            field: 'countryCode',
+            title: '国家编码',
+            width: 150
+          },
+          {
+            field: 'enabled',
+            title: '是否启用',
+            width: 150,
+            slots: {
+              default: ({row}) => {
+                if (row.enabled) {
+                  return [
+                    <div class="txt-status">
+                      <span>启用</span>
+                    </div>
+                  ];
+                } else {
+                  return [
+                    <div class="txt-status disable">
+                      <span>禁用</span>
+                    </div>
+                  ];
+                }
+              }
+            }
+          },
+          {
+            field: 'createDate',
+            title: '创建时间',
+            width: 150
+          },
           {
             field: '_createBy',
             title: '创建人',
@@ -139,49 +148,50 @@ export default {
             title: '更新人',
             width: 150
           },
-					{
-						width: 47,
-						fixed: 'right',
-						title: '',
-						sortable: false,
-						slots: {
-							default: ({ row }) => {
-								return [
-									<div>
-										<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>
-									</div>
-								];
-							}
-						}
-					}
-				]
-			};
-			this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
-				this.vxeOption = opts;
-			});
-		},
-		importExcel() {
-			let that = this;
-			that.$excelImport({
-				prefix: USER_PREFIX,
-				excel: USER_PREFIX + '/excelTemplate/country/country.xlsx',
-				multi: false,
-				saveUrl: USER_PREFIX + '/country/save',
-				callback: () => {
-					that.searchEvent();
-				}
-			});
-		}
-	}
+          {
+            width: 47,
+            fixed: 'right',
+            title: '',
+            sortable: false,
+            slots: {
+              default: ({row}) => {
+                return [
+                  <div>
+                    <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>
+                  </div>
+                ];
+              }
+            }
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        this.vxeOption = opts;
+      });
+    },
+    importExcel() {
+      let that = this;
+      that.$excelImport({
+        prefix: USER_PREFIX,
+        excel: USER_PREFIX + '/excelTemplate/country/country.xlsx',
+        multi: false,
+        saveUrl: USER_PREFIX + '/country/save',
+        callback: () => {
+          that.searchEvent();
+        }
+      });
+    }
+  }
 };
 </script>

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

@@ -27,9 +27,11 @@
           <div class="clearfix screen-btns">
             <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">
+                {{$t1('搜索')}}
               </vxe-button>
-              <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索</vxe-button>
             </div>
           </div>
           <vxe-form class="screen-box" title-width="92px" title-align="right" :data="formData" @submit="searchEvent"
@@ -56,8 +58,9 @@
       </div>
     </label>
     <div class="multipleChoice">
-      <el-tooltip :enterable="false" effect="dark" content="全部删除" placement="top"><a class="allDel icon-quanbushanchu"
-                                                                                     @click="clearChecked()"></a>
+      <el-tooltip :enterable="false" effect="dark" content="全部删除" placement="top"><a
+        class="allDel icon-quanbushanchu"
+        @click="clearChecked()"></a>
       </el-tooltip>
       <div class="list">
         <div class="item" v-for="(checkRow, index) in checkRows" :key="index">
@@ -67,14 +70,14 @@
       </div>
     </div>
     <span slot="footer" class="dialog-footer">
-			<span class="fl tips" v-if="!selectMulti">注：双击确认选择（单选）</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>
-				取 消
+				{{$t1('取 消')}}
 			</el-button>
 			<el-button type="primary" @click="dialogPrimary" class="button-sty">
 				<i class="el-icon-check el-icon"></i>
-				确 定
+				{{$t1('确 定')}}
 			</el-button>
 		</span>
   </el-dialog>

package/src/views/user/data_type_setting/editDialog.vue

@@ -13,7 +13,8 @@
     @close="close"
   >
     <div class="cont">
-      <el-form ref="editForm" :model="dataType" label-width="110px" class="adSearchForm" style="width: 362px;height: auto;">
+      <el-form ref="editForm" :model="dataType" label-width="110px" class="adSearchForm"
+               style="width: 362px;height: auto;">
         <el-form-item label="数据类型编码">
           <span>{{dataType.dataTypeCode}}</span>
         </el-form-item>
@@ -25,11 +26,11 @@
     <span slot="footer" class="dialog-footer">
       <el-button type="primary" plain class="button-sty" @click="showDialog=false">
         <i class="el-icon-close el-icon"></i>
-        取 消
+        {{$t1('取 消')}}
       </el-button>
       <el-button type="primary" @click="saveData" class="button-sty">
         <i class="el-icon-check el-icon"></i>
-        确 定
+        {{$t1('确 定')}}
       </el-button>
     </span>
   </el-dialog>
@@ -39,15 +40,15 @@
 export default {
   props: {
     _dataId: [String, Number],
-    dataTypeGroup:String
+    dataTypeGroup: String
   },
   data() {
     return {
       isEdit: false,
       tabIndex: 'first',
       dataId: '',
-      dataType: {enabled:true},
-      showDialog:true
+      dataType: {enabled: true},
+      showDialog: true
     };
   },
   created() {
@@ -74,7 +75,7 @@ export default {
             callback && callback(row);
           }
         });
-      }else{
+      } else {
         this.dataType.dataTypeGroup = this.dataTypeGroup
       }
     },
@@ -95,9 +96,9 @@ export default {
                   duration: 500,
                   onClose: t => {
                     this.dataId = res.objx;
-                    this.getData((row)=>{
+                    this.getData((row) => {
                       this.close();
-                      this.$emit('confirm',row)
+                      this.$emit('confirm', row)
                     })
                   }
                 });
@@ -107,9 +108,9 @@ export default {
         }
       });
     },
-    close(){
+    close() {
       this.showDialog = false;
-      this.$emit('update:visiable',false)
+      this.$emit('update:visiable', false)
     }
   }
 }