Parcourir la source

提交审批流程

caojunjie il y a 4 ans
Parent
commit
4a1bd7a07d

+ 17 - 14
src/views/purchaseRequest/index.vue

@@ -958,7 +958,7 @@ export default {
         case '修改':
           this.contentButton.forEach(item =>{
             if (this.$refs.avatar.form.fBillstatus > 4){
-              if (item.name === '返回列表' || item.name === '修改' || item.name === '保存' || item.name === '生成入库单' || item.name === '生成销售单'){
+              if (item.name === '返回列表' || item.name === '修改' || item.name === '生成入库单' || item.name === '生成销售单'){
                 item.disabled = false
               }else {
                 item.disabled = true
@@ -993,8 +993,7 @@ export default {
           })
           break
         case '返回列表':
-          console.log(this.$refs.avatar.form,this.contentList)
-          if (!this.$refs.avatar.form.fId && this.contentList !== 0) {
+          if (!this.$refs.avatar.form.fId && this.contentList !== 0 || this.$refs.avatar.form.fBillstatus > 3) {
             data = {
               tableName: this.queryList.tableName,
               userId: Cookies.get('userName')
@@ -1052,18 +1051,22 @@ export default {
           })
           break
         case '复制新增':
-          let datae = {
-            fId:this.selection[0].fId,
-            fBilltype:'SQ'
+          if (this.selection.length > 0){
+            let datae = {
+              fId:this.selection[0].fId,
+              fBilltype:'SQ'
+            }
+            copyNew(datae).then(res=>{
+              this.$message({
+                message: '复制新增成功',
+                type: 'success',
+                showClose:true
+              });
+              this.query(this.formDataList)
+            })
+          }else {
+            this.$message.warning('未选择列表,请选择后再点击');
           }
-          copyNew(datae).then(res=>{
-            this.$message({
-              message: '复制新增成功',
-              type: 'success',
-              showClose:true
-            });
-            this.query(this.formDataList)
-          })
           break
         default:
           this.$message.error('该按钮暂无功能')

+ 6 - 4
src/views/system/auditConfiguration/index.vue

@@ -100,7 +100,7 @@
 </template>
 
 <script>
-import {addCharge,preservation} from '@/views/system/auditConfiguration/index'
+import {addCharge,preservation} from '@/api/system/auditConfiguration'
 export default {
   data () {
     return {
@@ -144,6 +144,11 @@ export default {
       ]
     }
   },
+  created() {
+    this.$nextTick(function () {
+      this.getDataList()
+    })
+  },
   activated () {
 
     // this.$http({
@@ -166,9 +171,6 @@ export default {
     //     }
     //   }
     // })
-    this.$nextTick(function () {
-      this.getDataList()
-    })
   },
   methods: {
     // 获取数据列表

+ 4 - 2
src/views/system/toConfigure/index.vue

@@ -99,7 +99,7 @@
 
 <script>
 import AddOrUpdate from './auditPaths-add-or-update'
-import {addCharge,delCharge} from '@/views/system/toConfigure/index'
+import {addCharge,delCharge} from '@/api/system/toConfigure'
 
 export default {
   data () {
@@ -127,6 +127,9 @@ export default {
   components: {
     AddOrUpdate
   },
+  created() {
+    this.getDataList()
+  },
   activated () {
     // this.$http({
     //   url: this.$http.adornUrl('/sys/user/getLoginContractorId'),
@@ -135,7 +138,6 @@ export default {
     //   this.loginContractorId = data.loginContractorId
     // })
 
-    this.getDataList()
   },
   methods: {
     resetQuery_s(){