guangao

src/pages/main/advReleaseAppro/index.vue

@@ -114,10 +114,10 @@
 						</el-form-item>
 					</div>
 					
-					<myinternet v-if="woTypeCode == 1" :titname='titname' :vision='vision' @backsum="backsum" :infodatas="infodatas" :status="status" :allsumnum="allsum"></myinternet>
-					<television v-if="woTypeCode == 2" :titname='titname' :vision='vision' @backsum="backsum" :infodatas="infodatas" :status="status" :allsumnum="allsum"></television>
-					<paper v-if="woTypeCode == 3" :titname='titname' :vision='vision' @backsum="backsum" :infodatas="infodatas" :status="status" :allsumnum="allsum"></paper>
-					<outdoors v-if="woTypeCode == 4" :titname='titname' :vision='vision' @backsum="backsum" :taxRate="suppinfo.taxRate" :infodatas="infodatas" :status="status" :allsumnum="allsum" :otherinfo="otherinfo"></outdoors>
+					<myinternet v-if="woTypeCode == 1" :titname='titname' :vision='vision' @backsum="backsum" :infodatas="infodatas" :status="status" :allSumnum="allSum"></myinternet>
+					<television v-if="woTypeCode == 2" :titname='titname' :vision='vision' @backsum="backsum" :infodatas="infodatas" :status="status" :allSumnum="allSum"></television>
+					<paper v-if="woTypeCode == 3" :titname='titname' :vision='vision' @backsum="backsum" :infodatas="infodatas" :status="status" :allSumnum="allSum"></paper>
+					<outdoors v-if="woTypeCode == 4" :titname='titname' :vision='vision' @backsum="backsum" :taxRate="suppinfo.taxRate" :infodatas="infodatas" :status="status" :allSumnum="allSum" :otherinfo="otherinfo"></outdoors>
 					
 					<div class="info-line" style="clear: both;">
 						<el-form-item>
@@ -182,7 +182,7 @@
 				<div slot="footer" class="dialog-footer myfooter">
 					<el-button v-if="titname != '查看' && vision == '流程发起'" type="primary" @click="dialogCli(2)">确 定
 					</el-button>
-					<el-button v-if="titname != '查看' && vision == '上刊用印'" type="primary" @click="dialogCli(2)">确 定
+					<el-button v-if="titname != '查看' && vision == '上刊用印'" type="primary" @click="dialogCli(2)">导 出
 					</el-button>
 					<el-button v-if="titname != '查看' && visionsts == '2'" type="primary" @click="dialogCli(2)">通 过
 					</el-button>
@@ -361,7 +361,7 @@
 				suppliersts: false,
 				suppList: [],
 				suppinfo: {},//供应商信息
-				allsum:0,//合计总价
+				allSum:0,//合计总价
 				status:false,//组件数据状态
 				otherinfo:{},
 			}
@@ -369,7 +369,7 @@
 		methods: {
 			//组件返回数据
 			backsum(v,n,x){
-				this.allsum = v;
+				this.allSum = v;
 				this.infodatas = n;
 				if(x){
 					this.otherinfo.advPriceSum= x.advPriceSum;
@@ -477,7 +477,7 @@
 					this.opno = res.data.opNo;
 					this.infolist = JSON.parse(res.data.params.terminalRes);
 					this.infodatas = this.infolist.factoryList;//组件数据
-					this.allsum = this.infolist.allsum;//合计总价
+					this.allSum = this.infolist.allSum;//合计总价
 					this.suppinfo = this.infolist.suppinfo;//供应商
 					this.woTypeCode = this.infolist.woTypeCode*1;//类型
 					this.otherinfo = this.infolist.otherinfo;//类型
@@ -628,7 +628,40 @@
 						}
 						param.params.attList = JSON.stringify(attList)
 					}
-					this.submitInfo("/bpm/api/submitTask", param);
+					if(this.vision == '上刊用印'){
+						let param = new FormData();
+						param.append("woNo", this.infolist.woNo);
+						this.$http({
+							url: "/market/cAdvPubWo/excelExport",
+							method: "post",
+							headers: {
+								"Content-Type": "application/json",
+							},
+							 responseType: "blob",
+							data: param,
+						}).then((response) => {
+							if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+							    let blob = new Blob([response.data], {
+							        type: 'application/vnd.ms-excel'
+							    })
+							    window.navigator.msSaveOrOpenBlob(blob,
+							        new Date().getTime() + '.xlsx')
+							} else {
+							    /* 火狐谷歌的文件下载方式 */
+							    var blob = new Blob([response.data])
+							    var downloadElement = document.createElement('a')
+							    var href = window.URL.createObjectURL(blob)
+							    downloadElement.href = href
+							    downloadElement.download = new Date().getTime() + '.xlsx'
+							    document.body.appendChild(downloadElement)
+							    downloadElement.click()
+							    document.body.removeChild(downloadElement)
+							    window.URL.revokeObjectURL(href)
+							}
+						});
+					}else{
+						this.submitInfo("/bpm/api/submitTask", param);
+					}
 				}
 			},
 			//添加
@@ -636,8 +669,8 @@
 				let _this = this;
 				let info = {};
 				info.opTime = _this.$formatDate(new Date(), "YYYY-MM-DD HH:mm:ss");
-				this.infolist.atime = _this.$formatDate(this.infolist.atime, "YYYY-MM-DD");
-				this.infolist.btime = _this.$formatDate(this.infolist.btime, "YYYY-MM-DD");
+				this.infolist.atime?this.infolist.atime = _this.$formatDate(this.infolist.atime, "YYYY-MM-DD"):'';
+				this.infolist.btime?this.infolist.btime = _this.$formatDate(this.infolist.btime, "YYYY-MM-DD"):'';
 				info.opNo = this.userInfo.loginNo;
 				info.opName = this.userInfo.loginName;
 				info.woTitle = this.infolist.woName;
@@ -653,7 +686,7 @@
 					infodatas.push(this.infodatas[i])
 				}
 				info.params.terminalRes.factoryList = infodatas;
-				info.params.terminalRes.allsum = this.allsum;
+				info.params.terminalRes.allSum = this.allSum;
 				info.params.terminalRes.woTypeCode = this.woTypeCode;
 				info.params.terminalRes.suppinfo = this.suppinfo;
 				info.params.terminalRes.otherinfo = this.otherinfo;
@@ -685,7 +718,7 @@
 			submitInfo(u, v) {
 				let _this = this;
 				this.$refs.infolist.validate(valid => {
-					if(this.suppinfo.surplusSum < this.allsum){
+					if(this.suppinfo.surplusSum < this.allSum){
 						this.$message({
 							message: '供应商剩余预算不足!',
 							type: 'error'
@@ -701,7 +734,7 @@
 						},
 						data: {},
 					}).then((res) => {
-						if(res.data.data[0].surplusSum < _this.allsum){
+						if(res.data.data[0].surplusSum < _this.allSum){
 							_this.$message({
 								message: '地市预算不足!',
 								type: 'error'

src/pages/main/advReleaseAppro/internet.vue

@@ -341,18 +341,18 @@
 			</el-table-column>
 
 		</el-table>
-		<div class="sumbox">总价：{{allsum}}</div>
+		<div class="sumbox">总价：{{allSum}}</div>
 	</div>
 
 </template>
 
 <script>
 	export default {
-		props: ["vision", "titname","infodatas","status","allsumnum"],
+		props: ["vision", "titname","infodatas","status","allSumnum"],
 		data() {
 			return {
 				infodata: [],
-				allsum: 0
+				allSum: 0
 			};
 		},
 		methods: {
@@ -362,9 +362,9 @@
 				} else {
 					this.infodata.splice(n.$index, 1)
 				}
-				this.allsum = 0;
+				this.allSum = 0;
 				for (let i = 0; i < this.infodata.length; i++) {
-					this.allsum += this.infodata[i].buyPrice;
+					this.allSum += this.infodata[i].buyPrice;
 				}
 			},
 			sumprice(v){
@@ -376,9 +376,9 @@
 				this.infodata[v.$index].buyPrice = info.discountPrice*info.exposureSum;
 				this.infodata[v.$index].buyPrice = Math.floor(this.infodata[v.$index].buyPrice * 100) / 100;
 				
-				this.allsum = 0;
+				this.allSum = 0;
 				for (let i = 0; i < this.infodata.length; i++) {
-					this.allsum += this.infodata[i].buyPrice;
+					this.allSum += this.infodata[i].buyPrice;
 				}
 			},
 			sumday(v) {
@@ -417,9 +417,9 @@
 				info.d31 ? this.infodata[v.$index].exposureSum += info.d31 * 1 : '';
 				this.infodata[v.$index].buyPrice = info.discountPrice*info.exposureSum;
 				this.infodata[v.$index].buyPrice = Math.floor(this.infodata[v.$index].buyPrice * 100) / 100;
-				this.allsum = 0;
+				this.allSum = 0;
 				for (let i = 0; i < this.infodata.length; i++) {
-					this.allsum += this.infodata[i].buyPrice;
+					this.allSum += this.infodata[i].buyPrice;
 				}
 			}
 		},
@@ -428,16 +428,16 @@
 			this.infodata = [{exposureSum:0,discountPrice:0,buyPrice:0,discountRate:0}, {exposureSum:0,discountPrice:0,buyPrice:0,discountRate:0}];
 			if(this.status){
 				this.infodata = this.infodatas;
-				this.allsum = this.allsumnum;
+				this.allSum = this.allSumnum;
 			}
 		},
 		watch:{
-			allsum(v){
-				this.$emit('backsum',this.allsum,this.infodata)
+			allSum(v){
+				this.$emit('backsum',this.allSum,this.infodata)
 			},
 			status(v){
 				this.infodata = this.infodatas;
-				this.allsum = this.allsumnum;
+				this.allSum = this.allSumnum;
 			}
 		}
 	};

src/pages/main/advReleaseAppro/outdoors.vue

@@ -5,7 +5,7 @@
 			style="width: 100%">
 			<el-table-column prop="media_type_name" label="媒体类别" width="200">
 				<template slot-scope="scope">
-					<el-select clearable v-model="scope.row.mediaTypeName" :disabled="titname != '添加'&&vision != '流程发起'">
+					<el-select clearable v-model="scope.row.mediaTypeCode" :disabled="titname != '添加'&&vision != '流程发起'" @change="getname(scope)">
 						<el-option v-for="items in mediaType" :key="items.dataCode" :label="items.dataName" :value="items.dataCode">
 						</el-option>
 					</el-select>
@@ -99,7 +99,7 @@
 						@change="sumadd" type="number" style="width: 100px;"></el-input></span>
 			<span class="sumbox">广告发布费：{{contractAdvCost}}</span>
 			<span class="sumbox">税费：{{contractAdvTax}}</span>
-			<span class="sumbox">合同总价款：{{contractCost}}</span>
+			<span class="sumbox">合同总价款：{{allSum}}</span>
 		</div>
 	</div>
 
@@ -107,11 +107,11 @@
 
 <script>
 	export default {
-		props: ["vision", "titname", "taxRate","infodatas","status","allsumnum","otherinfo"],
+		props: ["vision", "titname", "taxRate","infodatas","status","allSumnum","otherinfo"],
 		data() {
 			return {
 				infodata: [],
-				contractCost: 0,
+				allSum: 0,
 				advPriceSum: 0,
 				advDiscountSum: 0,
 				contractAdvCost: 0,
@@ -150,7 +150,7 @@
 				this.contractAdvTax = this.contractAdvCost*(this.taxRate.split("%")[0]*1)/100;
 				this.contractAdvCost = Math.round(this.contractAdvCost * 100) / 100;
 				this.contractAdvTax = Math.round(this.contractAdvTax * 100) / 100;
-				this.contractCost = this.contractAdvCost + this.contractAdvTax;
+				this.allSum = this.contractAdvCost + this.contractAdvTax;
 			},
 			gettype(){
 				this.$http({
@@ -165,6 +165,13 @@
 				}).then((res) => {
 				    this.mediaType = res.data;
 				});
+			},
+			getname(v){
+				for (let i = 0; i < this.mediaType.length; i++) {
+					if(this.mediaType[i].mediaTypeCode == v.row.mediaTypeCode){
+						this.infodata[v.$index].mediaTypeName = this.mediaType[i].mediaTypeName
+					}
+				}
 			}
 		},
 		mounted() {},
@@ -181,7 +188,7 @@
 			this.gettype();
 			if(this.status){
 				this.infodata = this.infodatas;
-				this.contractCost = this.allsumnum;
+				this.allSum = this.allSumnum;
 				this.advPriceSum = this.otherinfo.advPriceSum;
 				this.advDiscountSum = this.otherinfo.advDiscountSum;
 				this.contractAdvCost = this.otherinfo.contractAdvCost;
@@ -190,7 +197,7 @@
 			}
 		},
 		watch: {
-			contractCost(v) {
+			allSum(v) {
 				let x= {
 					advPriceSum: this.advPriceSum,
 					advDiscountSum: this.advDiscountSum,
@@ -198,14 +205,18 @@
 					contractAdvTax: this.contractAdvTax,
 					otherDiscount: this.otherDiscount
 				}
-				this.$emit('backsum', this.contractCost,this.infodata,x)
+				for (let i = 0; i < this.infodata.length; i++) {
+					this.infodata[i].startTime?this.infodata[i].startTime = this.$formatDate(this.infodata[i].startTime, "YYYY-MM-DD"):'';
+					this.infodata[i].endTime?this.infodata[i].endTime = this.$formatDate(this.infodata[i].endTime, "YYYY-MM-DD"):'';
+				}
+				this.$emit('backsum', this.allSum,this.infodata,x)
 			},
 			taxRate(){
 				this.sumadd();
 			},
 			status(v){
 				this.infodata = this.infodatas;
-				this.contractCost = this.allsumnum;
+				this.allSum = this.allSumnum;
 				this.advPriceSum = this.otherinfo.advPriceSum;
 				this.advDiscountSum = this.otherinfo.advDiscountSum;
 				this.contractAdvCost = this.otherinfo.contractAdvCost;

src/pages/main/advReleaseAppro/paper.vue

@@ -72,17 +72,17 @@
 				</template>
 			</el-table-column>
 		</el-table>
-		<div class="sumbox">总价：{{allsum}}</div>
+		<div class="sumbox">总价：{{allSum}}</div>
 	</div>
 </template>
 
 <script>
 	export default {
-		props: ["vision", "titname","infodatas","status","allsumnum"],
+		props: ["vision", "titname","infodatas","status","allSumnum"],
 		data() {
 			return {
 				infodata: [],
-				allsum: 0
+				allSum: 0
 			};
 		},
 		methods: {
@@ -92,15 +92,15 @@
 				} else {
 					this.infodata.splice(n.$index, 1)
 				}
-				this.allsum = 0;
+				this.allSum = 0;
 				for (let i = 0; i < this.infodata.length; i++) {
-					this.allsum += this.infodata[i].costAll*1;
+					this.allSum += this.infodata[i].costAll*1;
 				}
 			},
 			sumfyno(){
-				this.allsum = 0;
+				this.allSum = 0;
 				for (let i = 0; i < this.infodata.length; i++) {
-					this.allsum += this.infodata[i].costAll*1;
+					this.allSum += this.infodata[i].costAll*1;
 				}
 			}
 		},
@@ -109,16 +109,16 @@
 			this.infodata = [{costAll:0}, {costAll:0}];
 			if(this.status){
 				this.infodata = this.infodatas;
-				this.allsum = this.allsumnum;
+				this.allSum = this.allSumnum;
 			}
 		},
 		watch:{
-			allsum(v){
-				this.$emit('backsum',this.allsum,this.infodata)
+			allSum(v){
+				this.$emit('backsum',this.allSum,this.infodata)
 			},
 			status(v){
 				this.infodata = this.infodatas;
-				this.allsum = this.allsumnum;
+				this.allSum = this.allSumnum;
 			}
 		}
 	};

src/pages/main/advReleaseAppro/television.vue

@@ -1,30 +1,26 @@
 <template>
 	<!-- 广播及电视上刊确认单样例 -->
 	<div style="margin: 5px 0 20px 0;padding: 0 20px;">
-		<el-table class="com-table" ref="multipleTable" :data="infodata" tooltip-effect="dark"
-			size="small" border style="width: 100%">
+		<el-table class="com-table" ref="multipleTable" :data="infodata" tooltip-effect="dark" size="small" border
+			style="width: 100%">
 			<el-table-column prop="media_name" label="媒体" width="200">
 				<template slot-scope="scope">
-					<el-input v-model="scope.row.mediaName"
-						:disabled="titname != '添加'&&vision != '流程发起'"></el-input>
+					<el-input v-model="scope.row.mediaName" :disabled="titname != '添加'&&vision != '流程发起'"></el-input>
 				</template>
 			</el-table-column>
-			<el-table-column prop="infoCode" label="栏目" width="200">
+			<el-table-column prop="colMenu" label="栏目" width="200">
 				<template slot-scope="scope">
-					<el-input v-model="scope.row.lm"
-						:disabled="titname != '添加'&&vision != '流程发起'"></el-input>
+					<el-input v-model="scope.row.colMenu" :disabled="titname != '添加'&&vision != '流程发起'"></el-input>
 				</template>
 			</el-table-column>
 			<el-table-column prop="adv_form" label="具体形式" width="200">
 				<template slot-scope="scope">
-					<el-input v-model="scope.row.advForm"
-						:disabled="titname != '添加'&&vision != '流程发起'"></el-input>
+					<el-input v-model="scope.row.advForm" :disabled="titname != '添加'&&vision != '流程发起'"></el-input>
 				</template>
 			</el-table-column>
 			<el-table-column prop="put_spec" label="规格" width="200">
 				<template slot-scope="scope">
-					<el-input v-model="scope.row.putSpec"
-						:disabled="titname != '添加'&&vision != '流程发起'"></el-input>
+					<el-input v-model="scope.row.putSpec" :disabled="titname != '添加'&&vision != '流程发起'"></el-input>
 				</template>
 			</el-table-column>
 			<el-table-column prop="put_cycle" label="发布周期" width="200">
@@ -35,105 +31,121 @@
 			</el-table-column>
 			<el-table-column prop="put_freq" label="频次" width="200">
 				<template slot-scope="scope">
-					<el-input v-model="scope.row.putFreq"
-						:disabled="titname != '添加'&&vision != '流程发起'"></el-input>
+					<el-input v-model="scope.row.putFreq" :disabled="titname != '添加'&&vision != '流程发起'"></el-input>
 				</template>
 			</el-table-column>
 			<el-table-column prop="start_time" label="时段" width="200">
-				<template slot-scope="scope">
-					<el-input v-model="scope.row.startTime"
-						:disabled="titname != '添加'&&vision != '流程发起'"></el-input>
-				</template>
+				<el-table-column prop="start_time" label="开始时间" width="200">
+					<template slot-scope="scope">
+						<el-date-picker :disabled="titname != '添加'&&vision != '流程发起'" v-model="scope.row.startTime"
+							type="date">
+						</el-date-picker>
+					</template>
+				</el-table-column>
+				<el-table-column prop="start_time" label="结束时间" width="200">
+					<template slot-scope="scope">
+						<el-date-picker :disabled="titname != '添加'&&vision != '流程发起'" v-model="scope.row.endTime"
+							type="date">
+						</el-date-picker>
+					</template>
+				</el-table-column>
 			</el-table-column>
 			<el-table-column prop="adv_price" label="刊例价" width="200">
 				<template slot-scope="scope">
-					<el-input v-model="scope.row.advPrice"
-						:disabled="titname != '添加'&&vision != '流程发起'"></el-input>
+					<el-input v-model="scope.row.advPrice" :disabled="titname != '添加'&&vision != '流程发起'"></el-input>
 				</template>
 			</el-table-column>
 			<el-table-column prop="discount_rate" label="折扣" width="200">
 				<template slot-scope="scope">
-					<el-input v-model="scope.row.discountRate"
-						:disabled="titname != '添加'&&vision != '流程发起'"></el-input>
+					<el-input v-model="scope.row.discountRate" :disabled="titname != '添加'&&vision != '流程发起'"></el-input>
 				</template>
 			</el-table-column>
 			<el-table-column label="结算" align="center">
 				<el-table-column prop="num_days" label="天数" width="100">
 					<template slot-scope="scope">
-						<el-input v-model="scope.row.numDays"
-							:disabled="titname != '添加'&&vision != '流程发起'"></el-input>
+						<el-input v-model="scope.row.numDays" :disabled="titname != '添加'&&vision != '流程发起'"></el-input>
 					</template>
 				</el-table-column>
 				<el-table-column prop="cost_tax" label="金额(含税)" width="100">
 					<template slot-scope="scope">
-						<el-input v-model="scope.row.costTax"
-							:disabled="titname != '添加'&&vision != '流程发起'"></el-input>
+						<el-input v-model="scope.row.costTax" :disabled="titname != '添加'&&vision != '流程发起'"></el-input>
 					</template>
 				</el-table-column>
 				<el-table-column prop="cost_all" label="金额(不含税)" width="100">
 					<template slot-scope="scope">
-						<el-input v-model="scope.row.costAll"
-							:disabled="titname != '添加'&&vision != '流程发起'" @change="sumjeno">
+						<el-input v-model="scope.row.costAll" :disabled="titname != '添加'&&vision != '流程发起'"
+							@change="sumjeno">
 						</el-input>
 					</template>
 				</el-table-column>
 			</el-table-column>
-	
-			<el-table-column label="操作" width="120px" align="center" v-if="titname == '添加'"
-				fixed="right">
+
+			<el-table-column label="操作" width="120px" align="center" v-if="titname == '添加'" fixed="right">
 				<template slot-scope="scope">
 					<el-button size="mini" type="primary" @click="choline(1,scope)">添加</el-button>
 					<el-button size="mini" type="danger" @click="choline(2,scope)">删除</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
-		<div class="sumbox">总价：{{allsum}}</div>
+		<div class="sumbox">总价：{{allSum}}</div>
 	</div>
 </template>
 
 <script>
 	export default {
-		props: ["vision", "titname","infodatas","status","allsumnum"],
+		props: ["vision", "titname", "infodatas", "status", "allSumnum"],
 		data() {
 			return {
 				infodata: [],
-				allsum: 0
+				allSum: 0
 			};
 		},
 		methods: {
 			choline(v, n) {
 				if (v == 1) {
-					this.infodata.push({costAll:0})
+					this.infodata.push({
+						costAll: 0
+					})
 				} else {
 					this.infodata.splice(n.$index, 1)
 				}
-				this.allsum = 0;
+				this.allSum = 0;
 				for (let i = 0; i < this.infodata.length; i++) {
-					this.allsum += this.infodata[i].costAll*1;
+					this.allSum += this.infodata[i].costAll * 1;
 				}
 			},
-			sumjeno(){
-				this.allsum = 0;
+			sumjeno() {
+				this.allSum = 0;
 				for (let i = 0; i < this.infodata.length; i++) {
-					this.allsum += this.infodata[i].costAll*1;
+					this.allSum += this.infodata[i].costAll * 1;
+				}
+				for (let i = 0; i < this.infodata.length; i++) {
+					this.infodata[i].startTime ? this.infodata[i].startTime = this.$formatDate(this.infodata[i].startTime,
+						"YYYY-MM-DD") : '';
+					this.infodata[i].endTime ? this.infodata[i].endTime = this.$formatDate(this.infodata[i].endTime,
+						"YYYY-MM-DD") : '';
 				}
 			}
 		},
 		mounted() {},
 		created() {
-			this.infodata = [{costAll:0}, {costAll:0}];
-			if(this.status){
+			this.infodata = [{
+				costAll: 0
+			}, {
+				costAll: 0
+			}];
+			if (this.status) {
 				this.infodata = this.infodatas;
-				this.allsum = this.allsumnum;
+				this.allSum = this.allSumnum;
 			}
 		},
-		watch:{
-			allsum(v){
-				this.$emit('backsum',this.allsum,this.infodata)
+		watch: {
+			allSum(v) {
+				this.$emit('backsum', this.allSum, this.infodata)
 			},
-			status(v){
+			status(v) {
 				this.infodata = this.infodatas;
-				this.allsum = this.allsumnum;
+				this.allSum = this.allSumnum;
 			}
 		}
 	};
@@ -148,4 +160,7 @@
 		margin: 20px 0;
 		font-size: 18px;
 	}
+	.el-date-editor{
+		width: 178px!important;
+	}
 </style>

src/pages/main/personlManage/census.vue

@@ -0,0 +1,207 @@
+<template>
+	<fullscreen :fullscreen.sync="fullscreen" class="container">
+		<div class="container-box">
+			<toolList @iconCli='iconCli' :tooltit='tooltit'></toolList>
+			<!-- <div class="search">
+                <mySearch :searchList="searchList" @searchInfo="searchInfo"></mySearch>
+            </div> -->
+			<div class="tabbox">
+				<el-table height="calc(100% - 40px)" class="com-table" ref="multipleTable" :data="tableData"
+					tooltip-effect="dark" size="small" border style="width: 100%" v-loading="loading">
+					<el-table-column prop="lineStrip" label="线条">
+					</el-table-column>
+					<el-table-column prop="frameSumName" label="科室">
+					</el-table-column>
+					<el-table-column prop="regionNum" label="地市公司">
+					</el-table-column>
+					<el-table-column prop="magorNum" label="专业公司">
+					</el-table-column>
+					<el-table-column prop="auxiliaryNum" label="辅助运营人员">
+					</el-table-column>
+					<el-table-column prop="totalNum" label="合计">
+					</el-table-column>
+				</el-table>
+				<el-pagination class="pageBox" @current-change="currchange" layout="prev, pager, next" background
+					:total="total">
+				</el-pagination>
+			</div>
+		</div>
+	</fullscreen>
+</template>
+<script>
+	import mySearch from "../../../components/search.vue";
+	import toolList from "../../../components/toolList.vue";
+
+	export default {
+		components: {
+			mySearch,
+			toolList
+		},
+		data() {
+
+			return {
+				tooltit: '人员统计',
+				searchList: [{
+						type: 'date',
+						tit: '开始时间',
+						value: '',
+						width: '49%',
+					},
+					{
+						type: 'date',
+						tit: '结束时间',
+						value: '',
+						width: '49%',
+					},
+				],
+				fullscreen: false,
+				total: 0,
+				pageSize: 1,
+				tableData: [],
+				dialogStatus: false,
+				disableStatus: false,
+				titname: '终端',
+				infolist: {},
+				typeOptions: [{
+					dataCode: 1,
+					dataName: 111,
+				}],
+				userInfo: {},
+				params: {},
+				infoApply: [],
+				loading: false
+			}
+		},
+		methods: {
+			//搜索数据
+			searchInfo(v) {
+				this.params = {};
+				v[0] ? this.params.recTimeFrom = this.$formatDate(v[0], "YYYY-MM-DD HH:mm:ss") : '';
+				v[1] ? this.params.recTimeTo = this.$formatDate(v[1], "YYYY-MM-DD HH:mm:ss") : '';
+				this.getList(this.params, this.pageSize);
+			},
+			//获取列表
+			getList(v, n) {
+				this.pageSize = n;
+				let _this = this;
+				this.loading = true;
+				this.tableData = [];
+				this.$http({
+					url: "/market/cwo/queryTotalPage",
+					method: "post",
+					headers: {
+						"Content-Type": "application/json",
+						"page": '{"pageNo":"' + n + '","pageSize":"10"}'
+					},
+					data: v,
+				}).then((res) => {
+					this.tableData = res.data.data;
+					this.total = res.data.totalRecord;
+					this.loading = false;
+				});
+			},
+			// 分页
+			currchange(v) {
+				this.pageSize = v;
+				this.getList(this.params, this.pageSize);
+			},
+			//功能栏
+			iconCli(v) {
+				if (v === 1) {
+					this.getList(this.params, this.pageSize);
+				}
+				if (v === 2) {
+					this.fullscreen = !this.fullscreen
+				}
+			},
+			getUser() {
+				this.userInfo = JSON.parse(window.sessionStorage.userInfo);
+				this.infolist = {
+					opNo: '',
+					opName: '',
+				};
+				this.infolist.opNo = this.userInfo.loginNo;
+				this.infolist.opName = this.userInfo.loginName;
+
+			}
+		},
+		mounted() {
+			this.getList({}, 1);
+			this.getUser();
+		},
+		created() {
+
+		}
+	}
+</script>
+<style scoped lang="scss">
+	.onetab {
+		margin-bottom: 20px;
+		padding: 0 20px;
+	}
+
+	.titbox {
+		div {
+			float: right;
+
+			i {
+				font-size: 22px;
+				margin-left: 20px;
+				cursor: pointer;
+			}
+		}
+	}
+
+	.tabbox {
+		margin-top: 15px;
+	}
+
+	.pageBox {
+		text-align: right;
+		margin-top: 10px;
+	}
+
+	.info-line {
+		width: 100%;
+		display: block;
+		padding-left: 20px;
+
+		div {
+			width: 50%;
+			display: inline-block;
+		}
+
+		span {
+			width: 80px;
+			display: inline-block;
+			text-align: left;
+
+			i {
+				color: red;
+				display: inline-block;
+				padding-right: 5px;
+			}
+		}
+
+		.el-select,
+		.el-input {
+			width: calc(100% - 100px);
+		}
+	}
+
+	.online {
+		width: 100%;
+
+		.el-select {
+			width: calc(100% - 100px);
+		}
+
+		span {
+			vertical-align: top;
+		}
+
+		.el-textarea {
+			width: calc(100% - 100px);
+		}
+	}
+</style>

src/pages/main/personlManage/inperson.vue

@@ -0,0 +1,10 @@
+<template>
+  <div class="container">
+    <iframe
+      height="100%"
+      width="100%"
+      src="/static/views/ecClubWork.html"
+      frameborder="0"
+    ></iframe>
+  </div>
+</template>

src/pages/main/personlManage/outperson.vue

@@ -0,0 +1,428 @@
+<template>
+    <fullscreen :fullscreen.sync="fullscreen" class="container">
+        <div class="container-box">
+            <toolList @iconCli='iconCli' :tooltit='tooltit'></toolList>
+            <div class="search">
+                <mySearch :searchList="searchList" @searchInfo="searchInfo"></mySearch>
+                <span>
+					<el-button class="btn-check" size="medium" type="primary" @click="jumpto(1)">人员工位
+					</el-button> 
+					<el-button class="btn-check" size="medium" type="primary" @click="jumpto(2)">人员统计
+					</el-button>
+					 <el-button class="btn-check" size="medium" type="primary" @click="dialogCheck(3)">添加
+					</el-button>
+				</span>
+            </div>
+            <div class="tabbox">
+                <el-table height="calc(100% - 40px)" class="com-table" ref="multipleTable" :data="tableData"
+                    tooltip-effect="dark" size="small" border style="width: 100%" v-loading="loading">
+                    <el-table-column prop="lineStrip" label="线条">
+                    </el-table-column>
+                    <el-table-column prop="frameSumName" label="对接科室">
+                    </el-table-column>
+                    <el-table-column prop="dockDepart" label="市场经营部对接人">
+                    </el-table-column>
+					<el-table-column prop="fieldPerson" label="驻场人员姓名">
+                    </el-table-column>
+					<el-table-column prop="idNum" label="身份证号">
+                    </el-table-column>
+					<el-table-column prop="telNum" label="联系电话">
+					</el-table-column>
+					<el-table-column prop="personType" label="人员类别">
+                    </el-table-column>
+					<el-table-column prop="affilAompanyName" label="归属公司">
+                    </el-table-column>
+					<el-table-column prop="cardNum" label="卡编号">
+					</el-table-column>
+                    <el-table-column label="操作" width="160px" align="center">
+                        <template slot-scope="scope">
+                            <el-button size="mini" type="primary" @click="dialogCheck(1,scope.row)">查看</el-button>
+                            <el-button size="mini" type="primary" @click="dialogCheck(2,scope.row)">修改</el-button>
+                            <el-button size="mini" type="danger" @click="delLine(scope.row)">删除</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <el-pagination class="pageBox" @current-change="currchange" layout="prev, pager, next" background
+                    :total="total">
+                </el-pagination>
+            </div>
+        </div>
+
+        <el-dialog :title="titname" :visible.sync="dialogStatus" width="50%" :destroy-on-close="true"
+            :modal-append-to-body="false" :close-on-click-modal="false" :before-close="closedia">
+            <div v-loading="loadinged">
+                <el-form :model="infolist" ref="infolist" >
+                    <div class="info-line">
+                        <el-form-item>
+                            <span>线条</span>
+                            <el-input v-model="infolist.lineStrip" placeholder="线条" :disabled="disableStatus"></el-input>
+                        </el-form-item>
+                       <el-form-item>
+                            <span>对接科室</span>
+                            <el-input v-model="infolist.frameSumName" placeholder="对接科室" :disabled="disableStatus"></el-input>
+                        </el-form-item>
+						<el-form-item>
+                            <span>对接人</span>
+                            <el-input v-model="infolist.dockDepart" placeholder="市场经营部对接人" :disabled="disableStatus"></el-input>
+                        </el-form-item>
+						<el-form-item>
+						    <span>驻场人员</span>
+						    <el-input v-model="infolist.fieldPerson" placeholder="驻场人员姓名" :disabled="disableStatus"></el-input>
+						</el-form-item>
+						<el-form-item>
+                            <span>身份证号</span>
+							 <el-input v-model="infolist.idNum" placeholder="身份证号" :disabled="disableStatus"></el-input>
+                        </el-form-item>
+						<el-form-item>
+						    <span>联系电话</span>
+							 <el-input v-model="infolist.telNum" placeholder="联系电话" :disabled="disableStatus"></el-input>
+						</el-form-item>
+						<el-form-item>
+						    <span>人员类别</span>
+						    <el-input v-model="infolist.personType" placeholder="人员类别" :disabled="disableStatus"></el-input>
+						</el-form-item>
+						<el-form-item>
+                            <span>归属公司</span>
+							 <el-input v-model="infolist.affilAompanyName" placeholder="归属公司" :disabled="disableStatus"></el-input>
+                        </el-form-item>
+						<el-form-item>
+						    <span>卡编号</span>
+							 <el-input v-model="infolist.cardNum" placeholder="卡编号" :disabled="disableStatus"></el-input>
+						</el-form-item>
+                    </div>
+                </el-form>
+
+                <div slot="footer" class="dialog-footer myfooter">
+                    <el-button type="primary" @click="dialogCli(2)" v-if="titname !== '查看'">确 定</el-button>
+                    <el-button @click="dialogCli(1)" v-if="titname === '查看'">确 定</el-button>
+                    <el-button @click="dialogCli(1)">取 消</el-button>
+                </div>
+            </div>
+        </el-dialog>
+
+        <myMessage :messTit='messTit' @closeMessage="closeMessage" :centerDialogVisible="centerDialogVisible" v-if="centerDialogVisible"></myMessage>
+    </fullscreen>
+
+</template>
+<script>
+    import mySearch from "../../../components/search.vue";
+    import myMessage from "../../../components/myMessage.vue"
+    import toolList from '../../../components/toolList'
+
+    export default {
+        components: {
+            mySearch,
+            myMessage,
+            toolList
+        },
+        data() {
+            const regionCode = (rule, value, callback) => {
+                if (!this.infolist.regionCode) {
+                    callback(new Error('不能为空'))
+                } else {
+                    callback()
+                }
+            }
+            return {
+                rules: {
+                    regionCode: [{
+                        required: true,
+                        trigger: 'change',
+                        validator: regionCode
+                    }]
+                },
+                searchList: [
+                    {
+                        type: 'input',
+                        tit: '对接科室',
+                        value: '',
+                        width: '98%',
+                    },
+                ],
+                tooltit:'外部人员管理',
+                fullscreen: false,
+                total: 0,
+                pageSize: 1,
+                tableData: [],
+                dialogStatus: false,
+                disableStatus: false,
+                titname: '',
+                infolist: {},
+                userInfo: {},
+                params: {},
+                centerDialogVisible: false,
+                messTit: '',
+                delid: '',
+                loading:false,
+                loadinged:false,
+				regionOpt:[],
+				countyOpt:[],
+				areaCode:'',
+				areaName:'',
+            }
+        },
+        methods: {
+			jumpto(v){
+				if(v == 1){
+					this.$router.push({
+					    path: '/inperson',
+					});
+					this.setabList('市场经营部人员', '/inperson');
+				}else{
+					this.$router.push({
+					    path: '/census',
+					});
+					this.setabList('人员统计', '/census');
+				}
+			},
+            closedia() {
+                this.infolist = {};
+                this.dialogStatus = false;
+            },
+            //搜索数据
+            searchInfo(v) {
+                this.params = {};
+                v[0] ? this.params.regionName = v[0] : '';
+                this.getList(this.params, this.pageSize);
+            },
+            //获取列表
+            getList(v, n) {
+                this.pageSize = n;
+                let _this = this;
+                this.loading = true;
+                this.tableData = [];
+                this.$http({
+                    url: "/market/cAdvPubBudget/queryPage",
+                    method: "post",
+                    headers: {
+                        "Content-Type": "application/json",
+                        "page": '{"pageNo":"' + n + '","pageSize":"10"}'
+                    },
+                    data: v,
+                }).then((res) => {
+                    this.tableData = res.data.data;
+                    this.total = res.data.totalRecord;
+                    this.loading = false;
+                });
+            },
+            // 分页
+            currchange(v) {
+                this.pageSize = v;
+                this.getList(this.params, this.pageSize);
+            },
+            //申请
+            dialogCheck(v, n) {
+                this.dialogStatus = true;
+                this.infolist = Object.assign({}, n);
+                if (v === 1) {
+                    this.titname = '查看';
+                    this.disableStatus = true;
+                    return
+                } else if (v === 2) {
+                    this.titname = '修改';
+                    this.disableStatus = false;
+                } else if (v === 3) {
+                    this.titname = '添加';
+                    this.disableStatus = false;
+                }
+                this.infolist.opNo = this.userInfo.loginNo;
+                this.infolist.opName = this.userInfo.loginName;
+            },
+            //添加
+            dialogCli(v) {
+                if (v === 1) {
+                    this.infolist = {};
+                    this.dialogStatus = false;
+                    return
+                } else {
+                    this.infolist.opTime = this.$formatDate(new Date(), "YYYY-MM-DD HH:mm:ss");
+                    if (this.titname === '添加') {
+                        this.submitInfo("/market/cAdvPubBudget/add");
+                    } else if (this.titname === '修改') {
+                        this.submitInfo("/market/cAdvPubBudget/update", v);
+                    }
+
+                }
+            },
+            submitInfo(u) {
+                let _this = this;
+                this.$refs.infolist.validate(valid => {
+                    if (valid) {
+                        this.loadinged = true;
+                        this.$http({
+                            url: u,
+                            method: "post",
+                            headers: {
+                                "Content-Type": "application/json",
+                            },
+                            data: this.infolist,
+                        }).then((res) => {
+                            this.loadinged = false;
+                            if (res.data.result === 1) {
+                                _this.$message({
+                                    message: res.data.desc,
+                                    type: 'error'
+                                });
+                            } else {
+                                _this.$message({
+                                    message: '成功',
+                                    type: 'success'
+                                });
+                                _this.infolist = {};
+                                _this.dialogStatus = false;
+                                _this.getList({}, _this.pageSize);
+                            }
+
+                        });
+                    }
+                })
+            },
+            closeMessage(v) {
+                this.centerDialogVisible = false;
+                let _this = this;
+                if (v === 1) {
+                    _this.$http({
+                        url: "/market/cAdvPubBudget/del",
+                        method: "post",
+                        headers: {
+                            "Content-Type": "application/json",
+                        },
+                        data: {
+                            id: this.delid
+                        },
+                    }).then((res) => {
+                        if (res.data.result === 1) {
+                            _this.$message({
+                                message: res.data.desc,
+                                type: 'error'
+                            });
+                        } else {
+                            _this.$message({
+                                message: '删除成功',
+                                type: 'success'
+                            });
+                            _this.getList(this.params, this.pageSize);
+                        }
+                    });
+                }
+            },
+            //删除
+            delLine(v) {
+                this.centerDialogVisible = true;
+                this.messTit = '即将删除此条数据, 是否删除?';
+                this.delid = v.id;
+            },
+            //文件返回值
+            uploadBack(v) {
+                console.log(v)
+            },
+            //功能栏
+            iconCli(v) {
+                if (v === 1) {
+                    this.getList(this.params, this.pageSize);
+                }
+                if (v === 2) {
+                    this.fullscreen = !this.fullscreen
+                }
+            },
+            getUser() {
+                this.userInfo = JSON.parse(window.sessionStorage.userInfo);
+            },
+			setabList(n, p) {
+			    let params = {
+			        children: "",
+			        name: n,
+			        rountPath: p,
+			        target: "_self",
+			    };
+			    for (let i = 0; i < this.$store.state.tabList.length; i++) {
+			        if (this.$store.state.tabList[i].name === params.name) {
+			            this.$store.state.tabList[i] = params;
+			        }
+			    }
+			    let set = new Set([...this.$store.state.tabList, params]);
+			    set.add(params);
+			    this.$store.commit("setDefaultActive", params.rountPath);
+			    this.$store.commit("setTabList", Array.from(set));
+			},
+        },
+        mounted() {
+            this.getList({}, 1);
+            this.getUser();
+        },
+        created() {
+
+        }
+    }
+</script>
+<style scoped lang="scss">
+    .onetab {
+        margin-bottom: 20px;
+        padding: 0 20px;
+    }
+
+    .titbox {
+        div {
+            float: right;
+
+            i {
+                font-size: 22px;
+                margin-left: 20px;
+                cursor: pointer;
+            }
+        }
+    }
+
+    .tabbox {
+        margin-top: 15px;
+    }
+
+    .pageBox {
+        text-align: right;
+        margin-top: 10px;
+    }
+
+    .info-line {
+        width: 100%;
+        display: block;
+        padding-left: 20px;
+
+        div {
+            width: 50%;
+            display: inline-block;
+        }
+
+        span {
+            width: 80px;
+            display: inline-block;
+            text-align: left;
+
+            i {
+                color: red;
+                display: inline-block;
+                padding-right: 5px;
+            }
+        }
+
+        .el-select,
+        .el-input {
+            width: calc(100% - 100px);
+        }
+    }
+
+    .online {
+        width: 100%;
+
+        .el-select {
+            width: calc(100% - 100px);
+        }
+
+        span {
+            vertical-align: top;
+        }
+
+        .el-textarea {
+            width: calc(100% - 100px);
+        }
+    }
+</style>

src/router/index.js

@@ -9,6 +9,24 @@ const routes = [{
     component: Index,
     redirect: '/leader',
     children: [
+		{
+		    meta: { name:  '外部人员管理', keepAlive: false },
+		    path: '/outperson',
+		    name: 'outperson',
+		    component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/personlManage/outperson.vue'], resolve)
+		},
+		{
+		    meta: { name:  '内部人员管理', keepAlive: false },
+		    path: '/inperson',
+		    name: 'inperson',
+		    component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/personlManage/inperson.vue'], resolve)
+		},
+		{
+		    meta: { name:  '人员统计', keepAlive: false },
+		    path: '/census',
+		    name: 'census',
+		    component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/personlManage/census.vue'], resolve)
+		},
         {
             meta: { name:  '广告发布审批', keepAlive: false },
             path: '/advReleaseAppro',