From 801770456ae3750a44e0989b0025a98ccbad24e6 Mon Sep 17 00:00:00 2001
From: bob <bob.zhang@highdatas.com>
Date: 星期四, 13 八月 2020 17:13:53 +0800
Subject: [PATCH] 最新

---
 src/components/popup/portion/substepReadOnly.vue |  635 ++++++++++-----------------------------------------------
 1 files changed, 115 insertions(+), 520 deletions(-)

diff --git a/src/components/popup/portion/substepReadOnly.vue b/src/components/popup/portion/substepReadOnly.vue
index 4dc67fe..d678259 100644
--- a/src/components/popup/portion/substepReadOnly.vue
+++ b/src/components/popup/portion/substepReadOnly.vue
@@ -3,13 +3,13 @@
 		<div style="width: 79%;text-align: center; margin: 0 10px;">
 			<h2 style="margin: 10px;">椤圭洰鎬婚噾棰�:<span style="font-weight: bold;">{{money}}</span></h2>
 		</div>
-		<div style="width: 79%; height: 88%; overflow: auto; padding-top: 0px; box-sizing: border-box;">
+		<div class="class_form_z1" style="width: 79%; height: 88%; 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']}]"
@@ -26,8 +26,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']}]"
@@ -35,7 +35,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"
@@ -106,9 +151,7 @@
 							</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-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
 									<el-checkbox @change="parttimeChange('title')" v-model="form_['title'].parttime"></el-checkbox>
 									</el-form-item>
 								</el-col>
@@ -128,7 +171,6 @@
 							</el-row>
 						</el-form>
 						<div v-if="form_['title'].parttime" style="text-align: left;">
-							<el-button :disabled="!form_['title'].parttime" size="small" @click="addParttime('title')">鏂板鍏艰亴浜哄憳</el-button>
 							<el-table
 							  :data="form_['title'].parttimeList"
 							  :show-header="true"
@@ -148,22 +190,8 @@
 									  </div>
 									</template>
 								</el-table-column>
-							  <el-table-column prop="parttimePay" label="璐圭敤" width="200" align="center">
-							    <template slot-scope="scope">
-							      <div>
-											<el-input-number size="small" v-model="scope.row.parttimePay" :min="1" label="鏀粯璐圭敤"></el-input-number>
-							      </div>
-							    </template>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
 							  </el-table-column>
-								<el-table-column width="280" label="鎿嶄綔" align="center">
-								  <template v-slot="{row}">
-								    <el-row>
-								      <el-tooltip class="item" effect="dark" content="鍒犻櫎" placement="top">
-								        <el-button type="danger" size="mini" icon="el-icon-delete" circle @click="deleteParttime('title', row)"></el-button>
-								      </el-tooltip>
-								    </el-row>
-								  </template>
-								</el-table-column>
 							</el-table>
 						</div>
 					</div>
@@ -243,9 +271,7 @@
 							</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-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
 									<el-checkbox @change="parttimeChange('scheme')" v-model="form_['scheme'].parttime"></el-checkbox>
 									</el-form-item>
 								</el-col>
@@ -265,7 +291,6 @@
 							</el-row>
 						</el-form>
 						<div v-if="form_['scheme'].parttime" style="text-align: left;">
-							<el-button :disabled="!form_['scheme'].parttime" size="small" @click="addParttime('scheme')">鏂板鍏艰亴浜哄憳</el-button>
 							<el-table
 							  :data="form_['scheme'].parttimeList"
 							  :show-header="true"
@@ -285,22 +310,8 @@
 									  </div>
 									</template>
 								</el-table-column>
-							  <el-table-column prop="parttimePay" label="璐圭敤" width="200" align="center">
-							    <template slot-scope="scope">
-							      <div>
-											<el-input-number size="small" v-model="scope.row.parttimePay" :min="1" label="鏀粯璐圭敤"></el-input-number>
-							      </div>
-							    </template>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
 							  </el-table-column>
-								<el-table-column width="280" label="鎿嶄綔" align="center">
-								  <template v-slot="{row}">
-								    <el-row>
-								      <el-tooltip class="item" effect="dark" content="鍒犻櫎" placement="top">
-								        <el-button type="danger" size="mini" icon="el-icon-delete" circle @click="deleteParttime('scheme', row)"></el-button>
-								      </el-tooltip>
-								    </el-row>
-								  </template>
-								</el-table-column>
 							</el-table>
 						</div>
 					</div>
@@ -380,9 +391,7 @@
 							</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-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
 									<el-checkbox @change="parttimeChange('search')" v-model="form_['search'].parttime"></el-checkbox>
 									</el-form-item>
 								</el-col>
@@ -402,7 +411,6 @@
 							</el-row>
 						</el-form>
 						<div v-if="form_['search'].parttime" style="text-align: left;">
-							<el-button :disabled="!form_['search'].parttime" size="small" @click="addParttime('search')">鏂板鍏艰亴浜哄憳</el-button>
 							<el-table
 							  :data="form_['search'].parttimeList"
 							  :show-header="true"
@@ -422,22 +430,8 @@
 									  </div>
 									</template>
 								</el-table-column>
-							  <el-table-column prop="parttimePay" label="璐圭敤" width="200" align="center">
-							    <template slot-scope="scope">
-							      <div>
-											<el-input-number size="small" v-model="scope.row.parttimePay" :min="1" label="鏀粯璐圭敤"></el-input-number>
-							      </div>
-							    </template>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
 							  </el-table-column>
-								<el-table-column width="280" label="鎿嶄綔" align="center">
-								  <template v-slot="{row}">
-								    <el-row>
-								      <el-tooltip class="item" effect="dark" content="鍒犻櫎" placement="top">
-								        <el-button type="danger" size="mini" icon="el-icon-delete" circle @click="deleteParttime('search', row)"></el-button>
-								      </el-tooltip>
-								    </el-row>
-								  </template>
-								</el-table-column>
 							</el-table>
 						</div>
 					</div>
@@ -517,9 +511,7 @@
 							</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-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
 									<el-checkbox @change="parttimeChange('select')" v-model="form_['select'].parttime"></el-checkbox>
 									</el-form-item>
 								</el-col>
@@ -539,7 +531,6 @@
 							</el-row>
 						</el-form>
 						<div v-if="form_['select'].parttime" style="text-align: left;">
-							<el-button :disabled="!form_['select'].parttime" size="small" @click="addParttime('select')">鏂板鍏艰亴浜哄憳</el-button>
 							<el-table
 							  :data="form_['select'].parttimeList"
 							  :show-header="true"
@@ -559,22 +550,8 @@
 									  </div>
 									</template>
 								</el-table-column>
-							  <el-table-column prop="parttimePay" label="璐圭敤" width="200" align="center">
-							    <template slot-scope="scope">
-							      <div>
-											<el-input-number size="small" v-model="scope.row.parttimePay" :min="1" label="鏀粯璐圭敤"></el-input-number>
-							      </div>
-							    </template>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
 							  </el-table-column>
-								<el-table-column width="280" label="鎿嶄綔" align="center">
-								  <template v-slot="{row}">
-								    <el-row>
-								      <el-tooltip class="item" effect="dark" content="鍒犻櫎" placement="top">
-								        <el-button type="danger" size="mini" icon="el-icon-delete" circle @click="deleteParttime('select', row)"></el-button>
-								      </el-tooltip>
-								    </el-row>
-								  </template>
-								</el-table-column>
 							</el-table>
 						</div>
 					</div>
@@ -654,9 +631,7 @@
 							</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-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
 									<el-checkbox @change="parttimeChange('get')" v-model="form_['get'].parttime"></el-checkbox>
 									</el-form-item>
 								</el-col>
@@ -676,7 +651,6 @@
 							</el-row>
 						</el-form>
 						<div v-if="form_['get'].parttime" style="text-align: left;">
-							<el-button :disabled="!form_['get'].parttime" size="small" @click="addParttime('get')">鏂板鍏艰亴浜哄憳</el-button>
 							<el-table
 							  :data="form_['get'].parttimeList"
 							  :show-header="true"
@@ -696,22 +670,8 @@
 									  </div>
 									</template>
 								</el-table-column>
-							  <el-table-column prop="parttimePay" label="璐圭敤" width="200" align="center">
-							    <template slot-scope="scope">
-							      <div>
-											<el-input-number size="small" v-model="scope.row.parttimePay" :min="1" label="鏀粯璐圭敤"></el-input-number>
-							      </div>
-							    </template>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
 							  </el-table-column>
-								<el-table-column width="280" label="鎿嶄綔" align="center">
-								  <template v-slot="{row}">
-								    <el-row>
-								      <el-tooltip class="item" effect="dark" content="鍒犻櫎" placement="top">
-								        <el-button type="danger" size="mini" icon="el-icon-delete" circle @click="deleteParttime('get', row)"></el-button>
-								      </el-tooltip>
-								    </el-row>
-								  </template>
-								</el-table-column>
 							</el-table>
 						</div>
 					</div>
@@ -791,9 +751,7 @@
 							</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-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
 									<el-checkbox @change="parttimeChange('find')" v-model="form_['find'].parttime"></el-checkbox>
 									</el-form-item>
 								</el-col>
@@ -813,7 +771,6 @@
 							</el-row>
 						</el-form>
 						<div v-if="form_['find'].parttime" style="text-align: left;">
-							<el-button :disabled="!form_['find'].parttime" size="small" @click="addParttime('find')">鏂板鍏艰亴浜哄憳</el-button>
 							<el-table
 							  :data="form_['find'].parttimeList"
 							  :show-header="true"
@@ -833,22 +790,8 @@
 									  </div>
 									</template>
 								</el-table-column>
-							  <el-table-column prop="parttimePay" label="璐圭敤" width="200" align="center">
-							    <template slot-scope="scope">
-							      <div>
-											<el-input-number size="small" v-model="scope.row.parttimePay" :min="1" label="鏀粯璐圭敤"></el-input-number>
-							      </div>
-							    </template>
+							  <el-table-column prop="parttimePay" label="璐圭敤" align="center">
 							  </el-table-column>
-								<el-table-column width="280" label="鎿嶄綔" align="center">
-								  <template v-slot="{row}">
-								    <el-row>
-								      <el-tooltip class="item" effect="dark" content="鍒犻櫎" placement="top">
-								        <el-button type="danger" size="mini" icon="el-icon-delete" circle @click="deleteParttime('find', row)"></el-button>
-								      </el-tooltip>
-								    </el-row>
-								  </template>
-								</el-table-column>
 							</el-table>
 						</div>
 					</div>
@@ -928,9 +871,7 @@
 							</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-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
 									<el-checkbox @change="parttimeChange('properties')" v-model="form_['properties'].parttime"></el-checkbox>
 									</el-form-item>
 								</el-col>
@@ -950,7 +891,6 @@
 							</el-row>
 						</el-form>
 						<div v-if="form_['properties'].parttime" style="text-align: left;">
-							<el-button :disabled="!form_['properties'].parttime" size="small" @click="addParttime('properties')">鏂板鍏艰亴浜哄憳</el-button>
 							<el-table
 							  :data="form_['properties'].parttimeList"
 							  :show-header="true"
@@ -970,22 +910,8 @@
 									  </div>
 									</template>
 								</el-table-column>
-							  <el-table-column prop="parttimePay" label="璐圭敤" width="200" align="center">
-							    <template slot-scope="scope">
-							      <div>
-											<el-input-number size="small" v-model="scope.row.parttimePay" :min="1" label="鏀粯璐圭敤"></el-input-number>
-							      </div>
-							    </template>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
 							  </el-table-column>
-								<el-table-column width="280" label="鎿嶄綔" align="center">
-								  <template v-slot="{row}">
-								    <el-row>
-								      <el-tooltip class="item" effect="dark" content="鍒犻櫎" placement="top">
-								        <el-button type="danger" size="mini" icon="el-icon-delete" circle @click="deleteParttime('properties', row)"></el-button>
-								      </el-tooltip>
-								    </el-row>
-								  </template>
-								</el-table-column>
 							</el-table>
 						</div>
 					</div>
@@ -1179,9 +1105,7 @@
 							</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-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
 									<el-checkbox @change="parttimeChange('analyse')" v-model="form_['analyse'].parttime"></el-checkbox>
 									</el-form-item>
 								</el-col>
@@ -1201,7 +1125,6 @@
 							</el-row>
 						</el-form>
 						<div v-if="form_['analyse'].parttime" style="text-align: left;">
-							<el-button :disabled="!form_['analyse'].parttime" size="small" @click="addParttime('analyse')">鏂板鍏艰亴浜哄憳</el-button>
 							<el-table
 							  :data="form_['analyse'].parttimeList"
 							  :show-header="true"
@@ -1221,22 +1144,8 @@
 									  </div>
 									</template>
 								</el-table-column>
-							  <el-table-column prop="parttimePay" label="璐圭敤" width="200" align="center">
-							    <template slot-scope="scope">
-							      <div>
-											<el-input-number size="small" v-model="scope.row.parttimePay" :min="1" label="鏀粯璐圭敤"></el-input-number>
-							      </div>
-							    </template>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
 							  </el-table-column>
-								<el-table-column width="280" label="鎿嶄綔" align="center">
-								  <template v-slot="{row}">
-								    <el-row>
-								      <el-tooltip class="item" effect="dark" content="鍒犻櫎" placement="top">
-								        <el-button type="danger" size="mini" icon="el-icon-delete" circle @click="deleteParttime('analyse', row)"></el-button>
-								      </el-tooltip>
-								    </el-row>
-								  </template>
-								</el-table-column>
 							</el-table>
 						</div>
 					</div>
@@ -1316,9 +1225,7 @@
 							</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-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
 									<el-checkbox @change="parttimeChange('arrange')" v-model="form_['arrange'].parttime"></el-checkbox>
 									</el-form-item>
 								</el-col>
@@ -1338,7 +1245,6 @@
 							</el-row>
 						</el-form>
 						<div v-if="form_['arrange'].parttime" style="text-align: left;">
-							<el-button :disabled="!form_['arrange'].parttime" size="small" @click="addParttime('arrange')">鏂板鍏艰亴浜哄憳</el-button>
 							<el-table
 							  :data="form_['arrange'].parttimeList"
 							  :show-header="true"
@@ -1358,22 +1264,8 @@
 									  </div>
 									</template>
 								</el-table-column>
-							  <el-table-column prop="parttimePay" label="璐圭敤" width="200" align="center">
-							    <template slot-scope="scope">
-							      <div>
-											<el-input-number size="small" v-model="scope.row.parttimePay" :min="1" label="鏀粯璐圭敤"></el-input-number>
-							      </div>
-							    </template>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
 							  </el-table-column>
-								<el-table-column width="280" label="鎿嶄綔" align="center">
-								  <template v-slot="{row}">
-								    <el-row>
-								      <el-tooltip class="item" effect="dark" content="鍒犻櫎" placement="top">
-								        <el-button type="danger" size="mini" icon="el-icon-delete" circle @click="deleteParttime('arrange', row)"></el-button>
-								      </el-tooltip>
-								    </el-row>
-								  </template>
-								</el-table-column>
 							</el-table>
 						</div>
 					</div>
@@ -1453,9 +1345,7 @@
 							</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-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
 									<el-checkbox @change="parttimeChange('meta')" v-model="form_['meta'].parttime"></el-checkbox>
 									</el-form-item>
 								</el-col>
@@ -1475,7 +1365,6 @@
 							</el-row>
 						</el-form>
 						<div v-if="form_['meta'].parttime" style="text-align: left;">
-							<el-button :disabled="!form_['meta'].parttime" size="small" @click="addParttime('meta')">鏂板鍏艰亴浜哄憳</el-button>
 							<el-table
 							  :data="form_['meta'].parttimeList"
 							  :show-header="true"
@@ -1495,22 +1384,8 @@
 									  </div>
 									</template>
 								</el-table-column>
-							  <el-table-column prop="parttimePay" label="璐圭敤" width="200" align="center">
-							    <template slot-scope="scope">
-							      <div>
-											<el-input-number size="small" v-model="scope.row.parttimePay" :min="1" label="鏀粯璐圭敤"></el-input-number>
-							      </div>
-							    </template>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
 							  </el-table-column>
-								<el-table-column width="280" label="鎿嶄綔" align="center">
-								  <template v-slot="{row}">
-								    <el-row>
-								      <el-tooltip class="item" effect="dark" content="鍒犻櫎" placement="top">
-								        <el-button type="danger" size="mini" icon="el-icon-delete" circle @click="deleteParttime('meta', row)"></el-button>
-								      </el-tooltip>
-								    </el-row>
-								  </template>
-								</el-table-column>
 							</el-table>
 						</div>
 					</div>
@@ -1589,9 +1464,7 @@
 							</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-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
 									<el-checkbox @change="parttimeChange('grade')" v-model="form_['grade'].parttime"></el-checkbox>
 									</el-form-item>
 								</el-col>
@@ -1611,7 +1484,6 @@
 							</el-row>
 						</el-form>
 						<div v-if="form_['grade'].parttime" style="text-align: left;">
-							<el-button :disabled="!form_['grade'].parttime" size="small" @click="addParttime('grade')">鏂板鍏艰亴浜哄憳</el-button>
 							<el-table
 							  :data="form_['grade'].parttimeList"
 							  :show-header="true"
@@ -1631,22 +1503,8 @@
 									  </div>
 									</template>
 								</el-table-column>
-							  <el-table-column prop="parttimePay" label="璐圭敤" width="200" align="center">
-							    <template slot-scope="scope">
-							      <div>
-											<el-input-number size="small" v-model="scope.row.parttimePay" :min="1" label="鏀粯璐圭敤"></el-input-number>
-							      </div>
-							    </template>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
 							  </el-table-column>
-								<el-table-column width="280" label="鎿嶄綔" align="center">
-								  <template v-slot="{row}">
-								    <el-row>
-								      <el-tooltip class="item" effect="dark" content="鍒犻櫎" placement="top">
-								        <el-button type="danger" size="mini" icon="el-icon-delete" circle @click="deleteParttime('grade', row)"></el-button>
-								      </el-tooltip>
-								    </el-row>
-								  </template>
-								</el-table-column>
 							</el-table>
 						</div>
 					</div>
@@ -1728,9 +1586,7 @@
 							</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-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
 									<el-checkbox @change="parttimeChange('tsa')" v-model="form_['tsa'].parttime"></el-checkbox>
 									</el-form-item>
 								</el-col>
@@ -1750,7 +1606,6 @@
 							</el-row>
 						</el-form>
 						<div v-if="form_['tsa'].parttime" style="text-align: left;">
-							<el-button :disabled="!form_['tsa'].parttime" size="small" @click="addParttime('tsa')">鏂板鍏艰亴浜哄憳</el-button>
 							<el-table
 							  :data="form_['tsa'].parttimeList"
 							  :show-header="true"
@@ -1770,22 +1625,8 @@
 									  </div>
 									</template>
 								</el-table-column>
-							  <el-table-column prop="parttimePay" label="璐圭敤" width="200" align="center">
-							    <template slot-scope="scope">
-							      <div>
-											<el-input-number size="small" v-model="scope.row.parttimePay" :min="1" label="鏀粯璐圭敤"></el-input-number>
-							      </div>
-							    </template>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
 							  </el-table-column>
-								<el-table-column width="280" label="鎿嶄綔" align="center">
-								  <template v-slot="{row}">
-								    <el-row>
-								      <el-tooltip class="item" effect="dark" content="鍒犻櫎" placement="top">
-								        <el-button type="danger" size="mini" icon="el-icon-delete" circle @click="deleteParttime('tsa', row)"></el-button>
-								      </el-tooltip>
-								    </el-row>
-								  </template>
-								</el-table-column>
 							</el-table>
 						</div>
 					</div>
@@ -1865,9 +1706,7 @@
 							</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-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
 									<el-checkbox @change="parttimeChange('compose')" v-model="form_['compose'].parttime"></el-checkbox>
 									</el-form-item>
 								</el-col>
@@ -1887,7 +1726,6 @@
 							</el-row>
 						</el-form>
 						<div v-if="form_['compose'].parttime" style="text-align: left;">
-							<el-button :disabled="!form_['compose'].parttime" size="small" @click="addParttime('compose')">鏂板鍏艰亴浜哄憳</el-button>
 							<el-table
 							  :data="form_['compose'].parttimeList"
 							  :show-header="true"
@@ -1907,22 +1745,8 @@
 									  </div>
 									</template>
 								</el-table-column>
-							  <el-table-column prop="parttimePay" label="璐圭敤" width="200" align="center">
-							    <template slot-scope="scope">
-							      <div>
-											<el-input-number size="small" v-model="scope.row.parttimePay" :min="1" label="鏀粯璐圭敤"></el-input-number>
-							      </div>
-							    </template>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
 							  </el-table-column>
-								<el-table-column width="280" label="鎿嶄綔" align="center">
-								  <template v-slot="{row}">
-								    <el-row>
-								      <el-tooltip class="item" effect="dark" content="鍒犻櫎" placement="top">
-								        <el-button type="danger" size="mini" icon="el-icon-delete" circle @click="deleteParttime('compose', row)"></el-button>
-								      </el-tooltip>
-								    </el-row>
-								  </template>
-								</el-table-column>
 							</el-table>
 						</div>
 					</div>
@@ -2002,9 +1826,7 @@
 							</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-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
 									<el-checkbox @change="parttimeChange('translate')" v-model="form_['translate'].parttime"></el-checkbox>
 									</el-form-item>
 								</el-col>
@@ -2024,7 +1846,6 @@
 							</el-row>
 						</el-form>
 						<div v-if="form_['translate'].parttime" style="text-align: left;">
-							<el-button :disabled="!form_['translate'].parttime" size="small" @click="addParttime('translate')">鏂板鍏艰亴浜哄憳</el-button>
 							<el-table
 							  :data="form_['translate'].parttimeList"
 							  :show-header="true"
@@ -2044,22 +1865,8 @@
 									  </div>
 									</template>
 								</el-table-column>
-							  <el-table-column prop="parttimePay" label="璐圭敤" width="200" align="center">
-							    <template slot-scope="scope">
-							      <div>
-											<el-input-number size="small" v-model="scope.row.parttimePay" :min="1" label="鏀粯璐圭敤"></el-input-number>
-							      </div>
-							    </template>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
 							  </el-table-column>
-								<el-table-column width="280" label="鎿嶄綔" align="center">
-								  <template v-slot="{row}">
-								    <el-row>
-								      <el-tooltip class="item" effect="dark" content="鍒犻櫎" placement="top">
-								        <el-button type="danger" size="mini" icon="el-icon-delete" circle @click="deleteParttime('translate', row)"></el-button>
-								      </el-tooltip>
-								    </el-row>
-								  </template>
-								</el-table-column>
 							</el-table>
 						</div>
 					</div>
@@ -2139,9 +1946,7 @@
 							</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-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
 									<el-checkbox @change="parttimeChange('evaluation')" v-model="form_['evaluation'].parttime"></el-checkbox>
 									</el-form-item>
 								</el-col>
@@ -2161,7 +1966,6 @@
 							</el-row>
 						</el-form>
 						<div v-if="form_['evaluation'].parttime" style="text-align: left;">
-							<el-button :disabled="!form_['evaluation'].parttime" size="small" @click="addParttime('evaluation')">鏂板鍏艰亴浜哄憳</el-button>
 							<el-table
 							  :data="form_['evaluation'].parttimeList"
 							  :show-header="true"
@@ -2181,22 +1985,8 @@
 									  </div>
 									</template>
 								</el-table-column>
-							  <el-table-column prop="parttimePay" label="璐圭敤" width="200" align="center">
-							    <template slot-scope="scope">
-							      <div>
-											<el-input-number size="small" v-model="scope.row.parttimePay" :min="1" label="鏀粯璐圭敤"></el-input-number>
-							      </div>
-							    </template>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
 							  </el-table-column>
-								<el-table-column width="280" label="鎿嶄綔" align="center">
-								  <template v-slot="{row}">
-								    <el-row>
-								      <el-tooltip class="item" effect="dark" content="鍒犻櫎" placement="top">
-								        <el-button type="danger" size="mini" icon="el-icon-delete" circle @click="deleteParttime('evaluation', row)"></el-button>
-								      </el-tooltip>
-								    </el-row>
-								  </template>
-								</el-table-column>
 							</el-table>
 						</div>
 					</div>
@@ -2276,9 +2066,7 @@
 							</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-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
 									<el-checkbox @change="parttimeChange('recommend')" v-model="form_['recommend'].parttime"></el-checkbox>
 									</el-form-item>
 								</el-col>
@@ -2298,7 +2086,6 @@
 							</el-row>
 						</el-form>
 						<div v-if="form_['recommend'].parttime" style="text-align: left;">
-							<el-button :disabled="!form_['recommend'].parttime" size="small" @click="addParttime('recommend')">鏂板鍏艰亴浜哄憳</el-button>
 							<el-table
 							  :data="form_['recommend'].parttimeList"
 							  :show-header="true"
@@ -2318,22 +2105,8 @@
 									  </div>
 									</template>
 								</el-table-column>
-							  <el-table-column prop="parttimePay" label="璐圭敤" width="200" align="center">
-							    <template slot-scope="scope">
-							      <div>
-											<el-input-number size="small" v-model="scope.row.parttimePay" :min="1" label="鏀粯璐圭敤"></el-input-number>
-							      </div>
-							    </template>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
 							  </el-table-column>
-								<el-table-column width="280" label="鎿嶄綔" align="center">
-								  <template v-slot="{row}">
-								    <el-row>
-								      <el-tooltip class="item" effect="dark" content="鍒犻櫎" placement="top">
-								        <el-button type="danger" size="mini" icon="el-icon-delete" circle @click="deleteParttime('recommend', row)"></el-button>
-								      </el-tooltip>
-								    </el-row>
-								  </template>
-								</el-table-column>
 							</el-table>
 						</div>
 					</div>
@@ -2413,9 +2186,7 @@
 							</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-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
 									<el-checkbox @change="parttimeChange('format')" v-model="form_['format'].parttime"></el-checkbox>
 									</el-form-item>
 								</el-col>
@@ -2435,7 +2206,6 @@
 							</el-row>
 						</el-form>
 						<div v-if="form_['format'].parttime" style="text-align: left;">
-							<el-button :disabled="!form_['format'].parttime" size="small" @click="addParttime('format')">鏂板鍏艰亴浜哄憳</el-button>
 							<el-table
 							  :data="form_['format'].parttimeList"
 							  :show-header="true"
@@ -2455,22 +2225,8 @@
 									  </div>
 									</template>
 								</el-table-column>
-							  <el-table-column prop="parttimePay" label="璐圭敤" width="200" align="center">
-							    <template slot-scope="scope">
-							      <div>
-											<el-input-number size="small" v-model="scope.row.parttimePay" :min="1" label="鏀粯璐圭敤"></el-input-number>
-							      </div>
-							    </template>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
 							  </el-table-column>
-								<el-table-column width="280" label="鎿嶄綔" align="center">
-								  <template v-slot="{row}">
-								    <el-row>
-								      <el-tooltip class="item" effect="dark" content="鍒犻櫎" placement="top">
-								        <el-button type="danger" size="mini" icon="el-icon-delete" circle @click="deleteParttime('format', row)"></el-button>
-								      </el-tooltip>
-								    </el-row>
-								  </template>
-								</el-table-column>
 							</el-table>
 						</div>
 					</div>
@@ -2550,9 +2306,7 @@
 							</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-form-item label="鏄惁鍏艰亴缂栬緫" label-width="120px">
 									<el-checkbox @change="parttimeChange('Contribute')" v-model="form_['Contribute'].parttime"></el-checkbox>
 									</el-form-item>
 								</el-col>
@@ -2572,7 +2326,6 @@
 							</el-row>
 						</el-form>
 						<div v-if="form_['Contribute'].parttime" style="text-align: left;">
-							<el-button :disabled="!form_['Contribute'].parttime" size="small" @click="addParttime('Contribute')">鏂板鍏艰亴浜哄憳</el-button>
 							<el-table
 							  :data="form_['Contribute'].parttimeList"
 							  :show-header="true"
@@ -2592,22 +2345,8 @@
 									  </div>
 									</template>
 								</el-table-column>
-							  <el-table-column prop="parttimePay" label="璐圭敤" width="200" align="center">
-							    <template slot-scope="scope">
-							      <div>
-											<el-input-number size="small" v-model="scope.row.parttimePay" :min="1" label="鏀粯璐圭敤"></el-input-number>
-							      </div>
-							    </template>
+							  <el-table-column prop="parttimePay" label="璐圭敤"  align="center">
 							  </el-table-column>
-								<el-table-column width="280" label="鎿嶄綔" align="center">
-								  <template v-slot="{row}">
-								    <el-row>
-								      <el-tooltip class="item" effect="dark" content="鍒犻櫎" placement="top">
-								        <el-button type="danger" size="mini" icon="el-icon-delete" circle @click="deleteParttime('Contribute', row)"></el-button>
-								      </el-tooltip>
-								    </el-row>
-								  </template>
-								</el-table-column>
 							</el-table>
 						</div>
 					</div>
@@ -2668,159 +2407,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'
@@ -2829,26 +2416,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: [
@@ -3004,8 +2591,16 @@
 							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