bug修改

zhouwx

2025-03-21 fd3ef41e30c4d262ceb5616075daacf61c40d20d

bug修改

 src/api/signAgreement/template.js

@@ -33,3 +33,11 @@
        data: data
    })
}

export function userListByDept(params) {
    return request({
        url: `/system/user/byDeptId`,
        method: 'post',
        data: params
    })
}

 src/views/signProject/components/record.vue

@@ -13,10 +13,15 @@
          <div>创建人：{{state.creatContent}}</div>
        </el-timeline-item>
        <el-timeline-item style="font-size: 16px" :color="state.firstPeopleState == 1 ? '#0bbd87' : '#B4B4B4' " size="large">
          <div>
            最初签署人：{{state.firstPeopleContent}}
            <span v-if="state.firstPeopleState == 1" style="color: #1ab394;font-size: 14px;">[已签]</span>
          <div style="display: flex">
            最初签署人：
            <div style="display: flex;flex-direction: column">
              <div v-for="item in firstArr">
                {{item.firstPeopleContent}}
                <span v-if="item.firstPeopleState == 1" style="color: #1ab394;font-size: 14px;">[已签]</span>
            <span v-else style="color: #6d737b;font-size: 14px;">[未签]</span>
              </div>
            </div>

          </div>
        </el-timeline-item>
@@ -71,6 +76,7 @@
})


const firstArr = ref([])
const openDialog = async (value) => {
  console.log('va',value)
  state.form = JSON.parse(JSON.stringify(value))
@@ -79,8 +85,11 @@
  state.activities.forEach(item => {
    if(item.sort == 1){
      state.creatContent = item.userName + '（'+ item.deptName + '）'
      state.firstPeopleContent =  item.signUserName + '（'+ item.signDeptName + '）'
      state.firstPeopleState = item.signStatus
      const obj = {
        firstPeopleContent: item.signUserName + '（'+ item.signDeptName + '）',
        firstPeopleState: item.signStatus
      }
      firstArr.value.push(obj)
    }else {
      newArr.push(item)
    }

 src/views/templateManage/components/createSign.vue

@@ -17,31 +17,33 @@

        <el-form-item label="最初签署人:" prop="deptId" >
            <el-cascader
                :show-all-levels="false"
                style="width: 170px"
                clearable
                placeholder="请选择部门"
                v-model="state.form.deptId"
                v-model="state.deptIds"
                :options="state.options"
                @change="selectValue"
                :props="{ expandTrigger: 'hover', value: 'deptId',label: 'deptName',emitPath: false}">
                :props="{ multiple:true, expandTrigger: 'hover', value: 'deptId',label: 'deptName',emitPath: false}">
            </el-cascader>
            <el-select
                clearable
                v-model="state.form.initiaiUserId"
                v-model="state.initiaiUsers"
                filterable
                remote
                multiple
                reserve-keyword
                placeholder="请输入签署人名称"
                remote-show-suffix
                :remote-method="(val)=>getUserList(val,state.form.deptId)"
                @change="changeUser"
                :remote-method="(val)=>getUserList(val,state.deptIds)"
                style=" width:170px;margin-left:20px"
                value-key="userId"
            >
              <el-option
                  v-for="item in state.userList"
                  :key="item.userId"
                  :label="item.nickName"
                  :value="item.userId"
                  :value="item"
              />
            </el-select>
        </el-form-item>
@@ -57,11 +59,13 @@
  </div>
</template>
<script setup>
import {reactive, ref, toRefs} from 'vue'
import {onMounted, reactive, ref, toRefs} from 'vue'
import {ElMessage} from "element-plus";
import {listDept} from "@/api/system/dept";
import {listUser} from "@/api/system/user";
import {addSignProject} from "@/api/signAgreement/signProject";
import Cookies from "js-cookie";
import {userListByDept} from "@/api/signAgreement/template";

const { proxy } = getCurrentInstance();
const dialogVisible = ref(false);
@@ -76,25 +80,35 @@
    itemName: '',
    deptId: null,
    initiaiUserId: null,
    templateId: null
    templateId: null,
    userDept: []
  },
  options: [],
  userList: [],
  formRules:{
    deptId: [{ required: true, trigger: "blur", message:'请选择部门' }],
    // deptId: [{ required: true, trigger: "blur", message:'请选择部门' }],
    itemName: [{ required: true, trigger: "blur", message:'请输入项目名称' }],
  },
  deptIds: [],
  initiaiUsers: []
})

onMounted( () => {
  const userInfo = JSON.parse(Cookies.get('userInfo'))
  state.form.deptId = userInfo.deptId
});

const openDialog = async (value) => {
  await getDept()
  state.form.templateId = value.id

  dialogVisible.value = true;
}
const selectValue = (val) => {
  state.userList = []
  state.form.initiaiUserId = null
  state.initiaiUsers = []
  state.form.userDept = []
  getUserList("",val)

}
@@ -146,9 +160,11 @@
    initiaiUserId: null,
    templateId: null
  }
  state.deptIds = []
}
const getUserList = async (val,deptId)=>{
  if(deptId == '' || deptId == null){
  console.log('dept',deptId)
  if(deptId.length ==0 || deptId == null){
    // ElMessage.warning("请选择部门！")
    return;
  }
@@ -157,9 +173,15 @@
      deptId: deptId,
      nickName: val,
    }
    const res = await listUser(queryParams)
    const res = await userListByDept(queryParams)
    if (res.code == 200) {
      state.userList = res.rows
      state.userList = res.rows.map(item => {
        return {
          ...item,
          nickName: item.nickName + '(' + item.dept.deptName + ')'
        }
      })

    } else {
      ElMessage.warning(res.message)
    }
@@ -169,14 +191,25 @@
      pageSize: 10,
      deptId: deptId
    }
    const res = await listUser(queryParams)
    const res = await userListByDept(queryParams)
    if (res.code == 200) {
      state.userList = res.rows
      state.userList = res.rows.map(item => {
        return {
          ...item,
          nickName: item.nickName +  ' ( ' + item.dept.deptName + ' ) '
        }
      })
    } else {
      ElMessage.warning(res.message)
    }
  }
}

const changeUser = (val) =>{
  const userIds = val.map(item => item.userId)
  state.form.initiaiUserId = userIds.join(',')
  state.form.userDept = val.map(i => i.userId + '_' + i.deptId)
}
defineExpose({
  openDialog
});