wyh 1 рік тому
батько
коміт
854d20bffa

+ 6 - 0
itdmWeb/src/api/api.js

@@ -114,6 +114,10 @@ const upload = (params)=>postAction("/itdmgomgongdanshuju/ItdmGongdanshuju/uploa
 const getUpload = (params)=>getAction("/itdmgomgongdanshuju/ItdmGongdanshuju/getUpdate",params);
 // 根据流程id查询业务内容
 const getYeWU = (params)=>getAction("flowpath/itdmRunFlowPath/queryById",params);
+// 新增运行流程时,第一步操作人的下拉列表
+const getFirNextZrr = (params)=>getAction("/flowpath/itdmRunFlowPathStep/AddSelectNextStepUser",params);
+// 下一步的时候选择操作人的下拉列表
+const getNextZrr = (params)=>getAction("/flowpath/itdmRunFlowPathStep/selectNextStepUser",params);
 
 
 //日志管理
@@ -303,6 +307,8 @@ export {
   runFlowPathrejectzd,
   getYeWU,
   jixiaoPersonPrice,
+  getFirNextZrr,
+  getNextZrr
 }
 
 

+ 39 - 18
itdmWeb/src/views/module-iTDM/flowpath/ItdmRunFlowPathList.vue

@@ -118,6 +118,9 @@
         </template>
 
         <span slot='action' slot-scope='text, record'>
+          <!-- <a-popconfirm v-show='record.isokview===true&&record.status==="0"' title="是否通过?" @confirm="() => tongguo(record) ">
+            <a>下一步</a>
+          </a-popconfirm> -->
           <a v-show='record.isokview===true&&record.status==="0"' @click='tongguo(record)'>下一步</a>
           <a-divider v-show='record.isokview===true&&record.status==="0"' type='vertical' />
           <a v-show='record.isbohuiview===true&&record.status==="0"' @click='bohui(record)'>驳回</a>
@@ -152,6 +155,10 @@
 
 
 
+    <!-- 选择下一步责任人 -->
+    <itdm-next-modal ref='nextChoose' @ok='modalFormOk' :fatherMethod="loadData"></itdm-next-modal>
+
+
 
   </a-card>
 </template>
@@ -168,12 +175,14 @@ import { Modal } from 'ant-design-vue'
 import ItdmRunFlowPathShenhel from './modules/ItdmRunFlowPathShenhel.vue'
 import ItdmRunFlowPathShenhel1 from './modules/ItdmRunFlowPathShenhel1.vue'
 import { deleteAction, getAction,downFile,getFileAccessHttpUrl } from '@/api/manage'
+import ItdmNextModal from './modules/ItdmNextModal.vue'
 
 export default {
   name: 'ItdmRunFlowPathList',
   mixins: [JeecgListMixin, mixinDevice],
   components: {
-    ItdmRunFlowPathModal,ItdmRunFlowPathShenhel,ItdmRunFlowPathShenhel1
+    ItdmRunFlowPathModal,ItdmRunFlowPathShenhel,ItdmRunFlowPathShenhel1,
+    ItdmNextModal
   },
   data() {
     return {
@@ -322,26 +331,38 @@ export default {
         this.loading = false
       })
     },
+    // dundun写的
+    // tongguo: function(record) {
+    //   let that = this
 
-    tongguo: function(record) {
-      let that = this
-
-      Modal.confirm({
-        title: '是否通过',
-        content: '是否通过',
-        onOk() {
-          var data = { 'runFlowPath': record.id }
-          runFlowPathPass1(data).then(response => {
-            if (response.code == '500') {
-              that.$message.error(response.message)
-            }
-            that.loadData(1);
-          })
-        },
-        onCancel() {},
-      });
+    //   Modal.confirm({
+    //     title: '是否通过',
+    //     content: '是否通过',
+    //     onOk() {
+    //       var data = { 'runFlowPath': record.id }
+    //       runFlowPathPass1(data).then(response => {
+    //         if (response.code == '500') {
+    //           that.$message.error(response.message)
+    //         }
+    //         that.loadData(1);
+    //       })
+    //     },
+    //     onCancel() {},
+    //   });
 
 
+    // },
+    // 17写的
+    tongguo: function(record) {
+      this.$refs.nextChoose.next(record);
+      // let that = this
+      // var data = { 'runFlowPath': record.id }
+      // runFlowPathPass1(data).then(response => {
+      //   if (response.code == '500') {
+      //     that.$message.error(response.message)
+      //   }
+      //   that.loadData(1);
+      // })
     },
     bohui: function(record) {
       console.log('123123')

+ 1 - 1
itdmWeb/src/views/module-iTDM/flowpath/modules/ItdmRunFlowPathShenhel.vue

@@ -31,7 +31,7 @@
     data () {
       return {
         model:{},
-        title:'',
+        title:'驳回',
         width:800,
         visible: false,
         disableSubmit: false,

+ 1 - 1
itdmWeb/src/views/module-iTDM/flowpath/modules/ItdmRunFlowPathShenhel1.vue

@@ -39,7 +39,7 @@ import { runFlowPathRejectDQ, runFlowPathrejectzd, runFlowPathyrunList } from '@
       return {
         yrunList:[],
         model:{},
-        title:'',
+        title:'驳回指定节点',
         width:800,
         visible: false,
         disableSubmit: false,