From 97a99c351902402995b63374a79fa5136c8d61f9 Mon Sep 17 00:00:00 2001
From: AliGhasami <alighassami@yahoo.com>
Date: Sun, 14 Mar 2021 16:19:51 +0330
Subject: [PATCH] fix error

---
 src/i18n/i18nData.js            |   2 +-
 src/views/config/Config.vue     |  85 ++------------
 src/views/personel/Personel.vue | 200 +++++++++++++-------------------
 src/views/register/Register.vue |   3 -
 4 files changed, 93 insertions(+), 197 deletions(-)

diff --git a/src/i18n/i18nData.js b/src/i18n/i18nData.js
index 6ea4c89..bbbb55a 100644
--- a/src/i18n/i18nData.js
+++ b/src/i18n/i18nData.js
@@ -1,7 +1,7 @@
 // en, de, fr, pt
 export default {
   fa: {
-    config:'پیکر بندی',
+    config:'پیکربندی',
     personel:'اطلاعات پرسنلی',
     proposal:'درخواست ها',
     Dashboard: 'داشبورد',
diff --git a/src/views/config/Config.vue b/src/views/config/Config.vue
index fb64828..f7316b8 100644
--- a/src/views/config/Config.vue
+++ b/src/views/config/Config.vue
@@ -31,10 +31,7 @@
                   ذخیره اطلاعات
                 </a-button>
 
-
               </a-tab-pane>
-
-
               <a-tab-pane key="2" tab="دسته های آموزشی">
                 <input
                     v-if="inputVisible"
@@ -52,11 +49,7 @@
                   <a-icon type="plus" /> افزودن دسته جدید آموزشی
                 </a-tag>
                 <template v-for="(tag, index) in tags">
-                 <!-- <a-tooltip v-if="tag.length > 20" :key="tag" :title="tag">
-                    <a-tag :key="tag" :closable="index !== 0" @close="() => handleClose(tag)">
-                      {{ `${tag.slice(0, 20)}...` }}
-                    </a-tag>
-                  </a-tooltip>-->
+
                   <a-tag  :key="tag" :closable="true" @close="() => handleClose(tag)">
                     {{ tag }}
                   </a-tag>
@@ -65,21 +58,9 @@
                 <a-button type="primary" class="mt-10" @click="saveCategory()">
                   ذخیره اطلاعات
                 </a-button>
-              <!--  <template v-for="(item, index) in category">
-                 &lt;!&ndash; <a-tooltip v-if="tag.length > 20" :key="tag" :title="tag">
-                    <a-tag :key="tag" :closable="index !== 0" @close="() => handleClose(tag)">
-                      {{ `${tag.slice(0, 20)}...` }}
-                    </a-tag>
-                  </a-tooltip>&ndash;&gt;
 
-
-
-                  <a-tag :key="item" :closable="index !== 0" @close="() => handleClose(item)">
-                    {{ item }}
-                  </a-tag>
-                </template>-->
               </a-tab-pane>
-              <a-tab-pane key="1" tab="مدیریت شهرها">
+              <a-tab-pane key="1" tab="شغل ها">
                     <div>
                      <!--   <a-card title="شهرهای محل همکاری" :bordered="true" >
                           <a-form :form="formCities" @submit="handleSubmitCities">
@@ -215,51 +196,7 @@
                     </template>
                   </x-table>
 
-                  <!--  <ATable
-                            class="mt-5"
-                            :pagination="true"
-                            bordered
-                            :locale="{emptyText:'داده ای یافت نشد'}"
-                            :columns="cols" :data-source="jobs">
-
-
-                        <template slot="cities_str_slot" slot-scope="items">
-                            <a-tag v-for="item,index in items" :key="index" >{{item}}</a-tag>
-                        </template>
-
-                        <template slot="operator" slot-scope="id">
-
-                            <a-tooltip placement="bottomLeft">
-                                <template slot="title">
-                                    <span>حذف</span>
-                                </template>
-                                <a-popconfirm
-                                        title="آیا می خواهید حذف کنید؟"
-                                        ok-text="بله"
-                                        cancel-text="خیر"
-                                        @confirm="okDelete(id)"
-                                >
-                                    <a-button type="danger" class="mr-3">
-                                        حذف
-                                    </a-button>
-                                </a-popconfirm>
-                            </a-tooltip>
-
-                            <a-button type="primary" @click="showEditModal(id)" >
-                                ویرایش
-                            </a-button>
-                        </template>
-                        &lt;!&ndash;  <a-button type="primary">
-                            Primary
-                          </a-button>&ndash;&gt;
-
-                    </ATable>-->
-
-
-
-
-
-                </a-tab-pane>
+              </a-tab-pane>
 
                <!-- <a-tab-pane key="1" tab="پیکربندی سیستم">
                     <a-checkbox v-model="global" style="direction: rtl">
@@ -313,10 +250,7 @@
 </template>
 
 <script>
-    //import * as TableCol from "./jobCols";
-    //import * from TblJobs from "./pe"
-    /*import * as  TableCol from './jobTbl';*/
-    //import XTable from "@/components/x-table/XTable";
+
     import * as  TableCol from './jobTbl';
     import XTable from "@/components/x-table/XTable";
 
@@ -346,7 +280,8 @@
                 form: this.$form.createForm(this, {name: 'coordinated'}),
                 fromJobEdit: this.$form.createForm(this, {name: 'coordinated'}),
                 formCities:this.$form.createForm(this, {name: 'coordinated'}),
-                defaultCity:[]
+                defaultCity:[],
+
             }
         },
         components: {
@@ -374,6 +309,7 @@
             axios.post('/add-city',{cities:this.configCities})
                 .then((res)=>{
                   //console.log(res.data);
+                  this.cities=res.data;
                   this.configCities=res.data.map((item)=>{ return {id:item.id,title:item.title} });
                   this.$message.success('اطلاعات با موفقیت ثبت شد');
                   //this.getJobs();
@@ -392,16 +328,17 @@
             if(removedTag!=null)
             {
               axios.post('/remove-city',{id:removedTag}).then((res)=>{
-
+                this.cities=res.data;
+                this.configCities=res.data.map((item)=>{ return {id:item.id,title:item.title} });
               });
             }
-            let index=this.configCities.findIndex((item)=> {
+           /* let index=this.configCities.findIndex((item)=> {
               return item.id==removedTag;
             });
 
             if(index>-1){
               this.configCities.splice(index,1);
-            }
+            }*/
           },
           showInput() {
             this.inputVisible = true;
diff --git a/src/views/personel/Personel.vue b/src/views/personel/Personel.vue
index 4cbdc0a..2d76a9c 100644
--- a/src/views/personel/Personel.vue
+++ b/src/views/personel/Personel.vue
@@ -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()
diff --git a/src/views/register/Register.vue b/src/views/register/Register.vue
index 414ca5b..deaed9e 100644
--- a/src/views/register/Register.vue
+++ b/src/views/register/Register.vue
@@ -32,10 +32,7 @@
                           &lt;!&ndash;<input type="text" v-decorator="['name',{initialValue: null,rules: [{ required: true, message: 'این فیلد نمیتواند خالی باشد.' }]}]" class="ant-input" >&ndash;&gt;
                      &lt;!&ndash; <vs-input v-decorator="['name',{initialValue: null,rules: [{ required: true, message: 'این فیلد نمیتواند خالی باشد.' }]}]" />&ndash;&gt;
                     </a-form-item>-->
-
                         <div v-show="current==0" class="mt-4" >
-
-
                           <a-button type="primary" @click="addCity()">
                                 افزودن ردیف
                             </a-button>