Merge branch 'lllll' of yinet2020/YinetOASystemWeb into master

src/views/system/actform/leave/leave.vue

@@ -64,47 +64,62 @@
           </el-form-item>
         </el-col>
 <!--        <el-row :span="24">-->
-          <el-col :span="18">
-            <el-col :span="12">
-              <el-form-item label="请假开始时间" prop="daterange">
-                <!--            <el-date-picker type="daterange" v-model="form.daterange" format="yyyy-MM-dd"-->
-                <!--                            value-format="yyyy-MM-dd" :style="{width: '100%'}" start-placeholder="开始日期"-->
-                <!--                            end-placeholder="结束日期" range-separator="至" clearable></el-date-picker>-->
-                <el-date-picker
-                  v-model="form.daterange"
-                  format="yyyy-MM-dd"
-                  value-format="yyyy-MM-dd"
-                  type="date"
-                  placeholder="选择日期">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="请假结束时间" prop="endTime">
-                <el-date-picker
-                  v-model="form.endTime"
-                  format="yyyy-MM-dd"
-                  value-format="yyyy-MM-dd"
-                  type="date"
-                  placeholder="选择日期">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="共" prop="statistics">
-              <el-input v-model="form.statistics" placeholder="" show-word-limit clearable
-                        :style="{width: '100%'}">
-                <template slot="append">天</template>
-              </el-input>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="18">-->
+<!--            <el-col :span="12">-->
+<!--              <el-form-item label="请假开始时间" prop="daterange">-->
+<!--                &lt;!&ndash;            <el-date-picker type="daterange" v-model="form.daterange" format="yyyy-MM-dd"&ndash;&gt;-->
+<!--                &lt;!&ndash;                            value-format="yyyy-MM-dd" :style="{width: '100%'}" start-placeholder="开始日期"&ndash;&gt;-->
+<!--                &lt;!&ndash;                            end-placeholder="结束日期" range-separator="至" clearable></el-date-picker>&ndash;&gt;-->
+<!--                <el-date-picker-->
+<!--                  v-model="form.daterange"-->
+<!--                  format="yyyy-MM-dd"-->
+<!--                  value-format="yyyy-MM-dd"-->
+<!--                  type="date"-->
+<!--                  placeholder="选择日期">-->
+<!--                </el-date-picker>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="12">-->
+<!--              <el-form-item label="请假结束时间" prop="endTime">-->
+<!--                <el-date-picker-->
+<!--                  v-model="form.endTime"-->
+<!--                  format="yyyy-MM-dd"-->
+<!--                  value-format="yyyy-MM-dd"-->
+<!--                  type="date"-->
+<!--                  placeholder="选择日期">-->
+<!--                </el-date-picker>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--          </el-col>-->
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="共" prop="statistics">-->
+<!--              <el-input v-model="form.statistics" placeholder="" show-word-limit clearable-->
+<!--                        :style="{width: '100%'}">-->
+<!--                <template slot="append">天</template>-->
+<!--              </el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 <!--        </el-row>-->
-
-        <el-col :span="24">
-          <p style="padding-left: 100px;color:#ff4949;">
-            1.请假半天可以写0.5不能写0.1,0.2等小数。2.全天假以00:00:00开始以23:59:59结束,下午请假以12:00:00开始</p>
+        <el-col :span="18">
+          <el-form-item label="日期范围" prop="daterange">
+            <el-date-picker type="daterange" v-model="form.daterange" format="yyyy-MM-dd"
+                            value-format="yyyy-MM-dd" :style="{width: '100%'}" start-placeholder="开始日期"
+                            end-placeholder="结束日期" range-separator="至" clearable @blur="hqtime()"></el-date-picker>
+          </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item label="共" prop="statistics">
+            <el-input v-model="form.statistics" placeholder="" show-word-limit clearable
+                      :style="{width: '100%'}">
+              <template slot="append">天</template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+
+<!--        <el-col :span="24">-->
+<!--          <p style="padding-left: 100px;color:#ff4949;">-->
+<!--            1.请假半天可以写0.5不能写0.1,0.2等小数。2.全天假以00:00:00开始以23:59:59结束,下午请假以12:00:00开始</p>-->
+<!--        </el-col>-->
         <el-col :span="12">
           <el-form-item label="休息期间联系方式" prop="phone">
             <el-input v-model="form.phone" placeholder="请输入休息期间联系方式" clearable
@@ -136,11 +151,11 @@
         <!--                      :autosize="{minRows: 4, maxRows: 4}" :style="{width: '100%'}"></el-input>-->
         <!--          </el-form-item>-->
         <!--        </el-col>-->
-        <el-col :span="12">
-          <p>
-            说明: 1.返回公司报到时间为销假时间。 2.所有员工3天及以上请假需总经理批准。 3.本表存人力资源部(行政办)备案。"
-          </p>
-        </el-col>
+<!--        <el-col :span="12">-->
+<!--          <p>-->
+<!--            说明: 1.返回公司报到时间为销假时间。 2.所有员工3天及以上请假需总经理批准。 3.本表存人力资源部(行政办)备案。"-->
+<!--          </p>-->
+<!--        </el-col>-->
         <el-col :span="24" align="center">
           <el-form-item size="large">
             <el-button type="primary" @click="submitForm" style="margin-left: -100px;">提交</el-button>
@@ -175,6 +190,7 @@
           reason: undefined,
          daterange: undefined,
          endTime:undefined,
+          statistics:undefined ,
         //   daterange : Date.parse(this.form.daterange),
         //   endTime : Date.parse(this.form.endTime),
         //   statistics: parseInt((daterange-endTime)/ (1000 * 60 * 60 * 24)),
@@ -207,7 +223,8 @@
             { required: true, message: "请假天数不能为空", trigger: "blur" }
           ],
         },
-        options: []
+        options: [],
+        time: [],
       }
     },
     computed: {},
@@ -231,7 +248,28 @@
   //       this.options = response.data;
   //     });
   // },
-    getList(){
+      hqtime(){
+        let s1 =  this.form.daterange;
+        let s2 = s1[0];
+        let s3 = s1[1];
+        let strtime = new Date(s2);
+        let strtime1 = new Date(s3);
+        let time = strtime.getTime();
+        let time1 = strtime1.getTime();
+        let time2 = parseInt((time1 - time) / (1000 * 60 *60 * 24));
+        if (time2==0){
+          this.form.statistics = 1
+        }else{
+          this.form.statistics = time2
+        }
+       this.time=s1
+
+        alert(this.form.daterange)
+        console.log(this.form.daterange)
+        console.log(   JSON.stringify(this.time))
+      },
+
+      getList(){
       this.getDicts("options").then(response => {
         this.options = response.data;
       });
@@ -257,29 +295,12 @@
       submitForm() {
         this.$refs['form'].validate(valid => {
           if (valid) {
+
+            this.form.daterange= JSON.stringify(this.time)
+            console.log(  this.form.daterange)
             // TODO 提交表单
-            this.getDicts("options").then(response => {
-              this.options = response.data;
-            });
-            var a1 = Date.parse(this.form.daterange);
-            var a2 = Date.parse(this.form.endTime);
-          // this.form.statistics=.parse(this.form.daterange)-this.form.endTime.parse()
-            var day = parseInt((a2-a1)/ (1000 * 60 * 60 * 24));//核心：时间戳相减，然后除以天数
-            console.log(a1)
-            console.log(a2)
-            console.log(day)
-            if (day==0){
-              alert(day)
-              this.form.statistics=1;
-              console.log( this.form.statistics)
-            }else{
-              this.form.statistics=day
-              alert(this.form.statistics)
-            }
             addLeave(this.form).then(response => {
-
               if (response.code === 200) {
-                console.log(response.code)
                 this.msgSuccess("新增成功");
                 this.resetForm("form");
               }