HR_asco/asco_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dagshdasd

Browse Source
This commit is contained in:
sedmedgh
2022-01-12 14:13:38 +03:30
parent 7904ce45a0
commit ea9904acfb
3 changed files with 13 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/css/main.css
+6
View File
@@ -84,3 +84,9 @@
margin-right: 8px;
margin-left: unset;
}
.vpd-input-group {
margin-top: 4px;
}
.vpd-input-group input {
border-radius: 4px 0 0 4px;
}
src/main.js
+2 -3
View File
@@ -143,12 +143,11 @@ import VuePersianDatetimePicker from 'vue-persian-datetime-picker';
Vue.use(VuePersianDatetimePicker, {
name: 'date-picker',
props: {
format: 'YYYY-MM-DD HH:mm',
displayFormat: 'jYYYY-jMM-jDD HH:mm',
displayFormat: 'jYYYY-jMM-jDD HH:mm:ss',
format: 'YYYY-MM-DD HH:mm:ss',
editable: false,
inputClass: '',
placeholder: 'انتخاب کنید',
altFormat: 'YYYY-MM-DD HH:mm',
color: '#1DA57A',
autoSubmit: true,
}
src/views/personel/Personel.vue
+5 -30
View File
@@ -758,25 +758,12 @@
<div class="grid grid-cols-2 gap-4">
<div>
<a-form-item label="تاریخ شروع">
<!--v-decorator="['start_at']"-->
<a-input class="ant-input" id="contrat_start_at" v-model="contractModel.start_at" style="width:100%"/>
<date-picker v-model="contractModel.start_at"/>
</a-form-item>
<date-picker
:auto-submit="true"
color="#4f72ab"
v-model="contractModel.start_at"
element="contrat_start_at" />
</div>
<div>
<a-form-item label="تاریخ خاتمه">
<!-- <a-input style="width:100%" v-decorator="['end_at']"/>-->
<input class="ant-input" id="contrat_end_at" style="width:100%" v-model="contractModel.end_at" />
<date-picker
:auto-submit="true"
color="#4f72ab"
v-model="contractModel.end_at"
element="contrat_end_at"
/>
<date-picker v-model="contractModel.end_at"/>
</a-form-item>
</div>
</div>
@@ -1011,14 +998,7 @@
&lt;!&ndash;v-model="contract[activeContract].date_termination"&ndash;&gt;
</a-form-item>-->
<a-form-item label="تاریخ فسخ قرارداد">
<!-- <a-input style="width:100%" v-decorator="['end_at']"/>-->
<input class="ant-input" id="contrat_termination" style="width:100%" v-model="date_termination" />
<date-picker
:auto-submit="true"
color="#4f72ab"
v-model="date_termination"
element="contrat_termination"
/>
<date-picker v-model="date_termination"/>
</a-form-item>
<a-form-item label="دلیل فسخ قرارداد">
<input class="ant-input" autocomplete="off" v-decorator="['reason_termination']" />
@@ -1186,7 +1166,6 @@
openEditingContractModal(item,index){
console.log(this.contractTypes)
console.log(item)
console.log(item)
item.type = item.type?item.type.toString():undefined
if(item.file){
this.contractFileList = [{ uid:item.file.id, name: item.file.filename, status: 'done', url:item.file.storage }]
@@ -1194,8 +1173,8 @@
this.activeContract = index
this.editContractFlag = true
this.showAddContract = true
this.contractModel.end_at = moment(item.end_at,'YYYY-MM-DD HH:mm:ss').format('jYYYY/jM/jD');
this.contractModel.start_at = moment(item.start_at,'YYYY-MM-DD HH:mm:ss').format('jYYYY/jM/jD');
this.contractModel.end_at = item.end_at
this.contractModel.start_at = item.start_at
// console.log("item:::::::::::::",item)
this.fromContract.setFieldsValue(item)
@@ -1206,15 +1185,11 @@
if (!err) {
if(this.image_data){
values.contract_file_id = this.image_data.id
//values.file = this.image_data.storage
}
//values.start_at=this.contractModel.start_at,
//values.end_at=this.contractModel.end_at;
if(values.work_unit=="new"){
values.work_unit = values.work_unit_name
}
if(this.editContractFlag){
// console.log("editing")
values.start_at = this.contractModel.start_at
values.end_at = this.contractModel.end_at
this.contract[this.activeContract] = Object.assign(this.contract[this.activeContract], values)