cloud-web-corejs-haier 1.0.5 → 1.0.6

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

@@ -6,6 +6,7 @@
         v-model="formData.dateRange"
         @change="handleSelectChange"
         clearable
+        style="width: 128px !important"
       >
         <el-option :label="$t1('本日')" :value="1"></el-option>
         <el-option :label="$t1('本周')" :value="2"></el-option>
@@ -15,67 +16,91 @@
       <el-select
         class="f-btn"
         v-model="formData.stat"
-        :placeholder="$t2('全部状态', 'components.wf.wfReport.allStatus')"
+        :placeholder="$t1('全部状态')"
         clearable
         @clear="formData.stat = null"
         @change="handleSelectChange"
+        style="width: 128px !important"
+      >
+        <el-option :label="$t1('审核中')" :value="1"></el-option>
+        <el-option :label="$t1('已完成')" :value="2"></el-option>
+        <el-option :label="$t1('已驳回')" :value="3"></el-option>
+      </el-select>
+      <el-select
+        class="f-btn"
+        v-model="formData.objTypeCode"
+        :placeholder="$t1('流程类型')"
+        clearable
+        @change="handleSelectChange"
+        style="width: 128px !important"
       >
         <el-option
-          :label="$t2('审核中', 'components.wf.wfStatus1')"
-          :value="1"
-        ></el-option>
-        <el-option
-          :label="$t2('已完成', 'components.wf.wfStatus2')"
-          :value="2"
-        ></el-option>
-        <el-option
-          :label="$t2('已驳回', 'components.wf.wfStatus3')"
-          :value="3"
+          v-for="(item, index) in objTypeList"
+          :key="index"
+          :label="item.objTypeName"
+          :value="item.objTypeCode"
         ></el-option>
       </el-select>
-      <el-input v-model="formData.objTypeName" placeholder="流程类型"></el-input>
+      <el-input
+        v-model="formData.name"
+        :placeholder="$t1('流程主题')"
+        style="width: 128px !important"
+      ></el-input>
       <span class="button-sty">
         <el-date-picker
           v-model="formData.startStartTime"
           type="date"
-          placeholder="启动时间（开始）"
+          :placeholder="$t1('启动时间（开始）')"
           size="small"
           clearable
           value-format="yyyy-MM-dd"
           :picker-options="$baseStartPickerOptions(formData.endStartTime)"
+          style="width: 128px !important"
         ></el-date-picker>
         <span>-</span>
         <el-date-picker
           v-model="formData.endStartTime"
           type="date"
-          placeholder="启动时间（结束）"
+          :placeholder="$t1('启动时间（结束）')"
           size="small"
           clearable
           value-format="yyyy-MM-dd"
           :picker-options="$baseEndPickerOptions(formData.startStartTime)"
+          style="width: 128px !important"
         ></el-date-picker>
       </span>
       <span class="button-sty">
         <el-date-picker
           v-model="formData.startEndTime"
           type="date"
-          placeholder="结束时间（开始）"
+          :placeholder="$t1('结束时间（开始）')"
           size="small"
           clearable
           value-format="yyyy-MM-dd"
           :picker-options="$baseStartPickerOptions(formData.endEndTime)"
+          style="width: 128px !important"
         ></el-date-picker>
         <span>-</span>
         <el-date-picker
           v-model="formData.endEndTime"
           type="date"
-          placeholder="结束时间（结束）"
+          :placeholder="$t1('结束时间（结束）')"
           size="small"
           clearable
           value-format="yyyy-MM-dd"
           :picker-options="$baseEndPickerOptions(formData.startEndTime)"
+          style="width: 128px !important"
         ></el-date-picker>
       </span>
+      <el-button
+        type="primary"
+        plain
+        class="button-sty"
+        @click="resetEvent"
+        icon="el-icon-brush"
+      >
+        {{ $t1("重置") }}
+      </el-button>
       <el-button
         type="warning"
         size="small"
@@ -124,7 +149,29 @@
             <span>流程详情列表</span>
           </div>
           <div style="height: 100%">
-            <vxe-grid ref="table-m1" v-bind="vxeOption" :data="tableData"> </vxe-grid>
+            <vxe-grid ref="table-m1" v-bind="vxeOption" :data="tableData">
+              <template #form>
+                <div class="clearfix screen-btns">
+                  <div class="fl">
+                    <base-table-export
+                      :option="{
+                        title: $t1('流程处理耗用时间查询'),
+                        targetRef: 'table-m1',
+                      }"
+                      :parent-target="_self"
+                    />
+                  </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>
+              </template>
+            </vxe-grid>
           </div>
         </el-card>
       </el-col>
@@ -169,14 +216,23 @@
         </el-card>
       </el-col>
     </el-row>
+    <wfContentDialog
+      v-if="showWfDialog"
+      :visible.sync="showWfDialog"
+      :option.sync="wfContentOption"
+    ></wfContentDialog>
   </div>
 </template>
 
 <script>
 import scriptHttpMixin from "@base/components/xform/mixins/scriptHttp";
+import wfContentDialog from "@base/views/user/wf/wf_manage/wfContentDialog";
 export default {
   name: "wf_report:index",
   mixins: [scriptHttpMixin],
+  components: {
+    wfContentDialog,
+  },
   data() {
     return {
       vxeOption: {},
@@ -224,16 +280,33 @@ export default {
         dateRange: 3,
         stat: null,
       },
+      objTypeList: [],
+
+      showWfDialog: false,
+      wfContentOption: {},
     };
   },
   mounted() {
+    this.initObjTypeList();
     this.initTableList();
     this.loadWfSummaryCount();
   },
   methods: {
+    openWfDialog(row) {
+      this.wfContentOption = {
+        objId: row.obj_id,
+        url: row.url,
+        objTypeCode: row.obj_type_code,
+      };
+      this.showWfDialog = true;
+    },
     searchEvent() {
       this.$refs["table-m1"].commitProxy("reload");
     },
+    resetEvent() {
+      this.formData = {};
+      this.$refs["table-m1"].commitProxy("reload");
+    },
     initTableList() {
       let that = this;
       let formCode = this.$route.query.formCode;
@@ -249,8 +322,13 @@ export default {
         },
         columns: [
           { type: "checkbox", width: 48, resizable: false, fixed: "left" },
-          { field: "obj_type_name", title: "流程类型", width: 150, fixed: "left" },
-          { field: "name", title: "流程主题", width: 180 },
+          {
+            field: "obj_type_name",
+            title: this.$t1("流程类型"),
+            width: 150,
+            fixed: "left",
+          },
+          { field: "name", title: this.$t1("流程主题"), width: 180 },
           {
             field: "stat",
             title: "状态",
@@ -279,10 +357,10 @@ export default {
               },
             },
           },
-          { field: "task_name", title: "当前节点", width: 180 },
+          { field: "task_name", title: this.$t1("当前节点"), width: 180 },
           {
             field: "candidate_names",
-            title: "当前处理人",
+            title: this.$t1("当前处理人"),
             width: 180,
             slots: {
               default: ({ row }) => {
@@ -295,11 +373,11 @@ export default {
               },
             },
           },
-          { field: "start_time", title: "启动时间", width: 150 },
-          { field: "end_time", title: "结束时间", width: 150 },
+          { field: "start_time", title: this.$t1("启动时间"), width: 150 },
+          { field: "end_time", title: this.$t1("结束时间"), width: 150 },
           {
             field: "duration",
-            title: "总耗时",
+            title: this.$t1("总耗时"),
             width: 180,
             slots: {
               default: ({ row }) => {
@@ -314,7 +392,7 @@ export default {
           },
           {
             field: "task_duration",
-            title: "当前节点耗时",
+            title: this.$t1("当前节点耗时"),
             width: 180,
             slots: {
               default: ({ row }) => {
@@ -327,8 +405,10 @@ export default {
               },
             },
           },
+          { field: "approver_num", title: this.$t1("审批总人数"), width: 180 },
+          { field: "node_num", title: this.$t1("审批节点数量"), width: 180 },
           {
-            width: 47,
+            width: 90,
             fixed: "right",
             title: "",
             sortable: false,
@@ -345,13 +425,30 @@ export default {
                     <el-tooltip
                       enterable={false}
                       effect="dark"
-                      content="查看"
+                      content={this.$t1("查看详情")}
                       placement="top"
                       popper-class="tooltip-skin"
                     >
                       <i class="iconfont icon-dianji" />
                     </el-tooltip>
                   </a>,
+                  <a
+                    href="javascript:void(0);"
+                    class="a-link"
+                    onclick={() => {
+                      this.openWfDialog(row);
+                    }}
+                  >
+                    <el-tooltip
+                      enterable={false}
+                      effect="dark"
+                      content={this.$t1("查看单据")}
+                      placement="top"
+                      popper-class="tooltip-skin"
+                    >
+                      <i class="el-icon-edit" />
+                    </el-tooltip>
+                  </a>,
                 ];
               },
             },
@@ -402,6 +499,18 @@ export default {
       this.searchEvent();
       this.clearWfSummaryNode();
     },
+    initObjTypeList() {
+      this.$http({
+        url: `/${this.serviceName}/wf_info/listGroupPage`,
+        method: "post",
+        data: {
+          type: 99,
+        },
+        success: (res) => {
+          this.objTypeList = res?.objx?.records || [];
+        },
+      });
+    },
   },
 };
 </script>
@@ -413,7 +522,7 @@ export default {
 }
 .filter-btns {
   .f-btn {
-    margin-right: 10px;
+    margin-right: 25px;
   }
 }
 .sum-statistics {