cloud-web-corejs 1.0.188 → 1.0.190

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

@@ -7,7 +7,7 @@
     v-if="showWfDialog2"
     :visible.sync="showWfDialog2"
     :modal="false"
-    custom-class="dialog-style designer-dialog indexUse"
+    custom-class="el-dialog dialog-style designer-dialog indexUse"
     width="100%"
     height="100%"
     top="0px"
@@ -81,8 +81,14 @@ export default {
         }
 
         if (wfUrl == "form") {
+          let formCode = null;
+          if (param.formCode) {
+            formCode = param.formCode;
+          } else {
+            formCode = param.objTypeCode.substr(9);
+          }
           this.param = Object.assign(param, {
-            formCode: param.objTypeCode.substr(9),
+            formCode: formCode,
             dataId: wfDataId,
           });
           let url = "/user/form/vform/render.vue";
@@ -107,8 +113,4 @@ export default {
 };
 </script>
 
-<style scoped>
-.designer-dialog.indexUse #containt .detail-wrap .d-cont {
-  height: calc(100vh - 82px);
-}
-</style>
+<style scoped></style>

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/modifyPasswordDialog.vue

@@ -40,51 +40,58 @@
             clearable
           />
         </el-form-item>
+        <el-form-item label-width="0" style="padding: 5px">
+          <div class="tips_1" style="white-space: pre-wrap; line-height: 20px">
+            {{ $t1(tip) }}
+          </div>
+        </el-form-item>
       </el-form>
     </div>
     <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-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>
 </template>
 
 <script>
-import {getParameterVauleByCode} from "@base/api/user";
+import { getParameterVauleByCode } from "@base/api/user";
 
 export default {
   components: {},
-  created() {
-
-  },
-  mounted() {
-
-  },
+  created() {},
+  mounted() {},
   data() {
     var validatePass = (rule, value, callback) => {
       const isPassRequired = true;
-      if (isPassRequired && (value == '' || value == undefined)) {
-        callback(new Error(this.$t1('密码不能为空')));
+      if (isPassRequired && (value == "" || value == undefined)) {
+        callback(new Error(this.$t1("密码不能为空")));
       } else {
         callback();
       }
-      this.$refs.editForm.validateField('rePassword');
+      this.$refs.editForm.validateField("rePassword");
     };
     var validatePass2 = (rule, value, callback) => {
       const isPassRequired = true;
-      const rePassword = value != undefined ? value : '';
-      const password = this.formData.password != undefined ? this.formData.password : '';
+      const rePassword = value != undefined ? value : "";
+      const password = this.formData.password != undefined ? this.formData.password : "";
 
-      if (isPassRequired && rePassword == '') {
-        callback(new Error(this.$t1('确认密码不能为空')));
+      if (isPassRequired && rePassword == "") {
+        callback(new Error(this.$t1("确认密码不能为空")));
       } else if (rePassword != password) {
-        callback(new Error(this.$t1('两次输入密码不一致!')));
+        callback(new Error(this.$t1("两次输入密码不一致!")));
       } else {
         callback();
       }
@@ -94,9 +101,13 @@ export default {
       falseValue: false,
       modifyMust: false,
       user: {},
-      formData: {password: null, rePassword: null},
-      passRules: [{validator: validatePass, trigger: 'blur', required: true}],
-      pass2Rules: [{validator: validatePass2, trigger: 'blur', required: true}]
+      formData: { password: null, rePassword: null },
+      passRules: [{ validator: validatePass, trigger: "blur", required: true }],
+      pass2Rules: [{ validator: validatePass2, trigger: "blur", required: true }],
+      tip: `密码规则:
+1、密码必须是8~20位，包含英文大写、英文小写、数字、特殊字符中的3种组合，字符例如:!@#$%^&0，不能包含空格和中文字符;
+2、密码有效期为90天，且不允许与前3次的密码相同
+3、密码不允许包含登录账号、hisense、admin、连续字母、连续键盘键等弱密码信息，例如:qwer1234!@、admin1234@#等`,
     };
   },
   methods: {
@@ -105,33 +116,33 @@ export default {
         url: USER_PREFIX + `/user/currentUser`,
         method: `post`,
         data: {
-          id: this.dataId
+          id: this.dataId,
         },
-        success: res => {
+        success: (res) => {
           var user = res.objx || {};
           this.user = res.objx || {};
-        }
+        },
       });
     },
     saveData() {
-      this.$refs.editForm.validate(valid => {
+      this.$refs.editForm.validate((valid) => {
         if (valid) {
-          this.$baseConfirm(this.$t1('您确定要修改密码吗？')).then(() => {
-            let resData = {...this.user, ...this.formData}
-            var url = USER_PREFIX + '/user/updateUserInfo';
+          this.$baseConfirm(this.$t1("您确定要修改密码吗？")).then(() => {
+            let resData = { ...this.user, ...this.formData };
+            var url = USER_PREFIX + "/user/updateUserInfo";
             this.$http({
               url: url,
               method: `post`,
               data: resData,
               isLoading: true,
-              success: res => {
+              success: (res) => {
                 this.$message({
                   message: res.content,
-                  type: 'success',
-                  duration: 2000
+                  type: "success",
+                  duration: 2000,
                 });
                 this.dialogClose();
-              }
+              },
             });
           });
         } else {
@@ -139,17 +150,17 @@ export default {
           let rePassword = this.formData.rePassword;
           if (!password || !rePassword) {
             this.$message({
-              message: this.$t1('密码/确认密码不能为空'),
-              type: 'error',
-              duration: 2000
+              message: this.$t1("密码/确认密码不能为空"),
+              type: "error",
+              duration: 2000,
             });
-            return
+            return;
           }
           if (password !== rePassword) {
             this.$message({
-              message: this.$t1('两次输入密码不一致'),
-              type: 'error',
-              duration: 2000
+              message: this.$t1("两次输入密码不一致"),
+              type: "error",
+              duration: 2000,
             });
           }
         }
@@ -164,15 +175,15 @@ export default {
     },
     init() {
       getParameterVauleByCode({
-        data: {code: "checkPasswordModify"},
+        data: { code: "checkPasswordModify" },
         success: (res0) => {
           if (res0.objx && res0.objx.value) {
             this.$http({
               url: USER_PREFIX + `/user/checkPasswordModifyDate`,
               method: `post`,
               data: {},
-              success: res => {
-                let flag = 0;//0 不提示；1 提示但不强制修改，即弹框它可以点x关掉；2 提示且强制修改，即他不能关掉这个弹框，要输入密码，点确定才能关掉
+              success: (res) => {
+                let flag = 0; //0 不提示；1 提示但不强制修改，即弹框它可以点x关掉；2 提示且强制修改，即他不能关掉这个弹框，要输入密码，点确定才能关掉
                 if (res.objx) {
                   flag = res.objx.flag || 0;
                 }
@@ -182,12 +193,12 @@ export default {
                   this.modifyMust = flag == 2;
                   this.showDialog = true;
                 }
-              }
+              },
             });
           }
-        }
-      })
-    }
-  }
+        },
+      });
+    },
+  },
 };
 </script>

package/src/views/user/wf/wfReport/index.vue

@@ -297,6 +297,7 @@ export default {
         objId: row.obj_id,
         url: row.url,
         objTypeCode: row.obj_type_code,
+        formCode: row.formCode,
       };
       this.showWfDialog = true;
     },

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

@@ -475,9 +475,16 @@ export default {
 
       let id = row.objId;
       let wfDataId = !id || typeof id == "object" ? 0 : Number(id);
+
       if (row.url == "form") {
+        let formCode = null;
+        if (row.formCode) {
+          formCode = row.formCode;
+        } else {
+          formCode = row.objTypeCode.substr(9);
+        }
         this.param = {
-          formCode: row.objTypeCode.substr(9),
+          formCode: formCode,
           dataId: wfDataId,
         };
         let url = "/user/form/vform/render.vue";

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

@@ -31,14 +31,13 @@
 </template>
 
 <script>
-
 export default {
   name: "wfContentDialog",
   props: {
     option: {
       type: Object,
-      default: {}
-    }
+      default: {},
+    },
   },
   components: {},
   data() {
@@ -46,7 +45,7 @@ export default {
       param: {},
       wfContent: null,
       showWfContent: false,
-      showWfDialog: true
+      showWfDialog: true,
     };
   },
   created() {
@@ -58,7 +57,7 @@ export default {
         this.$http({
           url: USER_PREFIX + "/wf_diy_attribute/getValue",
           method: `post`,
-          data: {attributeKey: "param4"},
+          data: { attributeKey: "param4" },
           isLoading: true,
           success: (res) => {
             let val = res.objx || false;
@@ -66,7 +65,7 @@ export default {
             if (val === true) {
               this.wfClose();
             }
-          }
+          },
         });
       } else {
         this.option._handleCallback && this.option._handleCallback(flag);
@@ -74,33 +73,37 @@ export default {
     },
     wfClose() {
       this.showWfDialog = false;
-      this.$emit('update:visible', false);
-      this.$emit('close');
+      this.$emit("update:visible", false);
+      this.$emit("close");
     },
     openWfDialog() {
       let id = this.option.objId;
-      let wfDataId = !id || typeof id == 'object' ? 0 : Number(id);
+      let wfDataId = !id || typeof id == "object" ? 0 : Number(id);
       let param = this.option.param || {};
-      if (this.option.url == 'form') {
+      if (this.option.url == "form") {
+        let formCode = null;
+        if (this.option.formCode) {
+          formCode = this.option.formCode;
+        } else {
+          formCode = this.option.objTypeCode.substr(9);
+        }
         this.param = Object.assign(param, {
-          formCode: this.option.objTypeCode.substr(9),
-          dataId: wfDataId
+          formCode: formCode,
+          dataId: wfDataId,
         });
-        let url = '/user/form/vform/render.vue';
-        this.wfContent = require('@base/views' + url).default;
+        let url = "/user/form/vform/render.vue";
+        this.wfContent = require("@base/views" + url).default;
       } else {
         this.param = Object.assign(param, {
-          _dataId: wfDataId
+          _dataId: wfDataId,
         });
-        let url = this.option.url + '.vue';
-        this.wfContent = require('@/views' + url).default;
+        let url = this.option.url + ".vue";
+        this.wfContent = require("@/views" + url).default;
       }
       this.showWfContent = true;
     },
-  }
-}
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>