cloud-web-corejs 1.0.18 → 1.0.19

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

@@ -1,125 +1,134 @@
 <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="name">
-									<template v-slot>
-										<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 />
-									</template>
-								</vxe-form-item>
-							</vxe-form>
-						</template>
-					</vxe-grid>
-				</div>
-			</el-tab-pane>
-		</el-tabs>
-	</div>
+  <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="name">
+                  <template v-slot>
+                    <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/>
+                  </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: 'position: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: 'basic_position_list-m2',
-				path: USER_PREFIX + '/position/listCurrentPage',
-				param: () => {
-					return this.formData;
-				},
-				columns: [
-					{ type: 'checkbox', width: 48, resizable: false, fixed: 'left' },
-					{
-						title: '岗位名称',
-						field: 'name',
-						width: 150,
-						fixed: 'left'
-					},
-					{
-						field: 'code',
-						title: '岗位编码',
-						width: 250
-					},
-					{ title: '所属组织', field: 'companyName', 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
-					},
+  name: 'position: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: 'basic_position_list-m2',
+        path: USER_PREFIX + '/position/listCurrentPage',
+        param: () => {
+          return this.formData;
+        },
+        columns: [
+          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          {
+            title: '岗位名称',
+            field: 'name',
+            width: 150,
+            fixed: 'left'
+          },
+          {
+            field: 'code',
+            title: '岗位编码',
+            width: 250
+          },
+          {title: '所属组织', field: 'companyName', 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: '创建人',
@@ -130,49 +139,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/position/position.xlsx',
-				multi: false,
-				saveUrl: USER_PREFIX + '/position/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/position/position.xlsx',
+        multi: false,
+        saveUrl: USER_PREFIX + '/position/save',
+        callback: () => {
+          that.searchEvent();
+        }
+      });
+    }
+  }
 };
 </script>

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

@@ -27,7 +27,7 @@
           <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">搜索
               </vxe-button>
@@ -72,14 +72,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>
@@ -93,7 +93,7 @@ export default {
   props: ['visiable', 'multi', 'rows', 'param'],
   mixins: [selectDialogMixins],
   created() {
-    if(this.$attrs.fieldKey){
+    if (this.$attrs.fieldKey) {
       this.fieldKey = this.$attrs.fieldKey;
     }
     this.initSetting();

package/src/views/user/project_tag/edit.vue

@@ -4,12 +4,12 @@
       <div class="d-header clearfix">
         <div class="fl">
           <i class="el-icon-info"/>
-          {{ dataId ? '查看' : '新增' }}项目标签
+          {{ dataId ? $t1('查看') : $t1('新增') }} 项目标签
         </div>
         <div class="fr">
-          <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">重置
+          <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">{{$t1('重置')}}
           </el-button>
-          <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">保存</el-button>
+          <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{$t1('保存')}}</el-button>
         </div>
       </div>
       <div class="d-cont">

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

@@ -1,11 +1,11 @@
 <template>
   <div id="containt">
     <el-tabs v-model="activeName" class="tab-box">
-      <el-tab-pane label="常规" name="first">
+      <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">
@@ -18,7 +18,7 @@
                 </template>
                 <template #buttonRight>
                   <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>

package/src/views/user/push_setting/edit.vue

@@ -4,12 +4,15 @@
       <div class="d-header clearfix">
         <div class="fl">
           <i class="el-icon-info"/>
-          {{ dataId ? '查看' : '新增' }}推送数据设置
+          {{ dataId ? $t1('查看') : $t1('新增') }} 推送数据设置
         </div>
         <div class="fr">
-          <el-button type="warning" class="button-sty" icon="el-icon-copy-document" @click="copy" v-if="!!dataId">复制</el-button>
-          <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">重置</el-button>
-          <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">保存</el-button>
+          <el-button type="warning" class="button-sty" icon="el-icon-copy-document" @click="copy" v-if="!!dataId">复制
+          </el-button>
+          <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
+            {{$t1('重置')}}
+          </el-button>
+          <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{$t1('保存')}}</el-button>
         </div>
       </div>
       <div class="d-cont">

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

@@ -1,33 +1,41 @@
 <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" :copyId.sync="copyId" :parent-target="_self" @reload="$reloadHandle"></editView>
+      <el-tab-pane :label="$t1('常规')" name="first">
+        <editView v-if="showEdit" visible-key="showEdit" :_dataId.sync="dataId" :copyId.sync="copyId"
+                  :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 status="warning" icon="iconfont icon-shaixuan" class="button-sty orgn" @click="showAdvancedSearch = true">高级筛选</vxe-button>-->
-                  <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 status="warning" icon="iconfont icon-shaixuan" class="button-sty orgn" @click="showAdvancedSearch = true">高级筛选</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="dataType">
                   <template v-slot>
-                    <el-input v-model="formData.dataType" size="small" clearable />
+                    <el-input v-model="formData.dataType" size="small" clearable/>
                   </template>
                 </vxe-form-item>
                 <vxe-form-item title="推送企业编码:" field="pushCompanyCode">
                   <template v-slot>
-                    <el-input v-model="formData.pushCompanyCode" size="small" clearable />
+                    <el-input v-model="formData.pushCompanyCode" size="small" clearable/>
                   </template>
                 </vxe-form-item>
                 <vxe-form-item title="是否启用:" field="enabled">
@@ -48,12 +56,12 @@
                 </vxe-form-item>
                 <vxe-form-item title="脚本:" field="script">
                   <template v-slot>
-                    <el-input v-model="formData.script" size="small" clearable />
+                    <el-input v-model="formData.script" size="small" clearable/>
                   </template>
                 </vxe-form-item>
                 <vxe-form-item title="脚本备注:" field="remark" class-name="block">
                   <template v-slot>
-                    <el-input v-model="formData.remark" size="small" clearable />
+                    <el-input v-model="formData.remark" size="small" clearable/>
                   </template>
                 </vxe-form-item>
               </vxe-form>
@@ -62,25 +70,26 @@
         </div>
       </el-tab-pane>
     </el-tabs>
-<!--    <advancedSearchDialog v-if="showAdvancedSearch" :visiable.sync="showAdvancedSearch" :formData.sync="advancedFormData" @confirm="searchEvent">-->
-<!--      <template #form>-->
-<!--        <vxe-form :model="advancedFormData" title-width="102px" :inline="true" class="adSearchForm">-->
-<!--          <vxe-form-item title="脚本备注:" field="remark" class-name="block">-->
-<!--            <template v-slot>-->
-<!--              <el-input v-model="advancedFormData.remark" size="small" clearable />-->
-<!--            </template>-->
-<!--          </vxe-form-item>-->
-<!--        </vxe-form>-->
-<!--      </template>-->
-<!--    </advancedSearchDialog>-->
+    <!--    <advancedSearchDialog v-if="showAdvancedSearch" :visiable.sync="showAdvancedSearch" :formData.sync="advancedFormData" @confirm="searchEvent">-->
+    <!--      <template #form>-->
+    <!--        <vxe-form :model="advancedFormData" title-width="102px" :inline="true" class="adSearchForm">-->
+    <!--          <vxe-form-item title="脚本备注:" field="remark" class-name="block">-->
+    <!--            <template v-slot>-->
+    <!--              <el-input v-model="advancedFormData.remark" size="small" clearable />-->
+    <!--            </template>-->
+    <!--          </vxe-form-item>-->
+    <!--        </vxe-form>-->
+    <!--      </template>-->
+    <!--    </advancedSearchDialog>-->
   </div>
 </template>
 
 <script>
 import editView from './edit.vue';
+
 export default {
   name: 'push_setting:list',
-  components: { editView },
+  components: {editView},
   data() {
     return {
       activeName: 'second',
@@ -113,7 +122,7 @@ export default {
     },
     initTableList() {
       let that = this;
-      let pushTypeMap = { 0: '异步推送', 1: '同步调用' };
+      let pushTypeMap = {0: '异步推送', 1: '同步调用'};
       let tableOption = {
         vue: this,
         tableRef: 'table-m1',
@@ -126,7 +135,7 @@ export default {
           }
         },
         columns: [
-          { type: 'checkbox', width: 48, resizable: false, fixed: 'left' },
+          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
           {
             title: '推送数据类型',
             field: 'dataType',
@@ -143,7 +152,7 @@ export default {
             field: 'pushType',
             width: 150,
             slots: {
-              default: ({ row }) => {
+              default: ({row}) => {
                 return pushTypeMap[row.pushType] || '';
               }
             }
@@ -168,7 +177,7 @@ export default {
             title: '是否启用',
             width: 150,
             slots: {
-              default: ({ row }) => {
+              default: ({row}) => {
                 if (row.enabled) {
                   return [
                     <div class="txt-status">
@@ -190,14 +199,14 @@ export default {
             title: '创建时间',
             width: 150
           },
-          { title: '更新时间', field: 'modifyDate', width: 150 },
+          {title: '更新时间', field: 'modifyDate', width: 150},
           {
             width: 47,
             fixed: 'right',
             title: '',
             sortable: false,
             slots: {
-              default: ({ row }) => {
+              default: ({row}) => {
                 return [
                   <div>
                     <a
@@ -207,8 +216,9 @@ export default {
                         this.openEditDialog(row.id);
                       }}
                     >
-                      <el-tooltip enterable={false} effect="dark" content="查看" placement="top" popper-class="tooltip-skin">
-                        <i class="el-icon-edit" />
+                      <el-tooltip enterable={false} effect="dark" content="查看" placement="top"
+                                  popper-class="tooltip-skin">
+                        <i class="el-icon-edit"/>
                       </el-tooltip>
                     </a>
                   </div>

package/src/views/user/redirect/index.vue

@@ -1,11 +1,11 @@
 <script>
 export default {
   created() {
-    const { params, query } = this.$route
-    const { path } = params
-    this.$router.replace({ path: '/' + path, query })
+    const {params, query} = this.$route
+    const {path} = params
+    this.$router.replace({path: '/' + path, query})
   },
-  render: function(h) {
+  render: function (h) {
     return h() // avoid warning message
   }
 }