Ver Fonte

介绍信有效期 改为范围选择

zhulu há 1 ano atrás
pai
commit
f6d44709bd

+ 1 - 1
src/views/core/outIn/approve/dialog.approve.letter.detail.vue

@@ -21,7 +21,7 @@
           <el-descriptions-item label="介绍信编号">{{formData.letterNo}}</el-descriptions-item>
           <el-descriptions-item label="接待机构">{{formData.receptionOrgNames}}</el-descriptions-item>
           <el-descriptions-item label="出入事由">{{formData.letterReasons}}</el-descriptions-item>
-          <el-descriptions-item label="开具日期">{{formData.startTimeStr}}</el-descriptions-item>
+          <el-descriptions-item label="介绍信有效期">{{formData.startTimeStr+'~'+formData.endTimeStr}}</el-descriptions-item>          
           <el-descriptions-item label="有效天数">{{formData.effectiveDays}}</el-descriptions-item>
           <el-descriptions-item label="介绍信附件" span="2">
             <image-file-list-preview v-model="formData.letterFile"></image-file-list-preview>

+ 2 - 3
src/views/core/outIn/approve/dialog.approve.letter.vue

@@ -36,11 +36,10 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item  label="开具时间">
-              {{formData.startTimeStr}}
+              <el-form-item  label="介绍信有效期">
+              {{formData.startTimeStr+'~'+formData.endTimeStr}}
               </el-form-item>
             </el-col>
-
             <el-col :span="12">
               <el-form-item  label="有效天数">
                 {{ formData.effectiveDays}}

+ 6 - 1
src/views/core/outIn/approve/index.vue

@@ -74,11 +74,16 @@
               </template>
          </template>
         </el-table-column> -->
-        <el-table-column align="center" label="开日期" width="150">
+        <el-table-column align="center" label="开日期" width="150">
           <template slot-scope="scope">
             <span>{{ scope.row.startTime }}</span>
           </template>
         </el-table-column>
+        <el-table-column align="center" label="截止日期" width="150">
+          <template slot-scope="scope">
+            <span>{{ scope.row.endTime }}</span>
+          </template>
+        </el-table-column>
         <el-table-column  align="center" label="有效天数" prop="effectiveDays" width="120"/>
         <!-- <el-table-column label="审批时间" width="150" align="center" align="left"  prop="approveTime" /> -->
 

+ 32 - 14
src/views/core/outIn/letter/dialog.addletter.vue

@@ -45,26 +45,27 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item prop="startTime" label="开具日期">
-                <!-- <el-date-picker
+              <el-form-item prop="range" label="介绍信有效期">
+                <el-date-picker
                   v-model="formData.range"
-                  type="daterange"
-                  :picker-options="startDatepickerOptions"
+                  type="daterange"                  
+                  @change="dateRangeChangedHandler"
                   range-separator="至"
                   start-placeholder="有效期开始日期"
-                  end-placeholder="有效期结束日期">
-                </el-date-picker> -->
-                <el-date-picker style="width:100%"
+                  end-placeholder="有效期截止日期">
+                </el-date-picker>
+                <!-- :picker-options="startDatepickerOptions" -->
+                <!-- <el-date-picker style="width:100%"
                   v-model="formData.startTime"
                   type="date"
                   placeholder="请选择开具日期"
                   >
-                </el-date-picker>
+                </el-date-picker> -->
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item prop="effectiveDays" label="有效天数">
-                <el-input-number style="width: 100%" v-model="formData.effectiveDays" :min="1" :max="365"></el-input-number>
+                <el-input-number style="width: 100%" :disabled='true' v-model="formData.effectiveDays" :min="1" :max="365"></el-input-number>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -234,8 +235,9 @@ export default {
         reasons: [{ required: true, message: "请输入出入事由" }],
         letterNo: [{ required: true, message: "请输入介绍信编号" }],
         receptionOrgIds: [{ required: true, message: "请选择接待机构" }],
-        startTime: [{ required: true, message: "请选择开具日期" }],
-        effectiveDays: [{ required: true, message: "请选择有效天数" }],
+        range:[{ required: true, message: "请选择介绍信有效期" }],
+        // startTime: [{ required: true, message: "请选择开具日期" }],
+        // effectiveDays: [{ required: true, message: "请选择有效天数" }],
         userInfos: [{ required: true, message: "请添加出入人员" }],
         letterFile:[{ required: true, message: "请上传介绍信附件" }],
       },
@@ -273,8 +275,9 @@ export default {
         reasons: null,
         letterNo:null,
         receptionOrgIds: [],
-        // range:[],
+        range:[],
         startTime:new Date(),
+        endTime:null,
         effectiveDays:1,
         description: null,
         letterFile: [],
@@ -307,7 +310,7 @@ export default {
           // tempRange.push(dayjs(response.data.startTime));
           // tempRange.push(new Date(response.data.endTime));
           // response.data.range=tempRange;
-          this.formData = response.data;
+          this.formData ={ ...response.data,range:[response.data.startTime,response.data.endTime]};          
           this.formFileListDefualtValue=this.formData.letterFile;
         });
       }
@@ -436,8 +439,23 @@ export default {
       console.log("================", row);
       this.formData.userInfos.splice(this.formData.userInfos.indexOf(row), 1);
     },
-    cannotEdit(){
+    dateRangeChangedHandler()
+    {
+      console.log("dateRangeChangedHandler",this.formData.range);
+      if(this.formData.range)
+      {
+        this.formData.startTime=dayjs(this.formData.range[0]).startOf('day');
+        this.formData.endTime=dayjs(this.formData.range[1]).startOf('day');
+        this.formData.effectiveDays=dayjs(this.formData.range[1]).diff(dayjs(this.formData.range[0]),'day')+1;
+
+      }
+      else{
+        this.formData.startTime=null;
+        this.formData.endTime=null;
+        this.formData.effectiveDays=1;
 
+      }
+      // console.log("dateRangeChangedHandler",this.formData.range, dayjs(this.formData.range[1]).diff(dayjs(this.formData.range[0]),'day') );
     }
   },
   mounted() {},

+ 2 - 1
src/views/core/outIn/letter/dialog.letter.detail.vue

@@ -38,7 +38,8 @@
 
 
           <el-descriptions-item label="出入事由">{{formData.reasons}}</el-descriptions-item>
-          <el-descriptions-item label="开具日期">{{formData.startTimeStr}}</el-descriptions-item>
+          <el-descriptions-item label="开始日期">{{formData.startTimeStr}}</el-descriptions-item>
+          <el-descriptions-item label="截止日期">{{formData.endTimeStr}}</el-descriptions-item>
           <el-descriptions-item label="有效天数">{{formData.effectiveDays}}</el-descriptions-item>
           <el-descriptions-item label="介绍信附件" span="2">
             <image-file-list-preview v-model="formData.letterFile"></image-file-list-preview>

+ 2 - 1
src/views/core/outIn/letter/index.vue

@@ -59,7 +59,8 @@
       <el-table-column label="接待机构"  :show-overflow-tooltip="true" align="center"  prop="receptionOrgNames" />
 
       <el-table-column label="出入事由"  :show-overflow-tooltip="true" align="center" prop="reasons" />
-      <el-table-column label="开具日期" align="center" prop="startTime"  width="150"/>
+      <el-table-column label="开始日期" align="center" prop="startTime"  width="150"/>
+      <el-table-column label="截止日期" align="center" prop="endTime"  width="150"/>
       <el-table-column label="有效天数" align="center"  prop="effectiveDays" width="100"/>
       <!-- <el-table-column label="介绍信有效期" align="center" width="250">
         <template slot-scope="scope">

+ 6 - 2
src/views/core/outIn/outInLog/dialog.outIn.detail.vue

@@ -27,9 +27,13 @@
           <el-descriptions-item label="出入事由">{{
             formData.letterReasons
           }}</el-descriptions-item>
-          <el-descriptions-item label="开具日期">{{
-            formData.startTime
+            <el-descriptions-item label="介绍信有效期">{{
+             formData.startTime
+             +'~' + formData.endTime
           }}</el-descriptions-item>
+          <!-- <el-descriptions-item label="开始日期">{{
+            formData.startTime
+          }}</el-descriptions-item> -->
           <el-descriptions-item label="有效天数">{{
             formData.effectiveDays
           }}</el-descriptions-item>