Merge branch 'master' of http://git.echepei.com/wengyuwen/anpinjingyuan-ui

src/views/purchaseIssue/index.vue

@@ -1268,6 +1268,25 @@ export default {
             }
             this.getRow(data)
             this.query(this.formDataList)
+          }else if (item === 3){
+            let datae = {
+              fId:this.$refs.avatar.form.fId,
+              fBilltype:'SQ'
+            }
+            copyNew(datae).then(res=>{
+              this.$message({
+                message: '复制新单成功',
+                type: 'success',
+                showClose:true
+              });
+              let scope = {
+                row:{
+                  fId:res.data
+                }
+              }
+              this.query(this.formDataList)
+              this.viewMethod(scope)
+            })
           }
         }
       })
@@ -1363,25 +1382,8 @@ export default {
           break
         case '复制新单':
           if (row.nameTwo === '详情页'){
+            this.submitAndSave(3)
             console.log(this.$refs.avatar.form)
-            let datae = {
-              fId:this.$refs.avatar.form.fId,
-              fBilltype:'SQ'
-            }
-            copyNew(datae).then(res=>{
-              this.$message({
-                message: '复制新单成功',
-                type: 'success',
-                showClose:true
-              });
-              let scope = {
-                row:{
-                  fId:res.data
-                }
-              }
-              this.query(this.formDataList)
-              this.viewMethod(scope)
-            })
           }else {
             if (this.selection.length > 0){
               let datae = {

src/views/purchaseRequest/index.vue

@@ -1142,6 +1142,25 @@ export default {
             }
             this.getRow(data)
             this.query(this.formDataList)
+          }else if (item === 3){
+            let datae = {
+              fId:this.$refs.avatar.form.fId,
+              fBilltype:'SQ'
+            }
+            copyNew(datae).then(res=>{
+              this.$message({
+                message: '复制新单成功',
+                type: 'success',
+                showClose:true
+              });
+              let scope = {
+                row:{
+                  fId:res.data
+                }
+              }
+              this.query(this.formDataList)
+              this.viewMethod(scope)
+            })
           }
         }
       })
@@ -1358,25 +1377,8 @@ export default {
         case '复制新单':
 
           if (row.nameTwo === '详情页'){
+            this.submitAndSave(3)
             console.log(this.$refs.avatar.form)
-            let datae = {
-              fId:this.$refs.avatar.form.fId,
-              fBilltype:'SQ'
-            }
-            copyNew(datae).then(res=>{
-              this.$message({
-                message: '复制新单成功',
-                type: 'success',
-                showClose:true
-              });
-              let scope = {
-                row:{
-                  fId:res.data
-                }
-              }
-              this.query(this.formDataList)
-              this.viewMethod(scope)
-            })
           }else {
             if (this.selection.length > 0){
               let datae = {