cloud-web-corejs 1.0.17 → 1.0.19

package/src/views/user/user/infoEdit.vue

@@ -3,12 +3,14 @@
     <el-form ref="editForm" :model="user">
       <div class="d-header clearfix">
         <div class="fl">
-          <i class="el-icon-info" />
-          {{ dataId ? '查看' : '新增' }}用户
+          <i class="el-icon-info"/>
+          {{ dataId ? $t1('查看') : $t1('新增') }} 用户
         </div>
         <div class="fr">
-          <el-button type="primary" plain class="button-sty" @click="reloadContent" 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="primary" plain class="button-sty" @click="reloadContent" 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">
@@ -16,92 +18,109 @@
           <div class="title first"><b>基本信息</b></div>
           <table class="table-detail">
             <tbody>
-              <tr>
-                <th>
-                  <em class="f-red">*</em>
-                  登录名
-                </th>
-                <td>
-                  <el-form-item prop="loginAccount" :rules="[{ required: true, trigger: 'blur' }]">
-                    <template v-if="dataId">
-                      <el-input size="small" v-model="user.loginAccount" maxlength="255" autocomplete="off" lay-verify="required" required="" :readonly="true" />
-                    </template>
-                    <template v-else>
-                      <el-input size="small" v-model="user.loginAccount" maxlength="255" autocomplete="off" lay-verify="required" required="" clearable />
-                    </template>
-                  </el-form-item>
-                </td>
-                <th>手机</th>
-                <td>
-                  <el-form-item prop="mobile" :rules="[{ required: false, trigger: 'blur' }]">
-                    <el-input size="small" v-model="user.mobile" type="text" maxlength="255" autocomplete="off" lay-verify="required|phone" clearable />
-                  </el-form-item>
-                </td>
-                <th>密码</th>
-                <td>
-                  <el-form-item prop="password" :rules="passRules">
-                    <el-input size="small" type="password" v-model="user.password" show-password maxlength="255" autocomplete="off" auto-complete="new-password" clearable />
-                  </el-form-item>
-                </td>
-                <th>确认密码</th>
-                <td>
-                  <el-form-item prop="rePassword" :rules="pass2Rules">
-                    <el-input
-                      size="small"
-                      type="password"
-                      v-model="user.rePassword"
-                      show-password
-                      maxlength="255"
-                      autocomplete="off"
-                      auto-complete="new-password"
-                      lay-verify="confirmPass"
-                      clearable
-                    />
-                  </el-form-item>
-                </td>
-              </tr>
-              <tr>
-                <th>
-                  <em class="f-red">*</em>
-                  姓名
-                </th>
-                <td>
-                  <el-form-item prop="nickName" :rules="[{ required: true, trigger: 'blur' }]">
-                    <el-input size="small" v-model="user.nickName" maxlength="200" lay-verify="required" required="" clearable />
-                  </el-form-item>
-                </td>
-                <th>性别</th>
-                <td>
-                  <el-radio-group v-model="user.gender">
-                    <el-radio :label="1">男</el-radio>
-                    <el-radio :label="2">女</el-radio>
-                  </el-radio-group>
-                </td>
-                <th>出生日期</th>
-                <td><el-date-picker size="small" v-model="user.birth" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" clearable /></td>
-                <th>邮编</th>
-                <td><el-input size="small" id="zipCode" v-model="user.zipCode" name="zipCode" maxlength="255" clearable /></td>
-              </tr>
-              <tr>
-                <th>地址</th>
-                <td colspan="3"><el-input size="small" v-model="user.address" class="b" maxlength="255" clearable /></td>
-                <th>设置</th>
-                <td colspan="3"><el-checkbox label="是否启用" v-model="user.enabled"></el-checkbox></td>
-              </tr>
-              <tr>
-                <th>头像</th>
-                <td colspan="7"><baseUpload :limit="1" accept="image/png, image/jpeg" multi="false" :file.sync="user.headPhotoUrl" dataType="medium"></baseUpload></td>
-              </tr>
-              <tr>
-                <th>创建人</th>
-                <td>{{ user.createBy }}</td>
-                <th>创建时间</th>
-                <td>{{ user.createDate }}</td>
-                <th>更新人</th>
-                <td>{{ user.modifyBy }}</td>
-                <th>更新时间</th>
-                <td>{{ user.modifyDate }}</td>
-              </tr>
+            <tr>
+              <th>
+                <em class="f-red">*</em>
+                登录名
+              </th>
+              <td>
+                <el-form-item prop="loginAccount" :rules="[{ required: true, trigger: 'blur' }]">
+                  <template v-if="dataId">
+                    <el-input size="small" v-model="user.loginAccount" maxlength="255" autocomplete="off"
+                              lay-verify="required" required="" :readonly="true"/>
+                  </template>
+                  <template v-else>
+                    <el-input size="small" v-model="user.loginAccount" maxlength="255" autocomplete="off"
+                              lay-verify="required" required="" clearable/>
+                  </template>
+                </el-form-item>
+              </td>
+              <th>手机</th>
+              <td>
+                <el-form-item prop="mobile" :rules="[{ required: false, trigger: 'blur' }]">
+                  <el-input size="small" v-model="user.mobile" type="text" maxlength="255" autocomplete="off"
+                            lay-verify="required|phone" clearable/>
+                </el-form-item>
+              </td>
+              <th>密码</th>
+              <td>
+                <el-form-item prop="password" :rules="passRules">
+                  <el-input size="small" type="password" v-model="user.password" show-password maxlength="255"
+                            autocomplete="off" auto-complete="new-password" clearable/>
+                </el-form-item>
+              </td>
+              <th>确认密码</th>
+              <td>
+                <el-form-item prop="rePassword" :rules="pass2Rules">
+                  <el-input
+                    size="small"
+                    type="password"
+                    v-model="user.rePassword"
+                    show-password
+                    maxlength="255"
+                    autocomplete="off"
+                    auto-complete="new-password"
+                    lay-verify="confirmPass"
+                    clearable
+                  />
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th>
+                <em class="f-red">*</em>
+                姓名
+              </th>
+              <td>
+                <el-form-item prop="nickName" :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-input size="small" v-model="user.nickName" maxlength="200" lay-verify="required" required=""
+                            clearable/>
+                </el-form-item>
+              </td>
+              <th>性别</th>
+              <td>
+                <el-radio-group v-model="user.gender">
+                  <el-radio :label="1">男</el-radio>
+                  <el-radio :label="2">女</el-radio>
+                </el-radio-group>
+              </td>
+              <th>出生日期</th>
+              <td>
+                <el-date-picker size="small" v-model="user.birth" type="date" placeholder="选择日期"
+                                value-format="yyyy-MM-dd" clearable/>
+              </td>
+              <th>邮编</th>
+              <td>
+                <el-input size="small" id="zipCode" v-model="user.zipCode" name="zipCode" maxlength="255" clearable/>
+              </td>
+            </tr>
+            <tr>
+              <th>地址</th>
+              <td colspan="3">
+                <el-input size="small" v-model="user.address" class="b" maxlength="255" clearable/>
+              </td>
+              <th>设置</th>
+              <td colspan="3">
+                <el-checkbox label="是否启用" v-model="user.enabled"></el-checkbox>
+              </td>
+            </tr>
+            <tr>
+              <th>头像</th>
+              <td colspan="7">
+                <baseUpload :limit="1" accept="image/png, image/jpeg" multi="false" :file.sync="user.headPhotoUrl"
+                            dataType="medium"></baseUpload>
+              </td>
+            </tr>
+            <tr>
+              <th>创建人</th>
+              <td>{{ user.createBy }}</td>
+              <th>创建时间</th>
+              <td>{{ user.createDate }}</td>
+              <th>更新人</th>
+              <td>{{ user.modifyBy }}</td>
+              <th>更新时间</th>
+              <td>{{ user.modifyDate }}</td>
+            </tr>
             </tbody>
           </table>
         </div>
@@ -153,8 +172,8 @@ export default {
       companyInfoOption: {},
       userRoleOption: {},
       showContent: true,
-      passRules: [{ validator: validatePass, trigger: 'blur', required: false }],
-      pass2Rules: [{ validator: validatePass2, trigger: 'blur', required: false }]
+      passRules: [{validator: validatePass, trigger: 'blur', required: false}],
+      pass2Rules: [{validator: validatePass2, trigger: 'blur', required: false}]
     };
   },
   methods: {

package/src/views/user/user/inner_list.vue

@@ -7,7 +7,7 @@ import listView from "./list";
 
 export default {
   name: "user:inner_list",
-  components:{listView}
+  components: {listView}
 }
 </script>
 

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

@@ -1,13 +1,13 @@
 <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" :userType="userType" :flag="flag"></editView>
       </el-tab-pane>
-      <el-tab-pane label="列表" name="second">
+      <el-tab-pane :label="$t1('列表')" name="second">
         <div class="tree-box fl">
-          <div class="tit" @click="clearNodeClick"><b>机构分类</b></div>
+          <div class="tit" @click="clearNodeClick"><b>{{ $t1('机构分类') }}</b></div>
           <el-tree
             :props="defaultProps"
             :load="loadNode"
@@ -41,18 +41,22 @@
                 <tableForm :formData.sync="formData" :advancedFormData.sync="advancedFormData"
                            @searchEvent="searchEvent" @resetEvent="resetEvent">
                   <template #buttonLeft>
-                    <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">新增
+                    <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">
+                      {{ $t1('新增') }}
                     </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">导入
+                    <base-table-export :option="{ title: $t1('账户导出'), targetRef: 'table-m1'}"
+                                       :parent-target="_self"/>
+                    <vxe-button status="primary" class="button-sty" icon="el-icon-download" @click="importExcel">
+                      {{ $t1('导入') }}
                     </vxe-button>
                     <base-input-export :option="exportOption" :parent-target="_self"/>
                   </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 status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
+                      {{ $t1('搜索') }}
                     </vxe-button>
                   </template>
                 </tableForm>
@@ -76,7 +80,7 @@ export default {
     userType: {
       type: Number
     },
-    flag:String
+    flag: String
   },
   components: {
     tableForm,
@@ -99,7 +103,7 @@ export default {
       exportOption: {
         prefix: USER_PREFIX,
         tableRef: 'table-m1',
-        title: '用户',
+        title: this.$t1('用户'),
         codes: ["USEREXCEL", "USERPDF", "USERPRINT", "USERHIPRINT", "USERJDPRINT", "USERPDDPRINT", "USERVIPPRINT"],
         onBeforePrint: (done, {etCode, etType}) => {
           /*etType: 2 菜鸟打印,3 网页打印,6 京东打印*/
@@ -231,30 +235,30 @@ export default {
             fixed: 'left'
           },
           {
-            title: '登录名',
+            title: this.$t1('登录名'),
             field: 'loginAccount',
             width: 250,
             fixed: 'left'
           },
           {
             field: 'nickName',
-            title: '姓名',
+            title: this.$t1('姓名'),
             width: 150
           },
           {
             field: 'mobile',
-            title: '手机号',
+            title: this.$t1('手机号'),
             width: 150
           },
           {
             width: 150,
-            title: '头像',
+            title: this.$t1('头像'),
             field: 'headPhotoUrl',
             sortable: false,
             slots: {
               default: ({row, rowIndex}) => {
                 let option = {
-                  title: "头像",
+                  title: this.$t1('头像'),
                   rows: row.headPhotoUrl,
                   showViewButton: false
                 };
@@ -266,36 +270,36 @@ export default {
           },
           {
             field: 'enabled',
-            title: '是否启用',
+            title: this.$t1('是否启用'),
             width: 150,
             slots: {
               default: ({row}) => {
                 if (row.enabled) {
-                  return [<div class="txt-status">启用</div>];
+                  return [<div class="txt-status">{this.$t1('启用')}</div>];
                 } else {
-                  return [<div class="txt-status s-3">禁用</div>];
+                  return [<div class="txt-status s-3">{this.$t1('禁用')}</div>];
                 }
               }
             }
           },
           {
             field: 'roleNames',
-            title: '角色',
+            title: this.$t1('角色'),
             width: 150
           },
           {
             field: 'saleOrgNames',
-            title: '机构',
+            title: this.$t1('机构'),
             width: 150
           },
           {
             field: 'positionNames',
-            title: '岗位',
+            title: this.$t1('岗位'),
             width: 150
           },
           {
             field: 'birth',
-            title: '出生日期',
+            title: this.$t1('出生日期'),
             width: 150,
             slots: {
               default: ({row}) => {
@@ -308,57 +312,57 @@ export default {
           },
           {
             field: 'zipCode',
-            title: '邮编',
+            title: this.$t1('邮编'),
             width: 150
           },
           {
             field: 'address',
-            title: '地址',
+            title: this.$t1('地址'),
             width: 150
           },
           {
             field: 'empNo',
-            title: '员工编码',
+            title: this.$t1('员工编码'),
             width: 150
           },
           {
             field: 'gender',
-            title: '性别',
+            title: this.$t1('性别'),
             width: 150,
             slots: {
               default: ({row}) => {
                 var val = row.gender;
                 if (val == 1) {
-                  return '男';
+                  return this.$t1('男');
                 } else if (val == 2) {
-                  return '女';
+                  return this.$t1('女');
                 }
               }
             }
           },
           {
             field: 'companyNames',
-            title: '所属组织',
+            title: this.$t1('所属组织'),
             width: 250
           },
           {
             field: 'createBy',
-            title: '创建人',
+            title: this.$t1('创建人'),
             width: 150
           },
           {
             field: 'modifyBy',
-            title: '更新人',
+            title: this.$t1('更新人'),
             width: 150
           },
           {
             field: 'modifyDate',
-            title: '更新时间',
+            title: this.$t1('更新时间'),
             width: 150
           },
           {
             field: 'createDate',
-            title: '创建时间',
+            title: this.$t1('创建时间'),
             width: 150
           },
           {
@@ -376,7 +380,8 @@ export default {
                       this.openEditDialog(row.id);
                     }}
                   >
-                    <el-tooltip enterable={false} enterable={false} effect="dark" content="查看" placement="top"
+                    <el-tooltip enterable={false} enterable={false} effect="dark" content={this.$t1('查看')}
+                                placement="top"
                                 popper-class="tooltip-skin">
                       <i class="el-icon-edit"/>
                     </el-tooltip>
@@ -388,18 +393,18 @@ export default {
         ],
         searchColumns: [
           {
-            title: "机构名称",
+            title: this.$t1('机构名称'),
             field: "saleOrgName",
             type: "input",
             common: true,
             disabled: true,
             defaultValueEnabled: false
           },
-          {title: "登录名", field: "loginAccount", type: "input", common: true},
-          {title: "姓名", field: "nickName", type: "input", common: true},
-          {title: "手机号", field: "mobile", type: "input", common: true},
+          {title: this.$t1('登录名'), field: "loginAccount", type: "input", common: true},
+          {title: this.$t1('姓名'), field: "nickName", type: "input", common: true},
+          {title: this.$t1('手机号'), field: "mobile", type: "input", common: true},
           {
-            title: "角色",
+            title: this.$t1('角色'),
             field: "roleCodes",
             type: "select",
             common: true,
@@ -414,23 +419,23 @@ export default {
               return this.getDict()
             }
           },*/
-          {title: "登录名(批量)", field: "loginAccounts", type: "inputBatch", common: false},
+          {title: this.$t1('登录名(批量)'), field: "loginAccounts", type: "inputBatch", common: false},
           {
-            title: "性别", field: "gender", type: "select", common: false, itemOption: [
-              {label: "男", value: 1},
-              {label: "女", value: 2}
+            title: this.$t1('性别'), field: "gender", type: "select", common: false, itemOption: [
+              {label: this.$t1('男'), value: 1},
+              {label: this.$t1('女'), value: 2}
             ]
           },
-          {title: "邮编", field: "zipCode", type: "input", common: false},
+          {title: this.$t1('邮编'), field: "zipCode", type: "input", common: false},
           {
-            title: "是否启用", field: "enabled", type: "select", common: false, itemOption: [
-              {label: "启用", value: true},
-              {label: "禁用", value: false}
+            title: this.$t1('是否启用'), field: "enabled", type: "select", common: false, itemOption: [
+              {label: this.$t1('启用'), value: true},
+              {label: this.$t1('禁用'), value: false}
             ]
           }/*,
-          {title: "客户名称", field: "customerName", type: "input", common: true, slot: "customerName"},
+          {title: this.$t1('客户名称'), field: "customerName", type: "input", common: true, slot: "customerName"},
           {
-            title: "日期",
+            title: this.$t1('日期'),
             field: "startDate",
             field2: "endDate",
             type: "dateRange",
@@ -438,7 +443,7 @@ export default {
             widgetType: "date",
             valueFormat: "yyyy-MM-dd"
           },
-          {title: "年份", field: "year", type: "date", common: true, widgetType: "year", valueFormat: "yyyy"},*/
+          {title: this.$t1('年份'), field: "year", type: "date", common: true, widgetType: "year", valueFormat: "yyyy"},*/
         ],
         config: {
           pagerConfig: {

package/src/views/user/user/list2.vue

@@ -5,7 +5,7 @@
 import listView from "../../../views/user/user/list.vue";
 
 export default {
-  name:"user:list2",
+  name: "user:list2",
   components: {listView}
 }
 </script>

package/src/views/user/user/modifyPasswordDialog.vue

@@ -45,11 +45,11 @@
     <span slot="footer" class="dialog-footer">
 			<el-button type="primary" plain class="button-sty" @click="dialogClose" v-if="!modifyMust">
 				<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>
@@ -173,7 +173,7 @@ export default {
               data: {},
               success: res => {
                 let flag = 0;//0 不提示；1 提示但不强制修改，即弹框它可以点x关掉；2 提示且强制修改，即他不能关掉这个弹框，要输入密码，点确定才能关掉
-                if(res.objx){
+                if (res.objx) {
                   flag = res.objx.flag || 0;
                 }
                 if (flag == 1 || flag == 2) {

package/src/views/user/user/out_list.vue

@@ -7,7 +7,7 @@ import listView from "./list";
 
 export default {
   name: "user:out_list",
-  components:{listView}
+  components: {listView}
 }
 </script>
 

package/src/views/user/wf/formCustDialog/list.vue

@@ -1,13 +1,13 @@
 <template>
-	<div id="containt">
-		<el-tabs v-model="activeName" class="tab-box">
-			<el-tab-pane label="列表" name="second">
-				<div class="grid-height">
-					<iframe :src="url" style="width: 100%;height: 100%;"></iframe>
-				</div>
-			</el-tab-pane>
-		</el-tabs>
-	</div>
+  <div id="containt">
+    <el-tabs v-model="activeName" class="tab-box">
+      <el-tab-pane :label="$t1('列表')" name="second">
+        <div class="grid-height">
+          <iframe :src="url" style="width: 100%;height: 100%;"></iframe>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
 </template>
 
 <script>
@@ -15,18 +15,16 @@ export default {
   name: 'formCustDialog:list',
   components: {},
   created() {
-	  this.url = process.env.VUE_APP_BASE_API + AGILEBPM_PREFIX + '/agilebpm-ui/form/formCustDialog/formCustDialogList.html';
+    this.url = process.env.VUE_APP_BASE_API + AGILEBPM_PREFIX + '/agilebpm-ui/form/formCustDialog/formCustDialogList.html';
   },
   mounted() {
   },
   data() {
     return {
-	  activeName: 'second',
+      activeName: 'second',
       url: '',
     };
   },
-  methods: {
-	  
-  }
+  methods: {}
 };
-</script>
+</script>