完善流程审批功能

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

@@ -33,16 +33,16 @@
 			<!-- Start 项目列表 -->
 			<div class="listcon" style="height: 100%;">
 				<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="handleSelectionChange">
-					<el-table-column width="30px" type="selection" align="center" />
           <el-table-column width="50px" label="序号" type="index" :index="indexMethod" align="center" />
+          <el-table-column width="30px" type="selection" align="center" />
+          <el-table-column prop="applicationCode" width="130px;" label="申请单编号" align="center" />
           <el-table-column width="150px" label="操作" align="center"  >
             <template slot-scope="scope">
-               <el-button v-if="scope.row.nodeState=='待提交'||(scope.row.nodeState!='待提交'&&scope.row.nodeState=='外采申请')"
-                          type="primary" size="mini" @click="edit(scope.row)">办理</el-button>
-               <el-button v-else type="info" size="mini">办理</el-button>
+              <el-button v-if="scope.row.nodeState=='待提交'||(scope.row.nodeState!='待提交'&&scope.row.nodeState=='外采申请')"
+                         type="primary" size="mini" @click="edit(scope.row)">办理</el-button>
+              <el-button v-else type="info" size="mini">办理</el-button>
               <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button></template>
           </el-table-column>
-          <el-table-column prop="applicationCode" width="130px;" label="申请编号" align="center" />
           <el-table-column prop="nodeState" width="100px;"  label="状态" align="center" >
             <template slot-scope="scope">
               <span >{{scope.row.nodeState}}</span>
@@ -52,7 +52,7 @@
 					<el-table-column prop="modelName" label="车型" align="center" />
           <el-table-column prop="num" width="60px;" label="台数" align="center" />
 					<el-table-column prop="purchasePrice" width="90px;" label="采购价格" align="center" />
-					<el-table-column prop="guidedPrice" width="90px;" label="指导价" align="center" />
+					<el-table-column prop="guidedPrice" width="90px;" label="销售指导价" align="center" />
 				</el-table>
 			</div>
 			<!-- End 项目列表 -->
@@ -182,7 +182,7 @@ export default {
         return
       }
       this.multipleSelection.forEach(row => {
-        if(row.nodeState == '' || (row.nodeState!=''&&row.nodeState=='外采申请')){
+        if(row.nodeState == '待提交' || (row.nodeState!='待提交'&&row.nodeState=='外采申请')){
           this.viewState = 3
           const row = this.multipleSelection[0]
           this.$refs['divadd'].showEdit(row)
@@ -233,7 +233,7 @@ export default {
 			const _this = this
 			const sids = []
       this.multipleSelection.forEach(row => {
-        if(row.nodeState==''||(row.nodeState!=''&&row.nodeState=='外采申请')){
+        if(row.nodeState=='待提交'||(row.nodeState!='待提交'&&row.nodeState=='外采申请')){
           sids.push(row.sid)
         }else{
           alert('已经发起的审批业务数据不能进行删除。');

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

@@ -131,6 +131,7 @@ export default {
   },
 	data() {
 		return {
+      obj:{},
 		  //角色sid
       roleSid:"",
 		  //选择待办人弹框
@@ -201,30 +202,25 @@ export default {
 		}
 	},
   created() {
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    this.obj=obj;
     // ===获取sid
-    var a = window.location.href.indexOf('?') + 1 // 第一个?后面的一个字符的位置
-    var b = window.location.href.indexOf('#data') // 第一个#data出现的位置
-    const info = window.location.href.slice(a, b)
-    var sid = info.substr(info.indexOf('=') + 1)
-    this.showInfo(sid)
+    this.showInfo(obj.businessSid)
     // ===获取参数
-    var one = window.location.href.lastIndexOf('#') + 1
-    var two = window.location.href.lastIndexOf('}') + 1
-    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.formobj.businessSid = sid
+    this.formobj.businessSid =obj.businessSid
     this.formobj.instanceId = obj.instanceId
     this.formobj.taskId = obj.taskId
     this.formobj.taskDefKey = obj.taskDefKey
     this.formobj.taskName = obj.taskName
     // 驳回列表
-    this.regectList.businessSid = sid
+    this.regectList.businessSid = obj.businessSid
     this.regectList.instanceId = obj.instanceId
     this.regectList.taskId = obj.taskId
     // 终止列表
-    this.stopList.businessSid = sid
+    this.stopList.businessSid = obj.businessSid
     this.stopList.instanceId = obj.instanceId
     this.stopList.taskId = obj.taskId
     window.parent.postMessage({

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

@@ -82,6 +82,7 @@ export default {
 	name: 'BaseOutsourcingApplicationInfo',
 	data() {
 		return {
+      obj:{},
       isBtnShow: true,
 			formobj: {
         sid: '',
@@ -114,23 +115,15 @@ export default {
 		}
 	},
   created() {
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    this.obj=obj;
     // ===获取sid
-    var a = window.location.href.indexOf('?') + 1 // 第一个?后面的一个字符的位置
-    var b = window.location.href.indexOf('#data') // 第一个#data出现的位置
-    const info = window.location.href.slice(a, b)
-    var sid = info.substr(info.indexOf('=') + 1)
-    this.showInfo(sid)
+    this.showInfo(obj.businessSid)
     // ===获取参数
-    var one = window.location.href.lastIndexOf('#') + 1
-    var two = window.location.href.lastIndexOf('}') + 1
-    const data = decodeURI(window.location.href.slice(one, two)) // url解码unescape()已从web中移除,尽量不使用
-    var tar = data.substr(data.indexOf('=') + 1)
-    const obj = JSON.parse(tar)
-    if (obj.taskName == '已完结' || '已终止') {
-     // this.isBtnShow = false
-    }
     // 撤回列表
-    this.revokeList.businessSid = sid
+    this.revokeList.businessSid = obj.businessSid
     this.revokeList.instanceId = obj.instanceId
     this.revokeList.taskId = obj.taskId
     window.parent.postMessage({

anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuiku.vue

@@ -56,7 +56,6 @@
           border
           style="width: 100%"
           @selection-change="handleSelectionChange">
-          <el-table-column width="50" type="selection" align="center"/>
           <el-table-column width="150" label="操作" align="center">
             <template slot-scope="scope">
               <el-button
@@ -68,6 +67,7 @@
               <el-button type="primary" size="small" @click="toInfo(scope.row)">查看</el-button>
             </template>
           </el-table-column>
+          <el-table-column width="50" type="selection" align="center"/>
           <el-table-column width="80" label="序号" type="index" :index="indexMethod" align="center"/>
           <el-table-column prop="nodeState" label="状态" align="center"/>
           <el-table-column prop="applicationCode" label="申请编号" align="center"/>
@@ -184,10 +184,26 @@ export default {
         this.$refs['divadd'].showAdd()
       },
       toEdit(row) {
-        this.viewState = 3
-        const sid = row.sid
-        const nodeState = row.nodeState
-        this.$refs['divadd'].showEdit(sid, nodeState)
+        if (this.multipleSelection.length === 0) {
+          this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' })
+          return
+        }
+        if (this.multipleSelection.length > 1) {
+          this.$message({ showClose: true, type: 'error', message: '只能选择一条记录进行编辑' })
+          return
+        }
+        this.multipleSelection.forEach(row => {
+          if(row.nodeState == '待提交' || (row.nodeState!='待提交'&&row.nodeState=='外采申请')){
+            this.viewState = 3
+            const sid = row.sid
+            const nodeState = row.nodeState
+            const row = this.multipleSelection[0]
+            this.$refs['divadd'].showEdit(sid, nodeState)
+          }else{
+            alert('已经发起的审批业务数据不能进行编辑。');
+            return false;
+          }
+        })
       },
       toInfo(row) {
         this.viewState = 4

anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue

@@ -146,12 +146,14 @@
         // 表单数据
         formobj: {
           remarks:'',
+          userSid: window.sessionStorage.getItem('userSid'), // 用户人sid
+          orgSid: window.sessionStorage.getItem('orgSid'), // 部门sid
+          staffSid: window.sessionStorage.getItem('staffSid'),
           sid: '', // 一条数据的sid
           applicationCode: '',
           name: '',
           createTime: '',
           money: '',
-          userSid: '', // 用户人sid
           detailsList: []
         },
         rules: {
@@ -181,9 +183,6 @@
         this.isXuanche = false
       },
       selectVehicle(depositVehicleList) {
-        console.log('depositVehicleList');
-        console.log(depositVehicleList);
-        console.log('depositVehicleList');
         for (var i = 0; i < depositVehicleList.length; i++) {
           this.list.push({
             configName: depositVehicleList[i].configName,