Prechádzať zdrojové kódy

完善增加选人的问题

LuChongMei 1 rok pred
rodič
commit
5141104f80

+ 23 - 10
jp-mobile/pages/fileTransmit/examineFile.vue

@@ -102,7 +102,14 @@
 				if (gw.length > 0) {
 					this.auditForm = gw[0]
 				}
-				if (role == '办公室主任') this.isoffice = true
+				if (role == '办公室主任') {
+					this.isoffice = true
+					let gw1 = data.filter(item => {
+						return item.which == 0
+					})
+					this.auditForm = gw1[0]
+					console.log("gwForm",this.gwForm);
+					}
 				if (role == '局领导' && gw.length > 0) this.isleader = true
 				if (role == '科室负责人' && gw.length > 0) this.isundertake = true
 			})
@@ -140,7 +147,7 @@
 					createTruename: '',
 					nextTruename: '',
 					nextUser: '',
-					which: '',
+					which: '0',
 					state: '0',
 
 					next: '',
@@ -148,6 +155,7 @@
 					nextDepUser: '',
 					remark: '',
 				},
+				gwForm:{},
 				gwId: "",
 				isoffice: false,
 				isleader: false,
@@ -202,10 +210,20 @@
 			},
 			// 提交表单
 			doSubmit() {
+				let inputForm={};
 				this.loading = true
-				if (this.auditForm.nextLeadUser != '' || this.auditForm.nextDepUser != '') this.auditForm.next = '1'
-				this.auditForm.state = "0"
-				gwFlowService.save(this.auditForm).then(data => {
+				// if(this.one){
+					if (this.auditForm.nextLeadUser != '' || this.auditForm.nextDepUser != '') this.auditForm.next = '1'
+					this.auditForm.state = "0"
+					this.auditForm.gwId = this.gwId
+					inputForm = this.auditForm
+				// }else {
+				// 	this.gwForm.nextLeadUser = this.gwForm.nextLeadUser + "," +this.auditForm.nextLeadUser
+				// 	this.gwForm.nextDepUser = this.auditForm.nextDepUser+ "," +this.auditForm.nextDepUser
+				// 	inputForm = this.gwForm
+				// }
+				
+				gwFlowService.save(inputForm).then(data => {
 					let param = {
 						type: 'success',
 						message: data,
@@ -213,11 +231,6 @@
 						url:"/pages/fileTransmit/fileTransmitList?type=1"
 					}
 					this.showToast(param);
-					// setTimeout(() => {
-					// 	uni.navigateTo({
-					// 		url: ''
-					// 	});
-					// }, 500)
 				}).catch(() => {
 					let param = {
 						type: 'error',

+ 12 - 11
jp-mobile/pages/fileTransmit/statistics.vue

@@ -60,7 +60,7 @@
 					</view>
 					<view class="card_chart">
 						<view class="charts-box_1">
-							<qiun-data-charts type="ring" :opts="opts1" :chartData="chartDataOne" />
+							<qiun-data-charts type="pie" :opts="opts1" :chartData="chartDataOne" />
 							<!-- <qiun-data-charts type="arcbar" :opts="opts1" :chartData="chartDataOne" /> -->
 						</view>
 					</view>
@@ -126,22 +126,22 @@
 						"#ea7ccc"
 					],
 					padding: [5, 5, 5, 5],
-					// dataLabel: true,
+					dataLabel: false,
 					enableScroll: false,
-					legend: {
-						show: true,
-						position: "right"
-					},
+					// legend: {
+					// 	show: true,
+					// 	position: "right"
+					// },
 					subtitle: {
-						name: "1",
+						name: "as",
 						fontSize: 25,
 						color: "#7cb5ec"
 					},
 					extra: {
-						ring: {
-							ringWidth: 100,
+						pie: {
+							// ringWidth: 100,
 							activeOpacity: 0.5,
-							activeRadius: 10,
+							activeRadius: 0,
 							offsetAngle: 0,
 							labelWidth: 15,
 							border: false,
@@ -201,6 +201,7 @@
 					//模拟服务器返回数据,如果数据格式和标准格式不同,需自行按下面的格式拼接
 					let res = {
 						series: [{
+							radius: ['40%', '70%'],
 							data: [{
 								"name":"已办",
 								"value": 50,
@@ -232,7 +233,7 @@
 
 	.charts-box_1 {
 		width: 100%;
-		height: 200px;
+		height: 160px;
 	}
 
 	.card_one {