pengyh 1 рік тому
батько
коміт
90116ab390

+ 9 - 1
src/views/workOrder/appraise/index.vue

@@ -55,7 +55,15 @@ export default {
 			defaultData.render = (h, { row, index, column }) => {
 			  	return (
 					<div style="padding:0 6px;cursor: pointer;" class={{ 'text-view': true, 'text-view-copy': column.isCopy }}>
-						<span style="color:#008dd4;" onClick={() => {}}>{row.id}</span>
+						<span style="color:#008dd4;" onClick={() => {
+							this.$router.push({
+									name: "workOrderPool",
+									query: {
+										id:row.id,
+										activeName: "Evaluation",
+									}
+							})
+						}}>{row.id}</span>
 						{column.isCopy ? (
             		    <i
 							style="color:#008dd4;"

+ 7 - 1
src/views/workOrder/orderHome/index.vue

@@ -13,7 +13,7 @@
 			<div class="chart">
 				<div class="head">
 					<div class="title">近7天订单趋势</div>
-					<div class="more">查看更多</div>
+					<div class="more" @click="openOrder">查看更多</div>
 				</div>
 				<div ref="chart1" style="width: 100%;height: 280px;"></div>
 			</div>
@@ -91,6 +91,12 @@
 			// this.drawChat1()
 		},
 		methods: {
+			openOrder(){
+				this.$router.push({
+					name: "workOrderPool",
+					query: {}
+				})
+			},
 			getCount(){
 				getCount().then(res => {
 					this.tabs[0].num = res.data.dpg

+ 7 - 1
src/views/workOrder/settleAccountsManagement/settleAccountsOrder/index.vue

@@ -160,7 +160,13 @@ export default {
       return (
         <div class='operation-btns'>
 		  <el-button type="text" onClick={() => {
-		    
+		    this.$router.push({
+		    		name: "workOrderPool",
+		    		query: {
+		    			id:row.orderBaseId,
+		    			activeName: "SettleAccounts",
+		    		}
+		    })
 		  }}>详情</el-button>
         </div>
       )

+ 6 - 3
src/views/workOrder/settleAccountsManagement/summaryBill/detailList.vue

@@ -117,7 +117,6 @@
 				<template slot-scope="scope">
 					{{scope.row.settleOrderType == 'INSTALL'?'安装':scope.row.settleOrderType == 'REPAIR'?'维修':scope.row.settleOrderType == 'OTHER'?'其他':scope.row.settleOrderType == 'EXAMINE'?'奖罚单':''}}
 				</template>
-				[{id: 'INSTALL',name:'安装'},{id: 'REPAIR',name:'维修'},{id: 'OTHER',name:'其他'},{id: 'EXAMINE',name:'奖罚单'}]
 			</el-table-column>
 			<el-table-column prop="installLabel" align="center" label="安装功率"></el-table-column>
 			<el-table-column prop="installNormAmount" align="center" label="安装结算标准" width="110"></el-table-column>
@@ -130,12 +129,16 @@
 			<el-table-column prop="otherPrice" align="center" label="其他费用单价" width="110"></el-table-column>
 			<!-- <el-table-column prop="" align="center" label="其他费用结算数量" width="140"></el-table-column> -->
 			<el-table-column prop="examineProject" align="center" label="奖罚单考核项目" width="120"></el-table-column>
-			<el-table-column prop="examineType" align="center" label="奖罚单考核类型" width="120"></el-table-column>
+			<el-table-column prop="examineType" align="center" label="奖罚单考核类型" width="120">
+				<template slot-scope="scope">
+					{{scope.row.examineType == 'PUNISH'?'惩罚':scope.row.examineType == 'REWARD'?'奖励':''}}
+				</template>
+			</el-table-column>
 			<el-table-column prop="settleNum" align="center" label="结算数量"></el-table-column>
 			<el-table-column prop="settleAmount" align="center" label="结算金额"></el-table-column>
 			<el-table-column prop="remark" align="center" label="备注"></el-table-column>
 			<el-table-column label="操作" align="center" width="80" fixed="right">
-				<template slot-scope="scope">
+				<template slot-scope="scope" v-if="scope.row.status == 'NO'">
 					<el-button type="text" style="color: #FF0000" @click="cancel(scope.row.orderId,scope.row.poolId)">驳回</el-button>
 				</template>
 			</el-table-column>