Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/administrative/DjCommissionsmangment.vue

@@ -35,6 +35,9 @@
           <el-tooltip class="item" effect="dark" content="一键制单" placement="top">
             <el-button @click="YijianZD(item)" type="danger" class="CM_look" icon="iconfont icon-mui-icon-add" circle></el-button>
           </el-tooltip>
+          <el-tooltip class="item" effect="dark" content="手动制单" placement="top">
+            <el-button type="primary" class="CM_look" @click="goUrlZD" icon="iconfont icon-danju1" circle></el-button>
+          </el-tooltip>    
           <el-tooltip class="item" effect="dark" content="查看" placement="top">
             <el-button type="primary" class="CM_look" @click="goUrl('DjCommissionDetail',item.ID)" icon="iconfont icon-chakan" circle></el-button>
           </el-tooltip>
@@ -70,6 +73,27 @@
       this.getList();
     },
     methods: {
+      goUrlZD(){
+        let orderObj = {
+          OrderID: 0,
+          OrderSource: 8,
+          Obj: {},
+          SourceID: 0,
+          CostType: 112,
+          SelectState:true,
+        }
+        console.log(JSON.stringify(orderObj))
+        let id=[29,31];
+        this.$router.push({
+            name: 'ChoiceAddFinancialDocuments',
+            query: {
+              Type: 2,
+              templateID: JSON.stringify(id),
+              'blank': 'y',
+              'orderObj': JSON.stringify(orderObj)
+            }
+          })
+      },
       YijianZD(item){
         this.$confirm('提成金额是否正确?', '提示', {
           confirmButtonText: '确定',
@@ -95,26 +119,26 @@
           
         });
       },
-      goUrlZD(num){
-        let orderObj = {
-          OrderID: 0,
-          OrderSource: 8,
-          Obj: {},
-          SourceID: 0,
-          CostType: num,
-          SelectState:true,
-        }
-        let id=[29,31];
-        this.$router.push({
-            name: 'ChoiceAddFinancialDocuments',
-            query: {
-              Type: 2,
-              templateID: JSON.stringify(id),
-              'blank': 'y',
-              'orderObj': JSON.stringify(orderObj)
-            }
-          })
-      },
+      // goUrlZD(num){
+      //   let orderObj = {
+      //     OrderID: 0,
+      //     OrderSource: 8,
+      //     Obj: {},
+      //     SourceID: 0,
+      //     CostType: num,
+      //     SelectState:true,
+      //   }
+      //   let id=[29,31];
+      //   this.$router.push({
+      //       name: 'ChoiceAddFinancialDocuments',
+      //       query: {
+      //         Type: 2,
+      //         templateID: JSON.stringify(id),
+      //         'blank': 'y',
+      //         'orderObj': JSON.stringify(orderObj)
+      //       }
+      //     })
+      // },
       handleCurrentChange(val) {
         this.msg.PageIndex = val;
         this.getList();