From ad5c15a163a7531656ea5087f09adf95421f9ccc Mon Sep 17 00:00:00 2001
From: long <18782126717@163.com>
Date: Fri, 30 Dec 2022 13:45:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A9=B3=E5=9B=9E?=
 =?UTF-8?q?=E8=87=B3=E8=8A=82=E7=82=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/activiti/todoManage.vue | 250 ++++++++++++++++--------------
 1 file changed, 131 insertions(+), 119 deletions(-)

diff --git a/src/views/activiti/todoManage.vue b/src/views/activiti/todoManage.vue
index d803499..4d6984c 100644
--- a/src/views/activiti/todoManage.vue
+++ b/src/views/activiti/todoManage.vue
@@ -14,15 +14,15 @@
                 />
               </a-form-item>
             </a-col>
-<!--            <a-col :xl="5" :md="6" :sm="8">-->
-<!--              <a-form-item label="委托人" prop="assignee">-->
-<!--                <a-input-->
-<!--                  type="text" allowClear-->
-<!--                  v-model="searchForm.assignee"-->
-<!--                  placeholder="请输入"-->
-<!--                />-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
+            <!--            <a-col :xl="5" :md="6" :sm="8">-->
+            <!--              <a-form-item label="委托人" prop="assignee">-->
+            <!--                <a-input-->
+            <!--                  type="text" allowClear-->
+            <!--                  v-model="searchForm.assignee"-->
+            <!--                  placeholder="请输入"-->
+            <!--                />-->
+            <!--              </a-form-item>-->
+            <!--            </a-col>-->
             <a-col :xl="5" :md="6" :sm="8">
               <a-form-item label="流程发起人" prop="applyer">
                 <a-input
@@ -147,10 +147,12 @@
       </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"
-                 :task="true" :hieg ="lcModa.hieg"
+                 :processData="lcModa.processData" :isNew="lcModa.isNew" :isPlanType="lcModa.isPlanType"
+                 :isSourceCapital="lcModa.isSourceCapital"
+                 :task="true" :hieg="lcModa.hieg"
                  @afterSubmit="afterSub"
                  @passTask="()=>passTask(lcModa.processData)"
                  @backTask="()=>backTask(lcModa.processData)" :procInstId="lcModa.procInstId"
@@ -166,7 +168,7 @@
             <j-editor v-model="form.comment"></j-editor>
 
           </a-form-item>
-          <a-form-item label="下一审批人" prop="assignees" v-show="false" :error="error" >
+          <a-form-item label="下一审批人" prop="assignees" v-show="false" :error="error">
             <a-select
               v-model="form.assignees"
               placeholder="请选择"
@@ -255,7 +257,7 @@
           // 搜索框对应data对象
           name: '',
           Id: '',
-          applyer: "",
+          applyer: '',
           createTime_begin: '',
           createTime_end: '',
           assignee: ''
@@ -289,9 +291,11 @@
           formComponent: null,
           isNew: false,
           hieg: true,
-          isSourceCapital:false,
+          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() {
@@ -328,13 +332,13 @@
     },
     methods: {
 
-      onDateChange: function (value, dateString) {
-        console.log(dateString[0],dateString[1]);
-        this.searchForm.createTime_begin=dateString[0];
-        this.searchForm.createTime_end=dateString[1];
+      onDateChange: function(value, dateString) {
+        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()
@@ -380,7 +384,7 @@
       },
       /*审批提交的方法*/
       handelSubmit() {
-        if(this.form.comment == ''){
+        if (this.form.comment == '') {
           // console.log("zxzxzx++++++++",this.form.comment.toString().trim())
           this.$message.error('请填写审批意见')
           return
@@ -406,10 +410,10 @@
               this.$message.success('操作成功')
               this.modalTaskVisible = false
               this.getDataList()
-            }else {
+            } else {
               console.log(res)
               this.$message.error(res.message)
-              return;
+              return
             }
           })
         } else if (formData.type == 1) {
@@ -463,7 +467,7 @@
           })
         }
       },
-     async detail(r) {
+      async detail(r) {
         if (!r.routeName) {
           this.$message.warning(
             '该流程信息未配置表单，请联系开发人员！'
@@ -471,82 +475,83 @@
           return
         }
         this.lcModa.disabled = true
-
-       //获取是不是第一个审核人和最后一个审核人（第一个审核人和最后一个审核人需要对表单进行操作）
-       if (r.processName === '预算计划采购流程') {
-         let userInfo = sessionStorage.getItem('USER_INFORMATION')
-         let res = JSON.parse(userInfo)
-         let param = {}
-         // param.id = r.procDefId
-         param.id = r.procInstId
-         param.tableName = r.tableName
-         param.tableId = r.tableId
-         param.username = res.username
-         // let res2 =await this.getAction('/hy/processMaterialsAllot/getOne', param)
-         // if (res2.success) {
-         //   if (res2.result) {
-         //       this.lcModa.isPlanType = true;
-         //       this.lcModa.isSourceCapital = true;
-         //       this.lcModa.disabled = false;
-         //   }
-         // }
-         // let res1=await this.getAction('/hy/processMaterialsAllot/getLast', param)
-         // if (res1.success) {
-         //   if (res1.result) {
-         //     if (param.username==res1.result.username){
-         //       this.lcModa.isPlanType = true;
-         //       this.lcModa.isSourceCapital = true;
-         //       this.lcModa.disabled = false;
-         //     }
-         //   }
-         // }
-        //获取当前节点审批名称审批人username
-         let res3=await this.getAction('/hy/processMaterialsAllot/getCurrent', param)
-         if (res3.success) {
-           if (res3.result) {
-             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;
-               }
-             }
-           }
-         }
-       }
-       if (r.processName === '物资入库流程') {
-         let userInfo = sessionStorage.getItem('USER_INFORMATION')
-         let res = JSON.parse(userInfo)
-         let param = {}
-         param.id = r.procInstId
-         param.tableName = r.tableName
-         param.tableId = r.tableId
-         param.username = res.username
-         let res1=await this.getAction('/hy/processMaterialsAllot/getCurrent', param)
-         if (res1.success) {
-           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.title = '查看流程业务信息：' + r.processName
-       this.lcModa.formComponent = this.getFormComponent(r.routeName).component
-       this.lcModa.processData = r
-       this.lcModa.isNew = false
-       this.lcModa.task = true
-       this.lcModa.procInstId = r.procInstId
-       this.lcModa.visible = true
+        this.tableName = r.tableName
+        this.tableId = r.tableId
+        //获取是不是第一个审核人和最后一个审核人（第一个审核人和最后一个审核人需要对表单进行操作）
+        if (r.processName === '预算计划采购流程') {
+          let userInfo = sessionStorage.getItem('USER_INFORMATION')
+          let res = JSON.parse(userInfo)
+          let param = {}
+          // param.id = r.procDefId
+          param.id = r.procInstId
+          param.tableName = r.tableName
+          param.tableId = r.tableId
+          param.username = res.username
+          // let res2 =await this.getAction('/hy/processMaterialsAllot/getOne', param)
+          // if (res2.success) {
+          //   if (res2.result) {
+          //       this.lcModa.isPlanType = true;
+          //       this.lcModa.isSourceCapital = true;
+          //       this.lcModa.disabled = false;
+          //   }
+          // }
+          // let res1=await this.getAction('/hy/processMaterialsAllot/getLast', param)
+          // if (res1.success) {
+          //   if (res1.result) {
+          //     if (param.username==res1.result.username){
+          //       this.lcModa.isPlanType = true;
+          //       this.lcModa.isSourceCapital = true;
+          //       this.lcModa.disabled = false;
+          //     }
+          //   }
+          // }
+          //获取当前节点审批名称审批人username
+          let res3 = await this.getAction('/hy/processMaterialsAllot/getCurrent', param)
+          if (res3.success) {
+            if (res3.result) {
+              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
+                }
+              }
+            }
+          }
+        }
+        if (r.processName === '物资入库流程') {
+          let userInfo = sessionStorage.getItem('USER_INFORMATION')
+          let res = JSON.parse(userInfo)
+          let param = {}
+          param.id = r.procInstId
+          param.tableName = r.tableName
+          param.tableId = r.tableId
+          param.username = res.username
+          let res1 = await this.getAction('/hy/processMaterialsAllot/getCurrent', param)
+          if (res1.success) {
+            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.title = '查看流程业务信息：' + r.processName
+        this.lcModa.formComponent = this.getFormComponent(r.routeName).component
+        this.lcModa.processData = r
+        this.lcModa.isNew = false
+        this.lcModa.task = true
+        this.lcModa.procInstId = r.procInstId
+        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) {
@@ -676,9 +685,9 @@
           }
         })
       },
-      afterSub(){
+      afterSub() {
         this.$message.success('保存成功')
-        this.lcModa.visible=false;
+        this.lcModa.visible = false
         this.lcModa.disabled = false
       },
       backAll() {
@@ -717,20 +726,23 @@
   }
 </script>
 <style scoped>
-@import '~@assets/less/common.less';
+  @import '~@assets/less/common.less';
+
+  /deep/ .ant-modal {
+    overflow-y: hidden;
+  }
 
-/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
-}
+  /deep/ .ant-modal-content {
+    height: 100%;
+    overflow-y: scroll;
+  }
+
+  /deep/ .ant-modal-body {
+    height: 100%;
+    /*overflow-y: scroll;*/
+  }
+
+  /deep/ .ant-modal {
+    top: 45px
+  }
 </style>
\ No newline at end of file

From fbcbb6b3f4ce7448774a00c4c6bb1a9fab72d3e9 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Fri, 30 Dec 2022 14:35:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/activiti/ProcessModelList.vue                    | 1 +
 src/views/activiti/form/ProcessMaterialWarehousingForm.vue | 7 ++++---
 src/views/activiti/form/ProcessUdgetPlanForm.vue           | 7 ++++---
 .../suppliesstronger/ProcessSuppliesStrongerLists.vue      | 4 ++--
 src/views/wastematerials/ProcessWasteMaterialsLists.vue    | 2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/views/activiti/ProcessModelList.vue b/src/views/activiti/ProcessModelList.vue
index 129d008..88c9816 100644
--- a/src/views/activiti/ProcessModelList.vue
+++ b/src/views/activiti/ProcessModelList.vue
@@ -758,6 +758,7 @@
         // this.loadData();
       },
       loadData(arg) {
+
         if(!this.url.list){
           this.$message.error("请设置url.list属性!")
           return
diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
index 21c7221..8780dfb 100644
--- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
+++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
@@ -649,8 +649,9 @@
                 httpAction(url, formData, method).then((res) => {
                   if (res.success) {
                     //todo 将表单的数据传给父组件
-                    this.$emit('afterSubmit', formData)
-                    this.$emit("close")
+                    if(e!=true){
+                      this.$emit('afterSubmit', formData)
+                    }
                   } else {
                     this.$message.error(res.message)
                   }
@@ -768,7 +769,7 @@
       },
       saveAndpassTask() {
         this.passTask()
-        this.handleSubmit();
+        this.handleSubmit(true);
       },
       validateError(msg) {
         this.$message.error(msg)
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index 3ad7604..d58fde8 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/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 将表单的数据传给父组件
-                    this.$emit('afterSubmit', formData)
-                    this.$emit("close")
+                    if(e!=true){
+                      this.$emit('afterSubmit', formData)
+                    }
                   } else {
                     this.$message.error(res.message)
                   }
diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
index 8fd49c9..4a7d1b6 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
+++ b/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>
 
diff --git a/src/views/wastematerials/ProcessWasteMaterialsLists.vue b/src/views/wastematerials/ProcessWasteMaterialsLists.vue
index 9bf52cb..35a2e5b 100644
--- a/src/views/wastematerials/ProcessWasteMaterialsLists.vue
+++ b/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">