From 5346354c8b6685d4c111041a8c5a4d61dae13050 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期四, 28 五月 2020 10:31:46 +0800
Subject: [PATCH] 添加任务总揽菜单

---
 src/components/finance/popup/substepReadOnly.vue | 1481 +++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 884 insertions(+), 597 deletions(-)

diff --git a/src/components/finance/popup/substepReadOnly.vue b/src/components/finance/popup/substepReadOnly.vue
index def1a38..9412aa3 100644
--- a/src/components/finance/popup/substepReadOnly.vue
+++ b/src/components/finance/popup/substepReadOnly.vue
@@ -7,13 +7,13 @@
 				<el-button size="small" style="float: right; margin-right: 32px;" @click="saveStep1">淇� 瀛�</el-button>
 			</div>
 		</div>
-		<div style="height: 500px; overflow: auto; padding-top: 0px; box-sizing: border-box;">
+		<div class="class_form_z1" style="height: 500px; overflow: auto; padding-top: 0px; box-sizing: border-box;">
 			<transition name="el-zoom-in-top">
 				<div v-show="showData['title']" class="transition-box" style="text-align: center; margin: 0 10px;">
 					<h3 style="margin: 10px;">绔嬮鏈嶅姟</h3>
 					<div>
 						<el-form disabled :show-message="false" :model="form_['title']" ref="form_1" label-position='right' label-width="100px"  class="demo-form-inline">
-							<el-row>
+							<!-- <el-row>
 								<el-col :span="22" class="z_grid-content3">
 									<el-form-item label="棰樼洰绫诲瀷" prop="titleType"
 										:rules="[{required: true, message: '璇烽�夋嫨', trigger: ['blur', 'change']}]"
@@ -30,8 +30,8 @@
 										</el-select>
 									</el-form-item>
 								</el-col>
-							</el-row>
-							<el-row v-if="form_['title'].titleType">
+							</el-row> -->
+							<!-- <el-row v-if="form_['title'].titleType">
 								<el-col :span="22" class="z_grid-content1">
 									<el-form-item label="鎻忚堪" prop="titleType"
 										:rules="[{required: true, message: '璇疯緭鍏�', trigger: ['blur', 'change']}]"
@@ -39,7 +39,52 @@
 										<el-input type="textarea" v-model="form_['title'].titleInput" :placeholder="titleInput_" style="width: 100%;"></el-input>
 									</el-form-item>
 								</el-col>
+							</el-row> -->
+							<el-form-item label="浜虹兢"
+								prop="population"
+								:rules="[{required: true, message: '璇疯緭鍏ヤ汉缇�', trigger: ['blur', 'change']}]"
+							>
+								<el-input type="textarea" v-model="form_['title'].population" ></el-input>
+							</el-form-item>
+							<el-form-item label="骞查鎴栧洜绱�" 
+								prop="exposure"
+								:rules="[{required: true, message: '璇疯緭鍏ュ共棰勬垨鍥犵礌', trigger: ['blur', 'change']}]"
+							>
+								<el-input type="textarea" v-model="form_['title'].exposure" ></el-input>
+							</el-form-item>
+							<el-form-item label="瀵圭収" 
+								prop="comparator"
+								:rules="[{required: true, message: '璇疯緭鍏ュ鐓�', trigger: ['blur', 'change']}]"
+							>
+								<el-input type="textarea" v-model="form_['title'].comparator" ></el-input>
+							</el-form-item>
+							<el-form-item label="鐮旂┒绫诲瀷" 
+								prop="titleType"
+								:rules="[{required: true, message: '璇烽�夋嫨鐮旂┒绫诲瀷', trigger: ['blur', 'change']}]"
+							>
+								<el-select size="small" v-model="form_['title'].titleType" style="width: 100%;">
+									<el-option label="浜屾鐮旂┒" value="浜屾鐮旂┒"></el-option>
+									<el-option label="涓�娆$爺绌�" value="涓�娆$爺绌�"></el-option>
+								</el-select>
+							</el-form-item>
+							<el-row>
+								<el-col :span="10">
+									<el-form-item label="缁撳眬">
+										<el-select multiple size="small" v-model="form_['title'].outcomes_array" style="width: 100%;">
+											<el-option label="鏈夋晥鎬�" value="鏈夋晥鎬�"></el-option>
+											<el-option label="瀹夊叏鎬�" value="瀹夊叏鎬�"></el-option>
+											<el-option label="缁忔祹鎬�" value="缁忔祹鎬�"></el-option>
+											<el-option label="鍏跺畠" value="鍏跺畠"></el-option>
+										</el-select>
+									</el-form-item>
+								</el-col>
+								<el-col :span="14">
+									<el-form-item v-if="form_['title'].outcomes && form_['title'].outcomes.indexOf('鍏跺畠') != -1" label="缁撳眬琛ュ厖">
+										<el-input type="textarea" v-model="form_['title'].outcomesOther" style="width: 100%;"></el-input>
+									</el-form-item>
+								</el-col>
 							</el-row>
+							
 							<el-row>
 								<el-col :span="6" class="z_grid-content3">
 									<el-form-item label="鍚堝悓閲戦" prop="budget"
@@ -91,29 +136,6 @@
 							</el-row>
 							
 							<el-row>
-								<el-col :span="4" class="z_grid-content3">
-									<el-form-item label="鏄惁鍏艰亴缂栬緫" prop="parttime" label-width="120px"
-									:rules="[{required: true, message: '璇烽�夋嫨', trigger: ['blur', 'change']}]"
-									>
-									<el-checkbox @change="parttimeChange('title')" v-model="form_['title'].parttime"></el-checkbox>
-									</el-form-item>
-								</el-col>
-								
-								<el-col :span="18" class="z_grid-content3">
-									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
-										<el-select multiple :disabled="!form_['title'].parttime" size="mini" v-model="form_['title'].parttimeUser" style="width: 100%;">
-											<el-option
-												v-for="item in options_parttimeUser"
-												:key="item.id"
-												:label="item.name"
-												:value="item.id"
-											></el-option>
-										</el-select>
-									</el-form-item>
-								</el-col>
-							</el-row>
-							
-							<el-row>
 								<el-col :span="17" class="z_grid-content1">
 									<el-form-item label="澶囨敞璇存槑">
 										<el-input type="textarea" v-model="form_['title'].remark" style="width: 100%;"></el-input>
@@ -131,8 +153,52 @@
 									</el-form-item>
 								</el-col>
 							</el-row>
-							
+							<el-row>
+								<el-col :span="4" class="z_grid-content3">
+									<el-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
+									<el-checkbox @change="parttimeChange('title')" v-model="form_['title'].parttime"></el-checkbox>
+									</el-form-item>
+								</el-col>
+								
+								<!-- <el-col :span="18" class="z_grid-content3">
+									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
+										<el-select multiple :disabled="!form_['title'].parttime" size="mini" v-model="form_['title'].parttimeUser" style="width: 100%;">
+											<el-option
+												v-for="item in options_parttimeUser"
+												:key="item.id"
+												:label="item.name"
+												:value="item.id"
+											></el-option>
+										</el-select>
+									</el-form-item>
+								</el-col> -->
+							</el-row>
 						</el-form>
+						
+						<div v-if="form_['title'].parttime" style="text-align: left;">
+							<el-table
+							  :data="form_['title'].parttimeList"
+							  :show-header="true"
+							  style="width: 100%;"
+							>
+							  <el-table-column prop="parttimeUser" label="濮撳悕" width="300" align="left" show-overflow-tooltip>
+									<template slot-scope="scope">
+									  <div>
+											<el-select disabled size="mini" v-model="scope.row.parttimeUser" style="width: 100%;">
+												<el-option
+													v-for="item in options_parttimeUser"
+													:key="item.id"
+													:label="item.name"
+													:value="item.id"
+												></el-option>
+											</el-select>
+									  </div>
+									</template>
+								</el-table-column>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
+							  </el-table-column>
+							</el-table>
+						</div>
 						
 						<el-form :show-message="false" :model="form_['title']" label-position='right' label-width="100px"  class="demo-form-inline">
 							<el-row>
@@ -201,29 +267,6 @@
 							</el-row>
 							
 							<el-row>
-								<el-col :span="4" class="z_grid-content3">
-									<el-form-item label="鏄惁鍏艰亴缂栬緫" prop="parttime" label-width="120px"
-									:rules="[{required: true, message: '璇烽�夋嫨', trigger: ['blur', 'change']}]"
-									>
-									<el-checkbox @change="parttimeChange('scheme')" v-model="form_['scheme'].parttime"></el-checkbox>
-									</el-form-item>
-								</el-col>
-								
-								<el-col :span="18" class="z_grid-content3">
-									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
-										<el-select multiple :disabled="!form_['scheme'].parttime" size="mini" v-model="form_['scheme'].parttimeUser" style="width: 100%;">
-											<el-option
-												v-for="item in options_parttimeUser"
-												:key="item.id"
-												:label="item.name"
-												:value="item.id"
-											></el-option>
-										</el-select>
-									</el-form-item>
-								</el-col>
-							</el-row>
-							
-							<el-row>
 								<el-col :span="17" class="z_grid-content1">
 									<el-form-item label="澶囨敞璇存槑">
 										<el-input type="textarea" v-model="form_['scheme'].remark" style="width: 100%;"></el-input>
@@ -241,9 +284,52 @@
 									</el-form-item>
 								</el-col>
 							</el-row>
-							
+							<el-row>
+								<el-col :span="4" class="z_grid-content3">
+									<el-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
+									<el-checkbox @change="parttimeChange('scheme')" v-model="form_['scheme'].parttime"></el-checkbox>
+									</el-form-item>
+								</el-col>
+								
+								<!-- <el-col :span="18" class="z_grid-content3">
+									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
+										<el-select multiple :disabled="!form_['scheme'].parttime" size="mini" v-model="form_['scheme'].parttimeUser" style="width: 100%;">
+											<el-option
+												v-for="item in options_parttimeUser"
+												:key="item.id"
+												:label="item.name"
+												:value="item.id"
+											></el-option>
+										</el-select>
+									</el-form-item>
+								</el-col> -->
+							</el-row>
 						</el-form>
 						
+						<div v-if="form_['scheme'].parttime" style="text-align: left;">
+							<el-table
+							  :data="form_['scheme'].parttimeList"
+							  :show-header="true"
+							  style="width: 100%;"
+							>
+							  <el-table-column prop="parttimeUser" label="濮撳悕" width="300" align="left" show-overflow-tooltip>
+									<template slot-scope="scope">
+									  <div>
+											<el-select disabled size="mini" v-model="scope.row.parttimeUser" style="width: 100%;">
+												<el-option
+													v-for="item in options_parttimeUser"
+													:key="item.id"
+													:label="item.name"
+													:value="item.id"
+												></el-option>
+											</el-select>
+									  </div>
+									</template>
+								</el-table-column>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
+							  </el-table-column>
+							</el-table>
+						</div>
 						<el-form :show-message="false" :model="form_['scheme']" label-position='right' label-width="100px"  class="demo-form-inline">
 							<el-row>
 								<el-col :span="6" class="z_grid-content1">
@@ -311,29 +397,6 @@
 							</el-row>
 							
 							<el-row>
-								<el-col :span="4" class="z_grid-content3">
-									<el-form-item label="鏄惁鍏艰亴缂栬緫" prop="parttime" label-width="120px"
-									:rules="[{required: true, message: '璇烽�夋嫨', trigger: ['blur', 'change']}]"
-									>
-									<el-checkbox @change="parttimeChange('search')" v-model="form_['search'].parttime"></el-checkbox>
-									</el-form-item>
-								</el-col>
-								
-								<el-col :span="18" class="z_grid-content3">
-									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
-										<el-select multiple :disabled="!form_['search'].parttime" size="mini" v-model="form_['search'].parttimeUser" style="width: 100%;">
-											<el-option
-												v-for="item in options_parttimeUser"
-												:key="item.value"
-												:label="item.label"
-												:value="item.value"
-											></el-option>
-										</el-select>
-									</el-form-item>
-								</el-col>
-							</el-row>
-							
-							<el-row>
 								<el-col :span="17" class="z_grid-content1">
 									<el-form-item label="澶囨敞璇存槑">
 										<el-input type="textarea" v-model="form_['search'].remark" style="width: 100%;"></el-input>
@@ -351,7 +414,51 @@
 									</el-form-item>
 								</el-col>
 							</el-row>
+							<el-row>
+								<el-col :span="4" class="z_grid-content3">
+									<el-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
+									<el-checkbox @change="parttimeChange('search')" v-model="form_['search'].parttime"></el-checkbox>
+									</el-form-item>
+								</el-col>
+								
+								<!-- <el-col :span="18" class="z_grid-content3">
+									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
+										<el-select multiple :disabled="!form_['search'].parttime" size="mini" v-model="form_['search'].parttimeUser" style="width: 100%;">
+											<el-option
+												v-for="item in options_parttimeUser"
+												:key="item.value"
+												:label="item.label"
+												:value="item.value"
+											></el-option>
+										</el-select>
+									</el-form-item>
+								</el-col> -->
+							</el-row>
 						</el-form>
+						<div v-if="form_['search'].parttime" style="text-align: left;">
+							<el-table
+							  :data="form_['search'].parttimeList"
+							  :show-header="true"
+							  style="width: 100%;"
+							>
+							  <el-table-column prop="parttimeUser" label="濮撳悕" width="300" align="left" show-overflow-tooltip>
+									<template slot-scope="scope">
+									  <div>
+											<el-select disabled size="mini" v-model="scope.row.parttimeUser" style="width: 100%;">
+												<el-option
+													v-for="item in options_parttimeUser"
+													:key="item.id"
+													:label="item.name"
+													:value="item.id"
+												></el-option>
+											</el-select>
+									  </div>
+									</template>
+								</el-table-column>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
+							  </el-table-column>
+							</el-table>
+						</div>
 						<el-form :show-message="false" :model="form_['search']" label-position='right' label-width="100px"  class="demo-form-inline">
 							<el-row>
 								<el-col :span="6" class="z_grid-content1">
@@ -419,29 +526,6 @@
 							</el-row>
 							
 							<el-row>
-								<el-col :span="4" class="z_grid-content3">
-									<el-form-item label="鏄惁鍏艰亴缂栬緫" prop="parttime" label-width="120px"
-									:rules="[{required: true, message: '璇烽�夋嫨', trigger: ['blur', 'change']}]"
-									>
-									<el-checkbox @change="parttimeChange('select')" v-model="form_['select'].parttime"></el-checkbox>
-									</el-form-item>
-								</el-col>
-								
-								<el-col :span="18" class="z_grid-content3">
-									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
-										<el-select multiple :disabled="!form_['select'].parttime" size="mini" v-model="form_['select'].parttimeUser" style="width: 100%;">
-											<el-option
-												v-for="item in options_parttimeUser"
-												:key="item.id"
-												:label="item.name"
-												:value="item.id"
-											></el-option>
-										</el-select>
-									</el-form-item>
-								</el-col>
-							</el-row>
-							
-							<el-row>
 								<el-col :span="17" class="z_grid-content1">
 									<el-form-item label="澶囨敞璇存槑">
 										<el-input type="textarea" v-model="form_['select'].remark" style="width: 100%;"></el-input>
@@ -459,8 +543,52 @@
 									</el-form-item>
 								</el-col>
 							</el-row>
+							<el-row>
+								<el-col :span="4" class="z_grid-content3">
+									<el-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
+									<el-checkbox @change="parttimeChange('select')" v-model="form_['select'].parttime"></el-checkbox>
+									</el-form-item>
+								</el-col>
+								
+								<!-- <el-col :span="18" class="z_grid-content3">
+									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
+										<el-select multiple :disabled="!form_['select'].parttime" size="mini" v-model="form_['select'].parttimeUser" style="width: 100%;">
+											<el-option
+												v-for="item in options_parttimeUser"
+												:key="item.id"
+												:label="item.name"
+												:value="item.id"
+											></el-option>
+										</el-select>
+									</el-form-item>
+								</el-col> -->
+							</el-row>
 						</el-form>
 						
+						<div v-if="form_['select'].parttime" style="text-align: left;">
+							<el-table
+							  :data="form_['select'].parttimeList"
+							  :show-header="true"
+							  style="width: 100%;"
+							>
+							  <el-table-column prop="parttimeUser" label="濮撳悕" width="300" align="left" show-overflow-tooltip>
+									<template slot-scope="scope">
+									  <div>
+											<el-select disabled size="mini" v-model="scope.row.parttimeUser" style="width: 100%;">
+												<el-option
+													v-for="item in options_parttimeUser"
+													:key="item.id"
+													:label="item.name"
+													:value="item.id"
+												></el-option>
+											</el-select>
+									  </div>
+									</template>
+								</el-table-column>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
+							  </el-table-column>
+							</el-table>
+						</div>
 						<el-form :show-message="false" :model="form_['select']" label-position='right' label-width="100px"  class="demo-form-inline">
 							<el-row>
 								<el-col :span="6" class="z_grid-content1">
@@ -528,29 +656,6 @@
 							</el-row>
 							
 							<el-row>
-								<el-col :span="4" class="z_grid-content3">
-									<el-form-item label="鏄惁鍏艰亴缂栬緫" prop="parttime" label-width="120px"
-									:rules="[{required: true, message: '璇烽�夋嫨', trigger: ['blur', 'change']}]"
-									>
-									<el-checkbox @change="parttimeChange('get')" v-model="form_['get'].parttime"></el-checkbox>
-									</el-form-item>
-								</el-col>
-								
-								<el-col :span="18" class="z_grid-content3">
-									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
-										<el-select multiple :disabled="!form_['get'].parttime" size="mini" v-model="form_['get'].parttimeUser" style="width: 100%;">
-											<el-option
-												v-for="item in options_parttimeUser"
-												:key="item.id"
-												:label="item.name"
-												:value="item.id"
-											></el-option>
-										</el-select>
-									</el-form-item>
-								</el-col>
-							</el-row>
-							
-							<el-row>
 								<el-col :span="17" class="z_grid-content1">
 									<el-form-item label="澶囨敞璇存槑">
 										<el-input type="textarea" v-model="form_['get'].remark" style="width: 100%;"></el-input>
@@ -568,9 +673,52 @@
 									</el-form-item>
 								</el-col>
 							</el-row>
-							
+							<el-row>
+								<el-col :span="4" class="z_grid-content3">
+									<el-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
+									<el-checkbox @change="parttimeChange('get')" v-model="form_['get'].parttime"></el-checkbox>
+									</el-form-item>
+								</el-col>
+								
+								<!-- <el-col :span="18" class="z_grid-content3">
+									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
+										<el-select multiple :disabled="!form_['get'].parttime" size="mini" v-model="form_['get'].parttimeUser" style="width: 100%;">
+											<el-option
+												v-for="item in options_parttimeUser"
+												:key="item.id"
+												:label="item.name"
+												:value="item.id"
+											></el-option>
+										</el-select>
+									</el-form-item>
+								</el-col> -->
+							</el-row>
 						</el-form>
 						
+						<div v-if="form_['get'].parttime" style="text-align: left;">
+							<el-table
+							  :data="form_['get'].parttimeList"
+							  :show-header="true"
+							  style="width: 100%;"
+							>
+							  <el-table-column prop="parttimeUser" label="濮撳悕" width="300" align="left" show-overflow-tooltip>
+									<template slot-scope="scope">
+									  <div>
+											<el-select disabled size="mini" v-model="scope.row.parttimeUser" style="width: 100%;">
+												<el-option
+													v-for="item in options_parttimeUser"
+													:key="item.id"
+													:label="item.name"
+													:value="item.id"
+												></el-option>
+											</el-select>
+									  </div>
+									</template>
+								</el-table-column>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
+							  </el-table-column>
+							</el-table>
+						</div>
 						<el-form :show-message="false" :model="form_['get']" label-position='right' label-width="100px"  class="demo-form-inline">
 							<el-row>
 								<el-col :span="6" class="z_grid-content1">
@@ -638,29 +786,6 @@
 							</el-row>
 							
 							<el-row>
-								<el-col :span="4" class="z_grid-content3">
-									<el-form-item label="鏄惁鍏艰亴缂栬緫" prop="parttime" label-width="120px"
-									:rules="[{required: true, message: '璇烽�夋嫨', trigger: ['blur', 'change']}]"
-									>
-									<el-checkbox @change="parttimeChange('find')" v-model="form_['find'].parttime"></el-checkbox>
-									</el-form-item>
-								</el-col>
-								
-								<el-col :span="18" class="z_grid-content3">
-									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
-										<el-select multiple :disabled="!form_['find'].parttime" size="mini" v-model="form_['find'].parttimeUser" style="width: 100%;">
-											<el-option
-												v-for="item in options_parttimeUser"
-												:key="item.id"
-												:label="item.name"
-												:value="item.id"
-											></el-option>
-										</el-select>
-									</el-form-item>
-								</el-col>
-							</el-row>
-							
-							<el-row>
 								<el-col :span="17" class="z_grid-content1">
 									<el-form-item label="澶囨敞璇存槑">
 										<el-input type="textarea" v-model="form_['find'].remark" style="width: 100%;"></el-input>
@@ -678,9 +803,52 @@
 									</el-form-item>
 								</el-col>
 							</el-row>
-							
+							<el-row>
+								<el-col :span="4" class="z_grid-content3">
+									<el-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
+									<el-checkbox @change="parttimeChange('find')" v-model="form_['find'].parttime"></el-checkbox>
+									</el-form-item>
+								</el-col>
+								
+								<!-- <el-col :span="18" class="z_grid-content3">
+									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
+										<el-select multiple :disabled="!form_['find'].parttime" size="mini" v-model="form_['find'].parttimeUser" style="width: 100%;">
+											<el-option
+												v-for="item in options_parttimeUser"
+												:key="item.id"
+												:label="item.name"
+												:value="item.id"
+											></el-option>
+										</el-select>
+									</el-form-item>
+								</el-col> -->
+							</el-row>
 						</el-form>
 						
+						<div v-if="form_['find'].parttime" style="text-align: left;">
+							<el-table
+							  :data="form_['find'].parttimeList"
+							  :show-header="true"
+							  style="width: 100%;"
+							>
+							  <el-table-column prop="parttimeUser" label="濮撳悕" width="300" align="left" show-overflow-tooltip>
+									<template slot-scope="scope">
+									  <div>
+											<el-select disabled size="mini" v-model="scope.row.parttimeUser" style="width: 100%;">
+												<el-option
+													v-for="item in options_parttimeUser"
+													:key="item.id"
+													:label="item.name"
+													:value="item.id"
+												></el-option>
+											</el-select>
+									  </div>
+									</template>
+								</el-table-column>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
+							  </el-table-column>
+							</el-table>
+						</div>
 						<el-form :show-message="false" :model="form_['find']" label-position='right' label-width="100px"  class="demo-form-inline">
 							<el-row>
 								<el-col :span="6" class="z_grid-content1">
@@ -748,29 +916,6 @@
 							</el-row>
 							
 							<el-row>
-								<el-col :span="4" class="z_grid-content3">
-									<el-form-item label="鏄惁鍏艰亴缂栬緫" prop="parttime" label-width="120px"
-									:rules="[{required: true, message: '璇烽�夋嫨', trigger: ['blur', 'change']}]"
-									>
-									<el-checkbox @change="parttimeChange('properties')" v-model="form_['properties'].parttime"></el-checkbox>
-									</el-form-item>
-								</el-col>
-								
-								<el-col :span="18" class="z_grid-content3">
-									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
-										<el-select multiple :disabled="!form_['properties'].parttime" size="mini" v-model="form_['properties'].parttimeUser" style="width: 100%;">
-											<el-option
-												v-for="item in options_parttimeUser"
-												:key="item.id"
-												:label="item.name"
-												:value="item.id"
-											></el-option>
-										</el-select>
-									</el-form-item>
-								</el-col>
-							</el-row>
-							
-							<el-row>
 								<el-col :span="17" class="z_grid-content1">
 									<el-form-item label="澶囨敞璇存槑">
 										<el-input type="textarea" v-model="form_['properties'].remark" style="width: 100%;"></el-input>
@@ -788,7 +933,52 @@
 									</el-form-item>
 								</el-col>
 							</el-row>
+							<el-row>
+								<el-col :span="4" class="z_grid-content3">
+									<el-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
+									<el-checkbox @change="parttimeChange('properties')" v-model="form_['properties'].parttime"></el-checkbox>
+									</el-form-item>
+								</el-col>
+								
+								<!-- <el-col :span="18" class="z_grid-content3">
+									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
+										<el-select multiple :disabled="!form_['properties'].parttime" size="mini" v-model="form_['properties'].parttimeUser" style="width: 100%;">
+											<el-option
+												v-for="item in options_parttimeUser"
+												:key="item.id"
+												:label="item.name"
+												:value="item.id"
+											></el-option>
+										</el-select>
+									</el-form-item>
+								</el-col> -->
+							</el-row>
 						</el-form>
+						
+						<div v-if="form_['properties'].parttime" style="text-align: left;">
+							<el-table
+							  :data="form_['properties'].parttimeList"
+							  :show-header="true"
+							  style="width: 100%;"
+							>
+							  <el-table-column prop="parttimeUser" label="濮撳悕" width="300" align="left" show-overflow-tooltip>
+									<template slot-scope="scope">
+									  <div>
+											<el-select disabled size="mini" v-model="scope.row.parttimeUser" style="width: 100%;">
+												<el-option
+													v-for="item in options_parttimeUser"
+													:key="item.id"
+													:label="item.name"
+													:value="item.id"
+												></el-option>
+											</el-select>
+									  </div>
+									</template>
+								</el-table-column>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
+							  </el-table-column>
+							</el-table>
+						</div>
 						<el-form :show-message="false" :model="form_['properties']" label-position='right' label-width="100px"  class="demo-form-inline">
 							<el-row>
 								<el-col :span="6" class="z_grid-content1">
@@ -968,28 +1158,7 @@
 									</el-form-item>
 								</el-col>
 							</el-row>
-							<el-row>
-								<el-col :span="4" class="z_grid-content3">
-									<el-form-item label="鏄惁鍏艰亴缂栬緫" prop="parttime" label-width="120px"
-									:rules="[{required: true, message: '璇烽�夋嫨', trigger: ['blur', 'change']}]"
-									>
-									<el-checkbox @change="parttimeChange('analyse')" v-model="form_['analyse'].parttime"></el-checkbox>
-									</el-form-item>
-								</el-col>
-								
-								<el-col :span="18" class="z_grid-content3">
-									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
-										<el-select multiple :disabled="!form_['analyse'].parttime" size="mini" v-model="form_['analyse'].parttimeUser" style="width: 100%;">
-											<el-option
-												v-for="item in options_parttimeUser"
-												:key="item.id"
-												:label="item.name"
-												:value="item.id"
-											></el-option>
-										</el-select>
-									</el-form-item>
-								</el-col>
-							</el-row>
+							
 							<el-row>
 								<el-col :span="17" class="z_grid-content1">
 									<el-form-item label="澶囨敞璇存槑">
@@ -1008,7 +1177,52 @@
 									</el-form-item>
 								</el-col>
 							</el-row>
+							<el-row>
+								<el-col :span="4" class="z_grid-content3">
+									<el-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
+									<el-checkbox @change="parttimeChange('analyse')" v-model="form_['analyse'].parttime"></el-checkbox>
+									</el-form-item>
+								</el-col>
+								
+								<!-- <el-col :span="18" class="z_grid-content3">
+									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
+										<el-select multiple :disabled="!form_['analyse'].parttime" size="mini" v-model="form_['analyse'].parttimeUser" style="width: 100%;">
+											<el-option
+												v-for="item in options_parttimeUser"
+												:key="item.id"
+												:label="item.name"
+												:value="item.id"
+											></el-option>
+										</el-select>
+									</el-form-item>
+								</el-col> -->
+							</el-row>
 						</el-form>
+						
+						<div v-if="form_['analyse'].parttime" style="text-align: left;">
+							<el-table
+							  :data="form_['analyse'].parttimeList"
+							  :show-header="true"
+							  style="width: 100%;"
+							>
+							  <el-table-column prop="parttimeUser" label="濮撳悕" width="300" align="left" show-overflow-tooltip>
+									<template slot-scope="scope">
+									  <div>
+											<el-select disabled size="mini" v-model="scope.row.parttimeUser" style="width: 100%;">
+												<el-option
+													v-for="item in options_parttimeUser"
+													:key="item.id"
+													:label="item.name"
+													:value="item.id"
+												></el-option>
+											</el-select>
+									  </div>
+									</template>
+								</el-table-column>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
+							  </el-table-column>
+							</el-table>
+						</div>
 						<el-form :show-message="false" :model="form_['analyse']" label-position='right' label-width="100px"  class="demo-form-inline">
 							<el-row>
 								<el-col :span="6" class="z_grid-content1">
@@ -1076,29 +1290,6 @@
 							</el-row>
 							
 							<el-row>
-								<el-col :span="4" class="z_grid-content3">
-									<el-form-item label="鏄惁鍏艰亴缂栬緫" prop="parttime" label-width="120px"
-									:rules="[{required: true, message: '璇烽�夋嫨', trigger: ['blur', 'change']}]"
-									>
-									<el-checkbox @change="parttimeChange('arrange')" v-model="form_['arrange'].parttime"></el-checkbox>
-									</el-form-item>
-								</el-col>
-								
-								<el-col :span="18" class="z_grid-content3">
-									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
-										<el-select multiple :disabled="!form_['arrange'].parttime" size="mini" v-model="form_['arrange'].parttimeUser" style="width: 100%;">
-											<el-option
-												v-for="item in options_parttimeUser"
-												:key="item.id"
-												:label="item.name"
-												:value="item.id"
-											></el-option>
-										</el-select>
-									</el-form-item>
-								</el-col>
-							</el-row>
-							
-							<el-row>
 								<el-col :span="17" class="z_grid-content1">
 									<el-form-item label="澶囨敞璇存槑">
 										<el-input type="textarea" v-model="form_['arrange'].remark" style="width: 100%;"></el-input>
@@ -1116,8 +1307,52 @@
 									</el-form-item>
 								</el-col>
 							</el-row>
+							<el-row>
+								<el-col :span="4" class="z_grid-content3">
+									<el-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
+									<el-checkbox @change="parttimeChange('arrange')" v-model="form_['arrange'].parttime"></el-checkbox>
+									</el-form-item>
+								</el-col>
+								
+								<!-- <el-col :span="18" class="z_grid-content3">
+									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
+										<el-select multiple :disabled="!form_['arrange'].parttime" size="mini" v-model="form_['arrange'].parttimeUser" style="width: 100%;">
+											<el-option
+												v-for="item in options_parttimeUser"
+												:key="item.id"
+												:label="item.name"
+												:value="item.id"
+											></el-option>
+										</el-select>
+									</el-form-item>
+								</el-col> -->
+							</el-row>
 						</el-form>
 						
+						<div v-if="form_['arrange'].parttime" style="text-align: left;">
+							<el-table
+							  :data="form_['arrange'].parttimeList"
+							  :show-header="true"
+							  style="width: 100%;"
+							>
+							  <el-table-column prop="parttimeUser" label="濮撳悕" width="300" align="left" show-overflow-tooltip>
+									<template slot-scope="scope">
+									  <div>
+											<el-select disabled size="mini" v-model="scope.row.parttimeUser" style="width: 100%;">
+												<el-option
+													v-for="item in options_parttimeUser"
+													:key="item.id"
+													:label="item.name"
+													:value="item.id"
+												></el-option>
+											</el-select>
+									  </div>
+									</template>
+								</el-table-column>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
+							  </el-table-column>
+							</el-table>
+						</div>
 						<el-form :show-message="false" :model="form_['arrange']" label-position='right' label-width="100px"  class="demo-form-inline">
 							<el-row>
 								<el-col :span="6" class="z_grid-content1">
@@ -1185,29 +1420,6 @@
 							</el-row>
 							
 							<el-row>
-								<el-col :span="4" class="z_grid-content3">
-									<el-form-item label="鏄惁鍏艰亴缂栬緫" prop="parttime" label-width="120px"
-									:rules="[{required: true, message: '璇烽�夋嫨', trigger: ['blur', 'change']}]"
-									>
-									<el-checkbox @change="parttimeChange('meta')" v-model="form_['meta'].parttime"></el-checkbox>
-									</el-form-item>
-								</el-col>
-								
-								<el-col :span="18" class="z_grid-content3">
-									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
-										<el-select multiple :disabled="!form_['meta'].parttime" size="mini" v-model="form_['meta'].parttimeUser" style="width: 100%;">
-											<el-option
-												v-for="item in options_parttimeUser"
-												:key="item.id"
-												:label="item.name"
-												:value="item.id"
-											></el-option>
-										</el-select>
-									</el-form-item>
-								</el-col>
-							</el-row>
-							
-							<el-row>
 								<el-col :span="17" class="z_grid-content1">
 									<el-form-item label="澶囨敞璇存槑">
 										<el-input type="textarea" v-model="form_['meta'].remark" style="width: 100%;"></el-input>
@@ -1225,7 +1437,52 @@
 									</el-form-item>
 								</el-col>
 							</el-row>
+							<el-row>
+								<el-col :span="4" class="z_grid-content3">
+									<el-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
+									<el-checkbox @change="parttimeChange('meta')" v-model="form_['meta'].parttime"></el-checkbox>
+									</el-form-item>
+								</el-col>
+								
+								<!-- <el-col :span="18" class="z_grid-content3">
+									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
+										<el-select multiple :disabled="!form_['meta'].parttime" size="mini" v-model="form_['meta'].parttimeUser" style="width: 100%;">
+											<el-option
+												v-for="item in options_parttimeUser"
+												:key="item.id"
+												:label="item.name"
+												:value="item.id"
+											></el-option>
+										</el-select>
+									</el-form-item>
+								</el-col> -->
+							</el-row>
 						</el-form>
+						
+						<div v-if="form_['meta'].parttime" style="text-align: left;">
+							<el-table
+							  :data="form_['meta'].parttimeList"
+							  :show-header="true"
+							  style="width: 100%;"
+							>
+							  <el-table-column prop="parttimeUser" label="濮撳悕" width="300" align="left" show-overflow-tooltip>
+									<template slot-scope="scope">
+									  <div>
+											<el-select disabled size="mini" v-model="scope.row.parttimeUser" style="width: 100%;">
+												<el-option
+													v-for="item in options_parttimeUser"
+													:key="item.id"
+													:label="item.name"
+													:value="item.id"
+												></el-option>
+											</el-select>
+									  </div>
+									</template>
+								</el-table-column>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
+							  </el-table-column>
+							</el-table>
+						</div>
 						<el-form :show-message="false" :model="form_['meta']" label-position='right' label-width="100px"  class="demo-form-inline">
 							<el-row>
 								<el-col :span="6" class="z_grid-content1">
@@ -1291,28 +1548,6 @@
 									</el-form-item>
 								</el-col>
 							</el-row>
-							<el-row>
-								<el-col :span="4" class="z_grid-content3">
-									<el-form-item label="鏄惁鍏艰亴缂栬緫" prop="parttime" label-width="120px"
-									:rules="[{required: true, message: '璇烽�夋嫨', trigger: ['blur', 'change']}]"
-									>
-									<el-checkbox @change="parttimeChange('grade')" v-model="form_['grade'].parttime"></el-checkbox>
-									</el-form-item>
-								</el-col>
-								
-								<el-col :span="18" class="z_grid-content3">
-									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
-										<el-select multiple :disabled="!form_['grade'].parttime" size="mini" v-model="form_['grade'].parttimeUser" style="width: 100%;">
-											<el-option
-												v-for="item in options_parttimeUser"
-												:key="item.id"
-												:label="item.name"
-												:value="item.id"
-											></el-option>
-										</el-select>
-									</el-form-item>
-								</el-col>
-							</el-row>
 							
 							<el-row>
 								<el-col :span="17" class="z_grid-content1">
@@ -1332,9 +1567,52 @@
 									</el-form-item>
 								</el-col>
 							</el-row>
-							
+							<el-row>
+								<el-col :span="4" class="z_grid-content3">
+									<el-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
+									<el-checkbox @change="parttimeChange('grade')" v-model="form_['grade'].parttime"></el-checkbox>
+									</el-form-item>
+								</el-col>
+								
+								<!-- <el-col :span="18" class="z_grid-content3">
+									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
+										<el-select multiple :disabled="!form_['grade'].parttime" size="mini" v-model="form_['grade'].parttimeUser" style="width: 100%;">
+											<el-option
+												v-for="item in options_parttimeUser"
+												:key="item.id"
+												:label="item.name"
+												:value="item.id"
+											></el-option>
+										</el-select>
+									</el-form-item>
+								</el-col> -->
+							</el-row>
 						</el-form>
 						
+						<div v-if="form_['grade'].parttime" style="text-align: left;">
+							<el-table
+							  :data="form_['grade'].parttimeList"
+							  :show-header="true"
+							  style="width: 100%;"
+							>
+							  <el-table-column prop="parttimeUser" label="濮撳悕" width="300" align="left" show-overflow-tooltip>
+									<template slot-scope="scope">
+									  <div>
+											<el-select disabled size="mini" v-model="scope.row.parttimeUser" style="width: 100%;">
+												<el-option
+													v-for="item in options_parttimeUser"
+													:key="item.id"
+													:label="item.name"
+													:value="item.id"
+												></el-option>
+											</el-select>
+									  </div>
+									</template>
+								</el-table-column>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
+							  </el-table-column>
+							</el-table>
+						</div>
 						<el-form :show-message="false" :model="form_['grade']" label-position='right' label-width="100px"  class="demo-form-inline">
 							<el-row>
 								<el-col :span="6" class="z_grid-content1">
@@ -1404,29 +1682,6 @@
 							</el-row>
 							
 							<el-row>
-								<el-col :span="4" class="z_grid-content3">
-									<el-form-item label="鏄惁鍏艰亴缂栬緫" prop="parttime" label-width="120px"
-									:rules="[{required: true, message: '璇烽�夋嫨', trigger: ['blur', 'change']}]"
-									>
-									<el-checkbox @change="parttimeChange('tsa')" v-model="form_['tsa'].parttime"></el-checkbox>
-									</el-form-item>
-								</el-col>
-								
-								<el-col :span="18" class="z_grid-content3">
-									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
-										<el-select multiple :disabled="!form_['tsa'].parttime" size="mini" v-model="form_['tsa'].parttimeUser" style="width: 100%;">
-											<el-option
-												v-for="item in options_parttimeUser"
-												:key="item.id"
-												:label="item.name"
-												:value="item.id"
-											></el-option>
-										</el-select>
-									</el-form-item>
-								</el-col>
-							</el-row>
-							
-							<el-row>
 								<el-col :span="17" class="z_grid-content1">
 									<el-form-item label="澶囨敞璇存槑">
 										<el-input type="textarea" v-model="form_['tsa'].remark" style="width: 100%;"></el-input>
@@ -1444,7 +1699,52 @@
 									</el-form-item>
 								</el-col>
 							</el-row>
+							<el-row>
+								<el-col :span="4" class="z_grid-content3">
+									<el-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
+									<el-checkbox @change="parttimeChange('tsa')" v-model="form_['tsa'].parttime"></el-checkbox>
+									</el-form-item>
+								</el-col>
+								
+								<!-- <el-col :span="18" class="z_grid-content3">
+									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
+										<el-select multiple :disabled="!form_['tsa'].parttime" size="mini" v-model="form_['tsa'].parttimeUser" style="width: 100%;">
+											<el-option
+												v-for="item in options_parttimeUser"
+												:key="item.id"
+												:label="item.name"
+												:value="item.id"
+											></el-option>
+										</el-select>
+									</el-form-item>
+								</el-col> -->
+							</el-row>
 						</el-form>
+						
+						<div v-if="form_['tsa'].parttime" style="text-align: left;">
+							<el-table
+							  :data="form_['tsa'].parttimeList"
+							  :show-header="true"
+							  style="width: 100%;"
+							>
+							  <el-table-column prop="parttimeUser" label="濮撳悕" width="300" align="left" show-overflow-tooltip>
+									<template slot-scope="scope">
+									  <div>
+											<el-select disabled size="mini" v-model="scope.row.parttimeUser" style="width: 100%;">
+												<el-option
+													v-for="item in options_parttimeUser"
+													:key="item.id"
+													:label="item.name"
+													:value="item.id"
+												></el-option>
+											</el-select>
+									  </div>
+									</template>
+								</el-table-column>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
+							  </el-table-column>
+							</el-table>
+						</div>
 						<el-form :show-message="false" :model="form_['tsa']" label-position='right' label-width="100px"  class="demo-form-inline">
 							<el-row>
 								<el-col :span="6" class="z_grid-content1">
@@ -1512,29 +1812,6 @@
 							</el-row>
 							
 							<el-row>
-								<el-col :span="4" class="z_grid-content3">
-									<el-form-item label="鏄惁鍏艰亴缂栬緫" prop="parttime" label-width="120px"
-									:rules="[{required: true, message: '璇烽�夋嫨', trigger: ['blur', 'change']}]"
-									>
-									<el-checkbox @change="parttimeChange('compose')" v-model="form_['compose'].parttime"></el-checkbox>
-									</el-form-item>
-								</el-col>
-								
-								<el-col :span="18" class="z_grid-content3">
-									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
-										<el-select multiple :disabled="!form_['compose'].parttime" size="mini" v-model="form_['compose'].parttimeUser" style="width: 100%;">
-											<el-option
-												v-for="item in options_parttimeUser"
-												:key="item.id"
-												:label="item.name"
-												:value="item.id"
-											></el-option>
-										</el-select>
-									</el-form-item>
-								</el-col>
-							</el-row>
-							
-							<el-row>
 								<el-col :span="17" class="z_grid-content1">
 									<el-form-item label="澶囨敞璇存槑">
 										<el-input type="textarea" v-model="form_['compose'].remark" style="width: 100%;"></el-input>
@@ -1552,7 +1829,52 @@
 									</el-form-item>
 								</el-col>
 							</el-row>
+							<el-row>
+								<el-col :span="4" class="z_grid-content3">
+									<el-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
+									<el-checkbox @change="parttimeChange('compose')" v-model="form_['compose'].parttime"></el-checkbox>
+									</el-form-item>
+								</el-col>
+								
+								<!-- <el-col :span="18" class="z_grid-content3">
+									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
+										<el-select multiple :disabled="!form_['compose'].parttime" size="mini" v-model="form_['compose'].parttimeUser" style="width: 100%;">
+											<el-option
+												v-for="item in options_parttimeUser"
+												:key="item.id"
+												:label="item.name"
+												:value="item.id"
+											></el-option>
+										</el-select>
+									</el-form-item>
+								</el-col> -->
+							</el-row>
 						</el-form>
+						
+						<div v-if="form_['compose'].parttime" style="text-align: left;">
+							<el-table
+							  :data="form_['compose'].parttimeList"
+							  :show-header="true"
+							  style="width: 100%;"
+							>
+							  <el-table-column prop="parttimeUser" label="濮撳悕" width="300" align="left" show-overflow-tooltip>
+									<template slot-scope="scope">
+									  <div>
+											<el-select disabled size="mini" v-model="scope.row.parttimeUser" style="width: 100%;">
+												<el-option
+													v-for="item in options_parttimeUser"
+													:key="item.id"
+													:label="item.name"
+													:value="item.id"
+												></el-option>
+											</el-select>
+									  </div>
+									</template>
+								</el-table-column>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
+							  </el-table-column>
+							</el-table>
+						</div>
 						<el-form :show-message="false" :model="form_['compose']" label-position='right' label-width="100px"  class="demo-form-inline">
 							<el-row>
 								<el-col :span="6" class="z_grid-content1">
@@ -1620,29 +1942,6 @@
 							</el-row>
 							
 							<el-row>
-								<el-col :span="4" class="z_grid-content3">
-									<el-form-item label="鏄惁鍏艰亴缂栬緫" prop="parttime" label-width="120px"
-									:rules="[{required: true, message: '璇烽�夋嫨', trigger: ['blur', 'change']}]"
-									>
-									<el-checkbox @change="parttimeChange('translate')" v-model="form_['translate'].parttime"></el-checkbox>
-									</el-form-item>
-								</el-col>
-								
-								<el-col :span="18" class="z_grid-content3">
-									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
-										<el-select multiple :disabled="!form_['translate'].parttime" size="mini" v-model="form_['translate'].parttimeUser" style="width: 100%;">
-											<el-option
-												v-for="item in options_parttimeUser"
-												:key="item.id"
-												:label="item.name"
-												:value="item.id"
-											></el-option>
-										</el-select>
-									</el-form-item>
-								</el-col>
-							</el-row>
-							
-							<el-row>
 								<el-col :span="17" class="z_grid-content1">
 									<el-form-item label="澶囨敞璇存槑">
 										<el-input type="textarea" v-model="form_['translate'].remark" style="width: 100%;"></el-input>
@@ -1660,7 +1959,52 @@
 									</el-form-item>
 								</el-col>
 							</el-row>
+							<el-row>
+								<el-col :span="4" class="z_grid-content3">
+									<el-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
+									<el-checkbox @change="parttimeChange('translate')" v-model="form_['translate'].parttime"></el-checkbox>
+									</el-form-item>
+								</el-col>
+								
+								<!-- <el-col :span="18" class="z_grid-content3">
+									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
+										<el-select multiple :disabled="!form_['translate'].parttime" size="mini" v-model="form_['translate'].parttimeUser" style="width: 100%;">
+											<el-option
+												v-for="item in options_parttimeUser"
+												:key="item.id"
+												:label="item.name"
+												:value="item.id"
+											></el-option>
+										</el-select>
+									</el-form-item>
+								</el-col> -->
+							</el-row>
 						</el-form>
+						
+						<div v-if="form_['translate'].parttime" style="text-align: left;">
+							<el-table
+							  :data="form_['translate'].parttimeList"
+							  :show-header="true"
+							  style="width: 100%;"
+							>
+							  <el-table-column prop="parttimeUser" label="濮撳悕" width="300" align="left" show-overflow-tooltip>
+									<template slot-scope="scope">
+									  <div>
+											<el-select disabled size="mini" v-model="scope.row.parttimeUser" style="width: 100%;">
+												<el-option
+													v-for="item in options_parttimeUser"
+													:key="item.id"
+													:label="item.name"
+													:value="item.id"
+												></el-option>
+											</el-select>
+									  </div>
+									</template>
+								</el-table-column>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
+							  </el-table-column>
+							</el-table>
+						</div>
 						<el-form :show-message="false" :model="form_['translate']" label-position='right' label-width="100px"  class="demo-form-inline">
 							<el-row>
 								<el-col :span="6" class="z_grid-content1">
@@ -1728,29 +2072,6 @@
 							</el-row>
 							
 							<el-row>
-								<el-col :span="4" class="z_grid-content3">
-									<el-form-item label="鏄惁鍏艰亴缂栬緫" prop="parttime" label-width="120px"
-									:rules="[{required: true, message: '璇烽�夋嫨', trigger: ['blur', 'change']}]"
-									>
-									<el-checkbox @change="parttimeChange('evaluation')" v-model="form_['evaluation'].parttime"></el-checkbox>
-									</el-form-item>
-								</el-col>
-								
-								<el-col :span="18" class="z_grid-content3">
-									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
-										<el-select multiple :disabled="!form_['evaluation'].parttime" size="mini" v-model="form_['evaluation'].parttimeUser" style="width: 100%;">
-											<el-option
-												v-for="item in options_parttimeUser"
-												:key="item.id"
-												:label="item.name"
-												:value="item.id"
-											></el-option>
-										</el-select>
-									</el-form-item>
-								</el-col>
-							</el-row>
-							
-							<el-row>
 								<el-col :span="17" class="z_grid-content1">
 									<el-form-item label="澶囨敞璇存槑">
 										<el-input type="textarea" v-model="form_['evaluation'].remark" style="width: 100%;"></el-input>
@@ -1768,7 +2089,52 @@
 									</el-form-item>
 								</el-col>
 							</el-row>
+							<el-row>
+								<el-col :span="4" class="z_grid-content3">
+									<el-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
+									<el-checkbox @change="parttimeChange('evaluation')" v-model="form_['evaluation'].parttime"></el-checkbox>
+									</el-form-item>
+								</el-col>
+								
+								<!-- <el-col :span="18" class="z_grid-content3">
+									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
+										<el-select multiple :disabled="!form_['evaluation'].parttime" size="mini" v-model="form_['evaluation'].parttimeUser" style="width: 100%;">
+											<el-option
+												v-for="item in options_parttimeUser"
+												:key="item.id"
+												:label="item.name"
+												:value="item.id"
+											></el-option>
+										</el-select>
+									</el-form-item>
+								</el-col> -->
+							</el-row>
 						</el-form>
+						
+						<div v-if="form_['evaluation'].parttime" style="text-align: left;">
+							<el-table
+							  :data="form_['evaluation'].parttimeList"
+							  :show-header="true"
+							  style="width: 100%;"
+							>
+							  <el-table-column prop="parttimeUser" label="濮撳悕" width="300" align="left" show-overflow-tooltip>
+									<template slot-scope="scope">
+									  <div>
+											<el-select disabled size="mini" v-model="scope.row.parttimeUser" style="width: 100%;">
+												<el-option
+													v-for="item in options_parttimeUser"
+													:key="item.id"
+													:label="item.name"
+													:value="item.id"
+												></el-option>
+											</el-select>
+									  </div>
+									</template>
+								</el-table-column>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
+							  </el-table-column>
+							</el-table>
+						</div>
 						<el-form :show-message="false" :model="form_['evaluation']" label-position='right' label-width="100px"  class="demo-form-inline">
 							<el-row>
 								<el-col :span="6" class="z_grid-content1">
@@ -1836,29 +2202,6 @@
 							</el-row>
 							
 							<el-row>
-								<el-col :span="4" class="z_grid-content3">
-									<el-form-item label="鏄惁鍏艰亴缂栬緫" prop="parttime" label-width="120px"
-									:rules="[{required: true, message: '璇烽�夋嫨', trigger: ['blur', 'change']}]"
-									>
-									<el-checkbox @change="parttimeChange('recommend')" v-model="form_['recommend'].parttime"></el-checkbox>
-									</el-form-item>
-								</el-col>
-								
-								<el-col :span="18" class="z_grid-content3">
-									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
-										<el-select multiple :disabled="!form_['recommend'].parttime" size="mini" v-model="form_['recommend'].parttimeUser" style="width: 100%;">
-											<el-option
-												v-for="item in options_parttimeUser"
-												:key="item.id"
-												:label="item.name"
-												:value="item.id"
-											></el-option>
-										</el-select>
-									</el-form-item>
-								</el-col>
-							</el-row>
-							
-							<el-row>
 								<el-col :span="17" class="z_grid-content1">
 									<el-form-item label="澶囨敞璇存槑">
 										<el-input type="textarea" v-model="form_['recommend'].remark" style="width: 100%;"></el-input>
@@ -1876,8 +2219,52 @@
 									</el-form-item>
 								</el-col>
 							</el-row>
+							<el-row>
+								<el-col :span="4" class="z_grid-content3">
+									<el-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
+									<el-checkbox @change="parttimeChange('recommend')" v-model="form_['recommend'].parttime"></el-checkbox>
+									</el-form-item>
+								</el-col>
+								
+								<!-- <el-col :span="18" class="z_grid-content3">
+									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
+										<el-select multiple :disabled="!form_['recommend'].parttime" size="mini" v-model="form_['recommend'].parttimeUser" style="width: 100%;">
+											<el-option
+												v-for="item in options_parttimeUser"
+												:key="item.id"
+												:label="item.name"
+												:value="item.id"
+											></el-option>
+										</el-select>
+									</el-form-item>
+								</el-col> -->
+							</el-row>
 						</el-form>
 						
+						<div v-if="form_['recommend'].parttime" style="text-align: left;">
+							<el-table
+							  :data="form_['recommend'].parttimeList"
+							  :show-header="true"
+							  style="width: 100%;"
+							>
+							  <el-table-column prop="parttimeUser" label="濮撳悕" width="300" align="left" show-overflow-tooltip>
+									<template slot-scope="scope">
+									  <div>
+											<el-select disabled size="mini" v-model="scope.row.parttimeUser" style="width: 100%;">
+												<el-option
+													v-for="item in options_parttimeUser"
+													:key="item.id"
+													:label="item.name"
+													:value="item.id"
+												></el-option>
+											</el-select>
+									  </div>
+									</template>
+								</el-table-column>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
+							  </el-table-column>
+							</el-table>
+						</div>
 						<el-form :show-message="false" :model="form_['recommend']" label-position='right' label-width="100px"  class="demo-form-inline">
 							<el-row>
 								<el-col :span="6" class="z_grid-content1">
@@ -1945,29 +2332,6 @@
 							</el-row>
 							
 							<el-row>
-								<el-col :span="4" class="z_grid-content3">
-									<el-form-item label="鏄惁鍏艰亴缂栬緫" prop="parttime" label-width="120px"
-									:rules="[{required: true, message: '璇烽�夋嫨', trigger: ['blur', 'change']}]"
-									>
-									<el-checkbox @change="parttimeChange('format')" v-model="form_['format'].parttime"></el-checkbox>
-									</el-form-item>
-								</el-col>
-								
-								<el-col :span="18" class="z_grid-content3">
-									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
-										<el-select multiple :disabled="!form_['format'].parttime" size="mini" v-model="form_['format'].parttimeUser" style="width: 100%;">
-											<el-option
-												v-for="item in options_parttimeUser"
-												:key="item.id"
-												:label="item.name"
-												:value="item.id"
-											></el-option>
-										</el-select>
-									</el-form-item>
-								</el-col>
-							</el-row>
-							
-							<el-row>
 								<el-col :span="17" class="z_grid-content1">
 									<el-form-item label="澶囨敞璇存槑">
 										<el-input type="textarea" v-model="form_['format'].remark" style="width: 100%;"></el-input>
@@ -1985,7 +2349,52 @@
 									</el-form-item>
 								</el-col>
 							</el-row>
+							<el-row>
+								<el-col :span="4" class="z_grid-content3">
+									<el-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
+									<el-checkbox @change="parttimeChange('format')" v-model="form_['format'].parttime"></el-checkbox>
+									</el-form-item>
+								</el-col>
+								
+								<!-- <el-col :span="18" class="z_grid-content3">
+									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
+										<el-select multiple :disabled="!form_['format'].parttime" size="mini" v-model="form_['format'].parttimeUser" style="width: 100%;">
+											<el-option
+												v-for="item in options_parttimeUser"
+												:key="item.id"
+												:label="item.name"
+												:value="item.id"
+											></el-option>
+										</el-select>
+									</el-form-item>
+								</el-col> -->
+							</el-row>
 						</el-form>
+						
+						<div v-if="form_['format'].parttime" style="text-align: left;">
+							<el-table
+							  :data="form_['format'].parttimeList"
+							  :show-header="true"
+							  style="width: 100%;"
+							>
+							  <el-table-column prop="parttimeUser" label="濮撳悕" width="300" align="left" show-overflow-tooltip>
+									<template slot-scope="scope">
+									  <div>
+											<el-select disabled size="mini" v-model="scope.row.parttimeUser" style="width: 100%;">
+												<el-option
+													v-for="item in options_parttimeUser"
+													:key="item.id"
+													:label="item.name"
+													:value="item.id"
+												></el-option>
+											</el-select>
+									  </div>
+									</template>
+								</el-table-column>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
+							  </el-table-column>
+							</el-table>
+						</div>
 						<el-form :show-message="false" :model="form_['format']" label-position='right' label-width="100px"  class="demo-form-inline">
 							<el-row>
 								<el-col :span="6" class="z_grid-content1">
@@ -2053,29 +2462,6 @@
 							</el-row>
 							
 							<el-row>
-								<el-col :span="4" class="z_grid-content3">
-									<el-form-item label="鏄惁鍏艰亴缂栬緫" prop="parttime" label-width="120px"
-									:rules="[{required: true, message: '璇烽�夋嫨', trigger: ['blur', 'change']}]"
-									>
-									<el-checkbox @change="parttimeChange('Contribute')" v-model="form_['Contribute'].parttime"></el-checkbox>
-									</el-form-item>
-								</el-col>
-								
-								<el-col :span="18" class="z_grid-content3">
-									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
-										<el-select multiple :disabled="!form_['Contribute'].parttime" size="mini" v-model="form_['Contribute'].parttimeUser" style="width: 100%;">
-											<el-option
-												v-for="item in options_parttimeUser" 
-												:key="item.id"
-												:label="item.name"
-												:value="item.id"
-											></el-option>
-										</el-select>
-									</el-form-item>
-								</el-col>
-							</el-row>
-							
-							<el-row>
 								<el-col :span="17" class="z_grid-content1">
 									<el-form-item label="澶囨敞璇存槑">
 										<el-input type="textarea" v-model="form_['Contribute'].remark" style="width: 100%;"></el-input>
@@ -2093,8 +2479,52 @@
 									</el-form-item>
 								</el-col>
 							</el-row>
+							<el-row>
+								<el-col :span="4" class="z_grid-content3">
+									<el-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
+									<el-checkbox @change="parttimeChange('Contribute')" v-model="form_['Contribute'].parttime"></el-checkbox>
+									</el-form-item>
+								</el-col>
+								
+								<!-- <el-col :span="18" class="z_grid-content3">
+									<el-form-item label="鍏艰亴缂栬緫鎴愬憳" label-width="120px">
+										<el-select multiple :disabled="!form_['Contribute'].parttime" size="mini" v-model="form_['Contribute'].parttimeUser" style="width: 100%;">
+											<el-option
+												v-for="item in options_parttimeUser" 
+												:key="item.id"
+												:label="item.name"
+												:value="item.id"
+											></el-option>
+										</el-select>
+									</el-form-item>
+								</el-col> -->
+							</el-row>
 						</el-form>
 						
+						<div v-if="form_['Contribute'].parttime" style="text-align: left;">
+							<el-table
+							  :data="form_['Contribute'].parttimeList"
+							  :show-header="true"
+							  style="width: 100%;"
+							>
+							  <el-table-column prop="parttimeUser" label="濮撳悕" width="300" align="left" show-overflow-tooltip>
+									<template slot-scope="scope">
+									  <div>
+											<el-select disabled size="mini" v-model="scope.row.parttimeUser" style="width: 100%;">
+												<el-option
+													v-for="item in options_parttimeUser"
+													:key="item.id"
+													:label="item.name"
+													:value="item.id"
+												></el-option>
+											</el-select>
+									  </div>
+									</template>
+								</el-table-column>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
+							  </el-table-column>
+							</el-table>
+						</div>
 						<el-form :show-message="false" :model="form_['Contribute']" label-position='right' label-width="100px"  class="demo-form-inline">
 							<el-row>
 								<el-col :span="6" class="z_grid-content1">
@@ -2150,159 +2580,7 @@
 					'Contribute': false,
 				},
 				
-        data_: [
-					{
-						id:"001",
-						title: "绔嬮涓庢柟妗堝紑鍙�",
-						parentId: "0",
-						checkArr: "0",
-						children:[
-							{
-								id:"title",
-								title: "绔嬮鏈嶅姟",
-								parentId: "001",
-								checkArr: "0"
-							},
-							{
-								id:"scheme",
-								title: "鏂规寮�鍙戞湇鍔�",
-								parentId: "001",
-								checkArr: "0"
-							}
-						]
-					},{
-						id:"002",
-						title: "鏂囩尞妫�绱笌绛涙煡",
-						parentId: "0",
-						checkArr: "0",
-						children:[
-							{
-								id:"search",
-								title: "鏂囩尞妫�绱�",
-								parentId: "002",
-								checkArr: "0"
-							},
-							{
-								id:"select",
-								title: "鏂囩尞鍒濈瓫",
-								parentId: "002",
-								checkArr: "0"
-							},
-							{
-								id:"get",
-								title: "鍏ㄦ枃鑾峰彇",
-								parentId: "002",
-								checkArr: "0"
-							},
-							{
-								id:"find",
-								title: "鍏ㄦ枃绛涙煡",
-								parentId: "002",
-								checkArr: "0"
-							}
-						]
-					},{
-						id:"003",
-						title: "鏁版嵁鎻愬彇",
-						parentId: "0",
-						checkArr: "0",
-						children:[
-							{
-								id:"properties",
-								title: "瀹氭�т俊鎭�",
-								parentId: "003",
-								checkArr: "0"
-							},
-							{
-								id:"risk",
-								title: "椋庨櫓鍋忓�氫俊鎭�",
-								parentId: "003",
-								checkArr: "0"
-							},
-							{
-								id:"target",
-								title: "缁撳眬鎸囨爣鏁版嵁",
-								parentId: "003",
-								checkArr: "0"
-							},
-						]
-					},{
-						id:"004",
-						title: "鏁版嵁鍒嗘瀽",
-						parentId: "0",
-						checkArr: "0",
-						children:[
-							{
-								id:"analyse",
-								title: "瀹氭�т俊鎭暣鐞嗘�荤粨",
-								parentId: "004",
-								checkArr: "0"
-							},
-							{
-								id:"arrange",
-								title: "椋庨櫓鍋忓�氬浘琛ㄥ埗浣�",
-								parentId: "004",
-								checkArr: "0"
-							},
-							{
-								id:"meta",
-								title: "Meta 鍒嗘瀽",
-								parentId: "004",
-								checkArr: "0"
-							},
-							{
-								id:"grade",
-								title: "GRADE 璇佹嵁璐ㄩ噺璇勪环",
-								parentId: "004",
-								checkArr: "0"
-							},
-							{
-								id:"tsa",
-								title: "TSA 鍒嗘瀽",
-								parentId: "004",
-								checkArr: "0"
-							}
-						]
-					},{
-						id:"005",
-						title: "鏂囩鎾板啓鍙婄浉鍏虫湇鍔�",
-						parentId: "0",
-						checkArr: "0",
-						children:[
-							{
-								id:"compose",
-								title: "鏂囩鎾板啓",
-								parentId: "005",
-								checkArr: "0"
-							},{
-								id:"translate",
-								title: "璇█缈昏瘧鍙婃鼎鑹�",
-								parentId: "005",
-								checkArr: "0"
-							},{
-								id:"evaluation",
-								title: "鏂囩璇勪及",
-								parentId: "005",
-								checkArr: "0"
-							},{
-								id:"recommend",
-								title: "鏉傚織鎺ㄨ崘",
-								parentId: "005",
-								checkArr: "0"
-							},{
-								id:"format",
-								title: "鏂囩鏍煎紡淇敼",
-								parentId: "005",
-								checkArr: "0"
-							},{
-								id:"Contribute",
-								title: "缃戜笂鎶曠",
-								parentId: "005",
-								checkArr: "0"
-							}
-						]
-					},
-				],
+        data_: [],
         defaultProps: {
           children: 'children',
           label: 'title'
@@ -2311,26 +2589,26 @@
 				defaultCheckedKeys: [],
 				
 				form_: {
-					title: {mustAttach: true, parttimeUser:[]},
-					scheme: {mustAttach: true, parttimeUser:[]},
-					search: {mustAttach: true, parttimeUser:[]},
-					select: {mustAttach: true, parttimeUser:[]},
-					get: {mustAttach: true, parttimeUser:[]},
-					find: {mustAttach: true, parttimeUser:[]},
-					properties: {mustAttach: true, parttimeUser:[]},
-					risk: {mustAttach: true, parttimeUser:[]},
-					target: {mustAttach: true, parttimeUser:[]},
-					analyse: {mustAttach: true, parttimeUser:[]},
-					arrange: {mustAttach: true, parttimeUser:[]},
-					meta: {mustAttach: true, parttimeUser:[]},
-					grade: {mustAttach: true, parttimeUser:[]},
-					tsa: {mustAttach: true, parttimeUser:[]},
-					compose: {mustAttach: true, parttimeUser:[]},
-					translate: {mustAttach: true, parttimeUser:[]},
-					evaluation: {mustAttach: true, parttimeUser:[]},
-					recommend: {mustAttach: true, parttimeUser:[]},
-					format: {mustAttach: true, parttimeUser:[]},
-					Contribute: {mustAttach: true, parttimeUser:[]},
+					title: {mustAttach: true, parttimeList: [], parttime: false},
+					scheme: {mustAttach: true, parttimeList: [], parttime: false},
+					search: {mustAttach: true, parttimeList: [], parttime: false},
+					select: {mustAttach: true, parttimeList: [], parttime: false},
+					get: {mustAttach: true, parttimeList: [], parttime: false},
+					find: {mustAttach: true, parttimeList: [], parttime: false},
+					properties: {mustAttach: true, parttimeList: [], parttime: false},
+					risk: {mustAttach: true, parttimeList: [], parttime: false},
+					target: {mustAttach: true, parttimeList: [], parttime: false},
+					analyse: {mustAttach: true, parttimeList: [], parttime: false},
+					arrange: {mustAttach: true, parttimeList: [], parttime: false},
+					meta: {mustAttach: true, parttimeList: [], parttime: false},
+					grade: {mustAttach: true, parttimeList: [], parttime: false},
+					tsa: {mustAttach: true, parttimeList: [], parttime: false},
+					compose: {mustAttach: true, parttimeList: [], parttime: false},
+					translate: {mustAttach: true, parttimeList: [], parttime: false},
+					evaluation: {mustAttach: true, parttimeList: [], parttime: false},
+					recommend: {mustAttach: true, parttimeList: [], parttime: false},
+					format: {mustAttach: true, parttimeList: [], parttime: false},
+					Contribute: {mustAttach: true, parttimeList: [], parttime: false},
 				},
 				
 				options_titleType: [
@@ -2414,7 +2692,7 @@
 						form_obj.createTime = this.$moment(form_obj.createTime).format('YYYY-MM-DD');
 					}
 					
-					if (form_obj.parttimeUser && form_obj.parttimeUser.length>0) {
+					/* if (form_obj.parttimeUser && form_obj.parttimeUser.length>0) {
 						let parttimeUser_ = "";
 						for (let i = 0; i<form_obj.parttimeUser.length; i++) {
 							if (parttimeUser_ == "") {
@@ -2426,7 +2704,7 @@
 						}
 						
 						form_obj.parttimeUser = parttimeUser_;
-					}
+					} */
 					
 					if (form_obj.userIds) {
 						let leng = form_obj.userIds.length;
@@ -2560,8 +2838,17 @@
 							me.form_[detail_.type].userIds = [];
 							me.form_[detail_.type].userIds.push(detail_.roleName);
 							me.form_[detail_.type].userIds.push(detail_.userId);
-							if (detail_.parttimeUser) {
+							/* if (detail_.parttimeUser) {
 								me.form_[detail_.type].parttimeUser = detail_.parttimeUser.split(";");
+							} */
+							
+							if (detail_.existsObject) {//濡傛灉鏈夐澶栧瓧娈�
+								for(let itm in detail_.existsObject) {
+									me.form_[detail_.type][itm] = detail_.existsObject[itm];
+									if (itm == "outcomes" && me.form_[detail_.type].outcomes) {
+										me.form_[detail_.type].outcomes_array = me.form_[detail_.type].outcomes.split(";");
+									}
+								}
 							}
 							
 							me.money += parseFloat(detail_.budget); 

--
Gitblit v1.8.0