cloud-web-corejs 1.0.18 → 1.0.19

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

@@ -1,147 +1,154 @@
 <template>
-	<el-dialog
-		title="组织列表"
-		:append-to-body="true"
-		:modal-append-to-body="true"
-		:close-on-click-modal="falseValue"
-		:visible.sync="showDialog"
-		:modal="falseValue"
-		custom-class="dialog-style list-dialog dialog-checkbox pd_0"
-		width="1200px"
-		@close="dialogClose"
-		v-el-drag-dialog
-		v-el-dialog-center
-	>
-		<div class="cont" style="height:450px">
-			<vxe-grid
-				class="is-pointer"
-				ref="table-m1"
-				v-bind="vxeOption"
-				@resizable-change="$vxeTableUtil.onColumnWitchChange"
-				@custom="$vxeTableUtil.customHandle"
-				@checkbox-change="addDataTable"
-				@checkbox-all="checkAll"
-				@cell-dblclick="checkWithSubmit"
-			>
-				<template #form>
-					<div class="clearfix screen-btns">
-						<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 class="screen-box" title-width="92px" title-align="right" :data="formData" @submit="searchEvent" @reset="resetEvent">
-						<vxe-form-item title="组织名称:" field="companyName">
-							<template v-slot>
-								<el-input v-model="formData.companyName" size="small" clearable />
-							</template>
-						</vxe-form-item>
+  <el-dialog
+    title="组织列表"
+    :append-to-body="true"
+    :modal-append-to-body="true"
+    :close-on-click-modal="falseValue"
+    :visible.sync="showDialog"
+    :modal="falseValue"
+    custom-class="dialog-style list-dialog dialog-checkbox pd_0"
+    width="1200px"
+    @close="dialogClose"
+    v-el-drag-dialog
+    v-el-dialog-center
+  >
+    <div class="cont" style="height:450px">
+      <vxe-grid
+        class="is-pointer"
+        ref="table-m1"
+        v-bind="vxeOption"
+        @resizable-change="$vxeTableUtil.onColumnWitchChange"
+        @custom="$vxeTableUtil.customHandle"
+        @checkbox-change="addDataTable"
+        @checkbox-all="checkAll"
+        @cell-dblclick="checkWithSubmit"
+      >
+        <template #form>
+          <div class="clearfix screen-btns">
+            <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 class="screen-box" title-width="92px" title-align="right" :data="formData" @submit="searchEvent"
+                    @reset="resetEvent">
+            <vxe-form-item title="组织名称:" field="companyName">
+              <template v-slot>
+                <el-input v-model="formData.companyName" size="small" clearable/>
+              </template>
+            </vxe-form-item>
             <vxe-button type="submit" @click="searchEvent" v-show="false"></vxe-button>
-					</vxe-form>
-				</template>
-			</vxe-grid>
-		</div>
-		<label id="labBtn" class="transverse">
-			<div class="icon">
-				<i class="el-icon-more"></i>
-				<i class="el-icon-more"></i>
-			</div>
-		</label>
-		<div class="multipleChoice">
-			<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">
-					<p>{{ checkRow.companyName }}</p>
-					<a class="el-icon-close" @click="clearTable1Select(index)"></a>
-				</div>
-			</div>
-		</div>
-		<span slot="footer" class="dialog-footer">
-			<span class="fl tips" v-if="!selectMulti">注：双击确认选择（单选）</span>
+          </vxe-form>
+        </template>
+      </vxe-grid>
+    </div>
+    <label id="labBtn" class="transverse">
+      <div class="icon">
+        <i class="el-icon-more"></i>
+        <i class="el-icon-more"></i>
+      </div>
+    </label>
+    <div class="multipleChoice">
+      <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">
+          <p>{{ checkRow.companyName }}</p>
+          <a class="el-icon-close" @click="clearTable1Select(index)"></a>
+        </div>
+      </div>
+    </div>
+    <span slot="footer" class="dialog-footer">
+			<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>
+  </el-dialog>
 </template>
 
 <script>
-import { selectDialogMixins } from '@base/mixins/selectDialog/index.js';
+import {selectDialogMixins} from '@base/mixins/selectDialog/index.js';
+
 export default {
-	name: 'company_info_dialog',
-	props: ['visiable', 'multi', 'rows', 'param', 'firstEnabled'],
-	mixins: [selectDialogMixins],
-	created() {
-		this.initSetting();
-	},
-	mounted() {
-		this.initTableM1();
-	},
-	data() {
-		var that = this;
-		return {
-			showDialog: true,
-			falseValue: false,
-			selectMulti: true,
-			formData: {},
-			vxeOption: {}
-		};
-	},
-	methods: {
-		initTableM1() {
-			let that = this;
-			let tableOption = {
-				vue: that,
-				tableRef: 'table-m1',
-				tableName: 'basic_ompany_info_dialog_list',
-				path: USER_PREFIX + '/user_company_info/getCurrentList',
-				treeNodeUrl: USER_PREFIX + '/user_company_info/getChildren',
-				treeNodeParam: function(row) {
-					return { parentCompanyCode: row.companyCode };
-				},
-				param: () => {
-					return this.formData;
-				},
-				columns: [
-					{ type: 'checkbox', width: 48, resizable: false, fixed: 'left' },
-					{ title: '组织名称', field: 'companyName', width: 250, fixed: 'left', treeNode: true },
-					{ title: '组织编码', field: 'companyCode', width: 200 },
-					{
-						width: 47,
-						fixed: 'right',
-						title: '',
-						sortable: false
-					}
-				],
-				config: {
-					checkboxConfig: {
-						checkStrictly: true,
-						showHeader: this.selectMulti,
-						trigger: 'row',
-						checkMethod: ({ row }) => {
-							if (this.firstEnabled === 'true' || this.firstEnabled === true) {
-								return true;
-							} else {
-								if (!row.parentCompanyCode) {
-									return false;
-								} else {
-									return true;
-								}
-							}
-						}
-					}
-				}
-			};
+  name: 'company_info_dialog',
+  props: ['visiable', 'multi', 'rows', 'param', 'firstEnabled'],
+  mixins: [selectDialogMixins],
+  created() {
+    this.initSetting();
+  },
+  mounted() {
+    this.initTableM1();
+  },
+  data() {
+    var that = this;
+    return {
+      showDialog: true,
+      falseValue: false,
+      selectMulti: true,
+      formData: {},
+      vxeOption: {}
+    };
+  },
+  methods: {
+    initTableM1() {
+      let that = this;
+      let tableOption = {
+        vue: that,
+        tableRef: 'table-m1',
+        tableName: 'basic_ompany_info_dialog_list',
+        path: USER_PREFIX + '/user_company_info/getCurrentList',
+        treeNodeUrl: USER_PREFIX + '/user_company_info/getChildren',
+        treeNodeParam: function (row) {
+          return {parentCompanyCode: row.companyCode};
+        },
+        param: () => {
+          return this.formData;
+        },
+        columns: [
+          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          {title: '组织名称', field: 'companyName', width: 250, fixed: 'left', treeNode: true},
+          {title: '组织编码', field: 'companyCode', width: 200},
+          {
+            width: 47,
+            fixed: 'right',
+            title: '',
+            sortable: false
+          }
+        ],
+        config: {
+          checkboxConfig: {
+            checkStrictly: true,
+            showHeader: this.selectMulti,
+            trigger: 'row',
+            checkMethod: ({row}) => {
+              if (this.firstEnabled === 'true' || this.firstEnabled === true) {
+                return true;
+              } else {
+                if (!row.parentCompanyCode) {
+                  return false;
+                } else {
+                  return true;
+                }
+              }
+            }
+          }
+        }
+      };
 
-			this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
-				that.vxeOption = opts;
-			});
-		}
-	}
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        that.vxeOption = opts;
+      });
+    }
+  }
 };
 </script>

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

@@ -7,9 +7,9 @@
           查看组织信息
         </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/company_info/view.vue

@@ -1,7 +1,7 @@
 <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" :parent-target="_self" @reload="$reloadHandle"></editView>
       </el-tab-pane>
     </el-tabs>

package/src/views/user/country/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>
@@ -37,12 +37,12 @@
                     @reset="resetEvent">
             <vxe-form-item title="国家名称:" field="countryName">
               <template v-slot>
-                <el-input v-model="formData.countryName" size="small" clearable />
+                <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">
@@ -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>

package/src/views/user/country/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">
@@ -26,10 +26,11 @@
                 <el-form-item prop="countryName" :rules="[{ required: true, trigger: 'blur' }]">
                   <el-input type="text" autocomplete="off" v-model="country.countryName" clearable/>
                 </el-form-item>
-              </td><th>
-              <em class="f-red">*</em>
-              国家简称
-            </th>
+              </td>
+              <th>
+                <em class="f-red">*</em>
+                国家简称
+              </th>
               <td colspan="3">
                 <el-form-item prop="simpleName" :rules="[{ required: true, trigger: 'blur' }]">
                   <el-input type="text" autocomplete="off" v-model="country.simpleName" clearable/>