审批记录显示修改

pages/oa/business/detail.vue

@@ -108,9 +108,11 @@
 			        let auditRecordList = response.data.auditRecordList;
 					let tasks = [];
 					auditRecordList.forEach(v => {
+						let reason = v.reason?v.reason:'';
+						let time = v.endTime?v.endTime:v.createTime;
 						tasks.push({
 							title:'任务:' + v.assigneeUser.nickname + v.name,
-							desc:this.parseTime(v.endTime),
+							desc: reason + " " + this.parseTime(time),
 						})
 					})
 					this.tasks = tasks;

pages/oa/business/edit.vue

@@ -292,7 +292,7 @@ export default {
 			//转换成天数
 			var day = days / (1000 * 60 * 60 * 24);
 			console.log("day = ", day);
-			return day;
+			return day?day:'';
 		},
 		/** 查询部门列表 */
 		getInfoDataList() {
@@ -353,9 +353,11 @@ export default {
 				if (auditRecordList) {
 					let tasks = [];
 					auditRecordList.forEach(v => {
+						let reason = v.reason?v.reason:'';
+						let time = v.endTime?v.endTime:v.createTime;
 						tasks.push({
-							title: '任务:' + v.assigneeUser.nickname + v.name,
-							desc: this.parseTime(v.endTime),
+							title:'任务:' + v.assigneeUser.nickname + v.name,
+							desc: reason + " " + this.parseTime(time),
 						})
 					})
 					this.tasks = tasks;

pages/oa/conversion/detail.vue

@@ -105,9 +105,11 @@
 			        let auditRecordList = response.data.auditRecordList;
 					let tasks = [];
 					auditRecordList.forEach(v => {
+						let reason = v.reason?v.reason:'';
+						let time = v.endTime?v.endTime:v.createTime;
 						tasks.push({
 							title:'任务:' + v.assigneeUser.nickname + v.name,
-							desc:this.parseTime(v.endTime),
+							desc: reason + " " + this.parseTime(time),
 						})
 					})
 					this.tasks = tasks;

pages/oa/conversion/edit.vue

@@ -261,9 +261,11 @@ export default {
 				if (auditRecordList) {
 					let tasks = [];
 					auditRecordList.forEach(v => {
+						let reason = v.reason?v.reason:'';
+						let time = v.endTime?v.endTime:v.createTime;
 						tasks.push({
-							title: '任务:' + v.assigneeUser.nickname + v.name,
-							desc: this.parseTime(v.endTime),
+							title:'任务:' + v.assigneeUser.nickname + v.name,
+							desc: reason + " " + this.parseTime(time),
 						})
 					})
 					this.tasks = tasks;

pages/oa/entry/detail.vue

@@ -108,9 +108,11 @@
 			        let auditRecordList = response.data.auditRecordList;
 					let tasks = [];
 					auditRecordList.forEach(v => {
+						let reason = v.reason?v.reason:'';
+						let time = v.endTime?v.endTime:v.createTime;
 						tasks.push({
 							title:'任务:' + v.assigneeUser.nickname + v.name,
-							desc:this.parseTime(v.endTime),
+							desc: reason + " " + this.parseTime(time),
 						})
 					})
 					this.tasks = tasks;

pages/oa/entry/edit.vue

@@ -307,9 +307,11 @@ export default {
 				if (auditRecordList) {
 					let tasks = [];
 					auditRecordList.forEach(v => {
+						let reason = v.reason?v.reason:'';
+						let time = v.endTime?v.endTime:v.createTime;
 						tasks.push({
-							title: '任务:' + v.assigneeUser.nickname + v.name,
-							desc: this.parseTime(v.endTime),
+							title:'任务:' + v.assigneeUser.nickname + v.name,
+							desc: reason + " " + this.parseTime(time),
 						})
 					})
 					this.tasks = tasks;

pages/oa/expense/detail.vue

@@ -119,9 +119,11 @@
 			        let auditRecordList = response.data.auditRecordList;
 					let tasks = [];
 					auditRecordList.forEach(v => {
+						let reason = v.reason?v.reason:'';
+						let time = v.endTime?v.endTime:v.createTime;
 						tasks.push({
 							title:'任务:' + v.assigneeUser.nickname + v.name,
-							desc:this.parseTime(v.endTime),
+							desc: reason + " " + this.parseTime(time),
 						})
 					})
 					this.tasks = tasks;

pages/oa/expense/edit.vue

@@ -340,9 +340,11 @@ export default {
 				if (auditRecordList) {
 					let tasks = [];
 					auditRecordList.forEach(v => {
+						let reason = v.reason?v.reason:'';
+						let time = v.endTime?v.endTime:v.createTime;
 						tasks.push({
-							title: '任务:' + v.assigneeUser.nickname + v.name,
-							desc: this.parseTime(v.endTime),
+							title:'任务:' + v.assigneeUser.nickname + v.name,
+							desc: reason + " " + this.parseTime(time),
 						})
 					})
 					this.tasks = tasks;

pages/oa/leave/detail.vue

@@ -108,9 +108,11 @@
 			        let auditRecordList = response.data.auditRecordList;
 					let tasks = [];
 					auditRecordList.forEach(v => {
+						let reason = v.reason?v.reason:'';
+						let time = v.endTime?v.endTime:v.createTime;
 						tasks.push({
 							title:'任务:' + v.assigneeUser.nickname + v.name,
-							desc:this.parseTime(v.endTime),
+							desc: reason + " " + this.parseTime(time),
 						})
 					})
 					this.tasks = tasks;

pages/oa/leave/edit.vue

@@ -312,7 +312,7 @@ export default {
 			//转换成天数
 			var day = days / (1000 * 60 * 60 * 24);
 			console.log("day = ", day);
-			return day;
+			return day?day:'';
 		},
 		/** 查询部门列表 */
 		getInfoDataList() {
@@ -349,9 +349,11 @@ export default {
 				if (auditRecordList) {
 					let tasks = [];
 					auditRecordList.forEach(v => {
+						let reason = v.reason?v.reason:'';
+						let time = v.endTime?v.endTime:v.createTime;
 						tasks.push({
-							title: '任务:' + v.assigneeUser.nickname + v.name,
-							desc: this.parseTime(v.endTime),
+							title:'任务:' + v.assigneeUser.nickname + v.name,
+							desc: reason + " " + this.parseTime(time),
 						})
 					})
 					this.tasks = tasks;

pages/oa/out/detail.vue

@@ -104,9 +104,11 @@
 			        let auditRecordList = response.data.auditRecordList;
 					let tasks = [];
 					auditRecordList.forEach(v => {
+						let reason = v.reason?v.reason:'';
+						let time = v.endTime?v.endTime:v.createTime;
 						tasks.push({
 							title:'任务:' + v.assigneeUser.nickname + v.name,
-							desc:this.parseTime(v.endTime),
+							desc: reason + " " + this.parseTime(time),
 						})
 					})
 					this.tasks = tasks;

pages/oa/out/edit.vue

@@ -214,7 +214,7 @@ export default {
 	methods: {
 		upHourStart(e) {
 			this.form.startDate = e;
-			if (this.form.startDate && this.form.endDate) {
+			if (this.form.startDate && this.form.endDate ) {
 				let Hours = this.calLeaveDays();
 				this.form.hour = Math.ceil(Hours);
 				if (Hours < 0) {
@@ -235,7 +235,7 @@ export default {
 		},
 		upHourEnd(e) {
 			this.form.endDate = e;
-			if (this.form.startDate && this.form.endDate) {
+			if (this.form.startDate != "" && this.form.endDate != "") {
 				let Hours = this.calLeaveDays();
 				this.form.hour = Math.ceil(Hours);
 				if (Hours < 0) {
@@ -266,7 +266,7 @@ export default {
 			//转换成小时
 			var hour = hours / (1000 * 60 * 60);
 			console.log("hour = ", hour);
-			return hour;
+			return hour?hour:'';
 		},
 		/** 获得详情信息 */
 		getDetail(val) {
@@ -292,9 +292,11 @@ export default {
 				if (auditRecordList) {
 					let tasks = [];
 					auditRecordList.forEach(v => {
+						let reason = v.reason?v.reason:'';
+						let time = v.endTime?v.endTime:v.createTime;
 						tasks.push({
-							title: '任务:' + v.assigneeUser.nickname + v.name,
-							desc: this.parseTime(v.endTime),
+							title:'任务:' + v.assigneeUser.nickname + v.name,
+							desc: reason + " " + this.parseTime(time),
 						})
 					})
 					this.tasks = tasks;

pages/oa/purchase/detail.vue

@@ -116,9 +116,11 @@
 			        let auditRecordList = response.data.auditRecordList;
 					let tasks = [];
 					auditRecordList.forEach(v => {
+						let reason = v.reason?v.reason:'';
+						let time = v.endTime?v.endTime:v.createTime;
 						tasks.push({
 							title:'任务:' + v.assigneeUser.nickname + v.name,
-							desc:this.parseTime(v.endTime),
+							desc: reason + " " + this.parseTime(time),
 						})
 					})
 					this.tasks = tasks;

pages/oa/purchase/edit.vue

@@ -268,9 +268,11 @@ export default {
 				if (auditRecordList) {
 					let tasks = [];
 					auditRecordList.forEach(v => {
+						let reason = v.reason?v.reason:'';
+						let time = v.endTime?v.endTime:v.createTime;
 						tasks.push({
-							title: '任务:' + v.assigneeUser.nickname + v.name,
-							desc: this.parseTime(v.endTime),
+							title:'任务:' + v.assigneeUser.nickname + v.name,
+							desc: reason + " " + this.parseTime(time),
 						})
 					})
 					this.tasks = tasks;

pages/oa/receive/detail.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<uni-forms ref="form" :model="form" labelWidth="120px" :label-position="alignment">
-			<uni-forms-item label="申请人">
+			<uni-forms-item label="领用人">
 				<uni-easyinput v-model="form.employeeName" disabled />
 			</uni-forms-item>
 			<uni-forms-item label="部门">
@@ -13,13 +13,16 @@
 			<uni-forms-item label="手机号">
 				<uni-easyinput v-model="form.employeePhone" disabled />
 			</uni-forms-item>
+			<uni-forms-item label="领用日期">
+				<uni-easyinput v-model="form.receiveDate" disabled />
+			</uni-forms-item>
 			<uni-table ref="table" border stripe>
 				<uni-tr>
-					<uni-th align="center">采购物资名称</uni-th>
-					<uni-th align="center" width="80">采购数量</uni-th>
-					<uni-th align="center">预算金额(元)</uni-th>
+					<uni-th align="center">领用物品名称</uni-th>
+					<uni-th align="center" width="80">领用数量</uni-th>
+					<uni-th align="center">规格型号</uni-th>
 				</uni-tr>
-				<uni-tr v-for="(item, index) in form.oaPurchaseObjs" :key="index">
+				<uni-tr v-for="(item, index) in form.oaReceiveObjs" :key="index">
 					<uni-td align="center">
 						{{item.name}}
 					</uni-td>
@@ -27,17 +30,11 @@
 						{{item.amount}}
 					</uni-td>
 					<uni-td align="center">
-						{{item.budget}}
+						{{item.config}}
 					</uni-td>
 				</uni-tr>
 			</uni-table>
-			<uni-forms-item label="总预算金额(元)">
-				<uni-easyinput v-model="form.totalBudget" disabled />
-			</uni-forms-item>
-			<uni-forms-item label="预期供应商">
-				<uni-easyinput v-model="form.supplierName" disabled />
-			</uni-forms-item>
-			<uni-forms-item label="采购事由">
+			<uni-forms-item label="领用事由">
 				<uni-easyinput autoHeight type="textarea" v-model="form.reason" disabled />
 			</uni-forms-item>
 			<uni-forms-item label="附件">
@@ -116,9 +113,11 @@
 			        let auditRecordList = response.data.auditRecordList;
 					let tasks = [];
 					auditRecordList.forEach(v => {
+						let reason = v.reason?v.reason:'';
+						let time = v.endTime?v.endTime:v.createTime;
 						tasks.push({
 							title:'任务:' + v.assigneeUser.nickname + v.name,
-							desc:this.parseTime(v.endTime),
+							desc: reason + " " + this.parseTime(time),
 						})
 					})
 					this.tasks = tasks;

pages/oa/receive/edit.vue

@@ -243,9 +243,11 @@ export default {
 				if (auditRecordList) {
 					let tasks = [];
 					auditRecordList.forEach(v => {
+						let reason = v.reason?v.reason:'';
+						let time = v.endTime?v.endTime:v.createTime;
 						tasks.push({
-							title: '任务:' + v.assigneeUser.nickname + v.name,
-							desc: this.parseTime(v.endTime),
+							title:'任务:' + v.assigneeUser.nickname + v.name,
+							desc: reason + " " + this.parseTime(time),
 						})
 					})
 					this.tasks = tasks;

pages/oa/renew/detail.vue

@@ -111,9 +111,11 @@
 			        let auditRecordList = response.data.auditRecordList;
 					let tasks = [];
 					auditRecordList.forEach(v => {
+						let reason = v.reason?v.reason:'';
+						let time = v.endTime?v.endTime:v.createTime;
 						tasks.push({
 							title:'任务:' + v.assigneeUser.nickname + v.name,
-							desc:this.parseTime(v.endTime),
+							desc: reason + " " + this.parseTime(time),
 						})
 					})
 					this.tasks = tasks;

pages/oa/renew/edit.vue

@@ -292,9 +292,11 @@ export default {
 				if (auditRecordList) {
 					let tasks = [];
 					auditRecordList.forEach(v => {
+						let reason = v.reason?v.reason:'';
+						let time = v.endTime?v.endTime:v.createTime;
 						tasks.push({
-							title: '任务:' + v.assigneeUser.nickname + v.name,
-							desc: this.parseTime(v.endTime),
+							title:'任务:' + v.assigneeUser.nickname + v.name,
+							desc: reason + " " + this.parseTime(time),
 						})
 					})
 					this.tasks = tasks;

pages/oa/stamp/detail.vue

@@ -111,9 +111,11 @@
 			        let auditRecordList = response.data.auditRecordList;
 					let tasks = [];
 					auditRecordList.forEach(v => {
+						let reason = v.reason?v.reason:'';
+						let time = v.endTime?v.endTime:v.createTime;
 						tasks.push({
 							title:'任务:' + v.assigneeUser.nickname + v.name,
-							desc:this.parseTime(v.endTime),
+							desc: reason + " " + this.parseTime(time),
 						})
 					})
 					this.tasks = tasks;

pages/oa/stamp/edit.vue

@@ -220,9 +220,11 @@
 					if (auditRecordList) {
 						let tasks = [];
 						auditRecordList.forEach(v => {
+							let reason = v.reason?v.reason:'';
+							let time = v.endTime?v.endTime:v.createTime;
 							tasks.push({
-								title: '任务:' + v.assigneeUser.nickname + v.name,
-								desc: this.parseTime(v.endTime),
+								title:'任务:' + v.assigneeUser.nickname + v.name,
+								desc: reason + " " + this.parseTime(time),
 							})
 						})
 						this.tasks = tasks;

pages/oa/turnover/detail.vue

@@ -99,9 +99,11 @@
 			        let auditRecordList = response.data.auditRecordList;
 					let tasks = [];
 					auditRecordList.forEach(v => {
+						let reason = v.reason?v.reason:'';
+						let time = v.endTime?v.endTime:v.createTime;
 						tasks.push({
 							title:'任务:' + v.assigneeUser.nickname + v.name,
-							desc:this.parseTime(v.endTime),
+							desc: reason + " " + this.parseTime(time),
 						})
 					})
 					this.tasks = tasks;

pages/oa/turnover/edit.vue

@@ -225,9 +225,11 @@ export default {
 				if (auditRecordList) {
 					let tasks = [];
 					auditRecordList.forEach(v => {
+						let reason = v.reason?v.reason:'';
+						let time = v.endTime?v.endTime:v.createTime;
 						tasks.push({
-							title: '任务:' + v.assigneeUser.nickname + v.name,
-							desc: this.parseTime(v.endTime),
+							title:'任务:' + v.assigneeUser.nickname + v.name,
+							desc: reason + " " + this.parseTime(time),
 						})
 					})
 					this.tasks = tasks;

pages/oa/universal/detail.vue

@@ -95,9 +95,11 @@
 			        let auditRecordList = response.data.auditRecordList;
 					let tasks = [];
 					auditRecordList.forEach(v => {
+						let reason = v.reason?v.reason:'';
+						let time = v.endTime?v.endTime:v.createTime;
 						tasks.push({
 							title:'任务:' + v.assigneeUser.nickname + v.name,
-							desc:this.parseTime(v.endTime),
+							desc: reason + " " + this.parseTime(time),
 						})
 					})
 					this.tasks = tasks;

pages/oa/universal/edit.vue

@@ -195,9 +195,11 @@
 					if (auditRecordList) {
 						let tasks = [];
 						auditRecordList.forEach(v => {
+							let reason = v.reason?v.reason:'';
+							let time = v.endTime?v.endTime:v.createTime;
 							tasks.push({
-								title: '任务:' + v.assigneeUser.nickname + v.name,
-								desc: this.parseTime(v.endTime),
+								title:'任务:' + v.assigneeUser.nickname + v.name,
+								desc: reason + " " + this.parseTime(time),
 							})
 						})
 						this.tasks = tasks;

static/font/iconfont.css

@@ -1,6 +1,6 @@
 @font-face {
   font-family: "iconfont";
-  src: url('/static/font/iconfont.ttf') format('truetype');
+  src: url('./static/font/iconfont.ttf') format('truetype');
 }
 
 .iconfont {

static/js/myPull.js

@@ -14,7 +14,7 @@ export default({getList="getList",listData="listData",page="page",initIndex="ini
 				[page]:1,
 				[initIndex]:0,
 				[modelData]:[
-					{label:"我的代办"},
+					{label:"我的待办"},
 					{label:"我处理的"},
 					{label:"我发起的"},
 				]