Merge remote-tracking branch 'origin/master'

virgo.wzfrontend/workark/src/components/work/system/serveSet/processSetItem.vue

@@ -71,7 +71,7 @@
 									</div>
 								</div>
 								<div class="operation-button" v-else-if="node.status !== 4">
-									<el-button size="mini" type="warning" @click="updateStatus(node,1)">修改</el-button>
+									<el-button size="mini" type="warning" @click="updateStatus(node,1)">整改</el-button>
 								</div>
 							</div>
 							<!-- 展示 -->
@@ -88,7 +88,7 @@
 					</div>
 					<div class="operation-button" v-else-if="item.status === 2 && roleType === 2">
 						<el-button size="mini" type="primary" @click="updateStatus(item,3)">通过</el-button>
-						<el-button size="mini" type="warning" @click="updateStatus(item,4)">修改</el-button>
+						<el-button size="mini" type="warning" @click="updateStatus(item,4)">整改</el-button>
 					</div>
 					<!-- 新增 -->
 					<div class="process-set-insert" @click="edit('insert', item.id)" v-if="type === 'edit'">

virgo.wzfrontend/workark/src/views/work/finance/contract.vue

@@ -59,7 +59,7 @@
 				</el-pagination>
 			</div>
 		</div>
-		<el-drawer title=" 订单详情" :visible.sync="drawer" :size="400" :append-to-body="true">
+		<el-drawer title=" 订单详情" :visible.sync="drawer" :size="800" :append-to-body="true">
 			<detail v-if="drawer" :detailId="detailId" :type="nowTitle.id" detailType="orderNo"></detail>
 		</el-drawer>
 	</div>

virgo.wzfrontend/workark/src/views/work/finance/invoice.vue

@@ -31,10 +31,10 @@
 					<el-table-column label="操作" width="150" align="center">
 						<template slot-scope="scope">
 							<div class="hui-table-operation">
-								<span class="table-operation" @click="lookItem(scope.row,2)">
+								<span class="table-operation" @click="lookItem(scope.row)">
 									详情
 								</span>
-								<span class="table-operation" @click="lookOrder(scope.row,1)">
+								<span class="table-operation" @click="lookOrder(scope.row)">
 									查看订单
 								</span>
 							</div>
@@ -51,9 +51,11 @@
 				</el-pagination>
 			</div>
 		</div>
-		<el-drawer :title=" type === 1?'订单详情':'发票详情'" :visible.sync="drawer" :size="400" :append-to-body="true">
-			<detail v-if="drawer && type === 1" :detailId="detailId" detailType="orderNo"></detail>
-			<invoice-detail v-if="drawer && type === 2" :detailId="detailId" :type="nowTitle.id" @callback="callback">
+		<el-drawer title="订单详情" :visible.sync="drawer" :size="800" :append-to-body="true">
+			<detail v-if="drawer" :detailId="detailId" detailType="orderNo"></detail>
+		</el-drawer>
+		<el-drawer title="发票详情" :visible.sync="drawers" :size="400" :append-to-body="true">
+			<invoice-detail v-if="drawers" :detailId="detailId" :type="nowTitle.id" @callback="callback">
 			</invoice-detail>
 		</el-drawer>
 	</div>
@@ -78,7 +80,7 @@
 				loading: false,
 				detailId: '',
 				drawer: false,
-				type: 1
+				drawers: false
 			}
 		},
 		mounted() {
@@ -121,13 +123,11 @@
 				this.currPage = currPage;
 				this.init();
 			},
-			lookItem(data, type) {
-				this.type = type;
+			lookItem(data) {
 				this.detailId = data.id;
-				this.drawer = true;
+				this.drawers = true;
 			},
-			lookOrder(data, type) {
-				this.type = type;
+			lookOrder(data) {
 				this.detailId = data.orderNo;
 				this.drawer = true;
 			},

virgo.wzfrontend/workark/src/views/work/serve/list.vue

@@ -50,12 +50,14 @@
 							<div class="hui-table-operation">
 								<span v-if="nowTitle.id === 1 && scope.row.orderStatus === '支付成功'">
 									<span class="table-operation" v-if="!scope.row.invoice"
-										@click="applyInvoice(scope.row)" v-permission="`/work/serve/list/${$route.params.type}/openInvoice`">
+										@click="applyInvoice(scope.row)"
+										v-permission="`/work/serve/list/${$route.params.type}/openInvoice`">
 										开具发票
 									</span>
 									<span class="color-warning" v-else-if="!scope.row.invoice.state">开具中</span>
 									<span class="color-success" style="cursor: pointer;" v-else
-										@click="lookOrder(scope.row,2)" v-permission="`/work/serve/list/${$route.params.type}/lookInvoice`">
+										@click="lookOrder(scope.row)"
+										v-permission="`/work/serve/list/${$route.params.type}/lookInvoice`">
 										查看发票
 									</span>
 								</span>
@@ -65,8 +67,9 @@
 					<el-table-column label="操作" align="center" width="100">
 						<template slot-scope="scope">
 							<div class="hui-table-operation">
-								<span class="table-operation" v-permission="`/work/serve/list/${$route.params.type}/detail`"
-									@click="lookItem(scope.row,1)">
+								<span class="table-operation"
+									v-permission="`/work/serve/list/${$route.params.type}/detail`"
+									@click="lookItem(scope.row)">
 									详情
 								</span>
 							</div>
@@ -84,9 +87,11 @@
 				</el-pagination>
 			</div>
 		</div>
-		<el-drawer :title=" type === 1?'订单详情':'发票详情'" :visible.sync="drawer" :size="800" :append-to-body="true">
-			<detail v-if="drawer && type === 1" :detailId="detailId" :type="nowTitle.id" @callback="callback"></detail>
-			<invoice-detail v-if="drawer && type === 2" :detailId="detailId"></invoice-detail>
+		<el-drawer title="订单详情" :visible.sync="drawer" :size="800" :append-to-body="true">
+			<detail v-if="drawer" :detailId="detailId" :type="nowTitle.id" @callback="callback"></detail>
+		</el-drawer>
+		<el-drawer title="发票详情" :visible.sync="drawers" :size="400" :append-to-body="true">
+			<invoice-detail v-if="drawers" :detailId="detailId"></invoice-detail>
 		</el-drawer>
 		<el-dialog :close-on-click-modal="false" title="开具发票" :visible.sync="visible" width="900px"
 			:append-to-body="true">
@@ -122,7 +127,7 @@
 				detailId: '',
 				visible: false,
 				orderNo: '',
-				type: 1
+				drawers: false
 			}
 		},
 		mounted() {
@@ -183,15 +188,13 @@
 				this.currPage = currPage;
 				this.init();
 			},
-			lookItem(data, type) {
-				this.type = type;
+			lookItem(data) {
 				this.detailId = data.id;
 				this.drawer = true;
 			},
-			lookOrder(data, type) {
-				this.type = type;
+			lookOrder(data) {
 				this.detailId = data.invoice.id;
-				this.drawer = true;
+				this.drawers = true;
 			},
 			applyInvoice(data) {
 				this.orderNo = data.orderNo;