fix error

This commit is contained in:
AliGhasami
2021-03-14 16:19:51 +03:30
parent 1692a9973e
commit 97a99c3519
4 changed files with 93 additions and 197 deletions
+81 -119
View File
@@ -22,48 +22,9 @@
<a-card title="اطلاعات فردی">
<a-form-item label="تصویر پرسنلی" >
<single-upload-input ref="fileUpload" :field="'profile_file'" ></single-upload-input>
<!--<a-upload
name="file"
list-type="picture-card"
class="avatar-uploader"
:show-upload-list="true"
:default-file-list="fileList"
action="http://hr.asco-intl.com/back/public/api/register/upload"
:before-upload="beforeUpload"
@change="handleChange"
@preview="handlePreview"
:remove="handleRemove"
:fileList="fileList"
>
&lt;!&ndash; &ndash;&gt;
&lt;!&ndash;<img v-if="imageUrl" :src="imageUrl" alt="avatar" />&ndash;&gt;
<div >
<a-icon :type="loading ? 'loading' : 'plus'" />
<div class="ant-upload-text">
بارگذاری
</div>
</div>
</a-upload>-->
<a-modal :visible="previewVisible" :footer="null" @cancel="previewVisible = false;">
<img alt="example" style="width: 100%" :src="previewImage" />
</a-modal>
<!--<a-upload
:customRequest="uploadImageProfile"
list-type="picture-card"
:file-list="fileList"
@preview="previewVisible=true"
@change="handleChange">
<div v-if="fileList.length==0">
<a-icon type="plus" />
<div class="ant-upload-text">
بارگذاری تصویر کاربری
</div>
</div>
</a-upload>
<a-modal :visible="previewVisible" :footer="null" @cancel="handleCancel">
<img alt="example" style="width: 100%" src="https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png" />
</a-modal>-->
</a-form-item>
<div class="grid sm:grid-cols-1 md:grid-cols-3 md:gap-3 lg:grid-cols-3 lg:gap-3">
<a-form-item label="نام و نام خانوادگی">
@@ -353,11 +314,6 @@
</template>
</a-card>
</a-tab-pane>
<!-- <a-tab-pane :forceRender="true" key="2" tab="اطلاعات پایه">
</a-tab-pane>-->
<a-tab-pane :forceRender="true" key="3" tab="اطلاعات آموزشی">
<a-list :locale="{emptyText:'رکوردی وجود ندارد.'}" bordered item-layout="horizontal" >
<a-list-item class="grid grid-cols-3" v-for="(item,index) in training" :key="index" >
@@ -385,22 +341,18 @@
</a-list>
<a-button class="mt-4" @click="showAddEducationalInformation=true;isAlertUpload = false">افزودن ردیف</a-button>
</a-tab-pane>
<a-tab-pane :forceRender="true" key="4" tab="قراردادها">
<a-list :locale="{emptyText:'رکوردی وجود ندارد.'}" bordered item-layout="horizontal" >
<a-list-item class="grid grid-cols-4" v-for="(item,index) in contract" :key="index" >
<div>
<a-button v-if="!item.date_termination" class="mt-3 mr-3" @click="showTerminationModal(index)">فسخ قرارداد</a-button>
<a-button v-if="item.file" target="_blank" :href="item.file.storage" >دانلود پیوست</a-button>
</div>
<div>{{ item.salary }} : حقوق پایه</div>
<div>{{ item.end_atj }} : تاریخ خاتمه</div>
<div>{{ item.start_atj }} : تاریخ شروع</div>
<div>
<a-tooltip placement="bottomRight" >
<a-tooltip placement="bottomRight" >
<template slot="title">
<span>حذف</span>
</template>
@@ -415,48 +367,45 @@
<a-button type="danger" class="mt-3 mr-3" style="width:40%">حذف</a-button>
</a-popconfirm>
</a-tooltip>
<a-dropdown class="mt-3" v-if="item.id">
<a-menu slot="overlay" >
<a-menu-item key="1">
<a :href="`/back/public/api/personnel/print?id=${item.id}&type=1`" target="_blank">نوع 1</a>
</a-menu-item>
<a-menu-item key="2">
<a :href="`/back/public/api/personnel/print?id=${item.id}&type=2`" target="_blank">نوع 2</a>
</a-menu-item>
<a-menu-item key="3">
<a :href="`/back/public/api/personnel/print?id=${item.id}&type=3`" target="_blank">نوع 3</a>
</a-menu-item>
<a-menu-item key="4">
<a :href="`back/public/api/personnel/print?id=${item.id}&type=4`" target="_blank">نوع 4</a>
</a-menu-item>
<a-menu-item key="5">
<a :href="`/back/public/api/personnel/print?id=${item.id}&type=5`" target="_blank">نوع 5</a>
</a-menu-item>
<a-menu-item key="6">
<a :href="`/back/public/api/personnel/print?id=${item.id}&type=6`" target="_blank">نوع 6</a>
</a-menu-item>
<a-menu-item key="7">
<a :href="`/back/public/api/personnel/print?id=${item.id}&type=7`" target="_blank">نوع 7</a>
</a-menu-item>
<a-menu-item key="8">
<a :href="`/back/public/api/personnel/print?id=${item.id}&type=8`" target="_blank">نوع 8</a>
</a-menu-item>
<a-menu-item key="9">
<a :href="`/back/public/api/personnel/print?id=${item.id}&type=9`" target="_blank">نوع 9</a>
</a-menu-item>
<a-menu-item key="10">
<a :href="`/back/public/api/personnel/print?id=${item.id}&type=10`" target="_blank">نوع 10</a>
</a-menu-item>
<!-- <a-menu-item key="7">
<a href="222" target="_blank">نوع سوم</a>
</a-menu-item>-->
</a-menu>
<a-button style="width: 33%" > چاپ <a-icon type="down" /> </a-button>
</a-dropdown>
<a-button style="width:28%" class="mr-3" @click="contractId=item.id;showContractPrint=true">چاپ</a-button>
<!-- <a-dropdown class="mt-3" v-if="item.id">
<a-menu slot="overlay" >
<a-menu-item key="1">
<a @click="showContractId=true">نوع 1</a>
</a-menu-item>
<a-menu-item key="2">
<a :href="`/back/public/api/personnel/print?id=${item.id}&type=2`" target="_blank">نوع 2</a>
</a-menu-item>
<a-menu-item key="3">
<a :href="`/back/public/api/personnel/print?id=${item.id}&type=3`" target="_blank">نوع 3</a>
</a-menu-item>
<a-menu-item key="4">
<a :href="`back/public/api/personnel/print?id=${item.id}&type=4`" target="_blank">نوع 4</a>
</a-menu-item>
<a-menu-item key="5">
<a :href="`/back/public/api/personnel/print?id=${item.id}&type=5`" target="_blank">نوع 5</a>
</a-menu-item>
<a-menu-item key="6">
<a :href="`/back/public/api/personnel/print?id=${item.id}&type=6`" target="_blank">نوع 6</a>
</a-menu-item>
<a-menu-item key="7">
<a :href="`/back/public/api/personnel/print?id=${item.id}&type=7`" target="_blank">نوع 7</a>
</a-menu-item>
<a-menu-item key="8">
<a :href="`/back/public/api/personnel/print?id=${item.id}&type=8`" target="_blank">نوع 8</a>
</a-menu-item>
<a-menu-item key="9">
<a :href="`/back/public/api/personnel/print?id=${item.id}&type=9`" target="_blank">نوع 9</a>
</a-menu-item>
<a-menu-item key="10">
<a :href="`/back/public/api/personnel/print?id=${item.id}&type=10`" target="_blank">نوع 10</a>
</a-menu-item>
&lt;!&ndash; <a-menu-item key="7">
<a href="222" target="_blank">نوع سوم</a>
</a-menu-item>&ndash;&gt;
</a-menu>
<a-button style="width: 33%" > چاپ <a-icon type="down" /> </a-button>
</a-dropdown>-->
</div>
<div>{{ item.worker_coupon }} : بن کارگری</div>
@@ -464,16 +413,15 @@
<div>{{ item.right_attraction }} : حق جذب</div>
<div>
<!--<a-button v-if="item.id" :href="`http://hr.asco-intl.com/back/public/api/personnel/print?id=${item.id}`" target="_blank" class="mt-3">چاپ</a-button>-->
</div>
<!--<div>
</div>-->
<div> دلیل فسخ قرارداد: <span>{{ item.reason_termination }}</span> </div>
<div>{{ item.datej_termination }} : تاریخ فسخ قرارداد</div>
<div>{{ item.promissory_number }} : شماره سفته</div>
<div>{{ item.promissory }} : مبلغ سفته</div>
<div>{{ item.right_guardianship }} : حق سرپرستی</div>
<div>
</div>
<div></div>
<div> دلیل فسخ قرارداد: <span>{{ item.reason_termination }}</span> </div>
<div>{{ item.datej_termination }} : تاریخ فسخ قرارداد</div>
<!--<div style="direction: rtl">عنوان گواهینامه : {{ item.title }}</div>-->
</a-list-item>
</a-list>
@@ -723,6 +671,19 @@
<input class="ant-input" v-decorator="['right_guardianship', { initialValue: 0 }]" />
</a-form-item>
</div>
<div>
<a-form-item label="مبلغ سفته">
<input class="ant-input" v-decorator="['promissory', { initialValue: 0 }]" />
</a-form-item>
</div>
<div>
<a-form-item label="شماره سفته">
<input class="ant-input" v-decorator="['promissory_number']" />
</a-form-item>
</div>
</div>
<!--<a-form-item label="دلیل فسخ قرارداد">
@@ -844,11 +805,23 @@
</a-form-item>
</a-form>
</a-modal>
<a-modal okText="چاپ" :footer="null" cancelText="بستن" forceRender v-model="showContractPrint" title="شماره قرارداد" >
<a-form-item label="شماره قرارداد">
<input class="ant-input" autocomplete="off" v-model="contractNumber" />
</a-form-item>
<a-form-item label="نوع قرارداد">
<a-select v-model="contractType" style="width: 120px" >
<a-select-option v-for="i in 10" :value="i">
{{ i }} نوع
</a-select-option>
</a-select>
</a-form-item>
<a-button :href="`/back/public/api/personnel/print?id=${contractId}&type=${contractType}&number=${contractNumber}`" target="_blank">چاپ قرداد</a-button>
</a-modal>
</a-card>
</div>
</a-spin>
</div>
</template>
@@ -863,6 +836,7 @@
import VuePersianDatetimePicker from 'vue-persian-datetime-picker';
import themeConfig from '@/../themeConfig.js'
import SingleUploadInput from '@/components/SingleUploadInput'
import Button from "@/views/components/vuesax/button/Button";
function getBase64(file) {
return new Promise((resolve, reject) => {
@@ -876,6 +850,7 @@
export default {
components:{
Button,
//Button,
XTable,
SingleUploadInput,
@@ -928,6 +903,10 @@
image_data:null,
personalDetails:{},
activeContract:null,
contractId:'',
contractNumber:'',
contractType:1,
showContractPrint:false,
//profile_file:null,
}
},
@@ -935,7 +914,6 @@
handleRemove(){
this.imageUrl='';
this.fileList=[];
//console.log('oooooooooooo',this.fileList);
//this.profile_file=null;
},
async handlePreview(file) {
@@ -955,16 +933,9 @@
return;
}
if (info.file.status === 'done') {
// Get this url from response in real world.
//console.log("dsffdsfsdfdsf",info);
this.loading = false;
//console.log()
//this.profile_file=info.file.response.id;
this.fileList.push({ uid: '-1', name: 'image.png', status: 'done', url:info.file.response.storage });
console.log(this.fileList);
//[0].url=record.profile.storage;
//this.imageUrl = info.file.response.storage;
//console.log(this.imageUrl)
getBase64(info.file.originFileObj, imageUrl => {
this.imageUrl = imageUrl;
this.loading = false;
@@ -1088,9 +1059,7 @@
this.$message.success('اطلاعات با موفقیت ثبت شد');
this.fromDocs.resetFields();
this.image_data=null;
//console.log('this is data');
this.saveData();
//this.savefromPersonel();
}
});
},
@@ -1138,14 +1107,7 @@
this.fromPersonel.validateFields(async(err, values) => {
if (!err) {
try{
/*//console.log(values);
values.id=this.personel.id;
values.contract=this.contract;
values.writ=this.writ;
values.training = this.training
values.estimate = this.estimate
console.log('All Data',values);
await axios.post('personnel/update',values);*/
this.saveData();
this.getdata(this.personel.id);
//this.$ntSet()