cloud-web-corejs 1.0.54-dev.33 → 1.0.54-dev.331

package/src/views/user/user/form_dialog.vue

@@ -0,0 +1,158 @@
+<template>
+  <el-dialog
+    :title="$t1('用户列表')"
+    :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:65vh">
+      <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="$t1('登录名')+':'" field="loginAccount">
+              <template v-slot>
+                <el-input v-model="formData.loginAccount" size="small" clearable/>
+              </template>
+            </vxe-form-item>
+            <vxe-form-item :title="$t1('姓名')+':'" field="nickName">
+              <template v-slot>
+                <el-input v-model="formData.nickName" 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="$t1('全部删除')" 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>{{ getCheckLabel(checkRow,'nickName') }}</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>
+</template>
+
+<script>
+import {selectDialogMixins} from '@base/mixins/selectDialog/index.js';
+
+export default {
+  name: 'userDialog',
+  props: ['visiable', 'multi', 'rows', 'param'],
+  mixins: [selectDialogMixins],
+  created() {
+    this.initSetting();
+    if (this.param) {
+      if (this.param.userType !== null) {
+        this.userType = this.param.userType;
+      }
+    }
+  },
+  mounted() {
+    this.initTableM1();
+  },
+  data() {
+    var that = this;
+    return {
+      showDialog: true,
+      falseValue: false,
+      userType: 0,
+      formData: {
+        saleOrgId: '',
+        saleOrgName: ''
+      },
+      selectMulti: true,
+      vxeOption: {}
+    };
+  },
+  methods: {
+    initTableM1() {
+      var that = this;
+      let tableOption = {
+        vue: that,
+        tableRef: 'table-m1',
+        tableName: 'user_user_form_dialog-m1',
+        path: USER_PREFIX + '/user/listCurrentPage',
+        param: () => {
+          // this.formData.userType = this.userType;
+          return {
+            enabled: true,
+            ...this.formData,
+            ...this.param
+          }
+        },
+        config: {
+          checkboxConfig: {
+            checkStrictly: true,
+            showHeader: this.selectMulti,
+            trigger: 'row'
+          }
+        },
+        columns: [
+          {type: 'checkbox', width: 50, resizable: false, fixed: 'left'},
+          {title: this.$t1('登录名'), field: 'loginAccount', width: 250, fixed: 'left'},
+          {field: 'nickName', title: this.$t1('姓名'), width: 150},
+          {field: 'groupName', title: this.$t1('用户组'), width: 250},
+          {
+            width: 47,
+            fixed: 'right',
+            title: '',
+            sortable: false
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        that.vxeOption = opts;
+      });
+    }
+  }
+};
+</script>

package/src/views/user/user/form_edit.vue

@@ -137,6 +137,7 @@
 <script>
 import xeUtils from "xe-utils";
 import groudDialog from "@base/views/user/groups/dialog.vue";
+import {getBdEnv} from "@base/api/user";
 
 export default {
   name: 'UserEdit',
@@ -229,8 +230,9 @@ export default {
       userInfo: {},
       userGroups: [],
       showGroupDialog: false,
-      vxeOption:{},
-      menuKindAuthDTOs:[]
+      vxeOption: {},
+      menuKindAuthDTOs: [],
+      isDev: true
     };
   },
   computed: {
@@ -247,6 +249,7 @@ export default {
     this.getUserGroups()
     this.getData();
     this.getConpanyInfo()
+    await this.initBdEnv();
     this.initTableM1();
   },
   methods: {
@@ -254,6 +257,7 @@ export default {
       if (this.dataId && !isNaN(this.dataId)) {
         this.isEdit = true;
         this.$commonHttp({
+          aes: true,
           url: USER_PREFIX + `/user/get`,
           method: `post`,
           data: {
@@ -297,6 +301,7 @@ export default {
           this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
             var url = USER_PREFIX + (this.isEdit ? '/user/update' : '/user/save');
             this.$http({
+              aes: true,
               url: url,
               method: `post`,
               data: this.user,
@@ -327,6 +332,7 @@ export default {
     getSaleOrgData() {
       if (this.dataId) {
         this.$http({
+          aes: true,
           url: USER_PREFIX + '/user/getUserSaleOrg',
           method: `post`,
           data: {id: this.dataId},
@@ -347,6 +353,7 @@ export default {
     getUserRoleData() {
       if (this.dataId) {
         this.$http({
+          aes: true,
           url: USER_PREFIX + '/user/getUserRole',
           method: `post`,
           data: {id: this.dataId},
@@ -370,6 +377,7 @@ export default {
     getCompanyInfoData(callback) {
       if (this.dataId) {
         this.$http({
+          aes: true,
           url: USER_PREFIX + '/user/getUserCompanyInfo',
           method: `post`,
           data: {id: this.dataId},
@@ -419,6 +427,7 @@ export default {
     },
     getConpanyInfo() {
       this.$http({
+        aes: true,
         url: USER_PREFIX + '/company_info/getCurrent',
         method: `post`,
         isLoading: true,
@@ -445,6 +454,7 @@ export default {
       this.$baseConfirm(this.$t1('您确定要解锁吗？')).then(() => {
         var url = USER_PREFIX + '/user/unlockLoginAccount';
         this.$http({
+          aes: true,
           url: url,
           method: `post`,
           data: {
@@ -473,6 +483,7 @@ export default {
     },
     getUserInfo() {
       return this.$http({
+        aes: true,
         url: USER_PREFIX + '/user/currentUser',
         method: 'post',
         success: res => {
@@ -486,6 +497,7 @@ export default {
     },
     getUserGroups() {
       return this.$http({
+        aes: true,
         url: USER_PREFIX + '/groups/listPage',
         method: 'post',
         data: {},
@@ -507,6 +519,48 @@ export default {
             width: 350,
             fixed: 'left'
           },
+          {
+            title: this.$t1('编辑'),
+            field: 'editAuth',
+            width: 150,
+            slots: {
+              default: ({row}) => {
+                if (row.editAuth) {
+                  return [<div class="txt-status">{this.$t1('是')}</div>];
+                } else {
+                  return [<div class="txt-status s-3">{this.$t1('否')}</div>];
+                }
+              }
+            }
+          },
+          {
+            title: this.$t1('导出发布'),
+            field: 'exportAuth',
+            width: 150,
+            slots: {
+              default: ({row}) => {
+                if (row.exportAuth) {
+                  return [<div class="txt-status">{this.$t1('是')}</div>];
+                } else {
+                  return [<div class="txt-status s-3">{this.$t1('否')}</div>];
+                }
+              }
+            }
+          },
+          ...(this.isDev ? [{
+            title: this.$t1('可选导出发布类型'),
+            field: 'selectTypeAuth',
+            width: 200,
+            slots: {
+              default: ({row}) => {
+                if (row.selectTypeAuth) {
+                  return [<div class="txt-status">{this.$t1('是')}</div>];
+                } else {
+                  return [<div class="txt-status s-3">{this.$t1('否')}</div>];
+                }
+              }
+            }
+          }] : []),
           {
             width: 47,
             fixed: 'right',
@@ -534,6 +588,13 @@ export default {
         });
       }
     },
+    initBdEnv() {
+      return getBdEnv({
+        success: res => {
+          this.isDev = res.objx == "dev"
+        }
+      });
+    },
   }
 };
 </script>

package/src/views/user/user/form_info.vue

@@ -0,0 +1,210 @@
+<template>
+  <el-dialog
+    :title="$t1('个人设置')"
+    :append-to-body="true"
+    :modal-append-to-body="falseValue"
+    :close-on-click-modal="falseValue"
+    :visible.sync="showDialog"
+    :modal="falseValue"
+    custom-class="dialog-style list-dialog demo-sty_2"
+    width="500px"
+    @close="dialogClose"
+    v-el-drag-dialog
+    v-el-dialog-center
+  >
+    <div id="containt" style="height: 300px">
+      <div class="detail-wrap">
+        <el-form ref="editForm" :model="user">
+          <div class="d-header clearfix">
+            <div class="fl">
+              <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">
+                {{ $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" style="height: auto">
+            <div class="d-item" style="padding-right: 0">
+              <div class="title first"><b>{{ $t1('基本信息') }}</b></div>
+              <table class="table-detail">
+                <tbody>
+                <tr>
+                  <th>
+                    <em class="f-red">*</em>
+                    {{ $t1('登录名') }}
+                  </th>
+                  <td colspan="3">
+                    {{ user.loginAccount }}
+                  </td>
+                </tr>
+                <tr>
+                  <th>
+                    <em class="f-red">*</em>
+                    {{ $t1('姓名') }}
+                  </th>
+                  <td colspan="3">
+                    <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>
+                </tr>
+                <tr>
+                  <th>{{ $t1('密码') }}</th>
+                  <td colspan="3">
+                    <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>
+                </tr>
+                <tr>
+                  <th>{{ $t1('确认密码') }}</th>
+                  <td colspan="3">
+                    <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>
+                </tbody>
+              </table>
+            </div>
+          </div>
+        </el-form>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'userInfo',
+  components: {},
+  props: ['_dataId'],
+  created() {
+    if (this._dataId && !isNaN(this._dataId)) this.dataId = this._dataId;
+  },
+  mounted() {
+    this.getData();
+  },
+  data() {
+    var validatePass = (rule, value, callback) => {
+      const isPassRequired = !this.dataId;
+      if (isPassRequired && (value == '' || value == undefined)) {
+        callback(new Error(this.$t1('密码不能为空')));
+      } else {
+        callback();
+      }
+      this.$refs.editForm.validateField('rePassword');
+    };
+    var validatePass2 = (rule, value, callback) => {
+      const isPassRequired = !this.dataId;
+      const rePassword = value != undefined ? value : '';
+      const password = this.user.password != undefined ? this.user.password : '';
+
+      if (isPassRequired && rePassword == '') {
+        callback(new Error(this.$t1('确认密码不能为空')));
+      } else if (rePassword != password) {
+        callback(new Error(this.$t1('两次输入密码不一致!')));
+      } else {
+        callback();
+      }
+    };
+    return {
+      showDialog: true,
+      falseValue: false,
+      dataId: '',
+      hBtn: true,
+      user: {},
+      vxeOption: {},
+      companyInfoOption: {},
+      userRoleOption: {},
+      showContent: true,
+      passRules: [{validator: validatePass, trigger: 'blur', required: false}],
+      pass2Rules: [{validator: validatePass2, trigger: 'blur', required: false}]
+    };
+  },
+  methods: {
+    getData() {
+      let t = this._dataId;
+      if (this.dataId && !isNaN(this.dataId)) {
+        this.isEdit = true;
+        this.$commonHttp({
+          url: USER_PREFIX + `/user/get`,
+          method: `post`,
+          data: {
+            id: this.dataId
+          },
+          isLoading: true,
+          modalStrictly: true,
+          success: res => {
+            var user = res.objx || {};
+            this.user = res.objx || {};
+            this.user.password = '';
+          }
+        });
+      } else {
+        this.isEdit = false;
+        this.user = {
+          enabled: true
+        };
+      }
+    },
+    saveData() {
+      this.$refs.editForm.$baseValidate(valid => {
+        if (valid) {
+          this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
+            var url = USER_PREFIX + '/user/updateUserInfo';
+            this.$http({
+              url: url,
+              method: `post`,
+              data: this.user,
+              isLoading: true,
+              success: res => {
+                this.$message({
+                  message: res.content,
+                  type: 'success',
+                  duration: 500,
+                  onClose: t => {
+                    this.reloadContent();
+                  }
+                });
+              }
+            });
+          });
+        }
+      });
+    },
+    dialogClose() {
+      this.$emit('update:visiable', false);
+    },
+    reloadContent() {
+      this.user = {};
+      this.getData();
+    }
+  }
+};
+</script>

package/src/views/user/user/form_list.vue

@@ -222,6 +222,7 @@ export default {
     getUserGroups() {
       return new Promise((resolve, reject) => {
         this.$http({
+          aes: true,
           url: USER_PREFIX + '/groups/listPage',
           method: 'post',
           data: {},

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

@@ -205,6 +205,24 @@ export default {
       });
     },
     initTableList() {
+      let otherColumns = [];
+      let userType = this.userType
+      if(userType==1){
+
+      }else if(userType==2){
+        otherColumns.push(...[
+          {
+            field: 'signatoryName',
+            title: this.$t1('签约人'),
+            width: 150
+          },
+          {
+            field: 'signatoryMobile',
+            title: this.$t1('签约人电话'),
+            width: 150
+          },
+        ])
+      }
       let tableOption = {
         vue: this,
         tableRef: 'table-m1',
@@ -217,7 +235,7 @@ export default {
           };
           let outUserCodes = this.outUserCodes;
           if (this.userType == 1) {
-            //企业用户
+            //组织用户
             formData.neRoleCodes = [...outUserCodes];
           } else if (this.userType == 2) {
             //外部用户
@@ -345,6 +363,7 @@ export default {
             title: this.$t1('所属组织'),
             width: 250
           },
+          ...otherColumns,
           {
             field: 'createBy',
             title: this.$t1('创建人'),
@@ -493,7 +512,7 @@ export default {
             let rows = res.objx || [];
             let outUserCodes = this.outUserCodes;
             if (this.userType == 1) {
-              //企业用户
+              //组织用户
               rows = rows.filter(row => !outUserCodes.includes(row.code));
             } else if (this.userType == 2) {
               //外部用户
@@ -535,7 +554,7 @@ export default {
           let rows = res.objx || [];
           let outUserCodes = this.outUserCodes;
           if (this.userType == 1) {
-            //企业用户
+            //组织用户
             rows = rows.filter(row => !outUserCodes.includes(row.code));
           } else if (this.userType == 2) {
             //外部用户

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

@@ -100,6 +100,7 @@
                         size="small"
                         clearable
                         value-format="yyyy-MM-dd HH:mm:ss"
+                        default-time="23:59:59"
                         :picker-options="$baseEndPickerOptions(formData.startToExeTime)"
                       ></el-date-picker>
                     </template>
@@ -211,6 +212,7 @@
                           size="small"
                           clearable
                           value-format="yyyy-MM-dd HH:mm:ss"
+                          default-time="23:59:59"
                           :picker-options="$baseEndPickerOptions(formData2.startToExeTime)"
                         ></el-date-picker>
                       </template>

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

@@ -93,6 +93,35 @@
                       </el-select>
                     </template>
                   </vxe-form-item>
+                  <vxe-form-item :title="$t1('启动人')+':'" field="starterName">
+                    <template v-slot>
+                      <el-input v-model="formData.starterName" size="small" clearable/>
+                    </template>
+                  </vxe-form-item>
+                  <vxe-form-item title="启动时间:">
+                    <template v-slot>
+                      <el-date-picker
+                        v-model="formData.startTime"
+                        type="datetime"
+                        placeholder=""
+                        size="small"
+                        clearable
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        :picker-options="$baseStartPickerOptions(formData.endTime)"
+                      ></el-date-picker>
+                      <span>-</span>
+                      <el-date-picker
+                        v-model="formData.endTime"
+                        type="datetime"
+                        placeholder=""
+                        size="small"
+                        clearable
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        default-time="23:59:59"
+                        :picker-options="$baseEndPickerOptions(formData.startTime)"
+                      ></el-date-picker>
+                    </template>
+                  </vxe-form-item>
                 </vxe-form>
               </template>
             </vxe-grid>
@@ -370,7 +399,7 @@ export default {
           dataId: wfDataId
         };
         let url = '/user/form/vform/render.vue';
-        this.wfContent = require('@/views' + url).default;
+        this.wfContent = require('@base/views' + url).default;
       } else {
         this.param = {
           _dataId: wfDataId

package/src/views/user/wf/wf_manage/wfContentDialog.vue

@@ -87,7 +87,7 @@ export default {
           dataId: wfDataId
         });
         let url = '/user/form/vform/render.vue';
-        this.wfContent = require('@/views' + url).default;
+        this.wfContent = require('@base/views' + url).default;
       } else {
         this.param = Object.assign(param, {
           _dataId: wfDataId