Merge remote-tracking branch 'origin/dev' into dev

src/views/activiti/Backlog.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="background-color: white" :style="conheight" >
 <!--  <div style="background-color: white"  >-->
-    <Schedule/>
+    <Schedule :LCid = LCid />
 <!--    <a-tabs default-active-key="1" @change="callback" style="padding:0px 10px">-->
 <!--      <a-tab-pane key="1" tab="我的申请">-->
 <!--        <apply-list/>-->
@@ -14,25 +14,30 @@
 </template>
 
 <script>
-import applyList from '@views/activiti/applyList'
+// import applyList from '@views/activiti/applyList'
-import todoManage from '@views/activiti/todoManage'
+// import todoManage from '@views/activiti/todoManage'
 import Schedule from '@views/activiti/Schedule'
 
 export default {
 name: "Backlog",
   components:{
-    applyList,
+    // applyList,
-    todoManage,
+    // todoManage,
     Schedule
   },
   data(){
    return{
+     LCid :'',
      conheight:{
        height:''
      }
    };
   },
   created() {
+    console.log(this.$route.params.id,"跳转=========");
+    if (this.$route.params.Id !== null) {
+      this.LCid = this.$route.params.id
+    }
   },
   // 在 mounted 生命周期监听窗口变化并触发上文处理函数，修改高度
   mounted() {

src/views/activiti/Schedule.vue

@@ -326,6 +326,11 @@ export default {
     ,historicDetail,
     JSelectUserByDep
   },
+  props:{
+    LCid:{
+      type : String,
+    },
+  },
   data () {
     return {
       userLoading: false,
@@ -468,6 +473,7 @@ export default {
         getFirstNode:'/actProcessIns/getFirstNode',
         applyBusiness:'/actBusiness/apply',
         cancelApply:'/actBusiness/cancel',
+        getBackList: '/actTask/getBackList/',
         pass: '/actTask/pass',
         back: '/actTask/back',
         backToTask: '/actTask/backToTask',
@@ -516,9 +522,48 @@ export default {
   created(){
     // this.searchReset();
     // 重新加载数据
-    this.getDataList();
+    // this.getDataList();
+    // this.getDataList();
+
+  },
+  watch:{
+    // LCid: {
+    //   immediate: true,
+    //   handler() {
+    //     console.log("didiidiidid",this.LCid);
+    //     if(!!this.LCid ){
+    //         this.queryParam.id = this.LCid;
+    //         this.loadData(1);
+    //     }
+    //   }
+    // },
   },
   methods: {
+    loadData(arg) {
+      if(!this.url.list){
+        this.$message.error("请设置url.list属性!")
+        return
+      }
+      //加载数据 若传入参数1则加载第一页的内容
+      if (arg === 1) {
+        this.ipagination.current = 1;
+      }
+      var params = this.getQueryParams();//查询条件
+      this.loading = true;
+      getAction(this.url.list, params).then((res) => {
+        if (res.success) {
+          this.dataSource = res.result.records||res.result;
+          if(res.result.total)
+          {
+            this.ipagination.total = res.result.total;
+          }
+        }
+        if(res.code===510){
+          this.$message.warning(res.message)
+        }
+        this.loading = false;
+      })
+    },
     changeBackTask(v) {
       if (v == '-1') {
         return
@@ -581,7 +626,7 @@ export default {
             this.$message.success('操作成功')
             this.modalTaskVisible = false;
             this.form.comment=null;
-            this.getDataList()
+            this.loadData(1);
           } else {
             console.log(res)
             this.$message.error(res.message);
@@ -600,7 +645,7 @@ export default {
               this.$message.success('操作成功')
               this.modalTaskVisible = false;
               this.form.comment=null;
-              this.getDataList()
+              this.loadData(1);
             }
           })
         } else {
@@ -619,7 +664,7 @@ export default {
               this.$message.success('操作成功')
               this.modalTaskVisible = false;
               this.form.comment=null;
-              this.getDataList()
+              this.loadData(1);
             }
           })
         }
@@ -638,7 +683,7 @@ export default {
             this.$message.success('操作成功')
             this.modalTaskVisible = false;
             this.form.comment=null;
-            this.getDataList()
+            this.loadData(1);
           }
         })
       }
@@ -651,7 +696,6 @@ export default {
         this.lcModa.disabled = false
     },
     passTask(v) {
-      // console.log(v.procInstId, '33333333333333333')
       this.lcModa.isBuyerName = false;
       this.lcModa.lead = false;
       this.modalTaskTitle = '审批通过'
@@ -900,8 +944,19 @@ export default {
       this.form.id = v.id;
       this.form.procDefId = v.procDefId;
       this.form.title = v.title;
+      let userInfo = sessionStorage.getItem('USER_INFORMATION');
+      let res = JSON.parse(userInfo);
+      // console.log(res,"12222222222222");
+      let pa = {
+        procDefId:v.procDefId,
+        tableId:v.tableId,
+        tableName:v.tableName
+      }
+      if(!!res.departIds && res.userIdentity ===1 && !!res.userIdentity  ){
+         pa.departId = res.departIds;
+      }
       // 加载审批人
-      this.getAction(this.url.getFirstNode,{procDefId:v.procDefId,tableId:v.tableId,tableName:v.tableName}).then(res => {
+      this.getAction(this.url.getFirstNode,pa).then(res => {
         if (res.success) {
           if (res.result.type == 3 || res.result.type == 4) {
             this.isGateway = true;

src/views/activiti/Separate.vue

@@ -87,13 +87,13 @@ export default {
   },
   watch:{
     $route(newData, oldData){
-      console.log(">>>",newData, oldData);
+      // console.log(">>>",newData, oldData);
       this.ChuShiHuan();
     }
   },
   created() {
    this.ChuShiHuan();
-    console.log('数据========', this.lcModa)
+    // console.log('数据========', this.lcModa)
   },
   // beforeRouteLeave(to,from,next){
   //   console.log("-----------",to,from);
@@ -107,7 +107,7 @@ export default {
       let lastname = localStorage.getItem(this.$route.query.merchandiseName)
       if (!!lastname) {
         this.lcModa = JSON.parse(decodeURIComponent(lastname));
-        console.log("l;;;;",this.lcModa.processData.name)
+        // console.log("l;;;;",this.lcModa.processData.name)
         this.close();
         if (this.lcModa.processData.name === '预算计划采购流程') {
           this.xian = true;

src/views/activiti/applyHome.vue

@@ -376,10 +376,10 @@
               _this.nodeList=arry;
               if (arry.length>0){
                 // console.log(_this.nodeList[0],"用户信息！")
-                // if (!_this.nodeList[0].users[0]){
+                if (!_this.nodeList[0].users[0]){
-                //   _this.$message.warning(v.name+"审批人员未配置,请配置后在申请！！！");
+                  _this.$message.warning(v.name+"审批人员未配置,请配置后在申请！！！");
-                //   ss= true;
+                  ss= true;
-                // }
+                }
               }
             }
             resolve(callback(ss));

src/views/activiti/form/ProcessMaterialsAllotForm.vue

@@ -113,7 +113,7 @@
         <a-button type="primary" :disabled="disabled||btndisabled" @click="handleSubmit" >保存</a-button>
         <a-button style="margin-left: 8px" type="primary" :disabled="disabled||btndisabled" @click="applySubmit">提交申请
         </a-button>
-        <a-button style="margin-left: 8px" :disabled="disabled" @click="close">取消</a-button>
+<!--        <a-button style="margin-left: 8px" :disabled="disabled" @click="close">取消</a-button>-->
       </a-form-item>
       <a-form-item v-if="task" :wrapperCol="{ span: 24 }" style="text-align: center" >
         <a-button type="primary" @click="passTask">通过</a-button>

src/views/activiti/form/ProcessUdgetPlanForm.vue

@@ -1267,7 +1267,7 @@
 
       },
       selectChang(val) {
-        console.log(val,"-----99956568989859")
+        // console.log(val,"-----99956568989859")
         if (val == 1) {
           this.isIfInspection = true
         } else {
@@ -1286,7 +1286,7 @@
           id: r.tableId
         }).then((res) => {
           if (res.success) {
-            console.log("??????????????",res.result);
+            // console.log("??????????????",res.result);
             // this.planType = res.result.planType
             let formData = res.result
             formData.tableName = r.tableName
@@ -1313,7 +1313,7 @@
 
               }
             }
-            console.log("qwerqwe..........",this.lead,this.isBuyerName);
+            // console.log("qwerqwe..........",this.lead,this.isBuyerName);
             this.editAfter()
             this.btndisabled = false
           } else {
@@ -1335,7 +1335,6 @@
               throw this.throwNotFunction('classifyIntoFormData')
             }
             let formData = this.classifyIntoFormData(allValues)
-            console.log("1321231313112",formData);
             let pre = {
               id : formData.id,
 
@@ -1348,7 +1347,6 @@
             }
             putAction(this.url.queryByIdUpdate,pre).then(res =>{
               if(res.success){
-                // console.log("修改采购");
                 this.$emit('passTask');
               }
             })
@@ -1704,6 +1702,7 @@
       },
       // handler
         handleSubmit(e) {
+          console.log("1>>>>>>>>>",e);
         this.getAllTable().then(tables => {
           return validateFormAndTables(this.form, tables)
         }).then(allValues => {

src/views/dashboard/HomePage.vue

@@ -658,7 +658,8 @@ export default {
       return {
         on: {
           click: () => {
-            this.$router.push({name:'activiti-todoManage',
+            this.$router.push({
+              name:'activiti-Backlog',
               params:{
                 id: record.id
               }