From d0be57c51de4ed3bf6e8d9a68242f24a5716e65d Mon Sep 17 00:00:00 2001 From: zhangyanpeng <bob.zhang@highdatas.com> Date: 星期三, 06 五月 2020 19:34:51 +0800 Subject: [PATCH] 添加修改密码功能 --- src/components/popup/portion/substep.vue | 1594 +++++++++++++++++++++------- src/components/finance/collectionStatistics.vue | 8 src/components/popup/portion/substepReadOnly.vue | 1517 +++++++++++++++++++------- src/views/login.vue | 15 package-lock.json | 5 src/components/finance/partTimeExpenses.vue | 1 package.json | 1 src/views/Home.vue | 110 + src/components/popup/newProject.vue | 14 src/main.ts | 4 10 files changed, 2,437 insertions(+), 832 deletions(-) diff --git a/package-lock.json b/package-lock.json index 30e8548..088ad20 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12078,6 +12078,11 @@ "resolved": "https://registry.npm.taobao.org/vue-class-component/download/vue-class-component-7.2.1.tgz", "integrity": "sha1-WqDWrvTEKuyAHFP+spN6Mi0ycPk=" }, + "vue-cookies": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/vue-cookies/-/vue-cookies-1.7.0.tgz", + "integrity": "sha512-vuEUm6wYMMrFAHFCrkzIUAy8+MgPAbBGmYXnk2M6X6O2KHbMT1wuDD2izacmsSUp6ZM02e23MJRtPRobl88VMg==" + }, "vue-echarts": { "version": "4.1.0", "resolved": "https://registry.npm.taobao.org/vue-echarts/download/vue-echarts-4.1.0.tgz", diff --git a/package.json b/package.json index d6e7cb6..a989d6b 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "register-service-worker": "^1.6.2", "vue": "^2.6.10", "vue-class-component": "^7.0.2", + "vue-cookies": "^1.7.0", "vue-echarts": "^4.1.0", "vue-property-decorator": "^8.3.0", "vue-router": "^3.1.3", diff --git a/src/components/finance/collectionStatistics.vue b/src/components/finance/collectionStatistics.vue index d2936ea..a41a9ec 100644 --- a/src/components/finance/collectionStatistics.vue +++ b/src/components/finance/collectionStatistics.vue @@ -314,26 +314,26 @@ this.$axios.get(url,{ params: params }).then(data_ => { - console.log(data_); + //console.log(data_); if (callback) { callback(data_); } }) .catch(error =>{ - console.log(error); + //console.log(error); }) }, postUrl(url, params, callback){ let me = this; this.$axios.post(url,params) .then(data_ => { - console.log(data_); + //console.log(data_); if (callback) { callback(data_); } }) .catch(error =>{ - console.log(error); + //console.log(error); }) }, diff --git a/src/components/finance/partTimeExpenses.vue b/src/components/finance/partTimeExpenses.vue index c69196d..f95ddd4 100644 --- a/src/components/finance/partTimeExpenses.vue +++ b/src/components/finance/partTimeExpenses.vue @@ -35,6 +35,7 @@ <el-table-column prop="finishMoney" label="宸插畬鎴愰噾棰�" align="center" :formatter="noisnull_"></el-table-column> <el-table-column prop="unFinishCnt" label="鏈畬鎴愭ā鍧�" align="center" :formatter="noisnull_"></el-table-column> <el-table-column prop="unFinishMoney" label="鏈畬鎴愰噾棰�" align="center" :formatter="noisnull_"></el-table-column> + <el-table-column prop="payMoney" label="鍚堝悓鏀粯閲戦" align="center" :formatter="noisnull_"></el-table-column> <el-table-column prop="money" label="鏀粯閲戦" width="150" align="center"> <template v-slot="{row}"> <div> diff --git a/src/components/popup/newProject.vue b/src/components/popup/newProject.vue index 4ba4b18..8a9a821 100644 --- a/src/components/popup/newProject.vue +++ b/src/components/popup/newProject.vue @@ -134,6 +134,7 @@ totalItems: null, showData_: null, form_objs: null, + parttimeLists: null, options_leadUserId: [], options_objectives: [ @@ -369,6 +370,7 @@ saveStep2() { this.showData_ = this.$refs.substep_zj.showData; this.form_objs = this.$refs.substep_zj.form_; + this.parttimeLists = this.$refs.substep_zj.parttimeList_; let form_array = []; let is_null1 = true; @@ -400,7 +402,11 @@ // form_obj.endTime = new Date(form_obj.endTime).Format("yyyy-MM-dd").toLocaleString(); } - if (form_obj.parttimeUser && form_obj.parttimeUser.length>0) { + if (form_obj.createTime) { + form_obj.createTime = this.$moment(form_obj.createTime).format('YYYY-MM-DD'); + } + + /* if (form_obj.parttimeUser && form_obj.parttimeUser.length>0) { let parttimeUser_ = ""; for (let i = 0; i<form_obj.parttimeUser.length; i++) { if (parttimeUser_ == "") { @@ -412,7 +418,9 @@ } form_obj.parttimeUser = parttimeUser_; - } + } */ + + //form_obj.parttimeList = this.parttimeLists[itm_k]; if (form_obj.userIds) { let leng = form_obj.userIds.length; @@ -431,7 +439,7 @@ let datas = "?datas=" + encodeURI(JSON.stringify(form_array)); let url = "/api/detail/updates"; this.$axios.get(url + datas).then(data_ => { - + window.console.log(data_); this.add_Step = 2; this.nextStepName = "瀹� 鎴�"; }).catch(error =>{ diff --git a/src/components/popup/portion/substep.vue b/src/components/popup/portion/substep.vue index 8f3fcdd..d7a4cc1 100644 --- a/src/components/popup/portion/substep.vue +++ b/src/components/popup/portion/substep.vue @@ -115,27 +115,6 @@ </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-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> @@ -153,7 +132,68 @@ </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-button :disabled="!form_['title'].parttime" size="small" @click="addParttime('title')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -228,28 +268,6 @@ </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-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> @@ -267,7 +285,68 @@ </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-button :disabled="!form_['scheme'].parttime" size="small" @click="addParttime('scheme')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -342,28 +421,6 @@ </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-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> @@ -381,7 +438,68 @@ </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-button :disabled="!form_['search'].parttime" size="small" @click="addParttime('search')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -454,28 +572,6 @@ </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-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> @@ -493,7 +589,69 @@ </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-button :disabled="!form_['select'].parttime" size="small" @click="addParttime('select')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -566,28 +724,6 @@ </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-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> @@ -605,7 +741,68 @@ </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-button :disabled="!form_['get'].parttime" size="small" @click="addParttime('get')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -678,28 +875,6 @@ </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-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> @@ -717,7 +892,68 @@ </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-button :disabled="!form_['find'].parttime" size="small" @click="addParttime('find')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -790,28 +1026,6 @@ </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-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> @@ -829,7 +1043,68 @@ </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-button :disabled="!form_['properties'].parttime" size="small" @click="addParttime('properties')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -1054,27 +1329,6 @@ </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-row> <el-col :span="17" class="z_grid-content1"> <el-form-item label="澶囨敞璇存槑"> <el-input type="textarea" v-model="form_['analyse'].remark" style="width: 100%;"></el-input> @@ -1092,7 +1346,67 @@ </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-button :disabled="!form_['analyse'].parttime" size="small" @click="addParttime('analyse')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -1165,28 +1479,6 @@ </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-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> @@ -1204,7 +1496,68 @@ </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-button :disabled="!form_['arrange'].parttime" size="small" @click="addParttime('arrange')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -1277,28 +1630,6 @@ </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-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> @@ -1316,7 +1647,68 @@ </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-button :disabled="!form_['meta'].parttime" size="small" @click="addParttime('meta')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -1389,28 +1781,6 @@ </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-row> <el-col :span="17" class="z_grid-content1"> <el-form-item label="澶囨敞璇存槑"> <el-input type="textarea" v-model="form_['grade'].remark" style="width: 100%;"></el-input> @@ -1428,7 +1798,68 @@ </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-button :disabled="!form_['grade'].parttime" size="small" @click="addParttime('grade')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -1501,28 +1932,6 @@ </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-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> @@ -1540,7 +1949,69 @@ </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-button :disabled="!form_['tsa'].parttime" size="small" @click="addParttime('tsa')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -1613,28 +2084,6 @@ </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-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> @@ -1652,7 +2101,68 @@ </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-button :disabled="!form_['compose'].parttime" size="small" @click="addParttime('compose')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -1725,28 +2235,6 @@ </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-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> @@ -1764,7 +2252,68 @@ </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-button :disabled="!form_['translate'].parttime" size="small" @click="addParttime('translate')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -1837,28 +2386,6 @@ </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-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> @@ -1876,7 +2403,69 @@ </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-button :disabled="!form_['evaluation'].parttime" size="small" @click="addParttime('evaluation')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -1949,28 +2538,6 @@ </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-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> @@ -1988,7 +2555,68 @@ </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-button :disabled="!form_['recommend'].parttime" size="small" @click="addParttime('recommend')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -2061,28 +2689,6 @@ </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-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> @@ -2100,7 +2706,68 @@ </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-button :disabled="!form_['format'].parttime" size="small" @click="addParttime('format')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -2173,28 +2840,6 @@ </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-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> @@ -2212,12 +2857,100 @@ </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-button :disabled="!form_['Contribute'].parttime" size="small" @click="addParttime('Contribute')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> </transition> </div> + + <el-dialog custom-class="z_master_dialog" v-if="dialog_2_2" title="鏂板鍏艰亴鎴愬憳" :visible.sync="dialog_2_2" append-to-body width="400px"> + <el-form ref="formParttime" :model="formInline" class="demo-form-inline" label-position="left" label-width="90px"> + <el-form-item label="鎴愬憳閫夋嫨" prop="parttimeUser" + :rules="{required: true, message: '璇烽�夋嫨鎴愬憳', trigger: ['change', 'blur']}" + > + <el-select size="small" v-model="formInline.parttimeUser" style="width: 100%;"> + <el-option + v-for="item in options_parttimeU_list" + :key="item.id" + :label="item.name" + :value="item.id" + :disabled="item.disabled" + ></el-option> + </el-select> + </el-form-item> + + <el-form-item label="鏀粯璐圭敤" prop="parttimePay" + :rules="{required: true, message: '璇峰~鍐欒垂鐢�', trigger: ['change', 'blur']}" + > + <el-input-number size="small" v-model="formInline.parttimePay" :min="1" label="鏀粯璐圭敤" style="width: 100%;"></el-input-number> + </el-form-item> + </el-form> + <div slot="footer" class="dialog-footer" style="text-align: right;"> + <el-button type="" size="small" @click="dialog_2_2 = false">鍙� 娑�</el-button> + <el-button type="primary" size="small" @click="saveparttime">淇� 瀛�</el-button> + </div> + </el-dialog> </div> </template> @@ -2799,7 +3532,33 @@ }, loading_tree: true, - + + dialog_2_2: false, + formInline: {}, + parttimeList_: { + 'title': [], + 'scheme': [], + 'search': [], + 'select': [], + 'get': [], + 'find': [], + 'properties': [], + 'risk': [], + 'target': [], + 'analyse': [], + 'arrange': [], + 'meta': [], + 'grade': [], + 'tsa': [], + 'compose': [], + 'translate': [], + 'evaluation': [], + 'recommend': [], + 'format': [], + 'Contribute': [] + }, + ParttimeType: "", + showData: {}, finish: false, hideData: { @@ -3025,6 +3784,7 @@ }, options_parttimeUser: [], + options_parttimeU_list: [], options_users: [ { value: "user1", @@ -3220,8 +3980,50 @@ if (!this.form_[code].parttime ) { this.form_[code].parttimeUser = []; } - } + }, + addParttime(code) { + let me = this; + this.ParttimeType = code; + this.formInline = {}; + let parttimeListObj_ = {}; + if (this.form_[code].parttimeList.length>0) { + this.form_[code].parttimeList.map(e => { + parttimeListObj_[e.parttimeUser] = true; + }) + } + + this.options_parttimeU_list = []; + let parttimeUserList = this.options_parttimeUser; + parttimeUserList.forEach(e => { + let o_ = {...e}; + if (parttimeListObj_[o_.id]) { + o_.disabled = true; + } + me.options_parttimeU_list.push(o_); + }) + + this.dialog_2_2 = true; + }, + saveparttime() { + let is_null1 = true; + this.$refs.formParttime.validate((valid) => { + if (!valid) { + is_null1 = false; + } + }); + + if (is_null1) { + this.form_[this.ParttimeType].parttimeList.push({...this.formInline}); + this.dialog_2_2 = false; + } + + }, + + deleteParttime(code, row) { + const index = this.form_[code].parttimeList.findIndex(d => d.parttimeUser === row.parttimeUser); + this.form_[code].parttimeList.splice(index, 1); + }, } }; diff --git a/src/components/popup/portion/substepReadOnly.vue b/src/components/popup/portion/substepReadOnly.vue index bd44a5d..4dc67fe 100644 --- a/src/components/popup/portion/substepReadOnly.vue +++ b/src/components/popup/portion/substepReadOnly.vue @@ -87,29 +87,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> @@ -127,8 +104,68 @@ </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('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-button :disabled="!form_['title'].parttime" size="small" @click="addParttime('title')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -187,29 +224,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> @@ -227,8 +241,68 @@ </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('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-button :disabled="!form_['scheme'].parttime" size="small" @click="addParttime('scheme')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -287,29 +361,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> @@ -327,7 +378,68 @@ </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('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-button :disabled="!form_['search'].parttime" size="small" @click="addParttime('search')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -386,29 +498,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> @@ -426,7 +515,68 @@ </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('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-button :disabled="!form_['select'].parttime" size="small" @click="addParttime('select')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -485,29 +635,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> @@ -525,8 +652,68 @@ </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('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-button :disabled="!form_['get'].parttime" size="small" @click="addParttime('get')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -585,29 +772,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> @@ -625,8 +789,68 @@ </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('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-button :disabled="!form_['find'].parttime" size="small" @click="addParttime('find')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -685,29 +909,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> @@ -725,7 +926,68 @@ </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('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-button :disabled="!form_['properties'].parttime" size="small" @click="addParttime('properties')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -896,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="澶囨敞璇存槑"> @@ -936,7 +1177,68 @@ </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-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" + 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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -995,29 +1297,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> @@ -1035,7 +1314,68 @@ </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('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-button :disabled="!form_['arrange'].parttime" size="small" @click="addParttime('arrange')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -1094,29 +1434,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> @@ -1134,7 +1451,68 @@ </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('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-button :disabled="!form_['meta'].parttime" size="small" @click="addParttime('meta')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -1192,29 +1570,6 @@ </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"> <el-form-item label="澶囨敞璇存槑"> <el-input type="textarea" v-model="form_['grade'].remark" style="width: 100%;"></el-input> @@ -1232,8 +1587,68 @@ </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-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" + 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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -1294,29 +1709,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> @@ -1334,7 +1726,68 @@ </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('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-button :disabled="!form_['tsa'].parttime" size="small" @click="addParttime('tsa')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -1393,29 +1846,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> @@ -1433,7 +1863,68 @@ </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('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-button :disabled="!form_['compose'].parttime" size="small" @click="addParttime('compose')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -1492,29 +1983,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> @@ -1532,7 +2000,68 @@ </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('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-button :disabled="!form_['translate'].parttime" size="small" @click="addParttime('translate')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -1591,29 +2120,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> @@ -1631,7 +2137,68 @@ </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('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-button :disabled="!form_['evaluation'].parttime" size="small" @click="addParttime('evaluation')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -1690,29 +2257,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> @@ -1730,7 +2274,68 @@ </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('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-button :disabled="!form_['recommend'].parttime" size="small" @click="addParttime('recommend')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -1789,29 +2394,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> @@ -1829,7 +2411,68 @@ </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('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-button :disabled="!form_['format'].parttime" size="small" @click="addParttime('format')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> @@ -1888,29 +2531,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> @@ -1928,7 +2548,68 @@ </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('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-button :disabled="!form_['Contribute'].parttime" size="small" @click="addParttime('Contribute')">鏂板鍏艰亴浜哄憳</el-button> + <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="璐圭敤" 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> + <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> <el-divider></el-divider> </div> diff --git a/src/main.ts b/src/main.ts index d133676..ce355bc 100644 --- a/src/main.ts +++ b/src/main.ts @@ -10,12 +10,14 @@ //npm i moment --save import moment from 'moment'; import echarts from 'echarts' +import VueCookies from 'vue-cookies' Vue.prototype.$echarts = echarts Vue.use(ElementUI); Vue.prototype.$moment = moment;//璧嬪�间娇鐢� - +Vue.use(VueCookies); + Vue.config.productionTip = false; Vue.prototype.$axios = Axios; Axios.defaults.baseURL = '/api'; diff --git a/src/views/Home.vue b/src/views/Home.vue index 8916265..cf699e9 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -43,6 +43,7 @@ <el-header style="text-align: right; font-size: 15px;padding-right: 40px;"> <i class="el-icon-user-solid"></i> <span>{{userName}}</span> + <el-button size="small" type="primary" @click="upPassword">淇敼瀵嗙爜</el-button> <el-button size="small" type="primary" @click="Cancel">閫� 鍑�</el-button> </el-header> @@ -51,6 +52,26 @@ </el-main> </el-container> </el-container> + + <el-dialog custom-class="z_master_dialog" v-if="dialog_2_2" title="鏂板鍏艰亴鎴愬憳" :visible.sync="dialog_2_2" width="400px"> + <el-form ref="ruleForm" label-position="left" :model="ruleForm" status-icon :rules="rules" label-width="90px" class="demo-ruleForm"> + <el-form-item label="鍘熷瘑鐮�" prop="pass_obj"> + <el-input type="password" size="small" v-model="ruleForm.pass_obj"></el-input> + </el-form-item> + <el-form-item label="鏂板瘑鐮�" prop="pass"> + <el-input type="password" size="small" v-model="ruleForm.pass" autocomplete="off"></el-input> + </el-form-item> + <el-form-item label="纭瀵嗙爜" prop="checkPass"> + <el-input type="password" size="small" v-model="ruleForm.checkPass" autocomplete="off"></el-input> + </el-form-item> + </el-form> + + <div slot="footer" class="dialog-footer" style="text-align: right;"> + <el-button type="" size="small" @click="dialog_2_2 = false">鍙� 娑�</el-button> + <el-button type="primary" size="small" @click="savePassword">淇濆瓨骞堕噸鏂扮櫥褰�</el-button> + </div> + </el-dialog> + </div> </template> @@ -61,17 +82,52 @@ navigationItem }, data() { - + var validatePass = (rule, value, callback) => { + if (value === '' || !(/^[A-Za-z0-9]{6,10}$/).test(value) || value.length<6 || value.length>10) { + callback(new Error('璇疯緭鍏ュ瘑鐮侊紝鐢卞瓧姣嶅拰鏁板瓧缁勬垚涓旈暱搴﹀湪6~10涔嬮棿')); + } else { + if (this.ruleForm.checkPass !== '') { + this.$refs.ruleForm.validateField('checkPass'); + } + callback(); + } + }; + var validatePass2 = (rule, value, callback) => { + if (value === '') { + callback(new Error('璇峰啀娆¤緭鍏ュ瘑鐮�')); + } else if (value !== this.ruleForm.pass) { + callback(new Error('涓ゆ杈撳叆瀵嗙爜涓嶄竴鑷�!')); + } else { + callback(); + } + }; return { breadcrumbItems:[], defaultActive: "", navList:[], + + dialog_2_2: false, + ruleForm: {}, + rules: { + pass_obj: [ + {required: true, message: '璇疯緭鍏ュ師瀵嗙爜', trigger: ['blur', 'change']} + ], + pass: [ + {required: true, validator: validatePass, trigger: ['blur', 'change']} + ], + checkPass: [ + {required: true, validator: validatePass2, trigger: ['blur', 'change']} + ] + }, } }, created() { - let userId_ = localStorage.getItem('userId'); - this.userName = localStorage.getItem('userName'); - let departId = localStorage.getItem('departId'); + //let userId_ = localStorage.getItem('userId'); + let userId_ = this.$cookies.get('userId'); + this.userName = this.$cookies.get('userName'); + let departId = this.$cookies.get('departId'); + //this.userName = localStorage.getItem('userName'); + //let departId = localStorage.getItem('departId'); if (!userId_ || !departId) { this.$router.push('/login'); } @@ -81,10 +137,12 @@ let type; if(departId == "100" || departId == "500") { type = departId; - localStorage.setItem('assign', false); + this.$cookies.set('assign', false); + // localStorage.setItem('assign', false); }else { type = "all"; - localStorage.setItem('assign', true); + this.$cookies.set('assign', true); + //localStorage.setItem('assign', true); } this.getMenu(type); @@ -158,9 +216,47 @@ this.navList = result; }, + upPassword() { + this.ruleForm = {}; + this.dialog_2_2 = true; + }, + + savePassword() { + let me = this; + let is_null1 = true; + this.$refs.ruleForm.validate((valid) => { + if (!valid) { + is_null1 = false; + } + }); + + if (is_null1) { + let url_ = "/api/user/changePass/" + this.$cookies.get('userId'); + let params_ = { + prePass: this.ruleForm.pass_obj, + newPass: this.ruleForm.checkPass, + }; + this.$axios.get(url_,{ + params: params_ + }).then(data_ => { + window.console.log(data_); + if (data_.data.status == "1009") { + me.$message.error("淇濆瓨澶辫触锛�" + data_.data.message); + } + else { + me.$router.push('/login'); + } + //me.$cookies.set('userId', null); + }).catch(error =>{ + + }) + } + }, + Cancel() { this.$router.push('/login'); - localStorage.setItem('userId', undefined); + //localStorage.setItem('userId', undefined); + this.$cookies.set('userId', null); }, menuSelect(index, a){ let isPage = index.substring(0,2); diff --git a/src/views/login.vue b/src/views/login.vue index 816158a..9a87e39 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -26,7 +26,7 @@ @keyup.enter.native="handleLogin" > <span slot="suffix" class="suffix-icon" :class="{eyeOpen: isOpen}" @click="showPwd"> - <svg-icon :icon-class="eyeIconClass" /> + <!-- <svg-icon :icon-class="eyeIconClass" /> --> </span> </el-input> </el-form-item> @@ -108,12 +108,21 @@ params }).then(data_ => { if(data_.data.success) { - localStorage.setItem('userId',data_.data.data.id); + /* localStorage.setItem('userId',data_.data.data.id); localStorage.setItem('userName',data_.data.data.name); localStorage.setItem('roleId',data_.data.data.roleCode); localStorage.setItem('roleName',data_.data.data.roleName); localStorage.setItem('departId',data_.data.data.departCode); - localStorage.setItem('departName',data_.data.data.departName); + localStorage.setItem('departName',data_.data.data.departName); */ + + this.$cookies.set('userId',data_.data.data.id); + this.$cookies.set('userName',data_.data.data.name); + this.$cookies.set('roleId',data_.data.data.roleCode); + this.$cookies.set('roleName',data_.data.data.roleName); + this.$cookies.set('departId',data_.data.data.departCode); + this.$cookies.set('departName',data_.data.data.departName); + this.$cookies.set('password', data_.data.data.password); + this.$router.push('/'); }else { this.$message({message:'鐧婚檰澶辫触', type: 'warning'}); -- Gitblit v1.8.0