oa 可运行版本上线

src/pages.json

@@ -1034,6 +1034,36 @@
                 }
                 
             ]
+        },
+        {
+            "name": "门禁管理系统",
+            "root": "pages/business/doorManage/",
+            "pages": [
+                {
+                    "path": "list/index",
+                    "style": {
+                        "navigationBarTitleText": "设备列表",
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
+                    }
+                },
+                {
+                    "path": "record/index",
+                    "style": {
+                        "navigationBarTitleText": "通行记录",
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
+                    }
+                }
+            ]
         }
     ],
     "globalStyle": {

src/pages/business/oa/approval/components/jbd.vue

@@ -0,0 +1,493 @@
+<template>
+  <oa-scroll
+    customClass="unitInfoCollection-container scroll-height"
+    :refresherLoad="false"
+    :refresherEnabled="false"
+    :refresherEnabledTitle="false"
+    :refresherDefaultStyle="'none'"
+    :refresherThreshold="44"
+    :refresherBackground="'#f5f6f7'"
+    :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
+    style="height:calc(100vh - 110px)"
+  >
+    <template #default>
+      <view class="centerOne">
+        <u--form ref="uForm" :model="form" :rules="rules" labelWidth="180">
+          <view style="padding: 0px 10px 0px 10px; background: #ffffff">
+            <view style="padding-left: 9px">
+              <u-form-item
+                label="核算方式："
+                prop="accountingMethod"
+                required
+                :borderBottom="false"
+                label-position="top"
+                @click="handleAction('核算方式')"
+                style="margin-top:10px"
+              >
+                <u-input
+                  v-model="form.accountingMethodName"
+                  placeholder="请选择核算方式"
+                  suffixIcon="arrow-right"
+                  suffixIconStyle="color: #909399"
+                  border="none"
+                  disabledColor="transparent"
+                  disabled
+                />
+              </u-form-item>
+            </view>
+          </view>
+          <view style="margin-top:10px;padding: 0px 10px 0px 10px; background: #ffffff">
+            <view style="padding-left: 9px">
+              <u-form-item
+                label="开始时间："
+                prop="startTime"
+                required
+                label-position="top"
+                @click="handleDateTime('开始时间', 0, form.startTime)"
+              >
+                <u-input
+                  v-model="form.startTime1"
+                  placeholder="请选择开始时间"
+                  border="none"
+                  suffixIcon="arrow-right"
+                  suffixIconStyle="color: #909399;"
+                />
+              </u-form-item>
+            </view>
+          </view>
+          <view style="margin-top:10px;padding: 0px 10px 0px 10px; background: #ffffff">
+            <view style="padding-left: 9px">
+              <u-form-item
+                label="结束时间："
+                prop="endTime"
+                required
+                label-position="top"
+                @click="handleDateTime('结束时间', 1, form.endTime)"
+              >
+                <u-input
+                  v-model="form.endTime1"
+                  placeholder="请选择结束时间"
+                  border="none"
+                  suffixIcon="arrow-right"
+                  suffixIconStyle="color: #909399;"
+                />
+              </u-form-item>
+            </view>
+          </view>
+          <view style="margin-top:10px;padding: 0px 10px 0px 10px; background: #ffffff">
+            <view style="padding-left: 9px">
+              <u-form-item
+                label="加班时长（小时）："
+                prop="duration"
+                required
+                label-position="top"
+              >
+                <u-input
+                  v-model="form.duration"
+                  placeholder="请输入加班时长"
+                  border="none"
+                  maxlength="4"
+                />
+              </u-form-item>
+            </view>
+          </view>
+          <view style="margin-top:10px;padding: 0px 10px 0px 10px; background: #ffffff">
+            <view style="padding-left: 9px">
+              <u-form-item
+                label="加班事由："
+                prop="reason"
+                required
+                label-position="top"
+              >
+                <u-input
+                  v-model="form.reason"
+                  placeholder="请输入加班事由"
+                  border="none"
+                  maxlength="18"
+                />
+              </u-form-item>
+            </view>
+          </view>
+          <view style="margin-top:10px;padding: 0px 10px 0px 10px; background: #ffffff">
+            <view style="padding-left: 9px">
+              <u-form-item label="日报及打卡记录图片：" prop="image" label-position="top" required>
+                <div style="margin-top: 10px">
+                  <oa-upload :uploadCount="1" :uploadImage="form.image" @uploadSuccessChange="uploadSuccessChange" @uploadDeleteChange="uploadDeleteChange"></oa-upload>
+                </div>
+                <!-- <view style="color: #666666">图片支持png、jpg</view> -->
+              </u-form-item>
+            </view>
+          </view>
+        </u--form>
+      </view>
+      <u-picker
+        :show="actionShow"
+        :columns="actionsList"
+        :title="actionTitle"
+        keyName="label"
+        visibleItemCount="6"
+        :defaultIndex="[actionDefaultIndex]"
+        :closeOnClickOverlay="true"
+        @close="actionShow = false"
+        @cancel="actionShow = false"
+        @confirm="selectAction"
+      ></u-picker>
+      <u-datetime-picker
+        :show="showTime"
+        v-model="timeValue"
+        mode="datetime"
+        @close="showTime = false"
+        @cancel="showTime = false"
+        @confirm="timeSubmit"
+        :closeOnClickOverlay="true"
+        :minDate="Number(new Date())"
+        :maxDate="Number(new Date('2027'))"
+      ></u-datetime-picker>
+      <view class="list-cell" style="color: #666666; line-height: 25px; width: auto;">
+        <view class="content-area-top">
+          <view style="width:100%;font-weight:bold;color:#333333;font-size:16px;margin-bottom:20px">流程</view>
+          <view class="stepBar">
+            <view class="item" v-for="(item, index) in nodeList" :key="index">
+              <view class="left">
+                <view class="yuan"></view>
+                <div>
+                  <view class="title">
+                    {{ item.nodeName }}
+                  </view>
+                  <view class="name">
+                    {{ item.appointApprover.split(',').length }}人{{ item.nodeType == "1" ? "审批" : item.nodeType == "2" ? "抄送" : "" }}
+                  </view>
+                </div>
+              </view>
+              <view class="right">
+                <view class="content-area-header  mb10 text-center" style="display: inline-block"  v-for="(item2, index2) in ccTo[index]" :key="index2">
+                  <img v-if='item2.avatar' class="content-area-header-avatarImg mlr5" :src='item2.avatar' style="display: block; width: 40px; height: 40px;border-radius: 6px;" />
+                  <u-avatar
+                  v-else
+                    class="content-area-header-avatar mlr5"
+                    :text='item2.nickName.length > 2 ? item2.nickName.slice(1, 3) : item2.nickName'
+                    shape="square"
+                    size="40"
+                    fontSize="12"
+                    color="#ffffff"
+                    :bgColor="proxy.$settingStore.themeColor.color"
+                  ></u-avatar>
+                  <u-text :text='item2.nickName' color="#000000" size="14" align="center" class="userName"></u-text>
+                </view>
+              </view>
+              <view class="line gray" v-if="index < nodeList.length -1">
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="app-button">
+        <u-button  type="primary" @click="handleSubmit('提交')" shape="circle"> 提交 </u-button>
+      </view>
+    </template>
+  </oa-scroll>
+</template>
+
+<script setup>
+/*----------------------------------依赖引入-----------------------------------*/
+import { onLoad, onShow, onHide, onLaunch, onReady } from "@dcloudio/uni-app";
+import {
+  ref,
+  onMounted,
+  inject,
+  shallowRef,
+  reactive,
+  toRefs,
+  getCurrentInstance,
+} from "vue";
+/*----------------------------------接口引入-----------------------------------*/
+import {
+  companyByNameSelect,
+  addBaseCompany,
+  delBaseBuild,
+  delBaseBuildExtinguish,
+} from "@/api/business/mhxf/unitInfoCollection";
+/*----------------------------------组件引入-----------------------------------*/
+/*----------------------------------store引入-----------------------------------*/
+/*----------------------------------公共方法引入-----------------------------------*/
+import {
+  getOaFormDefinition,
+  addOaDocument,
+} from "@/api/oa/approval/index.js";
+/*----------------------------------公共变量-----------------------------------*/
+const { proxy } = getCurrentInstance();
+/*----------------------------------变量声明-----------------------------------*/
+const props = defineProps({
+  data: {
+    type: Object,
+    default: Object,
+  },
+})
+const actionTitle = ref(null);
+const actionsList = ref([]);
+const actionDefaultIndex = ref(0);
+const actionShow = ref(false);
+const uForm = ref(null);
+const showTime = ref(false) //时间选择显示隐藏
+const timeValue = ref(Number(new Date())) //时间选择值
+const timeTitle = ref("") //时间选择标题
+const state = reactive({
+  form: {
+    reason: "",
+    accountingMethod: undefined,
+    accountingMethodName: undefined,
+    formName: undefined,
+    duration: "",
+    image: "",
+    startTime: "",
+    startTime1: "",
+    endTime: "",
+    endTime1: "",
+    formSign: undefined,
+    formId: undefined,
+  },
+  rules: {
+    accountingMethod: [{ required: true, message: "请选择核算方式", trigger: "change" }],
+    startTime: [
+      { required: true, message: "加班开始时间不能为空", trigger: "change" },
+    ],
+    endTime: [
+      { required: true, message: "加班结束时间不能为空", trigger: "change" },
+    ],
+    duration: [
+      { required: true, message: "加班时长不能为空", trigger: "blur" },
+    ],
+    reason: [{ required: true, message: "加班事由不能为空", trigger: "blur" }],
+    image: [{ required: true, message: "日报及打卡记录图片不能为空", trigger: "blur" }],
+  },
+  userData:[],
+  ccTo:[]
+});
+
+const { form, rules, userData, ccTo} = toRefs(state);
+const nodeList = ref([]);
+state.userData = props.data.userData
+
+nodeList.value = props.data.nodeList
+state.ccTo = props.data.ccTo
+
+
+form.value.formSign = props.data.form.formSign
+form.value.formId = props.data.form.id
+
+//编辑状态
+if(JSON.stringify(props.data.docNoDetail)!= "{}"){
+  form.value.accountingMethod = props.data.docNoDetail.accountingMethod.toString()
+  form.value.accountingMethodName = "申请调休"
+}
+
+/**
+ * @图片上传成功回调
+ */
+ function uploadSuccessChange(e) {
+  form.value.image = e.url;
+}
+
+/**
+ * @图片删除回调
+ */
+function uploadDeleteChange(e) {
+  form.value.image = e;
+}
+
+/**
+ * @api提交
+ */
+function handleSubmit(value) {
+  uForm.value
+    .validate()
+      .then((res) => {
+        if(form.value.docNo){
+          updateDocument({
+            docNo: form.value.docNo,
+            id: form.value.id,
+            formId: form.value.formId,
+            formSign: form.value.formSign,
+            type: form.value.type,
+            startTime: form.value.startTime,
+            endTime: form.value.endTime,
+            duration: Number(form.value.duration),
+            reason: form.value.reason,
+            docStatus: 1,
+            image: form.value.image
+          }).then((res) => {
+            proxy.$modal.msgSuccess("表单修改成功");
+            if(getCurrentPages().length > 1){
+              uni.navigateBack()
+            }else{
+              uni.switchTab({
+                url: `/pages/business/oa/approval/index`
+              })
+            }
+          });
+        }else{
+          addOaDocument({
+            formId: form.value.formId,
+            formSign: form.value.formSign,
+            type: form.value.type,
+            startTime: form.value.startTime,
+            endTime: form.value.endTime,
+            duration: Number(form.value.duration),
+            reason: form.value.reason,
+            docStatus: 1,
+            image: form.value.image
+          }).then((res) => {
+            proxy.$modal.msgSuccess("表单提交成功");
+            if(getCurrentPages().length > 1){
+              uni.navigateBack()
+            }else{
+              uni.redirectTo({
+                url: `/pages/business/oa/approval/index`
+              })
+            }
+          });
+        }
+      })
+      .catch((errors) => {
+        proxy.$modal.msg("校验失败");
+      });
+}
+
+/**
+ * @action弹出框点击事件
+ */
+function handleAction(value, index, ind) {
+  if (value == "核算方式") {
+    actionTitle.value = value;
+    actionsList.value = [[{label:"申请调休",value:"0"}]];
+    actionDefaultIndex.value = 0;
+  }
+  actionShow.value = true;
+}
+
+/**
+ * @action弹出框选择事件
+ */
+function selectAction(e) {
+  if(actionTitle.value == "核算方式"){
+    form.value.accountingMethod = e.value[0].value;
+    form.value.accountingMethodName = e.value[0].label;
+  }
+  actionShow.value = false;
+}
+/**
+ * @时间弹出框点击事件
+ */
+function handleDateTime(value, index, time) {
+  showTime.value = true;
+  timeTitle.value = value;
+}
+
+/**
+ * @时间选择器
+ * @确定按钮事件
+ */
+function timeSubmit(data) {
+  let time = proxy.$time.getFormatterDate(data.value);
+  let timeData = time.split(" ")[0] + " " + time.split(" ")[1]
+  if (timeTitle.value == "开始时间") {
+    form.value.startTime1 = timeData;
+    form.value.startTime = timeData;
+  } else if (timeTitle.value == "结束时间") {
+    form.value.endTime1 = timeData;
+    form.value.endTime = timeData;
+  }
+  showTime.value = false;
+}
+
+onLoad((options) => {
+
+});
+
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+</script>
+
+<style lang="scss">
+.unitInfoCollection-container {
+  .centerOne,
+  .centerTwo {
+    .title {
+      color: #333333;
+      text-align: center;
+      margin-top: 10px;
+    }
+  }
+  :deep(.u-picker__view__column__item) {
+    font-size: 13px;
+  }
+}
+.app-button{
+  position: fixed;
+  bottom:10px;
+  left:10px;
+  width:calc(100% - 20px);
+  button{
+    border-radius: 10px !important;
+  }
+}
+.stepBar{
+    margin-top:-20px;
+    font-weight: 400;
+    width:100%;
+    .item{
+    position: relative;
+      .left{
+        width:100%;
+        position: relative;
+        .yuan{
+          width:10px;
+          height:10px;
+          margin-top:10px;
+          vertical-align: middle;
+          float: left;
+          border-radius: 50%;
+          background: #999;
+        }
+        >div{
+          width:80%;
+          margin-left:20px;
+          vertical-align: top;
+          line-height: 20px;
+          .title{
+            font-size: 14px;
+          }
+          .name{
+            font-size: 12px;
+            color: #999;
+          }
+        }
+      }
+      .line{
+        height:84%;
+        width:1px;
+        position: absolute;
+        top:24px;
+        left:5px;
+        background: #999;
+      }
+      .right{
+        width:calc(100% - 100px);
+        margin-left:100px;
+        text-align: right;
+      }
+    }
+    .item:nth-child(1){
+      margin-top:10%;
+    }
+  }
+.userName{
+  white-space: nowrap;      /* 确保文本在一行内显示 */
+  overflow: hidden;         /* 超出容器部分隐藏 */
+  text-overflow: ellipsis;  /* 超出部分显示省略号 */
+  width: 50px !important;             /* 定义容器宽度 */
+  text-align: center;
+}
+</style>

src/pages/business/oa/approval/components/qjd.vue

@@ -12,7 +12,7 @@
   >
     <template #default>
       <view class="centerOne">
-        <u--form ref="uForm" :model="form" :rules="rules" labelWidth="130">
+        <u--form ref="uForm" :model="form" :rules="rules" labelWidth="150">
           <view style="padding: 0px 10px 0px 10px; background: #ffffff">
             <view style="padding-left: 9px">
               <u-form-item
@@ -77,7 +77,7 @@
           <view style="margin-top:10px;padding: 0px 10px 0px 10px; background: #ffffff">
             <view style="padding-left: 9px">
               <u-form-item
-                label="时长（小时）："
+                label="请假时长（小时）："
                 prop="duration"
                 required
                 label-position="top"
@@ -155,23 +155,24 @@
                     {{ item.nodeName }}
                   </view>
                   <view class="name">
-                    {{  item.appointApprover.split(',').length }}人{{ item.nodeName }}
+                    {{ item.appointApprover.split(',').length }}人{{ item.nodeType == "1" ? "审批" : item.nodeType == "2" ? "抄送" : "" }}
                   </view>
                 </div>
               </view>
               <view class="right">
                 <view class="content-area-header  mb10 text-center" style="display: inline-block"  v-for="(item2, index2) in ccTo[index]" :key="index2">
-                  <img v-if='item2.avatar' class="content-area-header-avatarImg mlr5" :src='item2.avatar' style="display: block; width: 40px; height: 40px" />
+                  <img v-if='item2.avatar' class="content-area-header-avatarImg mlr5" :src='item2.avatar' style="display: block; width: 40px; height: 40px;border-radius: 6px;" />
                   <u-avatar
+                  v-else
                     class="content-area-header-avatar mlr5"
-                    :text='item2.userName.length > 2 ? item2.userName.slice(1, 3) : item2.userName'
+                    :text='item2.nickName.length > 2 ? item2.nickName.slice(1, 3) : item2.nickName'
                     shape="square"
                     size="40"
                     fontSize="12"
                     color="#ffffff"
                     :bgColor="proxy.$settingStore.themeColor.color"
                   ></u-avatar>
-                  <u-text :text='item2.userName' color="#000000" size="14" align="center" class="userName"></u-text>
+                  <u-text :text='item2.nickName' color="#000000" size="14" align="center" class="userName"></u-text>
                 </view>
               </view>
               <view class="line gray" v-if="index < nodeList.length -1">
@@ -223,7 +224,6 @@ const props = defineProps({
     default: Object,
   },
 })
-console.log(props.data)
 const actionTitle = ref(null);
 const actionsList = ref([]);
 const actionDefaultIndex = ref(0);
@@ -270,12 +270,15 @@ state.userData = props.data.userData
 
 nodeList.value = props.data.nodeList
 state.ccTo = props.data.ccTo
-console.log(state.ccTo,1)
 
 form.value.formSign = props.data.form.formSign
 form.value.formId = props.data.form.id
 
-console.log(props.data.form)
+//编辑状态
+if(JSON.stringify(props.data.docNoDetail)!= "{}"){
+  form.value.type = props.data.docNoDetail.type.toString()
+  form.value.typeName = "申请调休"
+}
 /**
  * @图片上传成功回调
  */
@@ -336,7 +339,7 @@ function handleSubmit(value) {
             if(getCurrentPages().length > 1){
               uni.navigateBack()
             }else{
-              uni.switchTab({
+              uni.redirectTo({
                 url: `/pages/business/oa/approval/index`
               })
             }
@@ -432,9 +435,8 @@ onShow(() => {
     margin-top:-20px;
     font-weight: 400;
     width:100%;
-    position: relative;
     .item{
-      margin-top:10%;
+    position: relative;
       .left{
         width:100%;
         position: relative;
@@ -462,7 +464,7 @@ onShow(() => {
         }
       }
       .line{
-        height:39.5%;
+        height:84%;
         width:1px;
         position: absolute;
         top:24px;
@@ -475,12 +477,15 @@ onShow(() => {
         text-align: right;
       }
     }
+    .item:nth-child(1){
+      margin-top:10%;
+    }
   }
-  .userName{
-    white-space: nowrap;      /* 确保文本在一行内显示 */
-    overflow: hidden;         /* 超出容器部分隐藏 */
-    text-overflow: ellipsis;  /* 超出部分显示省略号 */
-    width: 50px !important;             /* 定义容器宽度 */
-    text-align: center;
-  }
+.userName{
+  white-space: nowrap;      /* 确保文本在一行内显示 */
+  overflow: hidden;         /* 超出容器部分隐藏 */
+  text-overflow: ellipsis;  /* 超出部分显示省略号 */
+  width: 50px !important;             /* 定义容器宽度 */
+  text-align: center;
+}
 </style>

src/pages/business/oa/approval/formType.vue

@@ -19,7 +19,8 @@
         >
       </template>
     </u-navbar>
-    <qjd v-if="datail?.fieldInfo == 'QJD' && pageStatus " :data="{form:datail,ccTo:ccTo,nodeList:nodeList,type:formType}" />
+    <qjd v-if="datail?.fieldInfo == 'QJD' && pageStatus " :data="{form:datail,ccTo:ccTo,nodeList:nodeList,type:formType,docNoDetail:docNoDetail}" />
+    <jbd v-if="datail?.fieldInfo == 'JBD' && pageStatus " :data="{form:datail,ccTo:ccTo,nodeList:nodeList,type:formType,docNoDetail:docNoDetail}" />
     <!-- :data="{form:form,nodeList:nodeList,ccTo:ccTo}" -->
 </template>
   
@@ -44,6 +45,7 @@
   } from "@/api/business/mhxf/unitInfoCollection";
   /*----------------------------------组件引入-----------------------------------*/
   import qjd from "./components/qjd.vue";//请假单
+  import jbd from "./components/jbd.vue";//加班单
   /*----------------------------------store引入-----------------------------------*/
   import { useStores, commonStores } from "@/store/modules/index";
   /*----------------------------------公共方法引入-----------------------------------*/
@@ -62,6 +64,7 @@
   const ccTo = ref([]); //抄送人列表
   const nodeList = ref([]); //节点列表
   const pageStatus = ref(false); //页面状态
+  const docNoDetail = ref({}); //文档号详情
   /**
    *
    * @param {*事件类型} type
@@ -70,9 +73,9 @@
    function handle(type,formSign,docNo) {
     if(type == "getMore"){
       getOaFormDefinition( {formSign:formSign ? formSign : docNo.split("-")[0]}).then((res)=>{
+        datail.value = res.data[0]
         if(formType.value == 1){
           if(res.data.length){
-            datail.value = res.data[0]
             var data = res.data[0]
             /** 查询用户列表 */
             UserList({ pageNum: "1", pageSize: "10000" }).then((res2) => {
@@ -108,10 +111,9 @@
         }else if(formType.value == 2){
           getDocumentDetails( {docNo:docNo}).then((res2)=>{
             if(res2.data){
-              activeName.value  = docNo.split("-")[0]
-              form.value = res2.data
+              docNoDetail.value = res2.data
               /** 查询用户列表 */
-              listUser({ pageNum: "1", pageSize: "10000" }).then((res3) => {
+              UserList({ pageNum: "1", pageSize: "10000" }).then((res3) => {
                 userData.value = res3.data.rows;
                 var data = res.data[0]
                 var flowInfo = JSON.parse(data.flowInfo)

src/pages/business/oa/approval/index.vue

@@ -44,8 +44,8 @@
           <!-- 我的宫格 -->
           <view class="grid-area bg-white" v-if="state.formList.length > 0">
             <view class="grid-area_title">我的</view>
-            <u-icon class="grid-area_icon"  name="arrow-down" color="#000" size="18"  @click="splitNum(0,5)" v-if="state.appContent[0].direction == '0'"></u-icon>
-            <u-icon class="grid-area_icon"  name="arrow-up" color="#000" size="18"  @click="splitNum(0,5)" v-if="state.appContent[0].direction == '1'"></u-icon>
+            <u-icon class="grid-area_icon"  name="arrow-down" color="#000" size="18"  @click="splitNum(0,5)" v-if="state.appContent[0].direction == '0' && state.formList.length>5"></u-icon>
+            <u-icon class="grid-area_icon"  name="arrow-up" color="#000" size="18"  @click="splitNum(0,5)" v-if="state.appContent[0].direction == '1' && state.formList.length>5"></u-icon>
             <view class="grid-area_center cu-list grid col-5 no-border" >
               <view class="grid-area_center_item cu-item align-center" v-for="(item, index) in state.appContent[0].array" :key="index" @click="toForm(item.formSign)">
                 <!-- <image class="grid-area_center_item_image" :src="item.icon"></image> -->
@@ -135,7 +135,6 @@
         state.formList[i].icon = proxy.$common.getAssetsFile(`images/oa/${state.formList[i].formImage}.png`);
       }
       state.appContent[0].array = state.formList
-      console.log(state.appContent[0].array)
     })
   }
   function getStatistics(){
@@ -160,7 +159,7 @@
    * 跳转表单模版
    */
   function toForm(formSign){
-    if(formSign == "QJD"){
+    if(formSign == "QJD" || formSign == "JBD"){
       uni.navigateTo({
         url: `/pages/business/oa/approval/formType?formSign=${formSign}`
       })

src/pages/business/oa/toDo/detail.vue

@@ -58,7 +58,7 @@
               <image class="icon" src="@/static/images/oa/Ccto.png" v-if="item.nodeType == 2"></image>
               <div>
                 <view class="title">
-                  {{ item.nodeType == 1 ? '审批人' : item.nodeType == 2 ? `抄送${item.appointApprover.indexOf(",") && item.appointApprover.split(",").length>1 ? `(${item.appointApprover.split(",").length}人)` : "人"}` : "" }}
+                  {{ item.nodeType == 1 ? item.nodeName : item.nodeType == 2 ? `抄送${item.appointApprover.indexOf(",") && item.appointApprover.split(",").length>1 ? `(${item.appointApprover.split(",").length}人)` : "人"}` : "" }}
                 </view>
                 <view class="name" v-if="item.nodeType == 1">
                   {{  proxy.$common.mapping("nickName", "userId", item.appointApprover, state.userData) }}
@@ -78,6 +78,7 @@
               <view class="content-area-header  mb10 text-center" style="display: inline-block"  v-for="(approver, index2) in item.appointApprover.split(',')" :key="index2">
                 <img v-if='proxy.$common.mapping("avatar", "userId", approver, state.userData)' class="content-area-header-avatarImg mlr5" :src='proxy.$common.mapping("avatar", "userId", approver, state.userData)' style="display: block; width: 40px; height: 40px" />
                 <u-avatar
+                  v-else
                   class="content-area-header-avatar mlr5"
                   :text='proxy.$common.mapping("nickName", "userId", approver, state.userData).length > 2 ? proxy.$common.mapping("nickName", "userId", approver, state.userData).slice(1, 3) : proxy.$common.mapping("nickName", "userId", approver, state.userData)'
                   shape="square"
@@ -95,7 +96,7 @@
         </view>
       </view>
     </view>
-    <view class="fixedBottom" v-if="state.approvalStatus == 2 || state.approvalStatus == 3">
+    <view class="fixedBottom" v-if="(state.approvalStatus == 2 || state.approvalStatus == 3)  && state.detail.proposer == useStore.userId  && state.detail.docNo.split('-')[0] == 'JBD'" @click="handle('again')">
       <img src="@/static/images/oa/loading.png" alt="">
       <span>再次提交</span>
     </view>
@@ -119,7 +120,9 @@ import { listDept, UserList } from "@/api/system/user";
 /*----------------------------------公共变量-----------------------------------*/
 const { proxy } = getCurrentInstance();
 const { form_status, workflow_form_subset } = proxy.useDict("form_status","workflow_form_subset");
+import { useStores } from "@/store/modules/index";
 /*----------------------------------变量声明-----------------------------------*/
+const useStore = useStores();
 const state = reactive({
   loading: false,
   queryParams:{
@@ -147,6 +150,7 @@ function init() {
  * @param status 
  */
 function handle(type) {
+  //通过、拒绝
   if(type == "pass" || type == "refuse"){
     approve({id:state.detail.id,approvalStatus:type == "pass"? 2:3}).then(() => {
       proxy.$modal.msgSuccess("操作成功");
@@ -155,6 +159,13 @@ function handle(type) {
       })
     })
   }
+  //再次提交
+  if(type == "again"){
+    
+    uni.redirectTo({
+      url: `/pages/business/oa/approval/formType?docNo=${state.detail.docNo}`
+    })
+  }
 }
 
 /**
@@ -174,7 +185,6 @@ function getDetail(type) {
         })
         UserList({ pageNum: "1", pageSize: "10000" }).then((res3) => {
           state.userData = res3.data.rows;
-          console.log(state.userData.length)
           getOaFormDefinition( {formSign:state.queryParams?.docNo?.split("-")[0]}).then((res4)=>{
             if(res4.data.length){
               var info = res4.data[0]

src/plugins/constData.plugins.js

@@ -332,5 +332,6 @@ export default {
 	xunJianList: xunJianList,
 	homeTabbar: homeTabbar,
 	projectTabbar: projectTabbar,
-	oaApprovalTabbar:oaApprovalTabbar
+	oaApprovalTabbar:oaApprovalTabbar,
+	doorTabbar:doorTabbar
 };