yangjun
/
nursing_unit_vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2026-03-18 16:04:31 +08:00
parent 8f4a2a1e18
commit c474c4ef63
4 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue
View File

@ -42,7 +42,7 @@
:md="12" :lg="12" :xl="8" :xxl="6">
<a-row style="padding: 14px;background-color: white;border-radius: 10px;height: 180px;">
<a-col :span="4" style="padding-left: 8px;">
<img :src="handleHeadPath(item.headPath)" style="width: 48px;height:48px;border-radius: 45px;" />
<img :src="item.headPath ? (opeMediaAddress +item.headPath) : (opeMediaAddress + mrtxPic)" style="width: 48px;height:48px;border-radius: 45px;" />
</a-col>
<a-col :span="16" style="padding-left: 8px;">
<div>
@ -103,10 +103,14 @@
</a-col>
<a-col :span="24" style="display: flex;">
<div class="card-btn" @click="handleEdit(item)">员工详情</div>
<div class="card-btn" @click="handleJdpe(item)">接单配额</div>
<div class="card-btn" @click="handleFwbq(item)">服务指令</div>
<div class="card-btn" @click="handleJdpe(item)" v-if="item.name.indexOf('nusys')<0">接单配额</div>
<div class="card-btn" @click="handleFwbq(item)" v-if="item.name.indexOf('nusys')<0">服务指令</div>
<div class="card-btn" @click="handleDjzh(item)" v-if="item.name.indexOf('nusys')>=0 && item.userStatus == '1'">冻结账号</div>
<div class="card-btn" @click="handleJdzh(item)" v-if="item.name.indexOf('nusys')>=0 && item.userStatus == '0'">解冻账号</div>
<div class="card-btn" @click="handleCzmm(item)" v-if="item.name.indexOf('nusys')>=0">权限标签</div>
<div class="card-btn" @click="handleCzmm(item)">重置密码</div>
<div style="float: right;margin-left: auto; margin-right: 0px;">
<div style="float: right;margin-left: auto; margin-right: 0px;" v-if="item.name.indexOf('nusys')<0">
<span>
<a-dropdown :trigger="['hover']" placement="topRight">
<a-button type="link">
@ -175,6 +179,8 @@ import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
import RolePermissionDrawer from './components/RolePermissionDrawer.vue';
import EmployeesInvidedList from '/@/views/admin/employeesapply/EmployeesInvidedList.vue'
import { useMessage } from '/@/hooks/web/useMessage';
const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS
const mrtxPic = import.meta.env.VITE_DEFAULT_MORENTOUXIANG_PIC//默认头像
const { createMessage, createConfirm } = useMessage();
const [rolePermissionDrawer, { openDrawer: openRolePermissionDrawer }] = useDrawer();

30
src/views/biz/bizEmployeesInfo/components/BizEmployeesInfoForm.vue
View File

@ -14,7 +14,7 @@
id="BizEmployeesInfoForm-headPath" name="headPath">
<j-image-upload :fileMax="1" :bizPath="upBizPrefix + '/ygxx/yg'" text="头像"
:value="!formData.headPath ? opeMediaAddress + mrtxPic : formData.headPath"></j-image-upload>
:value="formData.headPath ? (opeMediaAddress +formData.headPath) : (opeMediaAddress + mrtxPic) "></j-image-upload>
</a-form-item>
</a-col>
</a-col>
@ -75,7 +75,7 @@
<!-- <span>{{ formData.idCard }}</span> -->
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="12" :hidden="formData.name.indexOf('nusys')>-1">
<a-form-item label="婚否" v-bind="validateInfos.marriedOrNot"
id="EmployeesApplyForm-marriedOrNot" name="marriedOrNot">
<!-- <j-dict-select-tag type='radio' v-model:value="formData.marriedOrNot" dictCode="married_or_not"
@ -84,14 +84,14 @@
<!-- <span>{{ formData.marriedOrNot }}</span> -->
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="12" :hidden="formData.name.indexOf('nusys')>-1">
<a-form-item label="身高(cm)" v-bind="validateInfos.height" id="EmployeesApplyForm-height"
name="height">
<a-input-number v-model:value="formData.height" style="width: 100%" disabled />
<!-- <span>{{ formData.height }}cm</span> -->
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="12" :hidden="formData.name.indexOf('nusys')>-1">
<a-form-item label="体重(kg)" v-bind="validateInfos.weight" id="EmployeesApplyForm-weight"
name="weight">
<a-input-number v-model:value="formData.weight" style="width: 100%" disabled />
@ -106,7 +106,7 @@
<span>{{ formData.isSmoking }}</span>
</a-form-item>
</a-col> -->
<a-col :span="12">
<a-col :span="12" :hidden="formData.name.indexOf('nusys')>-1">
<a-form-item label="健康状况" v-bind="validateInfos.healthStatus"
id="EmployeesApplyForm-healthStatus" name="healthStatus">
<!-- <j-dict-select-tag type='radio' v-model:value="formData.healthStatus" dictCode="health_status" disabled
@ -115,7 +115,7 @@
<!-- <span>{{ formData.healthStatus }}</span> -->
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="12" :hidden="formData.name.indexOf('nusys')>-1">
<a-form-item label="政治面貌" v-bind="validateInfos.politicalAppearance"
id="EmployeesApplyForm-politicalAppearance" name="politicalAppearance">
<!-- <j-dict-select-tag v-model:value="formData.politicalAppearance" dictCode="political_appearance" disabled
@ -132,28 +132,28 @@
<!-- <span>{{ formData.houseAddress }}</span> -->
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="12" :hidden="formData.name.indexOf('nusys')>-1">
<a-form-item label="紧急联系人" v-bind="validateInfos.emergencyContact"
id="EmployeesApplyForm-emergencyContact" name="emergencyContact">
<a-input v-model:value="formData.emergencyContact" disabled></a-input>
<!-- <span>{{ formData.emergencyContact }}</span> -->
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="12" :hidden="formData.name.indexOf('nusys')>-1">
<a-form-item label="紧急联系人电话" v-bind="validateInfos.emergencyTel"
id="EmployeesApplyForm-emergencyTel" name="emergencyTel">
<a-input v-model:value="formData.emergencyTel" disabled></a-input>
<!-- <span>{{ formData.emergencyTel }}</span> -->
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="12" :hidden="formData.name.indexOf('nusys')>-1">
<a-form-item label="与本人关系" v-bind="validateInfos.emergencyRelationship"
id="EmployeesApplyForm-emergencyRelationship" name="emergencyRelationship">
<a-input v-model:value="formData.emergencyRelationship" disabled></a-input>
<!-- <span>{{ formData.emergencyRelationship }}</span> -->
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="12" :hidden="formData.name.indexOf('nusys')>-1">
<a-form-item label="户口性质" v-bind="validateInfos.hukouNature"
id="EmployeesApplyForm-hukouNature" name="hukouNature">
<!-- <j-dict-select-tag type='radio' v-model:value="formData.hukouNature" dictCode="hukou_nature" disabled
@ -162,7 +162,7 @@
<!-- <span>{{ formData.hukouNature }}</span> -->
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="12" :hidden="formData.name.indexOf('nusys')>-1">
<a-form-item label="现住址" v-bind="validateInfos.currentAddress"
id="EmployeesApplyForm-currentAddress" name="currentAddress">
<a-textarea v-model:value="formData.currentAddress" disabled
@ -208,7 +208,7 @@
</a-col>
</a-row>
</a-tab-pane>
<a-tab-pane key="3" tab="健康证">
<a-tab-pane key="3" tab="健康证" v-if="formData.name.indexOf('nusys')==-1">
<a-row>
<a-col :span="12" v-if="!!formData.healthCertificatePositive">
<a-form-item label="健康证" v-bind="validateInfos.healthCertificatePositive"
@ -239,7 +239,7 @@
</a-row>
</a-tab-pane>
<a-tab-pane key="4" tab="银行卡">
<a-tab-pane key="4" tab="银行卡" v-if="formData.name.indexOf('nusys')==-1">
<a-row v-if="!!formData.bankPositive || !!formData.bankNegative">
<a-col :span="12">
<a-form-item label="银行卡正面" v-bind="validateInfos.bankPositive"
@ -270,7 +270,7 @@
</a-col>
</a-row>
</a-tab-pane>
<a-tab-pane key="5" tab="资质证件">
<a-tab-pane key="5" tab="资质证件" v-if="formData.name.indexOf('nusys')==-1">
<a-row>
<a-col :span="24" v-if="!!formData.qualification">
<a-form-item label="资质证" v-bind="validateInfos.qualification"
@ -291,7 +291,7 @@
</a-col>
</a-row>
</a-tab-pane>
<a-tab-pane key="6" tab="无犯罪证明">
<a-tab-pane key="6" tab="无犯罪证明" v-if="formData.name.indexOf('nusys')==-1">
<a-row>
<a-col :span="24" v-if="!!formData.noCrimeCertificate">
<a-form-item label="无犯罪证明" v-bind="validateInfos.noCrimeCertificate"

12
src/views/invoicing/ConfigMaterial/ConfigMaterialInfo.data.ts
View File

@ -84,12 +84,12 @@ export const columns: BasicColumn[] = [
dataIndex: 'brandType',
width:'100px'
},
{
title: '物料标签',
align: "center",
dataIndex: 'tagType_dictText',
width:'100px'
},
// {
// title: '物料标签',
// align: "center",
// dataIndex: 'tagType_dictText',
// width:'100px'
// },
// {
// title: '物料图片',
// align: "center",

5
src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue
View File

@ -138,12 +138,12 @@
</a-col>
<a-col :span="8">
<a-form-item label="物料图片" v-bind="validateInfos.materialImg" id="ConfigMaterialInfoForm-materialImg" name="materialImg">
<j-image-upload :fileMax="1" bizPath="wlpicPath" :value="formData.materialImg?formData.materialImg:defaultPrePic" ></j-image-upload>
<j-image-upload :fileMax="1" bizPath="wlpicPath" :value="formData.materialImg?formData.materialImg:(opeMediaAddress + defaultPrePic)" ></j-image-upload>
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="物料标识" v-bind="validateInfos.materialIdent" id="ConfigMaterialInfoForm-materialIdent" name="materialIdent">
<j-image-upload :fileMax="1" bizPath="wlbsPath" :value="formData.materialIdent?formData.materialIdent:defaultPrePic" ></j-image-upload>
<j-image-upload :fileMax="1" bizPath="wlbsPath" :value="formData.materialIdent?formData.materialIdent:(opeMediaAddress + defaultPrePic)" ></j-image-upload>
</a-form-item>
</a-col>
</a-row>
@ -165,6 +165,7 @@
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS
const defaultPrePic = import.meta.env.VITE_DEFAULT_NULL_PIC//证件照默认图片
const props = defineProps({
formDisabled: { type: Boolean, default: false },