8-10

src/api/clocking/leave.js

@@ -60,3 +60,11 @@ export function getMsgByType(workid, actiontype) {
     method: "GET",
   });
 }
+//请假天数
+export function getLeaveDays(query) {
+  return request({
+    url: "/oa/attendance/getDays",
+    method: "post",
+    params: query,
+  });
+}

src/views/clocking/contSeal.vue

@@ -101,7 +101,7 @@
                     type="textarea"
                   ></el-input>
                 </el-form-item>
-                <el-form-item prop="activeSend" label="主送单位：">
+                <el-form-item prop="activeSend" label="合同签订单位：">
                   <el-col :span="24">
                     <el-input
                       v-model="form1.activeSend"

src/views/clocking/leaveApplication.vue

@@ -59,50 +59,6 @@
                       :value="dict.value"
                     />
                   </el-select>
-                  <!-- <el-radio-group v-model="form1.leaveTpye">
-                  <el-radio
-                    :disabled="showTable !== undefined"
-                    label="0"
-                    size="large"
-                    >事假</el-radio
-                  >
-                  <el-radio
-                    :disabled="showTable !== undefined"
-                    label="1"
-                    size="large"
-                    >病假</el-radio
-                  >
-                  <el-radio
-                    :disabled="showTable !== undefined"
-                    label="2"
-                    size="large"
-                    >年休假</el-radio
-                  >
-                  <el-radio
-                    :disabled="showTable !== undefined"
-                    label="3"
-                    size="large"
-                    >探亲假</el-radio
-                  >
-                  <el-radio
-                    :disabled="showTable !== undefined"
-                    label="4"
-                    size="large"
-                    >婚假</el-radio
-                  >
-                  <el-radio
-                    :disabled="showTable !== undefined"
-                    label="5"
-                    size="large"
-                    >丧假</el-radio
-                  >
-                  <el-radio
-                    :disabled="showTable !== undefined"
-                    label="6"
-                    size="large"
-                    >产假</el-radio
-                  >
-                </el-radio-group> -->
                 </el-form-item>
                 <el-form-item prop="leaveTime" label="请（休）假起止日期：">
                   <el-col :span="24">
@@ -317,6 +273,7 @@ import {
   getReturnWorkNode,
   WorkProgressBar,
   NodeReturnWork,
+  getLeaveDays,
 } from "@/api/clocking/leave";
 import {
   generNextStepNode,
@@ -376,20 +333,6 @@ export default {
         workid: null,
         reviewMsg: null,
       },
-      leaveInfo: [
-        {
-          lable: "事假",
-          value: "0",
-        },
-        {
-          lable: "年假",
-          value: "1",
-        },
-        {
-          lable: "病假",
-          value: "2",
-        },
-      ],
       flowDatas: {
         FK_Flow: null,
         toNodeId: "",
@@ -407,7 +350,6 @@ export default {
       leaveClear: false,
       workId: null,
       value2: "",
-      // name: "",
       input: "",
       form1: {
         leaveTime: null,
@@ -538,11 +480,16 @@ export default {
 
   methods: {
     changeDate(val) {
-      var d1 = new Date(val[0]);
-      var d2 = new Date(val[1]);
-      var diff = d2 - d1;
-      var days = diff / (1000 * 60 * 60 * 24);
-      this.form1.leaveNumber = Math.floor(days) + 1;
+      console.log("56", val);
+      getLeaveDays({ startDate: val[0], endDate: val[1] }).then((res) => {
+        console.log("res", res);
+        this.form1.leaveNumber = res.data;
+      });
+      // var d1 = new Date(val[0]);
+      // var d2 = new Date(val[1]);
+      // var diff = d2 - d1;
+      // var days = diff / (1000 * 60 * 60 * 24);
+      // this.form1.leaveNumber = Math.floor(days) + 1;
     },
     closeLeaveDialog() {
       this.$emit("closeViewLeave");
@@ -643,7 +590,6 @@ export default {
           return;
         }
       }
-
       this.flowDatas.token = getJToken();
       this.flowDatas.WorkID = this.workId;
       this.flowDatas.FK_Flow = "009";
@@ -667,11 +613,9 @@ export default {
       this.form1.leaveReason = data.leaveReason;
       this.form1.leaveTpye = data.leaveTpye;
       this.form1.leaveTime = [data.leaveStartTime, data.leaveEndTime];
-
       if (this.leaveTrue == false) {
         this.generNextStepAllNode();
       }
-
       this.WorkProgressBar();
     },
     async generNextStepAllNode() {
@@ -713,9 +657,7 @@ export default {
           this.form.leaveReason = this.form1.leaveReason;
           this.form.leaveTpye = Number(this.form1.leaveTpye);
           this.form.leaveStartTime = this.form1.leaveTime[0];
-
           this.form.leaveEndTime = this.form1.leaveTime[1];
-
           if (this.Fzr) {
             this.flowDatas.token = getJToken();
             this.flowDatas.WorkID = this.workId;

src/views/clocking/selectUserDb.vue

@@ -224,6 +224,7 @@ export default {
         groupId: null,
         userIds: [],
       },
+      NodeId: "602",
       columns: [
         { key: 0, label: `用户编号`, visible: true },
         { key: 1, label: `用户名称`, visible: true },
@@ -248,13 +249,16 @@ export default {
     // 查询表数据
     getList1(formDatas) {
       console.log("formDatas", formDatas);
-      GenerNextStepNodeEmpsNoWorkId(formDatas.FK_Flow, "602", "", "").then(
-        (res) => {
-          this.allUserList = res.Emps;
-          this.userList = res.Emps;
-          this.deptOptions = this.handleTree(res.Depts, "No", "ParentNo");
-        }
-      );
+      GenerNextStepNodeEmpsNoWorkId(
+        formDatas.FK_Flow,
+        this.NodeId,
+        "",
+        ""
+      ).then((res) => {
+        this.allUserList = res.Emps;
+        this.userList = res.Emps;
+        this.deptOptions = this.handleTree(res.Depts, "No", "ParentNo");
+      });
     },
     // el-table只能选一个
 
@@ -279,6 +283,9 @@ export default {
       if (str == "0") {
         this.yijiaoFlg = true;
       }
+      if (str != null && str != "" && str != undefined) {
+        this.NodeId = str;
+      }
       console.log("flowDatas111", flowDatas);
       this.getList1(flowDatas);
       this.dialogVisible11 = true;

src/views/clocking/workApply.vue

@@ -888,7 +888,7 @@ export default {
             this.flowDatas.toNodeId = null;
             console.log(this.flowDatas);
             // this.$modal.closeLoading();
-            this.$refs["selectRef"].show1(this.flowDatas);
+            this.$refs["selectRef"].show1(this.flowDatas, "2002");
           }
           // if (this.Fzr) {
           //   this.$modal.loading("提交中...");

src/views/deskWork/deskWork/dutyOn.vue

@@ -115,11 +115,15 @@
 
 <script>
 import { selectMyDuty, selectDutyInfoByDate } from "@/api/deskWork/dutyOn";
+import dayjs from "dayjs";
+import "dayjs/locale/zh-cn";
+dayjs.locale("zh-cn");
 export default {
   name: "YinetoaDutyOn",
 
   data() {
     return {
+      firstDayOfWeek: 1, // 设置每周第一天为星期一
       showPopover: false,
       CheckInfo: {
         num: "",

src/views/lcqd/index.vue

@@ -160,7 +160,7 @@
                 </div>
               </div>
             </div>
-            <div
+            <!-- <div
               class="hoverable-element"
               style="display: inline-block; border: 1px solid #efefef"
             >
@@ -297,7 +297,7 @@
                   </div>
                 </div>
               </div>
-            </div>
+            </div> -->
           </div>
         </div>
         <div
@@ -908,7 +908,7 @@
               </div>
 
               <div
-                v-hasPermi="['lcqd:zbtj:start']"
+                v-hasPermi="['lcqd:htyz:start']"
                 class="hoverable-element"
                 style="display: inline-block; border: 1px solid #efefef"
               >

src/views/liucheng/todowork/formView/contSeal.vue

@@ -116,7 +116,7 @@
                         type="textarea"
                       ></el-input>
                     </el-form-item>
-                    <el-form-item prop="activeSend" label="主送单位：">
+                    <el-form-item prop="activeSend" label="合同签订单位：">
                       <el-col :span="24">
                         <el-input
                           disabled