update

src/components/FinancialModule/ReportForm/RevenueFileMan.vue

@@ -101,6 +101,9 @@
             <el-tooltip class="item" effect="dark" content="删除" placement="top-start">
                 <el-button v-if="item.CreateBy==EmployeeId && item.ConfirmStatus==1" @click="Delete(item)" style="padding:4px" type="danger" icon="el-icon-delete" circle></el-button>    
             </el-tooltip>
+            <el-tooltip class="item" effect="dark" content="红利制单" placement="top-start">
+                <el-button v-if="item.ConfirmStatus==2 && item.EmployeeId==EmployeeId" @click="goUrl(item)" style="padding:4px" type="success" icon="el-icon-circle-plus" circle></el-button>
+            </el-tooltip>
             
         </td>
       </tr>
@@ -280,6 +283,19 @@ export default {
     },
     
     methods:{
+        goUrl(){
+            this.$router.push({
+                name: 'addFinancialDocuments',
+                query: {
+                    id: 20,
+                    Name: '员工红利单',
+                    Type: 2,
+                    IsUploadPic:1,
+                    blank: "y",
+                    tab: name
+                }
+            });
+        },
         Delete(item){
             this.$confirm('是否删除?', '提示', {
                     confirmButtonText: '确定',

src/components/PrintPageN.vue

@@ -27,7 +27,7 @@
       position: absolute;
       top:10px;
       color:#106BAF;
-      left: -130px;
+      left: -190px;
     }
     ._PrintPage_box .SetDiv span{
         color:#106BAF;
@@ -37,8 +37,9 @@
 <template v-loading="loading">
     <div class="_PrintPage">
         <div class="_PrintPage_box">
-            <template v-if="type==='2'&&(Merge==='0' ||Merge===null)">
+            <template v-if="type==='2'&&(Merge==='0' || Merge===null || (Merge==='1' && hedan==1)) ">
                 <div class="SetDiv">
+                    <span v-if="Merge==='1' " @click="goUrl(1)">切换</span>
                     <span @click="disabled=false">编辑</span>
                     <span @click="disabled=true">保存</span>
                 </div>
@@ -60,8 +61,9 @@
                     <my-GZ-Bill :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :OrderSource="OrderSource" :name='index+1'></my-GZ-Bill>
                 </div>
             </template>
-            <template v-if="Merge==='1'">
+            <template v-if="(Merge==='1' && hedan==2)">
                 <div class="SetDiv">
+                    <span @click="goUrl(2)">切换</span>
                     <span @click="disabled2=false">编辑</span>
                     <span @click="disabled2=true">保存</span>
                 </div>
@@ -107,6 +109,7 @@ export default {
             Merge:null,
             OrderSource:-1,
             CapitalState:false,
+            hedan:1,
         }
     },components:{
         'my-Bill': myBill,
@@ -117,18 +120,45 @@ export default {
     },methods:{
         numAdd(){ 
             this.num = this.num + 1
-        }
+        },
+        goUrl(num){
+            let hedan;
+            if(num==1){
+                hedan=2;
+            }else{
+                hedan=1;
+            }
+            if(this.type===1){
+                let routeData = this.$router.resolve({
+                    name: 'PrintPageN',
+                    query: { hedan:hedan,type: this.type,id:this.id,isKehu:0,Merge:this.Merge,OrderSource:this.OrderSource?this.OrderSource:-1}
+                });
+                window.open(routeData.href, "_blank");
+            }else{
+                let routeData = this.$router.resolve({
+                    name: 'PrintPageN',
+                    query: { hedan:hedan,type: this.type,id:this.id,Merge:this.Merge,OrderSource:this.OrderSource?this.OrderSource:-1}
+                });
+                window.open(routeData.href, "_blank");
+            }
+        },
     },mounted(){
 
     },created(){
         this.id = this.$route.query.id;
         this.type = this.$route.query.type;
         this.isKehu = this.$route.query.isKehu;
+        if(this.$route.query.hedan){
+            this.hedan=this.$route.query.hedan;
+        }
+        
         this.Merge = this.$route.query.Merge;
         this.OrderSource = this.$route.query.OrderSource;
         if(this.$route.query.Capital){
             this.CapitalState=true;
         }
+        console.log("hedan",this.hedan)
+        console.log("Merge",this.Merge)
         
   }
 }

src/components/index.vue

@@ -191,11 +191,11 @@
                       合同管理
                        <i class="iconfont icon-right1"></i>
                     </el-dropdown-item>
-                    <!-- <el-dropdown-item class="clearfix _dropdown_other"  @click.native="goUrlZC()">
+                    <el-dropdown-item class="clearfix _dropdown_other"  @click.native="goUrlZC()">
                       <i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
                       资产管理
                        <i class="iconfont icon-right1"></i>
-                    </el-dropdown-item> -->
+                    </el-dropdown-item>
 
                     <!-- <el-dropdown-item class="clearfix _dropdown_other"  @click.native="settingSys">
                       <i class="iconfont icon-menu-shezhi1" style="color:#2c3e50"></i>
@@ -3604,10 +3604,15 @@ export default {
     },
     goUrlZC(){
       let url='';
+      let obj={};
+      let userinfo=this.getLocalStorage();
+      obj.token=userinfo.token;
+      obj.SecretKey=userinfo.SecretKey;
+      let ObjInfo=JSON.stringify(obj);
       if (!this.isOnline()) {
-          url="http://www.test.com:8080/#/Home";
+          url="http://www.test.com:8080/#/login?token="+userinfo.token+"&SecretKey="+userinfo.SecretKey;
       }else{
-          url="http://zcyx.oytour.com/#/Home";
+          url="http://zcyx.oytour.com/#/login?ObjInfo="+ObjInfo;
       }
       window.open(url)
     },