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

src/views/activiti/ProcessModelList.vue

@@ -758,6 +758,7 @@
         // this.loadData();
       },
       loadData(arg) {
+
         if(!this.url.list){
           this.$message.error("请设置url.list属性!")
           return

src/views/activiti/form/ProcessMaterialWarehousingForm.vue

@@ -649,8 +649,9 @@
                 httpAction(url, formData, method).then((res) => {
                   if (res.success) {
                     //todo 将表单的数据传给父组件
+                    if(e!=true){
                       this.$emit('afterSubmit', formData)
-                    this.$emit("close")
+                    }
                   } else {
                     this.$message.error(res.message)
                   }
@@ -768,7 +769,7 @@
       },
       saveAndpassTask() {
         this.passTask()
-        this.handleSubmit();
+        this.handleSubmit(true);
       },
       validateError(msg) {
         this.$message.error(msg)

src/views/activiti/form/ProcessUdgetPlanForm.vue

@@ -1350,7 +1350,7 @@
               return
             } else {
               this.passTask();
-              this.handleSubmit();
+              this.handleSubmit(true);
             }
           }
         })
@@ -1413,8 +1413,9 @@
                 httpAction(url, formData, method).then((res) => {
                   if (res.success) {
                     //todo 将表单的数据传给父组件
+                    if(e!=true){
                       this.$emit('afterSubmit', formData)
-                    this.$emit("close")
+                    }
                   } else {
                     this.$message.error(res.message)
                   }

src/views/activiti/todoManage.vue

@@ -147,9 +147,11 @@
       </div>
     </a-modal>
     <!--流程表单-->
-    <a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%" height="93%">
+    <a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%"
+             height="93%">
       <component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent"
-                 :processData="lcModa.processData" :isNew="lcModa.isNew" :isPlanType="lcModa.isPlanType" :isSourceCapital="lcModa.isSourceCapital"
+                 :processData="lcModa.processData" :isNew="lcModa.isNew" :isPlanType="lcModa.isPlanType"
+                 :isSourceCapital="lcModa.isSourceCapital"
                  :task="true" :hieg="lcModa.hieg"
                  @afterSubmit="afterSub"
                  @passTask="()=>passTask(lcModa.processData)"
@@ -255,7 +257,7 @@
           // 搜索框对应data对象
           name: '',
           Id: '',
-          applyer: "",
+          applyer: '',
           createTime_begin: '',
           createTime_end: '',
           assignee: ''
@@ -292,6 +294,8 @@
           isSourceCapital: false,
           isPlanType: false
         },
+        tableName: '',
+        tableId: '',
         url: {
           todoList: '/actTask/todoList',
           pass: '/actTask/pass',
@@ -310,12 +314,12 @@
 
         labelCol: {
           xs: { span: 1 },
-          sm: { span: 2 },
+          sm: { span: 2 }
         },
         wrapperCol: {
           xs: { span: 10 },
-          sm: { span: 16 },
-        },
+          sm: { span: 16 }
+        }
       }
     },
     mounted() {
@@ -329,12 +333,12 @@
     methods: {
 
       onDateChange: function(value, dateString) {
-        console.log(dateString[0],dateString[1]);
-        this.searchForm.createTime_begin=dateString[0];
-        this.searchForm.createTime_end=dateString[1];
+        console.log(dateString[0], dateString[1])
+        this.searchForm.createTime_begin = dateString[0]
+        this.searchForm.createTime_end = dateString[1]
       },
       onDateOk(value) {
-        console.log(value);
+        console.log(value)
       },
       init() {
         this.getDataList()
@@ -409,7 +413,7 @@
             } else {
               console.log(res)
               this.$message.error(res.message)
-              return;
+              return
             }
           })
         } else if (formData.type == 1) {
@@ -471,7 +475,8 @@
           return
         }
         this.lcModa.disabled = true
-
+        this.tableName = r.tableName
+        this.tableId = r.tableId
         //获取是不是第一个审核人和最后一个审核人（第一个审核人和最后一个审核人需要对表单进行操作）
         if (r.processName === '预算计划采购流程') {
           let userInfo = sessionStorage.getItem('USER_INFORMATION')
@@ -507,10 +512,10 @@
               console.log(res.username, res3.result.relateId)
               if (param.username == res3.result.relateId) {
                 if (res3.result.name == '生产供应站' || res3.result.name == '物装公司' || res3.result.name == '采购员') {
-                 this.lcModa.isPlanType = true;
-                 this.lcModa.isSourceCapital = true;
-                 this.lcModa.disabled = false;
-                 this.lcModa.hieg=false;
+                  this.lcModa.isPlanType = true
+                  this.lcModa.isSourceCapital = true
+                  this.lcModa.disabled = false
+                  this.lcModa.hieg = false
                 }
               }
             }
@@ -529,9 +534,9 @@
             if (res1.result) {
               if (param.username == res1.result.relateId) {
                 if (res1.result.name == '采购员') {
-                 this.lcModa.isPlanType = true;
-                 this.lcModa.isSourceCapital = true;
-                 this.lcModa.disabled = false;
+                  this.lcModa.isPlanType = true
+                  this.lcModa.isSourceCapital = true
+                  this.lcModa.disabled = false
                 }
               }
             }
@@ -546,7 +551,7 @@
         this.lcModa.visible = true
       },
       passTask(v) {
-        console.log(v.procInstId,"33333333333333333")
+        console.log(v.procInstId, '33333333333333333')
         this.modalTaskTitle = '审批通过'
         this.form.id = v.id
         this.form.procInstId = v.procInstId
@@ -587,7 +592,11 @@
           return
         }
         this.userLoading = true
-        this.getAction(this.url.getNode + v).then(res => {
+        let param = {}
+        param.tableName = this.tableName
+        param.tableId = this.tableId
+        param.nodeId = v
+        this.getAction(this.url.getNode, param).then(res => {
           this.userLoading = false
           if (res.success) {
             if (res.result.users && res.result.users.length > 0) {
@@ -678,7 +687,7 @@
       },
       afterSub() {
         this.$message.success('保存成功')
-        this.lcModa.visible=false;
+        this.lcModa.visible = false
         this.lcModa.disabled = false
       },
       backAll() {
@@ -722,14 +731,17 @@
   /deep/ .ant-modal {
     overflow-y: hidden;
   }
+
   /deep/ .ant-modal-content {
     height: 100%;
     overflow-y: scroll;
   }
+
   /deep/ .ant-modal-body {
     height: 100%;
     /*overflow-y: scroll;*/
   }
+
   /deep/ .ant-modal {
     top: 45px
   }

src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue

@@ -26,7 +26,7 @@
             </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="16">
               <a-form-item label="仓储地点">
-                <a-input placeholder="请选择仓储地点" v-model="queryParam.unitWasteWarehouseCodeId"/>
+                <a-input placeholder="请输入仓储地点" v-model="queryParam.unitWasteWarehouseCodeId"/>
               </a-form-item>
             </a-col>
           <a-col :xl="5" :lg="7" :md="8" :sm="16">
@@ -73,7 +73,7 @@
         <a-row :gutter="24">
           <a-col :xl="5" :lg="7" :md="8" :sm="16">
             <a-form-item label="入库批次">
-              <a-input placeholder="请选择批次" v-model="queryParam.supplierBatch"/>
+              <a-input placeholder="请输入批次" v-model="queryParam.supplierBatch"/>
             </a-form-item>
           </a-col>
 

src/views/wastematerials/ProcessWasteMaterialsLists.vue

@@ -47,7 +47,7 @@
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="保质期">
-                <a-input placeholder="请选择保质期" v-model="queryParam.expirationDate"></a-input>
+                <a-input placeholder="请输入保质期" v-model="queryParam.expirationDate"></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">