Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-ui/src/api/sealContract/sealContract.js

@@ -68,7 +68,7 @@ export function dataDictionary(data) {
 // 待办任务同意办理
 export function businessAgree(data) {
   return request({
-    url: '/buscenter/v1/scmapplyinbound/complete',
+    url: '/buscenter/v1/bussealapply/complete',
     method: 'post',
     data: data,
     headers: {
@@ -80,7 +80,7 @@ export function businessAgree(data) {
 // 待办任务驳回任务
 export function rejectTask(data) {
   return request({
-    url: '/buscenter/v1/scmapplyinbound/reject/' + data.businessSid,
+    url: '/buscenter/v1/bussealapply/reject/' + data.businessSid,
     method: 'post',
     data: data,
     headers: {
@@ -92,7 +92,7 @@ export function rejectTask(data) {
 // 待办任务终止任务
 export function breakTask(data) {
   return request({
-    url: '/buscenter/v1/scmapplyinbound/breakProcess/' + data.businessSid,
+    url: '/buscenter/v1/bussealapply/breakProcess/' + data.businessSid,
     method: 'post',
     data: data,
     headers: {
@@ -104,7 +104,7 @@ export function breakTask(data) {
 // 待办任务撤回任务
 export function revokeTask(data) {
   return request({
-    url: '/buscenter/v1/scmapplyinbound/revokeProcess/' + data.userSid + '/' + data.businessSid,
+    url: '/buscenter/v1/bussealapply/revokeProcess/' + data.userSid + '/' + data.businessSid,
     method: 'post',
     data: data,
     headers: {

anrui-buscenter/anrui-buscenter-ui/src/router/index.js

@@ -600,8 +600,23 @@ export const constantRoutes = [{
     component: () =>
       import('@/views/workflow/hetongguanliFlow/hetongdanganguanli/hetongdanganEdit.vue'),
     name: 'hetongdanganEdit'
-  }
+  },
 
+  // 盖章管理
+  // 盖章申请详情
+  {
+    path: '/gaizhangguanliFlow/gaizhangshenqingguanli/gaizhangshenqingInfo.vue',
+    component: () =>
+      import('@/views/workflow/gaizhangguanliFlow/gaizhangshenqingguanli/gaizhangshenqingInfo.vue'),
+    name: 'gaizhangshenqingInfo'
+  },
+  // 盖章申请编辑
+  {
+    path: '/gaizhangguanliFlow/gaizhangshenqingguanli/gaizhangshenqingEdit.vue',
+    component: () =>
+      import('@/views/workflow/gaizhangguanliFlow/gaizhangshenqingguanli/gaizhangshenqingEdit.vue'),
+    name: 'gaizhangshenqingEdit'
+  }
   // 销售订单
   // 销售管理详情
   // {

anrui-buscenter/anrui-buscenter-ui/src/views/gaizhanggunali/gaizhangshenqingguanli/gaizhangAdd.vue

@@ -88,7 +88,7 @@ export default {
       viewTitle: '',
       sealType_list: [],
       list1: [],
-      accept: '.jpg,.jpeg,.png,.JPG,.JPEG',
+      accept: '.jpg,.jpeg,.png,.pdf,.doc,.JPG,.JPEG,.PNG,.PDF,.docx',
       formobj: {
         sid: '',
         applyName: window.sessionStorage.getItem('name'),

anrui-buscenter/anrui-buscenter-ui/src/views/gaizhanggunali/gaizhangshenqingguanli/gaizhangguanli.vue

@@ -42,7 +42,7 @@
               <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
               <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
-                  <el-button type="primary" size="small" @click="handUpdate(scope.row)">办理</el-button>
+                  <el-button type="primary" size="small" :disabled="scope.row.nodeState !== '待提交'" @click="handUpdate(scope.row)">办理</el-button>
                   <el-button type="primary" size="small" @click="handLook(scope.row)">查看</el-button>
                 </template>
               </el-table-column>

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/gaizhangguanliFlow/gaizhangshenqingguanli/gaizhangshenqingEdit.vue

@@ -75,11 +75,11 @@
 </template>
 
 <script>
-import { dataDictionary, fetchDetailsBySid, save } from '@/api/sealContract/sealContract.js'
+import {dataDictionary, fetchDetailsBySid, save, submitSealApply} from '@/api/sealContract/sealContract.js'
 import Upload from '@/components/uploadFile/filesUpload' // 上传文件
 
 export default {
-  name: 'gaizhangAdd',
+  name: 'gaizhangshenqingEdit',
   components: {
     Upload
   },
@@ -99,6 +99,8 @@ export default {
         fileNameOrSealReason: '', // 文章名称或盖章事由
         sealFileUrl: '',
         useOrgSid: '',
+        userSid: window.sessionStorage.getItem('userSid'),
+        staffSid: window.sessionStorage.getItem('staffSid'),
         businessSid: '', // 业务sid
         instanceId: '', // 流程id
         taskId: '', // 环节id
@@ -144,13 +146,14 @@ export default {
       fetchDetailsBySid(sid).then(resp => {
         if (resp.code === '200') {
           this.formobj.sid = sid
+          this.formobj.applyName = window.sessionStorage.getItem('name')
           this.formobj.sealDate = resp.data.sealDate
-          this.formobj.sealTypeValue = resp.data.sealTypeValue
+          this.formobj.sealTypeValue = resp.data.sealTypeValue // 盖章类型
           this.formobj.sealTypekey = resp.data.sealTypekey
-          this.formobj.sealNum = resp.data.sealNum
+          this.formobj.sealNum = resp.data.sealNum // 盖章个数
-          this.formobj.fileNameOrSealReason = resp.data.fileNameOrSealReason
+          this.formobj.fileNameOrSealReason = resp.data.fileNameOrSealReason // 文章名称或盖章事由
           this.formobj.sealFileUrl = resp.data.sealFileUrl
-          this.formobj.busSealApplyAppendices = resp.data.busSealApplyAppendices
+          this.formobj.busSealApplyAppendices = resp.data.busSealApplyAppendices // 盖章文件
           if (this.formobj.busSealApplyAppendices.length > 0) {
             for (var i = 0; i < this.formobj.busSealApplyAppendices.length; i++) {
               this.list1.push({
@@ -206,8 +209,29 @@ export default {
       console.log(this.formobj)
       save(this.formobj).then(resp => {
         this.submitdisabled = false
-        this.$message({ showClose: true, type: 'success', message: resp.msg })
+        if (resp.code === '200') {
-        this.handleReturn()
+          this.$message({ showClose: true, type: 'success', message: resp.msg })
+          this.handleReturn()
+        }
+      }).catch(() => {
+        this.submitdisabled = false
+      })
+    },
+    submit() {
+      this.submitdisabled = true
+      if (this.formobj.busSealApplyAppendices.length > 0) {
+        var sealFileUrl_list = []
+        for (var i = 0; i < this.formobj.busSealApplyAppendices.length; i++) {
+          sealFileUrl_list.push(this.formobj.busSealApplyAppendices[i].filePath)
+        }
+        this.formobj.sealFileUrl = sealFileUrl_list.join(',')
+      }
+      submitSealApply(this.formobj).then(resp => {
+        this.submitdisabled = false
+        if (resp.code === '200') {
+          this.$message({ showClose: true, type: 'success', message: resp.msg })
+          this.handleReturn()
+        }
       }).catch(() => {
         this.submitdisabled = false
       })

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/gaizhangguanliFlow/gaizhangshenqingguanli/gaizhangshenqingInfo.vue

@@ -74,9 +74,13 @@
         <div v-show="transactState=='00'">
           <el-form :model="dialogList" :inline="true" label-width="80px">
             <el-row>
-              <el-col>
+              <el-col :span="6" class="tleftb">
                 <el-form-item label="审批意见">
-                  <el-input v-model="dialogList.comment" type="textarea" maxlength="20" placeholder="请输入审批意见" class="inputType" clearable/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="18">
+                <el-form-item>
+                  <el-input v-model="dialogList.comment" type="textarea" maxlength="20" placeholder="请输入审批意见" style="width: 400px" clearable/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -88,7 +92,7 @@
 </template>
 
 <script>
-import { fetchDetailsBySid } from '@/api/sealContract/sealContract.js'
+import { fetchDetailsBySid, businessAgree, rejectTask, breakTask, revokeTask } from '@/api/sealContract/sealContract.js'
 
 export default {
   name: 'gaizhangshenqingInfo',
@@ -182,9 +186,9 @@ export default {
     this.transactState = obj.transactState
   },
   methods: {
-    showInfo(row) {
+    showInfo(sid) {
       this.viewTitle = '盖章申请单详情'
-      fetchDetailsBySid(row.sid).then(resp => {
+      fetchDetailsBySid(sid).then(resp => {
         if (resp.code === '200') {
           this.formobj = resp.data
           if (this.formobj.busSealApplyAppendices.length > 0) {
@@ -263,7 +267,7 @@ export default {
     /** 同意任务 */
     handleAgree() {
       this.agreeList.comment = this.dialogList.comment
-      req.businessAgree(this.agreeList).then((response) => {
+      businessAgree(this.agreeList).then((response) => {
         if (response.code === '200') {
           this.$notify({
             title: '提示',
@@ -285,7 +289,7 @@ export default {
     /** 终止任务 */
     handleStop() {
       this.stopList.comment = this.dialogList.comment
-      req.breakTask(this.stopList).then((response) => {
+      breakTask(this.stopList).then((response) => {
         if (response.code === '200') {
           this.$notify({
             title: '提示',
@@ -306,7 +310,7 @@ export default {
     /** 驳回任务 */
     handleReject() {
       this.regectList.comment = this.dialogList.comment
-      req.rejectTask(this.regectList).then((response) => {
+      rejectTask(this.regectList).then((response) => {
         if (response.code === '200') {
           this.$notify({
             title: '提示',
@@ -327,7 +331,7 @@ export default {
     /** 撤回任务 */
     handleRevoke() {
       this.revokeList.comment = this.dialogList.comment
-      req.revokeTask(this.revokeList).then((response) => {
+      revokeTask(this.revokeList).then((response) => {
         if (response.code === '200') {
           this.$notify({
             title: '提示',

anrui-system-ui/src/views/flow/doneList.vue

@@ -245,7 +245,7 @@
     },
     created() {
       // 加载列表
-      this.getList()
+      // this.getList()
       this.init()
     },
     filters: {
@@ -271,8 +271,10 @@
         loginDetails(token).then((response) => {
           if (response.code === '200') {
             this.loginInfo = response.data;
-            this.revokeList.userSid = this.loginInfo.userSid
+            console.log(this.loginInfo)
-            this.listQuery.params.userSid = this.loginInfo.userSid
+            this.revokeList.userSid = this.loginInfo.sid
+            this.listQuery.params.userSid = this.loginInfo.sid
+            this.getList()
           }
         });
         this.getType()
@@ -286,12 +288,13 @@
         const parameter_list = {
           instanceId: row.procInsId,
           taskId: row.taskId,
-          taskName: row.taskName
+          taskName: row.taskName,
+          transactState: '01' // 已办任务状态
         }
         selectUrl(this.selectUrl_list).then((response) => {
           if (response.code === '200') {
             // this.url = 'http://120.46.131.15' + response.data.url + '?row=' + row.processVariables.businessSid + '#data=' + JSON.stringify(parameter_list) + '?token=' + getStorage()
-            this.url = 'http://localhost:9532' + response.data.url + '?row=' + row.processVariables.businessSid + '#data=' + JSON.stringify(parameter_list) + '?token=123456abc'
+            this.url = 'http://localhost:9531' + response.data.url + '?row=' + row.processVariables.businessSid + '#data=' + JSON.stringify(parameter_list) + '?token=123456abc'
             console.log('页面url', this.url)
           } else {
             this.$notify({

anrui-system-ui/src/views/flow/todoList.vue

@@ -330,13 +330,14 @@
         const parameter_list = {
           instanceId: row.procInsId,
           taskId: row.taskId,
-          taskName: row.taskName
+          taskName: row.taskName,
+          transactState: '00' // 待办任务状态
         }
         console.log('123123123', JSON.stringify(parameter_list))
         selectUrl(this.selectUrl_list).then((response) => {
           if (response.code === '200') {
             // this.url = 'http://120.46.131.15' + response.data.url + '?row=' + row.processVariables.businessSid + '#data=' + JSON.stringify(parameter_list) + '?token=' + getStorage()
-            this.url = 'http://localhost:9532' + response.data.url + '?row=' + row.processVariables.businessSid + '#data=' + JSON.stringify(parameter_list) + '?token=123456abc'
+            this.url = 'http://localhost:9531' + response.data.url + '?row=' + row.processVariables.businessSid + '#data=' + JSON.stringify(parameter_list) + '?token=123456abc'
             console.log('页面url', this.url)
           } else {
             this.$notify({