车辆外采流程办理

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@@ -695,7 +695,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             if (end_act_id != null) {
                 flowTask.setEndActId((String) end_act_id);
             }
-            Object end_time = histTask.get("end_time");
+            Object end_time = histTask.get("END_TIME_");
             if (end_time != null) {
                 Timestamp end_time_t = (Timestamp) end_time;
                 long end_time_t_l = end_time_t.getTime();

anrui-scm/anrui-scm-ui/src/api/chexingchaxun/modelinquire.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 根据条件分页查询数据的列表(车型)
 export function modelPageList(data) {
   return request({
-    url: '/base/v1/basevehiclemodel/modelPageList',
+    url: '/base/v1/basevehicle/getModelList',
     method: 'post',
     data: data,
     headers: {
@@ -15,7 +15,7 @@ export function modelPageList(data) {
 // 根据条件分页查询数据的列表（车型配置）
 export function configPageList(data) {
   return request({
-    url: '/base/v1/basemodelconfig/configPageList',
+    url: '/base/v1/basemodelconfig/getPcModelConfigList',
     method: 'post',
     data: data,
     headers: {

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue

@@ -203,7 +203,7 @@
           <el-col :span="20" class="trightb" >
             <el-radio-group >
               <el-radio v-for="item in users" :key="item.sid" :label="item.sid"
-                        @change="checkedUser">{{ item.name }}</el-radio>
+                        @change="checkedUser(item.sid)">{{ item.name }}</el-radio>
             </el-radio-group>
           </el-col>
         </el-row>
@@ -313,7 +313,6 @@ export default {
       // this.$refs['chexingxuanze'].showChexing()
     },
     selectChexing(info) {
-      console.log('车型info', info)
       this.viewState = '1'
       this.formobj.modelSid = info.modelSid // 车型sid
       this.formobj.modelName = info.modelName // 车型名称
@@ -423,6 +422,8 @@ export default {
     //选择下一环节的用户
     checkedUser(val) {
       const choosetItem = this.users.filter((item) => item.sid == val)
+      console.log(this.users);
+      console.log(choosetItem);
       this.userName = choosetItem[0].name
       this.formobj.nextUserSid = choosetItem[0].sid
       this.nodeUserDialogVisible = false

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/relation/vehiclelibraryconfiguration.vue

@@ -407,7 +407,7 @@ export default {
       return pageindex
     },
     showData(row) {
-      this.listQuery.params.modelSid = row.sid
+      this.listQuery.params.modelSid = row.modelSid
       this.modelSid = row.sid
       this.modelName = row.modelName
       this.guidedPrice = row.guidedPrice

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue

@@ -78,6 +78,7 @@
         <flow :xmlData="xmlData" :taskData="taskList"></flow>
 		</el-form>
 		</div>
+    <!-- 选择待办人 的弹出框-->
     <el-dialog title="选择待办人"  :visible.sync="nodeDialogVisible" width="80%">
       <el-form label-position="right" class="formadd" >
         <el-row>
@@ -104,6 +105,7 @@
         </div>
       </el-form>
     </el-dialog>
+   <!-- 选择用户 的弹出框-->
     <el-dialog title="选择用户"  :visible.sync="nodeUserDialogVisible" width="80%">
       <el-form label-position="right" class="formadd" >
         <el-row>
@@ -130,18 +132,23 @@ export default {
   },
 	data() {
 		return {
+		  //选择待办人弹框
       nodeDialogVisible:false,
+      //选择用户弹框
       nodeUserDialogVisible:false,
       // 模型xml数据
       xmlData: "",
-      nodeSid: "",
+      //根据角色查询的用户数组
-     // nextNodeSid:'',
-      nodes: [],
       users:[],
+      //选择的用户的姓名
       userName:'',
+      //选择的用户sid
       userSid:'',
       taskList: [],
+      //获取环节时默认是最后一个环节
       endTask:true,
+      //下一环节
+      nextNode:{},
 			formobj: {
         sid: '',
         comment:'',
@@ -165,7 +172,6 @@ export default {
         orgSid: '', // 部门sid
         baseOutsourcingApplicationVehicleDtos:[]
       },
-      nextNode:{},
       agreeList: { //同意办理列表
         businessSid: '',
         comment: '',
@@ -206,7 +212,7 @@ export default {
     const data = decodeURI(window.location.href.slice(one, two)) // url解码unescape()已从web中移除,尽量不使用
     var tar = data.substr(data.indexOf('=') + 1)
     const obj = JSON.parse(tar)
-    // 同意列表
+    // 同意列表  父级页面传递过来的流程的相关的属性参数
     this.agreeList.businessSid = sid
     this.agreeList.instanceId = obj.instanceId
     this.agreeList.taskId = obj.taskId
@@ -220,46 +226,45 @@ export default {
     this.stopList.businessSid = sid
     this.stopList.instanceId = obj.instanceId
     this.stopList.taskId = obj.taskId
+    //加载流程图相关的数据
     this.getModelDetail(obj.deployId)
     this.getFlowViewer(obj.instanceId)
-    this.getNextNodes(obj.taskId)
     window.parent.postMessage({
       cmd: 'returnHeight',
       params: {
+        //告诉父级页面，子页面的弹框高度。
         code: 2,
         data: 1500 + 'px'
       }
     }, '*')
   },
 	methods: {
+	  //关闭弹出框 选择待办人弹框
     closeNodeDialog(){
       this.nodeDialogVisible = false
     },
+    //根据环节上配置的角色查询用户
     selectUser() {
         this.nodeUserDialogVisible=true
         req.getUsers(this.nextNode.candidateGroups[0]).then(res => {
           this.users = res.data
         })
     },
+    //选中下一环节的用户
     checkedUser(val) {
       const choosetItem = this.users.filter((item) => item.sid == val)
       this.userName = choosetItem[0].name
+      this.userSid = choosetItem[0].sid
       this.nodeUserDialogVisible = false
     },
     /** xml 文件 */
-    getNextNodes(taskid) {
-      // 发送请求，获取xml
-      req.getNextNodes(taskid).then(res => {
-        this.nodes = res.data
-      })
-    },
-    /** xml 文件 */
     getModelDetail(deployId) {
       // 发送请求，获取xml
       req.readXml(deployId).then(res =>{
         this.xmlData = res.data
       })
     },
+    //已办环节的节点
     getFlowViewer(procInsId){
       req.getFlowViewer(procInsId).then(res =>{
         this.taskList = res.data
@@ -301,30 +306,32 @@ export default {
     },
     // 同意
     openAgree() {
+      //查验下一环节要用到，流程定义的id
       this.formobj.modelId = 'process_5tqysnjc:2:325008'
       req.getNextNodesForSubmit(this.formobj).then(resp=>{
         if (resp.success) {
          var arr= resp.data;
+        //循环获取当前环节的下一个环节信息
          for(var i=0;i<arr.length;i++){
            if(i+1<arr.length&&this.agreeList.taskDefKey==arr[i].id){
              this.nextNode=arr[i+1];
-             this.endTask=fasle;
+             //不是最后一个环节
+             this.endTask=false;
            }
          }
+         //如果是最后一个环节 则设置一个结束环节 提醒用户
          if(this.endTask){
            this.nextNode={
              name:'结束'
            }
          }else{
-           /*this.nextNode=resp.data[1];
+           //如果不是最后一个环节 要取下一个环节的角色sid
-            this.firstNode=resp.data[0];*/
            var candidateGroups=this.nextNode.candidateGroups;
            this.roleSid=candidateGroups[0];
          }
           this.nodeDialogVisible = true
         }
         this.submitdisabled = false
-       // this.handleAgree()
       });
 
     },
@@ -366,22 +373,25 @@ export default {
 					_this.formobj = {}
 				})
 		},
-    /** 同意任务 */
+    //同意任务
-    handleAgree() {
-      this.nodeDialogVisible = true
-    },
    agree() {
+      if(this.formobj.comment==''){
+        alert('请填写审批意见!');
+      }
+      //意见
     this.agreeList.comment = this.formobj.comment
-   // this.agreeList.nextNodeSid = this.nextNodeSid
+     //下一环节的用户sid
     this.agreeList.nextUserSid = this.userSid
+     //调用后台接口流转
     req.agreeTask(this.agreeList).then((response) => {
       if (response.code === '200') {
        this.nodeDialogVisible=false;
+       //子页面向父级页面传递值
         window.parent.postMessage({
           cmd: 'returnHeight',
           params: {
-            code: 1,
+            //操作成功，告诉父级页面关闭弹框
-            data: document.body.scrollHeight + 'px'
+            code: 1
           }
         }, '*')
       } else {