liyuanpeng před 3 roky
rodič
revize
3b69e10b12

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 608 - 414
src/pages/main/memberFamily/haveInHand.vue


+ 23 - 12
src/pages/main/memberFamily/index.vue

@@ -38,7 +38,7 @@
 					<span>统计周期</span>
 					<el-date-picker v-model="infolist.time" type="daterange"></el-date-picker>
 				</el-form-item>
-				
+
 				<el-form-item class="info-line online">
 				    <span>填报人</span>
 				    <deptTree v-if="!disableStatus" :closeList="closeList" class="tree" @treeCheck="treeCheck">
@@ -71,7 +71,7 @@
 				<el-button @click="dialogCli(2)">取 消</el-button>
 			</div>
 		</el-dialog>
-		
+
 		<el-dialog title="选择负责人" :visible.sync="dialogStatusp" width="50%" :destroy-on-close="true"
 			:modal-append-to-body="false" :close-on-click-modal="false">
 			<el-form :model="infolist" ref="infolist" style="height: 50vh;overflow-y: scroll;">
@@ -268,10 +268,21 @@
 			},
 			advmaterial(v) {
 				if(v.dataCode == 1){
-					this.$router.push({
-						path: "/empInfoFilling",
-					});
-					this.setabList("信息填报", "/empInfoFilling");
+                    this.$http({
+                        url: "/market/cMemberFill/queryMkMemberFillInfo",
+                        method: "post",
+                        headers: {
+                            "Content-Type": "application/json",
+                        },
+                        data: {},
+                    }).then((res) => {
+                        if(res.data){
+                            this.$router.push({
+                            	path: "/empInfoFilling",
+                            });
+                            this.setabList("信息填报", "/empInfoFilling");
+                        }
+                    });
 				}else{
 					this.$router.push({
 						path: "/dataStatistics",
@@ -464,7 +475,7 @@
 				display: inline-block;
 				width: calc(100% - 100px);
 			}
-		
+
 		    .el-icon-error {
 		        float: right;
 		        font-size: 20px;
@@ -472,18 +483,18 @@
 		        cursor: pointer;
 		    }
 		}
-		
+
 		.treeUser {
 		    margin: 0;
 		    border: 1px solid #ddd;
-		
+
 		    p {
 		        background: #f4f4f4;
 		        padding: 0 20px;
 		        margin-bottom: 5px;
 		    }
 		}
-		
+
 		.treeUserb {
 		    width: calc(100% - 100px);
 		    border: 1px solid #ddd;
@@ -491,7 +502,7 @@
 		    border-radius: 3px;
 		    height: auto;
 		    overflow: hidden;
-		
+
 		    p {
 		        display: inline-block;
 		        padding: 0 20px;
@@ -499,7 +510,7 @@
 		    }
 		}
 	}
-	
+
 	.treeUserp{
 		p{
 			padding: 5px;

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1002 - 0
src/pages/main/outCallDemand/index.vue


+ 6 - 0
src/router/index.js

@@ -10,6 +10,12 @@ const routes = [{
     redirect: '/leader',
     children: [
 		{
+		    meta: { name:  '外呼需求申请', keepAlive: false },
+		    path: '/outCallDemand',
+		    name: 'outCallDemand',
+		    component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/outCallDemand/index.vue'], resolve)
+		},
+		{
 		    meta: { name:  '员工信息填报', keepAlive: false },
 		    path: '/empInfoFilling',
 		    name: 'empInfoFilling',