12321

src/components/menu/index.js

@@ -61,7 +61,7 @@ export default {
     methods: {
     // select menu item
         onOpenChange (openKeys) {
-          console.log("============1=========");
+          // console.log("============1=========");
             // 在水平模式下时执行，并且不再执行后续
             // if (this.mode === 'horizontal') {
             if (this.mode === 'vertical') {
@@ -81,7 +81,7 @@ export default {
             }
         },
         updateMenu () {
-          console.log("============2=========");
+          // console.log("============2=========");
             const routes = this.$route.matched.concat()
             const { hidden } = this.$route.meta
             if (routes.length >= 3 && hidden) {
@@ -107,14 +107,14 @@ export default {
 
         // render
         renderItem (menu) {
-          console.log("============3=========");
+          // console.log("============3=========");
             if (!menu.hidden) {
                 return menu.children && !menu.alwaysShow ? this.renderSubMenu(menu) : this.renderMenuItem(menu)
             }
             return null
         },
         renderMenuItem (menu) {
-          console.log("============4=========");
+          // console.log("============4=========");
             const target = menu.meta.target || null
             const tag = (target && 'a') || 'router-link'
             let props = { to: { name: menu.name } }
@@ -143,7 +143,7 @@ export default {
             )
         },
         renderSubMenu (menu) {
-          console.log("============5=========");
+          // console.log("============5=========");
             const itemArr = []
             if (!menu.alwaysShow) {
                 menu.children.forEach(item => itemArr.push(this.renderItem(item)))
@@ -159,7 +159,7 @@ export default {
             )
         },
         renderIcon (icon) {
-          console.log("============6=========");
+          // console.log("============6=========");
             if (icon === 'none' || icon === undefined) {
                 return null
             }

src/views/activiti/form/demoForm2.vue

@@ -679,9 +679,9 @@ export default {
                     this.todoManageOperationObject.url = url
                     // formData.jsonContent=JSON.stringify(this.jsonData).toString()
                     // 获取是否部门负责人
-                    formData.filedNames = formData.filedNames + ',is_leaders,is_possess'
-                    formData.is_leaders = this.$store.getters.userInfo.identity
-                    formData.is_possess = this.$store.getters.userInfo.isPossess
+                    formData.filedNames = formData.filedNames + ',is_leaders'
+                    // formData.is_leaders = this.$store.getters.userInfo.identity
+                    formData.is_leaders = this.$store.getters.userInfo.isPossess
                     // 清除子表规则的属性
                     _.keys(formData).forEach(r => {
                         if (r.indexOf('child&') != -1) {
@@ -798,9 +798,9 @@ export default {
                     this.todoManageOperationObject.formData = formData
                     this.todoManageOperationObject.url = url
                     // 获取是否部门负责人
-                    formData.filedNames = formData.filedNames + ',is_leaders,is_possess'
-                    formData.is_leaders = this.$store.getters.userInfo.identity
-                    formData.is_possess = this.$store.getters.userInfo.isPossess
+                    formData.filedNames = formData.filedNames + ',is_leaders'
+                    // formData.is_leaders = this.$store.getters.userInfo.identity
+                    formData.is_leaders = this.$store.getters.userInfo.isPossess
                     // 清除子表规则的属性
                     _.keys(formData).forEach(r => {
                         if (r.indexOf('child&') != -1) {

src/views/activiti/todoManage.vue

@@ -457,12 +457,11 @@ export default {
       this.form.procInstId = v.procInstId
       this.form.priority = v.priority
       this.form.type = 0
-      this.form.comment = "审批通过";
+      this.form.comment = "已同意";
       this.modalTaskVisible = true
       this.userLoading = true
       this.getAction(this.url.getNextNode, { procDefId: v.procDefId, currActId: v.key, procInstId: v.procInstId }).then(
         res => {
-          debugger
           this.userLoading = false
           if (res.success) {
             if (res.result.type == 3 || res.result.type == 4) {
@@ -491,10 +490,10 @@ export default {
       )
     },
     changeBackTask(v) {
-      console.log(this.url.getNode)
+      // console.log(this.url.getNode)
 
-      console.log(v)
-      console.log(this.form.procInstId)
+      // console.log(v)
+      // console.log(this.form.procInstId)
       if (v == '-1') {
         return
       }

src/views/process-center/applyListByTableName.vue

@@ -49,7 +49,7 @@
           <a-col :md="6" :sm="12">
             <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
             <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px;">重置</a-button>
-            
+             <!-- <j-super-query :fieldList="fieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query> -->
           </a-col>
         </a-row>
 
@@ -327,6 +327,23 @@ import pick from 'lodash.pick'
 import JTreeSelect from '@/components/jeecg/JTreeSelect'
 import { initDictOptions, filterDictText } from '@/components/dict/JDictSelectUtil'
 import historicDetail from '@/views/activiti/historicDetail'
+ import JSuperQuery from '@/components/jeecg/JSuperQuery.vue';
+ 
+ //高级查询modal需要参数
+ const superQueryFieldList=[{
+   type:"date",
+   value:"birthday",
+   text:"生日"
+ },{
+   type:"string",
+   value:"title",
+   text:"用户名"
+ },{
+   type:"int",
+   value:"age",
+   text:"年龄"
+ }]
+ 
 const data = []
 for (let i = 0; i < 5; i++) {
   data.push({
@@ -346,7 +363,7 @@ export default {
   mixins: [activitiMixin, JeecgListMixin],
   components: {
     JEllipsis,
-    JTreeSelect,
+    JTreeSelect,JSuperQuery,
     historicDetail
   },
   data() {
@@ -371,6 +388,9 @@ export default {
         applyBusiness: '/actBusiness/apply',
         cancelApply: '/actBusiness/cancel'
       },
+      fieldList:superQueryFieldList,
+      superQueryFlag:false,
+      superQueryParams:"",
       // 查询条件
       queryParam: {
         createTimeRange: [],
@@ -435,6 +455,24 @@ export default {
   mounted() {},
   computed: {},
   methods: {
+    //高级查询方法
+    handleSuperQuery(arg) {
+
+      this.tableColumns.forEach(t => {
+        
+        console.log("sssssssssssss",t);
+      })
+      
+      // if(!arg){
+      //   this.superQueryParams=''
+      //   this.superQueryFlag = false
+      // }else{
+      //   this.superQueryFlag = true
+      //   this.superQueryParams=JSON.stringify(arg)
+      // }
+      // console.log("sssssssssssss",this.superQueryParams);
+      // this.loadData()
+    },
     initial() {
       // if (this.tableName != this.$route.params.tableName) {
       this.clear()

src/views/system/UserList.vue

@@ -86,6 +86,10 @@
             <a-icon type="unlock" @click="batchFrozen('1')"/>
             解冻
           </a-menu-item>
+          <a-menu-item key="4">
+            <a-icon type="edit" @click="showModal()"/>
+            变更社保/公积金基数
+          </a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作
@@ -93,7 +97,14 @@
         </a-button>
       </a-dropdown>
     </div>
-
+  <div>
+    <a-modal v-model:visible="userVisible" title="变更社保/公积金基数" @ok="handleOk">
+      <p>社保基数</p>
+      <p><a-input-number style="width: 100%;" placeholder="请输入社保基数" v-model="sheBao" :min="1" ></a-input-number></p>
+      <p>公积金基数</p>
+      <p><a-input-number style="width: 100%;" placeholder="请输入公积金基数" v-model="gongJiJin" :min="1" ></a-input-number></p>
+    </a-modal>
+  </div>
     <!-- table区域-begin -->
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
@@ -205,6 +216,9 @@
         description: '这是用户管理页面',
         queryParam: {},
         recycleBinVisible: false,
+        userVisible: false,
+        sheBao: '',
+        gongJiJin: '',
         columns: [
           /*{
             title: '#',
@@ -288,6 +302,7 @@
           list: "/sys/user/list",
           delete: "/sys/user/delete",
           deleteBatch: "/sys/user/deleteBatch",
+          updateUserBatch: "/sys/user/updateUserBatch",
           exportXlsUrl: "/sys/user/exportXls",
           importExcelUrl: "sys/user/importExcel",
         },
@@ -302,7 +317,45 @@
       getAvatarView: function (avatar) {
         return getFileAccessHttpUrl(avatar,this.url.imgerver,"http")
       },
-
+      showModal: function () {
+        this.gongJiJin = '';
+        this.sheBao = '';
+        this.userVisible = true;
+      },
+      handleOk() {
+        let ids = "";
+        let that = this;
+        if(this.gongJiJin == '' || this.sheBao == ''){
+          this.$message.warning('请填写要修改的数据！');
+          return false;
+        }else{
+          if (this.selectedRowKeys.length <= 0) {
+            this.$message.warning('请选择一条记录！');
+            return false;
+          }else{
+            that.selectedRowKeys.forEach(function (val) {
+              ids += val + ",";
+            });
+            putAction(this.url.updateUserBatch, {ids:ids,gongJiJin:this.gongJiJin,sheBao:this.sheBao}).then((res) => {
+              if (res.success) {
+                that.$message.success("操作成功");
+                that.loadData();
+              } else {
+                that.$message.warning(res.message);
+                that.loadData();
+              }
+            }).finally(() => {
+              that.gongJiJin = '';
+              that.sheBao = '';
+              that.selectedRowKeys = [];
+            })
+            
+          }
+        }
+        console.log(this.gongJiJin);
+        console.log(this.sheBao);
+        this.userVisible = false;
+      },
       batchFrozen: function (status) {
         if (this.selectedRowKeys.length <= 0) {
           this.$message.warning('请选择一条记录！');
@@ -347,6 +400,8 @@
           this.batchFrozen(2);
         } else if (e.key == 3) {
           this.batchFrozen(1);
+        }else if (e.key == 4) {
+          this.showModal();
         }
       },
       handleFrozen: function (id, status, username) {