diff --git a/src/views/admin/employeesapply/EmployeesApply.data.ts b/src/views/admin/employeesapply/EmployeesApply.data.ts index 6911fe1..cafe188 100644 --- a/src/views/admin/employeesapply/EmployeesApply.data.ts +++ b/src/views/admin/employeesapply/EmployeesApply.data.ts @@ -139,4 +139,5 @@ export const applyObj = { startTime: '有效开始日期', endTime: '有效结束日期', currentAddress: '现住址', + headPath: '头像', }; diff --git a/src/views/admin/employeesapply/EmployeesAuditHistoryList.vue b/src/views/admin/employeesapply/EmployeesAuditHistoryList.vue index 684c2f5..ed2949a 100644 --- a/src/views/admin/employeesapply/EmployeesAuditHistoryList.vue +++ b/src/views/admin/employeesapply/EmployeesAuditHistoryList.vue @@ -135,14 +135,14 @@ const wrapperCol = reactive({ */ function handleDetail(record: Recordable) { console.log("🚀 ~ handleDetail ~ record:", record) - if(record.applyType == '2'){ + if(record.modifyStatus){ + //审核历史 registerModal.value.disableSubmit = true; registerModal.value.edit(record); - }else if(record.applyType == '1' || record.applyType == '0'){ + }else if(!record.modifyStatus){ + //入驻审核历史 registerModal.value.disableSubmit = true; registerModal.value.editDitail(record); - }else{ - createMessage.error('错误数据，请联系管员'); } } diff --git a/src/views/admin/employeesapply/components/EmployeesApplyDetailForm.vue b/src/views/admin/employeesapply/components/EmployeesApplyDetailForm.vue index 53f7ff8..df59781 100644 --- a/src/views/admin/employeesapply/components/EmployeesApplyDetailForm.vue +++ b/src/views/admin/employeesapply/components/EmployeesApplyDetailForm.vue @@ -394,6 +394,7 @@ const formData = reactive>({ startTime: '', endTime: '', currentAddress: '', + headPath: '', }); const { createMessage } = useMessage(); const labelCol = ref({ xs: { span: 24 }, sm: { span: 8 } }); diff --git a/src/views/admin/employeesapply/components/EmployeesApplyHistoryForm.vue b/src/views/admin/employeesapply/components/EmployeesApplyHistoryForm.vue index 887c6b3..e4b05c2 100644 --- a/src/views/admin/employeesapply/components/EmployeesApplyHistoryForm.vue +++ b/src/views/admin/employeesapply/components/EmployeesApplyHistoryForm.vue @@ -90,7 +90,7 @@ const { createMessage } = useMessage(); const labelCol = { span: 6 }; // 标签宽度 const wrapperCol = { span: 18 }; // 控件宽度 const isImg = (v_) => { - return v_ == 'idCardPositive' || v_ == 'idCardNegative' || v_ == 'healthCertificatePositive' || v_ == 'bankPositive' || v_ == 'bankNegative' || v_ == 'qualification' || v_ == 'noCrimeCertificate' + return v_ == 'idCardPositive' || v_ == 'idCardNegative' || v_ == 'healthCertificatePositive' || v_ == 'bankPositive' || v_ == 'bankNegative' || v_ == 'qualification' || v_ == 'noCrimeCertificate'|| v_ == 'headPath' } const provinceOptions = ref({}) const formData = reactive>({ diff --git a/src/views/admin/employeesapply/components/EmployeesUpInfoForm.vue b/src/views/admin/employeesapply/components/EmployeesUpInfoForm.vue index 96c05e1..30775dc 100644 --- a/src/views/admin/employeesapply/components/EmployeesUpInfoForm.vue +++ b/src/views/admin/employeesapply/components/EmployeesUpInfoForm.vue @@ -83,7 +83,7 @@ const { createMessage } = useMessage(); const labelCol = { span: 4 }; // 标签宽度 const wrapperCol = { span: 18 }; // 控件宽度 const isImg = (v_) => { - return v_ == 'idCardPositive' || v_ == 'idCardNegative' || v_ == 'healthCertificatePositive' || v_ == 'bankPositive' || v_ == 'bankNegative' || v_ == 'qualification' || v_ == 'noCrimeCertificate' + return v_ == 'idCardPositive' || v_ == 'idCardNegative' || v_ == 'healthCertificatePositive' || v_ == 'bankPositive' || v_ == 'bankNegative' || v_ == 'qualification' || v_ == 'noCrimeCertificate'|| v_ == 'headPath' } const provinceOptions = ref({}) const formData = reactive>({ @@ -189,6 +189,7 @@ const fieldMap = { startTime: 'startTime', endTime: 'endTime', currentAddress: 'currentAddress', + headPath: 'headPath', }; async function show(record) { diff --git a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfo.data.ts b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfo.data.ts index 23558db..7d93d8a 100644 --- a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfo.data.ts +++ b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfo.data.ts @@ -24,24 +24,24 @@ export const columns: BasicColumn[] = [ dataIndex: 'specificationModel', search: true, }, - { - title: '一级分类', - align: "center", - dataIndex: 'categoryId_dictText', - width:'100px' - }, - { - title: '二级分类', - align: "center", - dataIndex: 'typeId_dictText', - width:'100px' - }, - { - title: '三级分类', - align: "center", - dataIndex: 'medicationId_dictText', - width:'100px' - }, + // { + // title: '一级分类', + // align: "center", + // dataIndex: 'categoryId_dictText', + // width:'100px' + // }, + // { + // title: '二级分类', + // align: "center", + // dataIndex: 'typeId_dictText', + // width:'100px' + // }, + // { + // title: '三级分类', + // align: "center", + // dataIndex: 'medicationId_dictText', + // width:'100px' + // }, { title: '品牌型号', align: "center", @@ -52,7 +52,6 @@ export const columns: BasicColumn[] = [ title: '生产厂家', align: "center", dataIndex: 'manufacturer', - width:'100px' }, // { // title: '物料标签', diff --git a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue index 864334b..aa82c91 100644 --- a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue +++ b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue @@ -5,7 +5,7 @@ - + - + @@ -42,35 +41,17 @@ placeholder="请选择三级分类" allowClear :ignoreDisabled="true" @select="handleSearch({ 'levle': 3, 'categoryId': queryParam.categoryId, 'typeId': queryParam.typeId, 'key': queryParam.medicationId }, false)" /> - - - - + + - - + + 查询 - + @@ -33,29 +33,14 @@ - - + - + @@ -63,84 +48,6 @@ - - - - diff --git a/src/views/invoicing/bizSuppliers/NuBizSuppliersInfo.data.ts b/src/views/invoicing/bizSuppliers/NuBizSuppliersInfo.data.ts index f52fee8..ced663f 100644 --- a/src/views/invoicing/bizSuppliers/NuBizSuppliersInfo.data.ts +++ b/src/views/invoicing/bizSuppliers/NuBizSuppliersInfo.data.ts @@ -68,7 +68,7 @@ export const columns: BasicColumn[] = [ } }, // { - // title: '资质照片', + // title: '营业执照', // align: "center", // dataIndex: 'imgPath', // // customRender: render.renderImage, @@ -96,6 +96,6 @@ export const superQuerySchema = { supplyState: {title: '供应状态',order: 5,view: 'list', type: 'string',dictCode: 'supply_status',}, openingBank: {title: '开户行',order: 6,view: 'text', type: 'string',}, openingBankNo: {title: '开户行账号',order: 7,view: 'text', type: 'string',}, - imgPath: {title: '资质照片',order: 8,view: 'image', type: 'string',}, + imgPath: {title: '营业执照',order: 8,view: 'image', type: 'string',}, createTime: {title: '创建日期',order: 9,view: 'datetime', type: 'string',}, }; diff --git a/src/views/invoicing/bizSuppliers/NuBizSuppliersInfoList.vue b/src/views/invoicing/bizSuppliers/NuBizSuppliersInfoList.vue index 3807cec..cff517f 100644 --- a/src/views/invoicing/bizSuppliers/NuBizSuppliersInfoList.vue +++ b/src/views/invoicing/bizSuppliers/NuBizSuppliersInfoList.vue @@ -90,9 +90,9 @@ import { defHttp } from '/@/utils/http/axios'; const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys,selectedRows }] = tableContext; const labelCol = reactive({ xs:24, - sm:8, - xl:8, - xxl:8 + sm:6, + xl:6, + xxl:6 }); const wrapperCol = reactive({ xs: 24, @@ -135,7 +135,7 @@ async function handleWlType(record) { searchQuery(); }, 1000); return defHttp.post({ - url: '/invoicing/configSuppliersInfo/updateWlType', + url: '/invoicing/configSuppliersInfo/cooperationSupp', params, timeout: 100000 }).then((res) => { diff --git a/src/views/invoicing/bizSuppliers/NuBizSuppliersMaterialInfo.data.ts b/src/views/invoicing/bizSuppliers/NuBizSuppliersMaterialInfo.data.ts index 6771d18..f2f9106 100644 --- a/src/views/invoicing/bizSuppliers/NuBizSuppliersMaterialInfo.data.ts +++ b/src/views/invoicing/bizSuppliers/NuBizSuppliersMaterialInfo.data.ts @@ -29,13 +29,13 @@ export const columns: BasicColumn[] = [ width: 200 }, { - title: '销售单价', + title: '采购单价', align: "center", dataIndex: 'salesUnitPrice', width: 100 }, { - title: '销售单位', + title: '采购单位', align: "center", dataIndex: 'salesUnit', width: 100 diff --git a/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfo.data.ts b/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfo.data.ts index a883470..4c6d6b4 100644 --- a/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfo.data.ts +++ b/src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfo.data.ts @@ -70,7 +70,7 @@ export const columns: BasicColumn[] = [ // dataIndex: 'wechartId' // }, // { - // title: '资质照片', + // title: '营业执照', // align:"center", // dataIndex: 'imgPath', // customRender:render.renderImage, @@ -203,7 +203,7 @@ export const formSchema: FormSchema[] = [ // component: 'Input', // }, { - label: '资质照片', + label: '营业执照', field: 'imgPath', component: 'JImageUpload', componentProps:{ @@ -230,7 +230,7 @@ export const superQuerySchema = { openingBank: {title: '开户行',order: 6,view: 'text', type: 'string',}, openingBankNo: {title: '开户行账号',order: 7,view: 'text', type: 'string',}, wechartId: {title: '微信账号',order: 8,view: 'text', type: 'string',}, - imgPath: {title: '资质照片',order: 9,view: 'image', type: 'string',}, + imgPath: {title: '营业执照',order: 9,view: 'image', type: 'string',}, }; /** diff --git a/src/views/invoicing/configSuppliersInfo/components/ConfigSuppliersInfoForm.vue b/src/views/invoicing/configSuppliersInfo/components/ConfigSuppliersInfoForm.vue index 922931f..22d8ebc 100644 --- a/src/views/invoicing/configSuppliersInfo/components/ConfigSuppliersInfoForm.vue +++ b/src/views/invoicing/configSuppliersInfo/components/ConfigSuppliersInfoForm.vue @@ -45,7 +45,7 @@ - +