From 1f62f3878b9ffe6025bb4fa5ec9cd15b036fd47c Mon Sep 17 00:00:00 2001 From: ylj20011123 Date: Fri, 5 Sep 2025 19:13:20 +0800 Subject: [PATCH] update --- package.json | 2 +- public/static/uploadPhoto/index.html | 94 +- .../components/PaymentConfirmTable.tsx | 2057 +++++++++-------- .../components/CardInfo.tsx | 4 +- .../CardInformationManager/index.tsx | 2 +- .../list/components/auditDetail.tsx | 7 +- .../list/components/detailBasicInfo.tsx | 6 +- .../company/components/CompanyInfo.tsx | 14 +- .../basicManage/Brand/components/addEdit.tsx | 17 +- .../basicManage/QualificationDelay/index.tsx | 7 +- .../basicManage/highwayHeadlines/index.tsx | 9 +- .../component/assetsEditor.tsx | 4 +- .../basicManage/serverpartAssets/index.tsx | 4 +- src/pages/busniess/PaymentConfirm/detail.tsx | 6 +- .../ShopExpense/components/fileDrawer.tsx | 7 +- src/pages/busniess/ShopExpense/index.tsx | 11 +- src/pages/busniess/ShopExpenseFince/index.tsx | 58 +- src/pages/contract/components/detail.tsx | 4 +- src/pages/contract/components/editor.tsx | 7 +- src/pages/contract/list.tsx | 7 +- src/pages/market/marketResearch/index.tsx | 2 +- .../Shops/components/AddShopModal.tsx | 9 +- src/pages/merchantManagement/brand/index.tsx | 7 +- .../supplier/Management/index.tsx | 9 +- .../supplier/Qualifications/index.tsx | 7 +- .../MerchantInformation/index.tsx | 17 +- .../reports/contractWarningQuery/index.tsx | 7 +- .../components/compareList.tsx | 9 +- .../component/YearExamineDetailTable.tsx | 7 +- .../component/yearExamineProcess.tsx | 4 +- src/pages/supplier/inspectionReport/index.tsx | 108 +- .../supplier/inspectionReport/service.ts | 2 +- .../supplierList/components/addNewShop.tsx | 1259 +++++----- src/pages/supplier/supplierList/list.tsx | 7 +- src/pages/travelMember/HomepageAds/index.tsx | 4 +- .../LostandFoundAPPliance/index.tsx | 7 +- .../travelMember/LostandFoundReview/index.tsx | 5 +- .../travelMember/MallBrandManage/index.tsx | 7 +- .../MallClassificationManage/index.tsx | 4 +- .../OrderCategoryManage/index.tsx | 4 +- .../travelMember/OrderProductManage/index.tsx | 5 +- .../ProductListingManagement/index.tsx | 17 +- .../ProductSpecificationManage/index.tsx | 4 +- .../ShoppingMallProductSearch/index.tsx | 17 +- .../travelMember/scenicSpotConfig/index.tsx | 7 +- .../travelMember/serverpartInfo/index.tsx | 7 +- src/services/picture.ts | 15 + src/versionEnv.ts | 6 +- 48 files changed, 1993 insertions(+), 1897 deletions(-) diff --git a/package.json b/package.json index d34108e..fded66f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ant-design-pro", - "version": "4.5.49", + "version": "4.5.50", "private": true, "description": "An out-of-box UI solution for enterprise applications", "scripts": { diff --git a/public/static/uploadPhoto/index.html b/public/static/uploadPhoto/index.html index d5fb8b9..0262db0 100644 --- a/public/static/uploadPhoto/index.html +++ b/public/static/uploadPhoto/index.html @@ -2,24 +2,24 @@ - - - - 图片上传 - - - - - + + + + 图片上传 + + + + + - - + + - - - + + + - + @@ -42,9 +42,9 @@ @click="submitUpload">保存单据 -
- 注意：上传文件大小小于4M, 上传文件格式：jpg、png、gif -
+
+ 注意：上传文件大小小于4M, 上传文件格式：jpg、png、gif +
@@ -61,13 +61,33 @@ 预览 + xmlns="http://www.w3.org/2000/svg" p-id="3120" width="20" height="20"> + + + 预览 + xmlns="http://www.w3.org/2000/svg" p-id="2158" width="20" height="18"> + + + + + 删除 @@ -77,7 +97,7 @@
- @@ -113,7 +133,7 @@ const tableType = getreqstr('tabletype'); const deleteType = getreqstr('deletetype'); const readonly = getreqstr('readonly') ? true : false; - const actions = 'https://api.eshangtech.com/EShangApiMain' + const actions = 'https://ahyd.eshangtech.com/EShangApiMain' let uploadRef = ref(null) let showPreviewRef = ref(null) let filename = ref('') @@ -206,20 +226,20 @@ const handleRemove = (file) => { var msg = "您真的确定要删除吗？\n\n请确认！"; if (confirm(msg)) { - loading.value = true - // const index = url.value.findIndex(n => n === file.ImageUrl) - axios.get(actions + '/Picture/DeletePicture?imageid=' + file.ImageId + '&TableName=' + - tableName + '&TableType=' + deleteType + '&ImagePath=' + file.ImagePath).then(res => { - const data = res.data - imageList.value = [] - if (data.Result_Code === 100) { - getImages(tableId) - ElMessage({ - type: 'success', - message: '删除成功!' - }) - } - }) + loading.value = true + // const index = url.value.findIndex(n => n === file.ImageUrl) + axios.get(actions + '/Picture/DeletePicture?imageid=' + file.ImageId + '&TableName=' + + tableName + '&TableType=' + deleteType + '&ImagePath=' + file.ImagePath).then(res => { + const data = res.data + imageList.value = [] + if (data.Result_Code === 100) { + getImages(tableId) + ElMessage({ + type: 'success', + message: '删除成功!' + }) + } + }) } } // 获取图片列表 @@ -273,4 +293,4 @@ - + \ No newline at end of file diff --git a/src/pages/BussinessProject/components/PaymentConfirmTable.tsx b/src/pages/BussinessProject/components/PaymentConfirmTable.tsx index c7f05fb..7ad50f4 100644 --- a/src/pages/BussinessProject/components/PaymentConfirmTable.tsx +++ b/src/pages/BussinessProject/components/PaymentConfirmTable.tsx @@ -29,6 +29,7 @@ import { getRemarksList, saveHisPaymentAccount, updatePaymentConfirm, updateSynchroRemarks, + uploadAHYDFile, uploadFile } from "@/pages/busniess/PaymentConfirm/service"; import { @@ -50,14 +51,14 @@ import type { BusinessProjectModel } from "@/pages/BussinessProject/data"; import type { ProFormInstance } from "@ant-design/pro-form"; import IconFont from "@/components/IconFont"; -import {getPaymentConfirmList, getPaymentConfirmListGet, getSelectList} from "../service"; +import { getPaymentConfirmList, getPaymentConfirmListGet, getSelectList } from "../service"; import type { CurrentUser } from "umi"; import type { ConnectState } from "@/models/connect"; import PaymentRecord from "./PaymentRecord"; // import { getBusinessMerchatsList } from "@/pages/basicManage/service"; import './PaymentConfirmTable.less' import Draggable from "react-draggable"; -import {fmoney, noDecimal} from "@/services/options"; +import { fmoney, noDecimal } from "@/services/options"; import ProDescriptions from "@ant-design/pro-descriptions"; import DescriptionItem from "@/pages/DataVerification/list/components/DescriptionItem"; @@ -66,18 +67,18 @@ const { Text } = Typography; // 更新回款信息 const handleAddUpdate = async (fields: PaymentConfirmModel, remark?: RemarksModel) => { - const hide = message.loading('正在提交...'); + const hide = message.loading('正在提交...'); - const result = await updatePaymentConfirm(fields); - hide(); + const result = await updatePaymentConfirm(fields); + hide(); - if (result.Result_Code !== 100) { - message.error(`${result.Result_Desc}` || `${result.Result_Code}:提交失败`); - return false; - } - await updateSynchroRemarks({ REMARKS_CONTENT: remark,REMARKS_ID:fields?.REMARKS_ID, TABLE_ID: fields?.TABLE_ID || result.Result_Data.PAYMENTCONFIRM_ID,TABLE_NAME: "T_PAYMENTCONFIRM" }) - message.success("提交成功！") - return result.Result_Data; + if (result.Result_Code !== 100) { + message.error(`${result.Result_Desc}` || `${result.Result_Code}:提交失败`); + return false; + } + await updateSynchroRemarks({ REMARKS_CONTENT: remark, REMARKS_ID: fields?.REMARKS_ID, TABLE_ID: fields?.TABLE_ID || result.Result_Data.PAYMENTCONFIRM_ID, TABLE_NAME: "T_PAYMENTCONFIRM" }) + message.success("提交成功！") + return result.Result_Data; }; // 校验图片大小 @@ -94,18 +95,18 @@ const beforeUpload = (file: any) => { } // 删除回款信息 const handleDelete = async (id: number) => { - const hide = message.loading('正在删除...'); - const result = await delPaymentConfirm(id) + const hide = message.loading('正在删除...'); + const result = await delPaymentConfirm(id) - hide(); + hide(); - if (result.Result_Code !== 100) { - message.error(`${result.Result_Desc}` || `${result.Result_Code}:删除失败`); - return false; - } + if (result.Result_Code !== 100) { + message.error(`${result.Result_Desc}` || `${result.Result_Code}:删除失败`); + return false; + } - message.success("删除成功！") - return true; + message.success("删除成功！") + return true; }; /** * @description: 往来款 组件主体 @@ -114,60 +115,62 @@ const handleDelete = async (id: number) => { * @return {*} * @LastEditTime: Do not edit */ -const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,showType }: { - props: BusinessProjectModel & any, handleModalVisible: (value: boolean) => void, - editable?: boolean | true, currentUser?: CurrentUser,showType?: any +const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser, showType }: { + props: BusinessProjectModel & any, handleModalVisible: (value: boolean) => void, + editable?: boolean | true, currentUser?: CurrentUser, showType?: any }) => { - const [currentRow, setCurrentRow] = useState() - const bussinessRef = useRef() - const formRef = useRef(); - const [myRemark, setMyRemark] = useState({}) - const [showDetail, setShowDetail] = useState(false) // 是否显示租金拆分日志 - // const [createModalVisible, handleModalVisible] = useState(false) - const actionRef = useRef() - const [businessDetail,setBussinessDetail] = useState(false)// 点击商家缴款出现的抽屉 - const { run: getRemark, loading: remarkLoading, data: remarkList = [] } = useRequest((params) => { - return getRemarksList({ ...params, TABLE_NAME: 'T_PAYMENTCONFIRM' }) - }, { manual: true }) + const [currentRow, setCurrentRow] = useState() + const bussinessRef = useRef() + const formRef = useRef(); + const [myRemark, setMyRemark] = useState({}) + const [showDetail, setShowDetail] = useState(false) // 是否显示租金拆分日志 + // const [createModalVisible, handleModalVisible] = useState(false) + const actionRef = useRef() + const [businessDetail, setBussinessDetail] = useState(false)// 点击商家缴款出现的抽屉 + const { run: getRemark, loading: remarkLoading, data: remarkList = [] } = useRequest((params) => { + return getRemarksList({ ...params, TABLE_NAME: 'T_PAYMENTCONFIRM' }) + }, { manual: true }) const [fileList, setFileList] = useState([]) const [imagePreviewVisible, setImagePreviewVisible] = useState(false) // 预览图片 // 商家缴款里面的款项类型 - const {loading:moneyTypeLoading, data:moneyTypeList } = useRequest(async ()=>{ + const { loading: moneyTypeLoading, data: moneyTypeList } = useRequest(async () => { const list = JSON.parse(JSON.stringify(props.FieldEnum)) delete list[9000]; return list }) // 应缴 - const [payableRes,setPayableRes] = useState({ label1000:0, - label1100:0, - label1200:0, - label1300:0, - label8000:0, - label2000:0, - label3000:0, - label4000:0, - label5000:0,}) + const [payableRes, setPayableRes] = useState({ + label1000: 0, + label1100: 0, + label1200: 0, + label1300: 0, + label8000: 0, + label2000: 0, + label3000: 0, + label4000: 0, + label5000: 0, + }) // 是否显示应缴汇总 - const [showPayableRes,setShowPayableRes] = useState(false) + const [showPayableRes, setShowPayableRes] = useState(false) // 已缴 - const [paidRes,setPaidRes] = useState({ - label1000:0, - label1100:0, - label1200:0, - label1300:0, - label8000:0, - label2000:0, - label3000:0, - label4000:0, - label5000:0, + const [paidRes, setPaidRes] = useState({ + label1000: 0, + label1100: 0, + label1200: 0, + label1300: 0, + label8000: 0, + label2000: 0, + label3000: 0, + label4000: 0, + label5000: 0, }) // 是否显示已缴汇总 - const [showPaidRes,setShowPaidRes] = useState(false) + const [showPaidRes, setShowPaidRes] = useState(false) // 汇总的商家欠款 - const [otherNumber,setOtherNumber] = useState() + const [otherNumber, setOtherNumber] = useState() // 是否是第一次调用 - const [isFirst,setIsFirst] = useState(true) + const [isFirst, setIsFirst] = useState(true) const [disabled, setDraggleDisabled] = useState() // 是否拖动 const [bounds, setBounds] = useState<{ left: number, right: number, top: number, bottom: number }>() // 移动的位置 const draggleRef = React.createRef() @@ -176,12 +179,12 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser, PAYMENTCONFIRM_DESC: { show: false, }, - STAFF_NAME:{ - show:false + STAFF_NAME: { + show: false } }); - const [pageData,setPageData]= useState() - const [tableLoading,setTableLoading] = useState(false) + const [pageData, setPageData] = useState() + const [tableLoading, setTableLoading] = useState(false) const onDraggaleStart = (event, uiData) => { const { clientWidth, clientHeight } = window.document.documentElement; const targetRect = draggleRef.current?.getBoundingClientRect(); @@ -195,53 +198,53 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser, bottom: clientHeight - (targetRect.bottom - uiData.y), }); }; - const { loading: selectLoading, data: selectDateList } = useRequest(async ()=>{ - const req = { - searchParameter: { - BUSINESSPROJECT_ID: props?.BUSINESSPROJECT_ID, - current: 1 - }, - SortStr: 'STARTDATE desc', - PageSize: 999999 - } - const data = await getSelectList(req) - const list: any = [] - if (data && data.data && data.data.length>0){ - data.data.forEach((item: any)=>{ - list.push({ - label: `${moment(item.STARTDATE).format('YYYY/MM/DD')}-${moment(item.ENDDATE).format('YYYY/MM/DD')}`, - value: `${moment(item.STARTDATE).format('YYYY/MM/DD')}-${moment(item.ENDDATE).format('YYYY/MM/DD')}` - }) + const { loading: selectLoading, data: selectDateList } = useRequest(async () => { + const req = { + searchParameter: { + BUSINESSPROJECT_ID: props?.BUSINESSPROJECT_ID, + current: 1 + }, + SortStr: 'STARTDATE desc', + PageSize: 999999 + } + const data = await getSelectList(req) + const list: any = [] + if (data && data.data && data.data.length > 0) { + data.data.forEach((item: any) => { + list.push({ + label: `${moment(item.STARTDATE).format('YYYY/MM/DD')}-${moment(item.ENDDATE).format('YYYY/MM/DD')}`, + value: `${moment(item.STARTDATE).format('YYYY/MM/DD')}-${moment(item.ENDDATE).format('YYYY/MM/DD')}` }) - } - // 默认设置时间 - const lastDay = new Date(moment().subtract(1, 'day').startOf('day').format('YYYY-MM-DD')).getTime() - let date: string = '' - list.forEach((item: any)=>{ - const timeList = item.label.split('-') - const start = new Date(timeList[0]).getTime() - const end = new Date(timeList[1]).getTime() - if (start { + const timeList = item.label.split('-') + const start = new Date(timeList[0]).getTime() + const end = new Date(timeList[1]).getTime() + if (start < lastDay && lastDay < end) { + date = item.value - return list + } }) + if (date) { + accountDate.current = date + if (isFirst) { + setIsFirst(false) + handleGetPageData(date) + } + } else { + accountDate.current = list[0].value + if (isFirst) { + setIsFirst(false) + handleGetPageData(list[0].value) + } + } + + return list + }) // 删除图片 const handleChange = async (info: any) => { if (info.file.status === 'removed') { @@ -271,249 +274,249 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser, setImagePreviewVisible(true) }; - // 刷新列表 - const handleRefreshTable = ()=>{ + // 刷新列表 + const handleRefreshTable = () => { actionRef.current?.reload() } - // 往来款表格头部设置 - const paymentColumns: ProColumns[] = [ - { - title: editable || editable === undefined ? , - // ], - // }} - className="table" - request={async (params, sorter, filter) => { - if (!isFirst){ - handleGetPageData(accountDate.current,params,sorter,filter) - } - }} - dataSource={pageData} - columns={paymentColumns} - // scroll={{ y: 200 }} - // options={false} - search={{ - span: 6, - defaultCollapsed:false, - optionRender:(searchConfig, formProps, dom)=> [ - ...dom.reverse(), - - ] - }} - pagination={{ defaultPageSize: 10 }} - /> - {/* 更新欠款记录 */} - - layout={'horizontal'} - wrapperCol={{ span: 16 }} - labelCol={{ span: 6 }} - width={600} - title={currentRow?.PAYMENTCONFIRM_ID ? '更新商家往来款' : '新增商家往来款'} - visible={props.createModalVisible} - formRef={formRef} - onVisibleChange={(value) => { - handleModalVisible(value) - if (!value) { - formRef.current?.resetFields(); - setCurrentRow(undefined); - setFileList([]) - } else { - formRef.current?.setFieldsValue(currentRow ? { - ...currentRow, - ACCOUNT_TYPE: `${currentRow.ACCOUNT_TYPE}`, - ACCOUNT_AMOUNT: `${currentRow.ACCOUNT_AMOUNT}` - } : {}) - if (currentRow?.ATTACHMENT_FILES) { - setFileList([{url:currentRow.ATTACHMENT_FILES}]) - } - } - }} - onFinish={async (values) => { - let newValue: any = { - ...values, - REGISTERCOMPACT_ID: props.REGISTERCOMPACT_ID, - BUSINESSPROJECT_ID: props.BUSINESSPROJECT_ID, - MERCHANTS_ID: props.MERCHANTS_ID, - MERCHANTS_NAME: props.MERCHANTS_NAME, - BUSINESS_TYPE: props.BUSINESS_TYPE, - PAYMENTCONFIRM_VALID: 1 - }; - if (currentRow) { // 编辑数据 - newValue = { - ...currentRow, - ...newValue, - CURRENTBALANCE: newValue.ACCOUNT_AMOUNT, - ACCOUNT_AMOUNT: newValue.ACCOUNT_AMOUNT, - TABLE_ID: currentRow.PAYMENTCONFIRM_ID, - TABLE_NAME: 'T_PAYMENTCONFIRM', - ACTUAL_PAYMENT: 0, - CONFIRMDATE:moment().format('YYYY-MM-DD HH:mm:ss') - } - - } else { - newValue = { - ...newValue, ACCOUNT_AMOUNT: newValue.ACCOUNT_AMOUNT, - CURRENTBALANCE: newValue.ACCOUNT_AMOUNT, ACTUAL_PAYMENT: 0 - } - } - newValue.MANAGEMONTH = moment(newValue.ACCOUNT_DATE).format("YYYYMM") - if (fileList && fileList.length>0) { - newValue.ATTACHMENT_FILES = fileList.map(n => n.url).toString() - }else{ - newValue.ATTACHMENT_FILES = [''] - } - const remark = { ...myRemark, TABLE_NAME: 'T_PAYMENTCONFIRM', REMARKS_CONTENT: newValue.REMARKS_DESC } - const success = await handleAddUpdate({ ...newValue }, newValue.REMARKS_DESC); - - if (success) { - if (actionRef.current) { - actionRef.current.reload(); - } - return true - } - return false - }} - > - - - - - value ? `${value}元` : '' - }} - rules={[ - { - required: true, - message: '请输入应缴金额', - }, - ]} - /> - current && current < moment(props?.PROJECT_STARTDATE).endOf('day') && current > moment(props?.PROJECT_ENDDATE).endOf('day') - }} - /> - - { - const formData = new FormData(); - formData.append('files', info.file); - formData.append('TableName', 'PAYMENTCONFIRM'); - formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : ''); - if (info.filename) { - const success = await uploadFile(formData) - - if (success) { - - const list = [...fileList, { - uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败 - name: success.ImageName, - status: 'done', - url: success.ImageUrl, // url 是展示在页面上的绝对链接 - imgUrl: success.ImagePath // + success.ImageUrl, - }] - setFileList(list) - - } - } else { - - message.error("您上传的图片不存在.") - } - - } - }} - - /> - - {currentRow && !remarkLoading && remarkList.filter((item: any) => item.STAFF_ID !== currentUser?.ID).length > 0 && - item.STAFF_ID !== currentUser?.ID)} - style={{paddingLeft: 85, paddingRight: 85}} - renderItem={(item: RemarksModel) => ( - - } - title={
- {item.STAFF_NAME}: - {item.OPERATE_DATE}
} - description={{item.REMARKS_CONTENT}} - /> - - )} - /> - } - - {/* */} - {/* {currentRow?.STAFF_NAME} */} - {/* */} - {/* */} - {/* {currentRow?.CONFIRMDATE} */} - {/* */} - - - {/* 商家缴款抽屉 */} - { - if (disabled) { - setDraggleDisabled(false) - } - }} - onMouseOut={() => { - setDraggleDisabled(true) - }} - onFocus={() => { }} - onBlur={() => { }} - > - {'商家缴款'} - + const data = await getPaymentConfirmListGet(req) + setPageData(data.data) + if (data.otherData && data.otherData.length > 0) { + const payableObj: any = { + label1000: 0, + label1100: 0, + label1200: 0, + label1300: 0, + label8000: 0, + label2000: 0, + label3000: 0, + label4000: 0, + label5000: 0, + }// 应缴 + const paidObj: any = { + label1000: 0, + label1100: 0, + label1200: 0, + label1300: 0, + label8000: 0, + label2000: 0, + label3000: 0, + label4000: 0, + label5000: 0, + }// 已缴 + data.otherData.forEach((item: any) => { + if (item.type === 1) { + payableObj[`label${item.label}`] = item.value + } else if (item.type === 2) { + paidObj[`label${item.label}`] = item.value + } else { + setOtherNumber(item.value) } - modalProps={{ - modalRender:(modal)=>{ - return onDraggaleStart(event, uiData)} - > -
{modal}
- - } - }} - visible={businessDetail} - formRef={bussinessRef} - onVisibleChange={(value) => { - setBussinessDetail(value) - if (!value){ - bussinessRef.current?.resetFields(); - setFileList([]) - } - }} - onFinish={async (values) => { - const hide = message.loading('正在提交...'); - const req = { - ...values, - REGISTERCOMPACT_ID: props.REGISTERCOMPACT_ID, - BUSINESSPROJECT_ID: props.BUSINESSPROJECT_ID, - MERCHANTS_ID: props.MERCHANTS_ID, - MERCHANTS_NAME: props.MERCHANTS_NAME, - BUSINESS_TYPE: props.BUSINESS_TYPE, - ACTUAL_PAYMENT:values.ACCOUNT_AMOUNT, - ACCOUNT_AMOUNT:values.ACCOUNT_AMOUNT, - PAYMENTCONFIRM_VALID: 1 - } - if (fileList && fileList.length>0) { - req.ATTACHMENT_FILES = fileList.map(n => n.url).toString() - }else{ - req.ATTACHMENT_FILES = null - } - const data = await saveHisPaymentAccount(req) - hide(); - if (data.Result_Code === 100) { - message.success("提交成功！") - setBussinessDetail(false) - actionRef.current.reload(); - bussinessRef.current?.resetFields(); - setFileList([]) - }else{ - message.error(`${data.Result_Desc}` || `${data.Result_Code}:提交失败`); - } - }} - > - - - - - value ? `${value}元` : '', - placeholder:'默认单位：元' - }} - rules={[ - { - required: true, - message: '请输入应缴金额', - }, - ]} - /> - current && current < moment(props?.PROJECT_STARTDATE).endOf('day') && current > moment(props?.PROJECT_ENDDATE).endOf('day'), - onChange: (e)=>{ - bussinessRef.current?.setFieldsValue({PAYMENTDATE: e}) - }, - placeholder:'款项应收日期,用于账期归口统计' - }} - /> - current && current < moment(props?.PROJECT_STARTDATE).endOf('day') && current > moment(props?.PROJECT_ENDDATE).endOf('day'), - placeholder:'商家打款日期,用户核对款项到账' - }} - /> + }) - - { - const formData = new FormData(); - formData.append('files', info.file); - formData.append('TableName', 'PAYMENTCONFIRM'); - formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : ''); - if (info.filename) { - const success = await uploadFile(formData) - if (success) { + let payShow: boolean = false + let paidShow: boolean = false + for (const key in payableObj) { + if (payableObj[key]) { + payShow = true + } + } - const list = [...fileList, { - uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败 - name: success.ImageName, - status: 'done', - url: success.ImageUrl, // url 是展示在页面上的绝对链接 - imgUrl: success.ImagePath // + success.ImageUrl, - }] - setFileList(list) + for (const key in paidObj) { + if (paidObj[key]) { + paidShow = true + } + } + setPayableRes(payableObj) + setShowPayableRes(payShow) + setPaidRes(paidObj) + setShowPaidRes(paidShow) + setTableLoading(false) + } + // const typeList: string = [] + // if (data && data.data && data.data.length>0){ + // data.data.forEach((item: any)=>{ + // + // }) + // } - } - } else { + // return { ...data } + } - message.error("您上传的图片不存在.") - } + return <> + { + return
+ {/* */} + {/* */} + {/* */} + {/* */} + {/* */} + {/* {otherNumber || 0} */} + {/* */} - } - }} - - /> - - - - {fileList.length > 0 &&
- - { - setImagePreviewVisible(vis) - } - - }}> { - fileList.map((n) => - - ) + showPayableRes ? + <> + 应缴汇总}> + { + payableRes?.label1000 ? + {fmoney(payableRes?.label1000, 2)} : '' + } + { + payableRes.label1100 !== 0 ? + {fmoney(payableRes?.label1100, 2)} : '' + } + { + payableRes?.label1200 ? + {fmoney(payableRes?.label1200, 2)} : '' + } + { + payableRes?.label1300 ? + {fmoney(payableRes?.label1300, 2)} : '' + } + { + payableRes?.label8000 ? + {fmoney(payableRes?.label8000, 2)} : '' + } + + + { + payableRes?.label2000 ? + {fmoney(payableRes?.label2000, 2)} : '' + } + { + payableRes?.label3000 ? + {fmoney(payableRes?.label3000, 2)} : '' + } + { + payableRes?.label4000 ? + {fmoney(payableRes?.label4000, 2)} : '' + } + { + payableRes?.label5000 ? + {fmoney(payableRes?.label5000, 2)} : '' + } + + : '' + } + { + showPaidRes ? + <> + 已缴汇总}> + { + paidRes?.label1000 ? + {fmoney(paidRes?.label1000, 2)} : '' + } + { + paidRes?.label1100 ? + {fmoney(paidRes?.label1100, 2)} : '' + } + { + paidRes?.label1200 ? + {fmoney(paidRes?.label1200, 2)} : '' + } + { + paidRes?.label1300 ? + {fmoney(paidRes?.label1300, 2)} : '' + } + { + paidRes?.label8000 ? + {fmoney(paidRes?.label8000, 2)} : '' + } + + + { + paidRes?.label2000 ? + {fmoney(paidRes?.label2000, 2)} : '' + } + { + paidRes?.label3000 ? + {fmoney(paidRes?.label3000, 2)} : '' + } + { + paidRes?.label4000 ? + {fmoney(paidRes?.label4000, 2)} : '' + } + { + paidRes?.label5000 ? + {fmoney(paidRes?.label5000, 2)} : '' + } + + : '' + } +
+ }} + // toolbar={{ + // actions: [ // 表格右上角工具栏配置 + // , + // ], + // }} + className="table" + request={async (params, sorter, filter) => { + if (!isFirst) { + handleGetPageData(accountDate.current, params, sorter, filter) + } + }} + dataSource={pageData} + columns={paymentColumns} + // scroll={{ y: 200 }} + // options={false} + search={{ + span: 6, + defaultCollapsed: false, + optionRender: (searchConfig, formProps, dom) => [ + ...dom.reverse(), + + ] + }} + pagination={{ defaultPageSize: 10 }} + /> + {/* 更新欠款记录 */} + + layout={'horizontal'} + wrapperCol={{ span: 16 }} + labelCol={{ span: 6 }} + width={600} + title={currentRow?.PAYMENTCONFIRM_ID ? '更新商家往来款' : '新增商家往来款'} + visible={props.createModalVisible} + formRef={formRef} + onVisibleChange={(value) => { + handleModalVisible(value) + if (!value) { + formRef.current?.resetFields(); + setCurrentRow(undefined); + setFileList([]) + } else { + formRef.current?.setFieldsValue(currentRow ? { + ...currentRow, + ACCOUNT_TYPE: `${currentRow.ACCOUNT_TYPE}`, + ACCOUNT_AMOUNT: `${currentRow.ACCOUNT_AMOUNT}` + } : {}) + if (currentRow?.ATTACHMENT_FILES) { + setFileList([{ url: currentRow.ATTACHMENT_FILES }]) + } + } + }} + onFinish={async (values) => { + let newValue: any = { + ...values, + REGISTERCOMPACT_ID: props.REGISTERCOMPACT_ID, + BUSINESSPROJECT_ID: props.BUSINESSPROJECT_ID, + MERCHANTS_ID: props.MERCHANTS_ID, + MERCHANTS_NAME: props.MERCHANTS_NAME, + BUSINESS_TYPE: props.BUSINESS_TYPE, + PAYMENTCONFIRM_VALID: 1 + }; + if (currentRow) { // 编辑数据 + newValue = { + ...currentRow, + ...newValue, + CURRENTBALANCE: newValue.ACCOUNT_AMOUNT, + ACCOUNT_AMOUNT: newValue.ACCOUNT_AMOUNT, + TABLE_ID: currentRow.PAYMENTCONFIRM_ID, + TABLE_NAME: 'T_PAYMENTCONFIRM', + ACTUAL_PAYMENT: 0, + CONFIRMDATE: moment().format('YYYY-MM-DD HH:mm:ss') } - -
} - {/* 查看租金拆分日志 右侧弹出的抽屉 */} - { // 关闭抽屉 设置抽屉状态为关闭 - setShowDetail(false); + } else { + newValue = { + ...newValue, ACCOUNT_AMOUNT: newValue.ACCOUNT_AMOUNT, + CURRENTBALANCE: newValue.ACCOUNT_AMOUNT, ACTUAL_PAYMENT: 0 + } + } + newValue.MANAGEMONTH = moment(newValue.ACCOUNT_DATE).format("YYYYMM") + if (fileList && fileList.length > 0) { + newValue.ATTACHMENT_FILES = fileList.map(n => n.url).toString() + } else { + newValue.ATTACHMENT_FILES = [''] + } + const remark = { ...myRemark, TABLE_NAME: 'T_PAYMENTCONFIRM', REMARKS_CONTENT: newValue.REMARKS_DESC } + const success = await handleAddUpdate({ ...newValue }, newValue.REMARKS_DESC); + + if (success) { + if (actionRef.current) { + actionRef.current.reload(); + } + return true + } + return false + }} + > + + + + + value ? `${value}元` : '' }} - // bodyStyle={{ backgroundColor: "#f9f9f9", padding: 0 }} - closable={false} + rules={[ + { + required: true, + message: '请输入应缴金额', + }, + ]} + /> + current && current < moment(props?.PROJECT_STARTDATE).endOf('day') && current > moment(props?.PROJECT_ENDDATE).endOf('day') + }} + /> + + { + const formData = new FormData(); + formData.append('files', info.file); + formData.append('TableName', 'PAYMENTCONFIRM'); + formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : ''); + if (info.filename) { + // const success = await uploadFile(formData) + const success = await uploadAHYDFile(formData) + + if (success) { + + const list = [...fileList, { + uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败 + name: success.ImageName, + status: 'done', + url: success.ImageUrl, // url 是展示在页面上的绝对链接 + imgUrl: success.ImagePath // + success.ImageUrl, + }] + setFileList(list) + + } + } else { + + message.error("您上传的图片不存在.") + } + + } + }} + + /> + + {currentRow && !remarkLoading && remarkList.filter((item: any) => item.STAFF_ID !== currentUser?.ID).length > 0 && + item.STAFF_ID !== currentUser?.ID)} + style={{ paddingLeft: 85, paddingRight: 85 }} + renderItem={(item: RemarksModel) => ( + + } + title={
+ {item.STAFF_NAME}: + {item.OPERATE_DATE}
} + description={{item.REMARKS_CONTENT}} + /> + + )} + /> + } + + {/* */} + {/* {currentRow?.STAFF_NAME} */} + {/* */} + {/* */} + {/* {currentRow?.CONFIRMDATE} */} + {/* */} + + + {/* 商家缴款抽屉 */} + { + if (disabled) { + setDraggleDisabled(false) + } + }} + onMouseOut={() => { + setDraggleDisabled(true) + }} + onFocus={() => { }} + onBlur={() => { }} > - {/* 抽屉打开时 加载项目详情组件 */} - {showDetail && } - - + {'商家缴款'} + + } + modalProps={{ + modalRender: (modal) => { + return onDraggaleStart(event, uiData)} + > +
{modal}
+ + } + }} + visible={businessDetail} + formRef={bussinessRef} + onVisibleChange={(value) => { + setBussinessDetail(value) + if (!value) { + bussinessRef.current?.resetFields(); + setFileList([]) + } + }} + onFinish={async (values) => { + const hide = message.loading('正在提交...'); + const req = { + ...values, + REGISTERCOMPACT_ID: props.REGISTERCOMPACT_ID, + BUSINESSPROJECT_ID: props.BUSINESSPROJECT_ID, + MERCHANTS_ID: props.MERCHANTS_ID, + MERCHANTS_NAME: props.MERCHANTS_NAME, + BUSINESS_TYPE: props.BUSINESS_TYPE, + ACTUAL_PAYMENT: values.ACCOUNT_AMOUNT, + ACCOUNT_AMOUNT: values.ACCOUNT_AMOUNT, + PAYMENTCONFIRM_VALID: 1 + } + if (fileList && fileList.length > 0) { + req.ATTACHMENT_FILES = fileList.map(n => n.url).toString() + } else { + req.ATTACHMENT_FILES = null + } + const data = await saveHisPaymentAccount(req) + hide(); + if (data.Result_Code === 100) { + message.success("提交成功！") + setBussinessDetail(false) + actionRef.current.reload(); + bussinessRef.current?.resetFields(); + setFileList([]) + } else { + message.error(`${data.Result_Desc}` || `${data.Result_Code}:提交失败`); + } + }} + > + + + + + value ? `${value}元` : '', + placeholder: '默认单位：元' + }} + rules={[ + { + required: true, + message: '请输入应缴金额', + }, + ]} + /> + current && current < moment(props?.PROJECT_STARTDATE).endOf('day') && current > moment(props?.PROJECT_ENDDATE).endOf('day'), + onChange: (e) => { + bussinessRef.current?.setFieldsValue({ PAYMENTDATE: e }) + }, + placeholder: '款项应收日期,用于账期归口统计' + }} + /> + current && current < moment(props?.PROJECT_STARTDATE).endOf('day') && current > moment(props?.PROJECT_ENDDATE).endOf('day'), + placeholder: '商家打款日期,用户核对款项到账' + }} + /> + + + { + const formData = new FormData(); + formData.append('files', info.file); + formData.append('TableName', 'PAYMENTCONFIRM'); + formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : ''); + if (info.filename) { + // const success = await uploadFile(formData) + const success = await uploadAHYDFile(formData) + if (success) { + + const list = [...fileList, { + uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败 + name: success.ImageName, + status: 'done', + url: success.ImageUrl, // url 是展示在页面上的绝对链接 + imgUrl: success.ImagePath // + success.ImageUrl, + }] + setFileList(list) + + } + } else { + + message.error("您上传的图片不存在.") + } + + } + }} + + /> + + + + {fileList.length > 0 &&
+ + { + setImagePreviewVisible(vis) + } + + }}> + { + fileList.map((n) => + + ) + } + + +
} + {/* 查看租金拆分日志 右侧弹出的抽屉 */} + { // 关闭抽屉 设置抽屉状态为关闭 + setShowDetail(false); + }} + // bodyStyle={{ backgroundColor: "#f9f9f9", padding: 0 }} + closable={false} + > + {/* 抽屉打开时 加载项目详情组件 */} + {showDetail && } + + } export default connect(({ user }: ConnectState) => ({ - currentUser: user.currentUser, + currentUser: user.currentUser, }))(PaymentConfirmTable); diff --git a/src/pages/CardInformation/CardInformationManager/components/CardInfo.tsx b/src/pages/CardInformation/CardInformationManager/components/CardInfo.tsx index 008cc0b..5748336 100644 --- a/src/pages/CardInformation/CardInformationManager/components/CardInfo.tsx +++ b/src/pages/CardInformation/CardInformationManager/components/CardInfo.tsx @@ -6,7 +6,7 @@ import ProForm, { ProFormDatePicker, ProFormSelect, ProFormText, ProFormTextArea import { handeGetCOUPONDetail, handeGetWECHATAPPSIGNList } from "@/pages/travelMember/service"; import session from "@/utils/session"; import { handleDeleteCOUPON, handleGetCOOPSHOP_RULEList, handleSynchroCOUPONService } from "../../service"; -import { uploadPicture } from "@/services/picture"; +import { uploadAHYDPicture, uploadPicture } from "@/services/picture"; import { ExclamationCircleOutlined } from "@ant-design/icons"; import ModalFooter from "@/pages/travelMember/scenicSpotConfig/component/modalFooter"; import { handleSetlogSave } from "@/utils/format"; @@ -638,7 +638,7 @@ const CardInfo = ({ showDetail, currentRow, currentUser, parentRef, setShowDetai formData.append('TableType', '1208'); formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : ''); if (info.filename) { - const success = await uploadPicture(formData) + const success = await uploadAHYDPicture(formData) if (success) { const list = [{ // uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败 diff --git a/src/pages/CardInformation/CardInformationManager/index.tsx b/src/pages/CardInformation/CardInformationManager/index.tsx index b405768..74f2524 100644 --- a/src/pages/CardInformation/CardInformationManager/index.tsx +++ b/src/pages/CardInformation/CardInformationManager/index.tsx @@ -833,7 +833,7 @@ const CardInformationManager: React.FC<{ currentUser: CurrentUser }> = (props) = formData.append('TableType', '1208'); formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : ''); if (info.filename) { - const success = await uploadPicture(formData) + const success = await uploadAHYDPicture(formData) if (success) { const list = [{ // uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败 diff --git a/src/pages/DataVerification/list/components/auditDetail.tsx b/src/pages/DataVerification/list/components/auditDetail.tsx index 42b5b6d..4a9a2de 100644 --- a/src/pages/DataVerification/list/components/auditDetail.tsx +++ b/src/pages/DataVerification/list/components/auditDetail.tsx @@ -6,7 +6,7 @@ import {Col, Row, Image, Modal, Upload, Button, message} from "antd"; import ProTable from "@ant-design/pro-table"; import {handleGetAuditDetail} from "@/pages/DataVerification/list/service"; import moment from "moment"; -import {deletePicture, uploadPicture} from "@/services/picture"; +import {deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture} from "@/services/picture"; import type {UploadFile} from "antd/es/upload/interface"; // 上传资质图片 @@ -22,7 +22,7 @@ const customUploadRequest = async (fileList: UploadFile[], tableId: string) => { formData.append('TableName', 'CHECKACCOUNT'); formData.append('TableId', tableId); - const success = await uploadPicture(formData) + const success = await uploadAHYDPicture(formData) if (success) { return true } @@ -247,7 +247,8 @@ const auditDetail: React.FC<{isShow: boolean,rowDetail: any,currentDetail?: any, onRemove={async (file)=>{ console.log('file',file) const list: any = [] - const success = await deletePicture(file.ImagePath, file.uid) + // const success = await deletePicture(file.ImagePath, file.uid) + const success = await deleteAHYDPicture(file.ImagePath, file.uid) console.log('success',success) picList.forEach((item=>{ if (item.uid!==file.uid){ diff --git a/src/pages/DataVerification/list/components/detailBasicInfo.tsx b/src/pages/DataVerification/list/components/detailBasicInfo.tsx index ee0dcdb..09b2451 100644 --- a/src/pages/DataVerification/list/components/detailBasicInfo.tsx +++ b/src/pages/DataVerification/list/components/detailBasicInfo.tsx @@ -3,7 +3,7 @@ import type { ConnectState } from "@/models/connect"; import ProForm, { ProFormText, ProFormTextArea } from "@ant-design/pro-form"; import { useRef } from "react"; import billBasic from '@/assets/DataVerification/billBasic.png' -import { Button, Col, Row,Image } from "antd"; +import { Button, Col, Row, Image } from "antd"; import billSale from '@/assets/DataVerification/billSale.png' import billCheck from '@/assets/DataVerification/billCheck.png' import ProTable from "@ant-design/pro-table"; @@ -31,7 +31,7 @@ type DetailProps = { imgList: any; formRef: any; } -const DetailBasicInfo = ({ formRef,imgList,handleGetShopPriceData, setShowChangeLoading, selectTab, handleGetQueryRecords, setAuditRowDetail, setShowAuditDrawer, auditTableData, leftTimeList, disableBtn, setPayDetail, setFlowFlush, currentDetail }: DetailProps) => { +const DetailBasicInfo = ({ formRef, imgList, handleGetShopPriceData, setShowChangeLoading, selectTab, handleGetQueryRecords, setAuditRowDetail, setShowAuditDrawer, auditTableData, leftTimeList, disableBtn, setPayDetail, setFlowFlush, currentDetail }: DetailProps) => { const columns: any = [ { dataIndex: 'Check_Info', @@ -477,7 +477,7 @@ const DetailBasicInfo = ({ formRef,imgList,handleGetShopPriceData, setShowChange width={'100%'} height={370} // src={`http://10.104.1.69:8000/cloud/static/uploadPhoto/index.html?id=${currentDetail?.Endaccount_Id}&tablename=ENDACCOUNT&readonly=&PopDialogName=IMAGEPage&Module_ID=3CD350DC5905D75D`} - src={`${REACT_APP_ENV === 'dev' ? 'http://10.104.1.69:8000/' : 'http://saas.eshangtech.com/cloud/'}static/uploadPhoto/index.html?id=${currentDetail?.Endaccount_Id}&tablename=ENDACCOUNT&readonly=&PopDialogName=IMAGEPage&Module_ID=3CD350DC5905D75D`} + src={`${REACT_APP_ENV === 'dev' ? 'http://192.168.1.207:8000/' : 'http://saas.eshangtech.com/cloud/'}static/uploadPhoto/index.html?id=${currentDetail?.Endaccount_Id}&tablename=ENDACCOUNT&readonly=&PopDialogName=IMAGEPage&Module_ID=3CD350DC5905D75D`} /> // http://saas.eshangtech.com/cloud/ : diff --git a/src/pages/account/company/components/CompanyInfo.tsx b/src/pages/account/company/components/CompanyInfo.tsx index 06e8bd0..2b8832b 100644 --- a/src/pages/account/company/components/CompanyInfo.tsx +++ b/src/pages/account/company/components/CompanyInfo.tsx @@ -12,7 +12,7 @@ import { Alert, Card, Col, Result, Row, Typography, Modal, Image, message, Form, import { connect, history } from "umi"; import { useRef, useState } from "react"; import { ExclamationCircleOutlined } from "@ant-design/icons"; -import { deletePicture, SavePicture } from '@/services/picture'; +import { deleteAHYDPicture, deletePicture, SavePicture } from '@/services/picture'; import { getBase64 } from "@/utils/utils"; import { createPermissionProInst } from "../../center/sevice"; @@ -219,7 +219,8 @@ const CompanyInfo: React.FC<{ currentUser?: CurrentUser, dispatch: Dispatch }> = icon: , async onOk() { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'PERMISSIONAPPLY') + // const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'PERMISSIONAPPLY') + const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.ImageId, 'PERMISSIONAPPLY') deleteLoading() if (success) { const files = [...fileList] @@ -278,7 +279,8 @@ const CompanyInfo: React.FC<{ currentUser?: CurrentUser, dispatch: Dispatch }> = icon: , async onOk() { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'PERMISSIONAPPLY') + // const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'PERMISSIONAPPLY') + const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.ImageId, 'PERMISSIONAPPLY') deleteLoading() if (success) { const files = [...fileList] @@ -386,7 +388,8 @@ const CompanyInfo: React.FC<{ currentUser?: CurrentUser, dispatch: Dispatch }> = async onOk() { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.deletepath, info.file?.uid, 'PERMISSIONAPPLY') + const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, 'PERMISSIONAPPLY') + // const success = await deletePicture(info.file?.deletepath, info.file?.uid, 'PERMISSIONAPPLY') deleteLoading() if (success) { @@ -480,7 +483,8 @@ const CompanyInfo: React.FC<{ currentUser?: CurrentUser, dispatch: Dispatch }> = icon: , async onOk() { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'PERMISSIONAPPLY') + // const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'PERMISSIONAPPLY') + const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.ImageId, 'PERMISSIONAPPLY') deleteLoading() if (success) { const files = [...fileList] diff --git a/src/pages/basicManage/Brand/components/addEdit.tsx b/src/pages/basicManage/Brand/components/addEdit.tsx index 98c2e16..b6a86ab 100644 --- a/src/pages/basicManage/Brand/components/addEdit.tsx +++ b/src/pages/basicManage/Brand/components/addEdit.tsx @@ -50,7 +50,7 @@ const customUploadRequest = async (fileList: UploadFile[], tableId: string, imag formData.append('ImageType', imageType); formData.append('TableType', '1125'); formData.append('TableId', tableId); - // const success = await uploadPicture(formData) + // const success = await uploadAHYDPicture(formData) const success = await uploadAHYDPicture(formData) if (success) { return true @@ -531,7 +531,8 @@ const AddEdit = ({ clickType, modalVisible, handleCloseAddEdit, currentRow, hand icon: , async onOk() { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000') + // const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000') + const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000') deleteLoading() if (success) { const files = [...list1001] @@ -594,7 +595,8 @@ const AddEdit = ({ clickType, modalVisible, handleCloseAddEdit, currentRow, hand icon: , async onOk() { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000') + // const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000') + const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000') deleteLoading() if (success) { const files = [...list1004] @@ -658,7 +660,8 @@ const AddEdit = ({ clickType, modalVisible, handleCloseAddEdit, currentRow, hand icon: , async onOk() { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000') + // const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000') + const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000') deleteLoading() if (success) { const files = [...list1005] @@ -723,7 +726,8 @@ const AddEdit = ({ clickType, modalVisible, handleCloseAddEdit, currentRow, hand icon: , async onOk() { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000') + // const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000') + const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000') deleteLoading() if (success) { const files = [...list1002] @@ -789,7 +793,8 @@ const AddEdit = ({ clickType, modalVisible, handleCloseAddEdit, currentRow, hand icon: , async onOk() { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000') + // const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000') + const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000') deleteLoading() if (success) { const files = [...list1003] diff --git a/src/pages/basicManage/QualificationDelay/index.tsx b/src/pages/basicManage/QualificationDelay/index.tsx index 3eab683..e11eee4 100644 --- a/src/pages/basicManage/QualificationDelay/index.tsx +++ b/src/pages/basicManage/QualificationDelay/index.tsx @@ -29,7 +29,7 @@ import { getFieldEnum, getServerpartTree } from "@/services/options"; // 枚举 import { getList, delcommodity_temp, updatecommodity_temp } from './service'; import { getBase64 } from '@/utils/utils'; -import { deletePicture, uploadPicture, getPictureList } from '@/services/picture'; +import { deletePicture, uploadPicture, getPictureList, uploadAHYDPicture, deleteAHYDPicture } from '@/services/picture'; import type { UploadFile } from 'antd/es/upload/interface'; import type { PictureModel } from '@/services/options/typings'; @@ -83,7 +83,7 @@ const customUploadRequest = async (fileList: UploadFile[], tableId: string) => { formData.append('Tabletype', '1114'); formData.append('TableId', tableId); - const success = await uploadPicture(formData) + const success = await uploadAHYDPicture(formData) if (success) { return true } @@ -668,7 +668,8 @@ const Commodity_tempTable: React.FC<{ currentUser: CurrentUser | undefined }> = icon: , async onOk() { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '1010') + // const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '1010') + const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, '', '1010') deleteLoading() if (success) { const files = [...fileList] diff --git a/src/pages/basicManage/highwayHeadlines/index.tsx b/src/pages/basicManage/highwayHeadlines/index.tsx index 3dbadba..b0f467c 100644 --- a/src/pages/basicManage/highwayHeadlines/index.tsx +++ b/src/pages/basicManage/highwayHeadlines/index.tsx @@ -17,7 +17,7 @@ import PageTitleBox from "@/components/PageTitleBox"; import { handleDeleteNOTICEINFO, handleGetNOTICEINFOList, handleSynchroNOTICEINFO } from "./service"; import moment from 'moment' import ProForm, { ProFormDatePicker, ProFormSelect, ProFormText, ProFormTextArea, ProFormTreeSelect, ProFormUploadButton } from "@ant-design/pro-form"; -import { deletePicture, uploadAHYDPicture, uploadPicture } from "@/services/picture"; +import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from "@/services/picture"; import { handleGetPictureList } from "@/pages/reports/settlementAccount/service"; import { truncate } from "lodash"; import Popconfirm from "antd/es/popconfirm"; @@ -239,7 +239,7 @@ const highwayHeadlines: React.FC<{ currentUser: CurrentUser }> = (props) => { }) formData.append('TableType', '1401'); formData.append('TableId', data.Result_Data.NOTICEINFO_ID.toString()); - // const success = await uploadPicture(formData) + // const success = await uploadAHYDPicture(formData) const success = await uploadAHYDPicture(formData) console.log('success', success); } @@ -540,7 +540,8 @@ const highwayHeadlines: React.FC<{ currentUser: CurrentUser }> = (props) => { icon: , async onOk() { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '5000') + // const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '5000') + const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, '', '5000') deleteLoading() if (success) { @@ -602,7 +603,7 @@ const highwayHeadlines: React.FC<{ currentUser: CurrentUser }> = (props) => { // }) // formData.append('TableType', '1401'); // formData.append('TableId', currentRow?.NOTICEINFO_ID.toString()); - // const success = await uploadPicture(formData) + // const success = await uploadAHYDPicture(formData) // console.log('success', success); // } // } diff --git a/src/pages/basicManage/serverpartAssets/component/assetsEditor.tsx b/src/pages/basicManage/serverpartAssets/component/assetsEditor.tsx index d628060..0d2d788 100644 --- a/src/pages/basicManage/serverpartAssets/component/assetsEditor.tsx +++ b/src/pages/basicManage/serverpartAssets/component/assetsEditor.tsx @@ -9,7 +9,7 @@ import HistoryTable from "./historyTable"; import ProForm, { ProFormSelect, ProFormText, ProFormTreeSelect, ProFormUploadButton } from "@ant-design/pro-form"; import { handleGetPictureList } from "@/pages/DataVerification/list/service"; import { getFieldEnumTreeNoSession } from "@/services/options"; -import { uploadPicture } from "@/services/picture"; +import { uploadAHYDPicture, uploadPicture } from "@/services/picture"; import RelatedShop from "./relatedShop"; type DetailProps = { @@ -832,7 +832,7 @@ const AssetsEditor = ({ onShow, handleClose, setOnShow, currentUser, id, parentR console.log('formData', formData); if (info.filename) { - const success = await uploadPicture(formData) + const success = await uploadAHYDPicture(formData) console.log('success', success); if (success.Result_Code === 100) { diff --git a/src/pages/basicManage/serverpartAssets/index.tsx b/src/pages/basicManage/serverpartAssets/index.tsx index bd6ff07..96e0e68 100644 --- a/src/pages/basicManage/serverpartAssets/index.tsx +++ b/src/pages/basicManage/serverpartAssets/index.tsx @@ -28,7 +28,7 @@ import Draggable from "react-draggable"; import RelatedShop from "./component/relatedShop"; import AssetsDetail from "./component/assetsDetail"; import { getBase64 } from "@/utils/utils"; -import { deletePicture, uploadPicture } from "@/services/picture"; +import { deletePicture, uploadAHYDPicture, uploadPicture } from "@/services/picture"; import { handleGetPictureList } from "@/pages/DataVerification/list/service"; import Item from "antd/lib/list/Item"; import HistoryTable from "./component/historyTable"; @@ -1395,7 +1395,7 @@ const serverpartAssets: React.FC<{ currentUser: CurrentUser }> = (props) => { console.log('formData', formData); if (info.filename) { - const success = await uploadPicture(formData) + const success = await uploadAHYDPicture(formData) console.log('success', success); if (success.Result_Code === 100) { diff --git a/src/pages/busniess/PaymentConfirm/detail.tsx b/src/pages/busniess/PaymentConfirm/detail.tsx index b532e53..e70d5fa 100644 --- a/src/pages/busniess/PaymentConfirm/detail.tsx +++ b/src/pages/busniess/PaymentConfirm/detail.tsx @@ -26,7 +26,8 @@ import type { AccountReceivablesModel, PaymentConfirmModel, RemarksModel } from import { getFieldEnum } from "@/services/options"; import { getPaymentConfirmList, getMerchantsReceivables, updatePaymentConfirm, uploadFile, - savePaymentRecord, getRemarksList, updateSynchroRemarks, delPaymentConfirm + savePaymentRecord, getRemarksList, updateSynchroRemarks, delPaymentConfirm, + uploadAHYDFile } from "./service"; import EditPaymentTable from "./components/EditPaymentTable"; @@ -797,7 +798,8 @@ const MerchartsPayment: React.FC = (props: any) => { formData.append('TableName', 'PAYMENTCONFIRM'); formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : ''); if (info.filename) { - const success = await uploadFile(formData) + // const success = await uploadFile(formData) + const success = await uploadAHYDFile(formData) if (success) { diff --git a/src/pages/busniess/ShopExpense/components/fileDrawer.tsx b/src/pages/busniess/ShopExpense/components/fileDrawer.tsx index 9525e87..89af483 100644 --- a/src/pages/busniess/ShopExpense/components/fileDrawer.tsx +++ b/src/pages/busniess/ShopExpense/components/fileDrawer.tsx @@ -4,7 +4,7 @@ import { Drawer, Image, message, Modal } from "antd"; import ProForm, { ProFormUploadButton } from "@ant-design/pro-form"; import { GetPictureListNormal } from "@/pages/supplier/inspectionReport/service"; import { useState } from "react"; -import { deletePicture, uploadPicture } from "@/services/picture"; +import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from "@/services/picture"; import { ExclamationCircleOutlined } from "@ant-design/icons"; type DetailProps = { @@ -115,7 +115,8 @@ const FileDrawer = ({ onShow, onFileCancel, currentRow, readOnly, isCanChange, p icon: , async onOk() { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '1129') + // const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '1129') + const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, '', '1129') deleteLoading() if (success) { @@ -147,7 +148,7 @@ const FileDrawer = ({ onShow, onFileCancel, currentRow, readOnly, isCanChange, p formData.append('TableType', '1129'); formData.append('TableId', currentRow?.SHOPEXPENSE_ID.toString()); - const success = await uploadPicture(formData) + const success = await uploadAHYDPicture(formData) console.log('success', success); if (parentRef) { parentRef.current?.reload() diff --git a/src/pages/busniess/ShopExpense/index.tsx b/src/pages/busniess/ShopExpense/index.tsx index 299b264..01c8e00 100644 --- a/src/pages/busniess/ShopExpense/index.tsx +++ b/src/pages/busniess/ShopExpense/index.tsx @@ -38,7 +38,7 @@ import { isNumber } from 'lodash'; import EditLog from './components/editLog'; import { uploadFile } from '../PaymentConfirm/service'; import { GetPictureList, GetPictureListNormal, handleUploadPicture } from '@/pages/supplier/inspectionReport/service'; -import { deletePicture, uploadPicture } from '@/services/picture'; +import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from '@/services/picture'; import http from '@/assets/supplier/http.png' import httpBlue from '@/assets/supplier/httpBlue.png' import FileDrawer from './components/fileDrawer'; @@ -1259,7 +1259,7 @@ const SHOPEXPENSETablePage: React.FC<{ formData.append('ImageName', item.name); }) formData.append('TableId', result?.SHOPEXPENSE_ID); - const success = await uploadPicture(formData) + const success = await uploadAHYDPicture(formData) console.log('success', success); } handleModalVisible(false); @@ -1310,7 +1310,7 @@ const SHOPEXPENSETablePage: React.FC<{ }) formData.append('TableId', result?.SHOPEXPENSE_ID); - const success = await uploadPicture(formData) + const success = await uploadAHYDPicture(formData) console.log('success', success); } @@ -1554,7 +1554,8 @@ const SHOPEXPENSETablePage: React.FC<{ icon: , async onOk() { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '1129') + // const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '1129') + const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, '', '1129') deleteLoading() if (success) { @@ -1583,7 +1584,7 @@ const SHOPEXPENSETablePage: React.FC<{ formData.append('TableType', '1129'); formData.append('TableId', currentRow?.SHOPEXPENSE_ID.toString()); - const success = await uploadPicture(formData) + const success = await uploadAHYDPicture(formData) console.log('success', success); await handleGetFileList(currentRow) } diff --git a/src/pages/busniess/ShopExpenseFince/index.tsx b/src/pages/busniess/ShopExpenseFince/index.tsx index 6090996..52f1100 100644 --- a/src/pages/busniess/ShopExpenseFince/index.tsx +++ b/src/pages/busniess/ShopExpenseFince/index.tsx @@ -38,7 +38,7 @@ import { isNumber } from 'lodash'; import EditLog from './components/editLog'; import { uploadFile } from '../PaymentConfirm/service'; import { GetPictureList, GetPictureListNormal, handleUploadPicture } from '@/pages/supplier/inspectionReport/service'; -import { deletePicture, uploadPicture } from '@/services/picture'; +import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from '@/services/picture'; import http from '@/assets/supplier/http.png' import httpBlue from '@/assets/supplier/httpBlue.png' import FileDrawer from './components/fileDrawer'; @@ -399,7 +399,7 @@ const SHOPEXPENSETablePage: React.FC<{ render: (_, record) => { // return record?.SHOPEXPENSE_TYPE ? SHOPEXPENSE_TYPEOBJ[record?.SHOPEXPENSE_TYPE] : '-' return
- {record?.SHOPEXPENSE_TYPE&& SHOPEXPENSETYPEObj ? SHOPEXPENSETYPEObj[record?.SHOPEXPENSE_TYPE] : ''} + {record?.SHOPEXPENSE_TYPE && SHOPEXPENSETYPEObj ? SHOPEXPENSETYPEObj[record?.SHOPEXPENSE_TYPE] : ''} { record?.ChangeFlag ? @@ -1257,7 +1257,7 @@ const SHOPEXPENSETablePage: React.FC<{ formData.append('ImageName', item.name); }) formData.append('TableId', result?.SHOPEXPENSE_ID); - const success = await uploadPicture(formData) + const success = await uploadAHYDPicture(formData) console.log('success', success); } handleModalVisible(false); @@ -1308,7 +1308,7 @@ const SHOPEXPENSETablePage: React.FC<{ }) formData.append('TableId', result?.SHOPEXPENSE_ID); - const success = await uploadPicture(formData) + const success = await uploadAHYDPicture(formData) console.log('success', success); } @@ -1541,32 +1541,42 @@ const SHOPEXPENSETablePage: React.FC<{ // 如果在待上传列表中找到，则说明当前图片没有上传服务器，可直接删除 const index = fileList.findIndex(n => n.uid === info.file.uid); + if (info.file.imgUrl) { + confirm({ + title: '确认删除该文件吗？', + icon: , + async onOk() { + const deleteLoading = message.loading('正在删除...') + // const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '1129') + const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, '', '1129') + deleteLoading() + + if (success) { + const files = [...fileList] + files.splice(index, 1) + setFileList(files) + } + else { + message.error("删除失败") + } + }, + onCancel() { + }, + }); + } else { + const newFileList = fileList.slice(); + newFileList.splice(index, 1); + setFileList(newFileList) + return + } + // if (info.file?.status === "removed" && ) { // const newFileList = fileList.slice(); // newFileList.splice(index, 1); // setFileList(newFileList) // return // } - confirm({ - title: '确认删除该文件吗？', - icon: , - async onOk() { - const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '1129') - deleteLoading() - if (success) { - const files = [...fileList] - files.splice(index, 1) - setFileList(files) - } - else { - message.error("删除失败") - } - }, - onCancel() { - }, - }); } else { if (currentRow?.SHOPEXPENSE_ID && info.fileList && info.fileList.length > 0) { @@ -1581,7 +1591,7 @@ const SHOPEXPENSETablePage: React.FC<{ formData.append('TableType', '1129'); formData.append('TableId', currentRow?.SHOPEXPENSE_ID.toString()); - const success = await uploadPicture(formData) + const success = await uploadAHYDPicture(formData) console.log('success', success); await handleGetFileList(currentRow) } diff --git a/src/pages/contract/components/detail.tsx b/src/pages/contract/components/detail.tsx index 1568baa..fea6747 100644 --- a/src/pages/contract/components/detail.tsx +++ b/src/pages/contract/components/detail.tsx @@ -506,7 +506,7 @@ const ContractDetail = ({ contractId, currentRow, clickedId }: { contractId: num console.log('item', item); console.log('historyList.current', historyList.current); console.log('clickedId', clickedId); - if (clickedId.indexOf(item.REGISTERCOMPACT_ID) === -1) { + if (clickedId && clickedId.indexOf(item.REGISTERCOMPACT_ID) === -1) { let list: any = JSON.parse(JSON.stringify(clickedId)) list.push(item.REGISTERCOMPACT_ID) historyList.current = list @@ -824,7 +824,7 @@ const ContractDetail = ({ contractId, currentRow, clickedId }: { contractId: num closable={false} bodyStyle={{ backgroundColor: "#f9f9f9", padding: 0 }} > - + {/* 日志抽屉 */} diff --git a/src/pages/contract/components/editor.tsx b/src/pages/contract/components/editor.tsx index e090514..31c4e5c 100644 --- a/src/pages/contract/components/editor.tsx +++ b/src/pages/contract/components/editor.tsx @@ -60,7 +60,7 @@ import { } from '../service'; import { getBase64 } from '@/utils/utils'; -import { getPictureList, deletePicture, uploadPicture } from '@/services/picture'; +import { getPictureList, deletePicture, uploadPicture, uploadAHYDPicture, deleteAHYDPicture } from '@/services/picture'; import type { UploadFile } from 'antd/es/upload/interface'; import type { PictureModel } from '@/services/options/typings'; @@ -123,7 +123,7 @@ const customUploadRequest = async (fileList: UploadFile[], tableId: string) => { }); formData.append('TableType', '1115'); formData.append('TableId', tableId); - const success = await uploadPicture(formData) + const success = await uploadAHYDPicture(formData) if (success) { return true } @@ -641,7 +641,8 @@ const EditContract = ({ contractId: id, actionRef, setShowDetail, showDelete, cu icon: , async onOk() { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '3000') + // const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '3000') + const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, '', '3000') deleteLoading() if (success) { const files = [...fileList] diff --git a/src/pages/contract/list.tsx b/src/pages/contract/list.tsx index 18ea6fb..fad578d 100644 --- a/src/pages/contract/list.tsx +++ b/src/pages/contract/list.tsx @@ -29,7 +29,7 @@ import { delCompact, getList, handleContractSupple } from "./service"; import ProForm, { ProFormDatePicker, ProFormSelect, ProFormTextArea, ProFormUploadButton } from "@ant-design/pro-form"; import { getProjectList } from "@/pages/BussinessProject/service"; import useRequest from "@ahooksjs/use-request"; -import { deletePicture, uploadPicture } from "@/services/picture"; +import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from "@/services/picture"; import type { UploadFile } from "antd/es/upload/interface"; import fileIcon from '@/assets/detail/fileIcon.svg' import session from "@/utils/session"; @@ -67,7 +67,7 @@ const customUploadRequest = async (fileList: UploadFile[], tableId: string) => { }); formData.append('TableType', '1115'); formData.append('TableId', tableId); - const success = await uploadPicture(formData) + const success = await uploadAHYDPicture(formData) if (success) { return true } @@ -799,7 +799,8 @@ const ContractTable: React.FC<{ currentUser: CurrentUser }> = (props) => { icon: , async onOk() { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '3000') + // const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '3000') + const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, '', '3000') deleteLoading() if (success) { const files = [...fileList] diff --git a/src/pages/market/marketResearch/index.tsx b/src/pages/market/marketResearch/index.tsx index 1b33acc..c4bd377 100644 --- a/src/pages/market/marketResearch/index.tsx +++ b/src/pages/market/marketResearch/index.tsx @@ -292,7 +292,7 @@ const marketResearch: React.FC<{ currentUser: CurrentUser }> = (props) => { }) formData.append('TableId', id) formData.append('TableType', '1128') - const data = await handleUploadPicture(formData) + const data = await handleuploadAHYDPicture(formData) console.log('data', data) } } diff --git a/src/pages/merchantManagement/Shops/components/AddShopModal.tsx b/src/pages/merchantManagement/Shops/components/AddShopModal.tsx index a599474..7a6c1f0 100644 --- a/src/pages/merchantManagement/Shops/components/AddShopModal.tsx +++ b/src/pages/merchantManagement/Shops/components/AddShopModal.tsx @@ -19,7 +19,7 @@ import type { PermissionApplyModel, PermissionProinstModel } from "@/pages/accou import { getServerpartOption } from "@/services/options"; import { createPermissionProInst } from "@/pages/account/center/sevice"; import { ExclamationCircleOutlined } from "@ant-design/icons"; -import { deletePicture, SavePicture } from '@/services/picture'; +import { deleteAHYDPicture, deletePicture, SavePicture } from '@/services/picture'; const { confirm } = Modal type ShopProps = { @@ -186,13 +186,13 @@ const AddShopModal: React.FC = ({ currentUser, createModalVisible, ha title="选择图片" label="营业执照" accept="image/*" - + fieldProps={{ name: 'files', accept: "image/*", listType: 'picture-card', fileList: fileList.filter(n => n.ImageType && n.ImageType === 1000), // : fileList, - + beforeUpload: (file: any) => { const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg'; if (!isJpgOrPng) { @@ -222,7 +222,8 @@ const AddShopModal: React.FC = ({ currentUser, createModalVisible, ha async onOk() { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.deletepath, info.file?.uid, 'PERMISSIONAPPLY') + // const success = await deletePicture(info.file?.deletepath, info.file?.uid, 'PERMISSIONAPPLY') + const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, 'PERMISSIONAPPLY') deleteLoading() if (success) { diff --git a/src/pages/merchantManagement/brand/index.tsx b/src/pages/merchantManagement/brand/index.tsx index f671b7b..dfa568a 100644 --- a/src/pages/merchantManagement/brand/index.tsx +++ b/src/pages/merchantManagement/brand/index.tsx @@ -28,7 +28,7 @@ import { getTreeSelectOption } from '@/utils/format'; import { ExclamationCircleOutlined } from "@ant-design/icons"; import React from "react"; import Draggable from "react-draggable"; -import { uploadFile } from "@/pages/busniess/PaymentConfirm/service"; +import { uploadAHYDFile, uploadFile } from "@/pages/busniess/PaymentConfirm/service"; const { confirm } = Modal; @@ -288,7 +288,7 @@ const BrandTable: React.FC = () => { setCurrentRow(undefined); setShowDetail(false); }} - bodyStyle={{backgroundColor: "#f9f9f9", padding: 16}} + bodyStyle={{ backgroundColor: "#f9f9f9", padding: 16 }} closable={false} > {currentRow?.BRAND_NAME && ( @@ -488,7 +488,8 @@ const BrandTable: React.FC = () => { formData.append('TableName', 'BRAND'); formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : ''); if (info.filename) { - const success = await uploadFile(formData) + // const success = await uploadFile(formData) + const success = await uploadAHYDFile(formData) if (success) { const list = [{ uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败 diff --git a/src/pages/merchantManagement/supplier/Management/index.tsx b/src/pages/merchantManagement/supplier/Management/index.tsx index cc869d9..21ce4dd 100644 --- a/src/pages/merchantManagement/supplier/Management/index.tsx +++ b/src/pages/merchantManagement/supplier/Management/index.tsx @@ -18,7 +18,7 @@ import type { CurrentUser } from 'umi'; import { getSupplierList, delSupplier, updateSupplier, getSupplierDetail, getBusinessManList } from './service'; import type { UploadFile } from 'antd/lib/upload/interface'; -import { deletePicture, uploadPicture } from '@/services/picture'; +import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from '@/services/picture'; import { getQualificationList } from '../Qualifications/service'; import { groupBy } from 'lodash'; import type { QualificationModel } from '../Qualifications/data'; @@ -74,7 +74,7 @@ const customUploadRequest = async (fileList: UploadFile[], tableId: string) => { formData.append('TableName', 'SUPPLIER'); formData.append('TableId', tableId); - const success = await uploadPicture(formData) + const success = await uploadAHYDPicture(formData) if (success) { return true } @@ -355,7 +355,7 @@ const SupplierTable: React.FC<{ currentUser?: CurrentUser }> = ({ currentUser }) }} /> } actionRef={actionRef} - search={{ span: 6 ,labelWidth:'auto'}} + search={{ span: 6, labelWidth: 'auto' }} request={async (params) => { const searchUser = currentUser?.UserPattern === 2000 ? { OWNERUNIT_ID: currentUser?.BusinessManID } : { PROVINCE_CODE: currentUser?.ProvinceCode } const data = await getSupplierList({ @@ -708,7 +708,8 @@ const SupplierTable: React.FC<{ currentUser?: CurrentUser }> = ({ currentUser }) async onOk() { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.deletepath, info.file?.uid, 'SUPPLIER') + // const success = await deletePicture(info.file?.deletepath, info.file?.uid, 'SUPPLIER') + const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, 'SUPPLIER') deleteLoading() if (success) { diff --git a/src/pages/merchantManagement/supplier/Qualifications/index.tsx b/src/pages/merchantManagement/supplier/Qualifications/index.tsx index 36f8cf5..9909871 100644 --- a/src/pages/merchantManagement/supplier/Qualifications/index.tsx +++ b/src/pages/merchantManagement/supplier/Qualifications/index.tsx @@ -19,7 +19,7 @@ import type { PictureModel } from '@/services/options/typings'; import { getQualificationList, delQualification, updateQualification, getQualificationDetail, relateBusinessCommodity } from './service'; import { getSupplierList } from '../Management/service'; -import { deletePicture, uploadPicture } from '@/services/picture'; +import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from '@/services/picture'; import { getFieldEnum } from '@/services/options'; import { transferImg } from '@/utils/format'; import { getBase64 } from '@/utils/utils'; @@ -93,7 +93,7 @@ const customUploadRequest = async (fileList: UploadFile[], tableId: string) => { formData.append('TableName', 'QUALIFICATION'); formData.append('TableId', tableId); - const success = await uploadPicture(formData) + const success = await uploadAHYDPicture(formData) if (success) { return true } @@ -701,7 +701,8 @@ const CommdityTable: React.FC<{ currentUser?: CurrentUser }> = ({ currentUser }) icon: , async onOk() { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.deletepath, info.file?.uid, 'QUALIFICATION') + // const success = await deletePicture(info.file?.deletepath, info.file?.uid, 'QUALIFICATION') + const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, 'QUALIFICATION') deleteLoading() if (success) { diff --git a/src/pages/operatingMerchants/MerchantInformation/index.tsx b/src/pages/operatingMerchants/MerchantInformation/index.tsx index a593147..93e56a5 100644 --- a/src/pages/operatingMerchants/MerchantInformation/index.tsx +++ b/src/pages/operatingMerchants/MerchantInformation/index.tsx @@ -24,7 +24,7 @@ import LeftSelectTree from '@/pages/reports/settlementAccount/component/leftSele import session from '@/utils/session'; import PageTitleBox from '@/components/PageTitleBox'; import { handeDeleteSERVERPARTSELLER, handeGetCOMMENTList, handeGetPictureList, handeGetRevenueReport } from '@/pages/travelMember/service'; -import { deletePicture, uploadPicture } from '@/services/picture'; +import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from '@/services/picture'; import { handleGetServerPartShopNewList } from '@/pages/basicManage/serviceArea/service'; import { handleGetServerpartShopList } from '@/pages/DataVerification/service'; import ModalFooter from '@/pages/travelMember/scenicSpotConfig/component/modalFooter'; @@ -701,7 +701,7 @@ const MerchantInformation: React.FC<{ currentUser: CurrentUser | undefined }> = formData.append('imageType', "1000"); formData.append('TableType', "1204"); - let res = await uploadPicture(formData) + let res = await uploadAHYDPicture(formData) } if (formValue.DoorImage && formValue.DoorImage.length > 0) { @@ -714,7 +714,7 @@ const MerchantInformation: React.FC<{ currentUser: CurrentUser | undefined }> = formData.append('imageType', "2000"); formData.append('TableType', "1204"); - let res = await uploadPicture(formData) + let res = await uploadAHYDPicture(formData) } if (formValue.InteriorImage && formValue.InteriorImage.length > 0) { @@ -727,7 +727,7 @@ const MerchantInformation: React.FC<{ currentUser: CurrentUser | undefined }> = formData.append('imageType', "3000"); formData.append('TableType', "1204"); - let res = await uploadPicture(formData) + let res = await uploadAHYDPicture(formData) } } @@ -1681,7 +1681,8 @@ const MerchantInformation: React.FC<{ currentUser: CurrentUser | undefined }> = async onOk() { if (info.file.ImageId) { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000') + // const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000') + const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '', '6000') deleteLoading() if (success) { @@ -1730,7 +1731,8 @@ const MerchantInformation: React.FC<{ currentUser: CurrentUser | undefined }> = async onOk() { if (info.file.ImageId) { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000') + // const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000') + const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '', '6000') deleteLoading() if (success) { @@ -1779,7 +1781,8 @@ const MerchantInformation: React.FC<{ currentUser: CurrentUser | undefined }> = async onOk() { if (info.file.ImageId) { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000') + // const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000') + const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '', '6000') deleteLoading() if (success) { diff --git a/src/pages/reports/contractWarningQuery/index.tsx b/src/pages/reports/contractWarningQuery/index.tsx index 93b2465..4d5950c 100644 --- a/src/pages/reports/contractWarningQuery/index.tsx +++ b/src/pages/reports/contractWarningQuery/index.tsx @@ -17,7 +17,7 @@ import { exportExcel, getBase64 } from '@/utils/utils'; import ProForm, { ProFormDatePicker, ProFormSelect, ProFormTextArea, ProFormUploadButton } from "@ant-design/pro-form"; import { getProjectList } from "@/pages/BussinessProject/service"; import useRequest from "@ahooksjs/use-request"; -import { deletePicture, uploadPicture } from "@/services/picture"; +import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from "@/services/picture"; import type { UploadFile } from "antd/es/upload/interface"; import fileIcon from '@/assets/detail/fileIcon.svg' import session from "@/utils/session"; @@ -61,7 +61,7 @@ const customUploadRequest = async (fileList: UploadFile[], tableId: string) => { }); formData.append('TableType', '1115'); formData.append('TableId', tableId); - const success = await uploadPicture(formData) + const success = await uploadAHYDPicture(formData) if (success) { return true } @@ -919,7 +919,8 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) => icon: , async onOk() { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '3000') + // const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '3000') + const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, '', '3000') deleteLoading() if (success) { const files = [...fileList] diff --git a/src/pages/reports/revenueConfirmation/components/compareList.tsx b/src/pages/reports/revenueConfirmation/components/compareList.tsx index c9b2ae3..69c0f46 100644 --- a/src/pages/reports/revenueConfirmation/components/compareList.tsx +++ b/src/pages/reports/revenueConfirmation/components/compareList.tsx @@ -46,7 +46,7 @@ import { handleGetAPPROVALROUTEList } from "@/pages/Setting/serviceConfig/servic import { handleSolidProjectRevenue } from "../../revenueDifference/service"; import MonthSettlement from "./monthSettlement"; import MonthTopTable from "./monthTopTable"; -import { deletePicture, uploadPicture } from "@/services/picture"; +import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from "@/services/picture"; import { ExclamationCircleOutlined } from "@ant-design/icons"; import { handleGetPictureList, handleGetProjectExpenseList } from "../../settlementAccount/service"; import PrintContent from "../../settlementAccount/component/printContent"; @@ -3750,7 +3750,7 @@ const compareList: React.FC<{ }) formData.append('TableType', '1130'); formData.append('TableId', detail?.BUSINESSAPPROVAL_ID); - const success = await uploadPicture(formData) + const success = await uploadAHYDPicture(formData) console.log('success', success); } @@ -4118,7 +4118,8 @@ const compareList: React.FC<{ icon: , async onOk() { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '3000') + // const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '3000') + const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, '', '3000') deleteLoading() if (success) { @@ -4147,7 +4148,7 @@ const compareList: React.FC<{ formData.append('TableType', '1130'); formData.append('TableId', compareCurrent?.BUSINESSAPPROVAL_ID); - const success = await uploadPicture(formData) + const success = await uploadAHYDPicture(formData) console.log('success', success); if (success) { message.success("上传成功！") diff --git a/src/pages/reports/settlementAccount/component/YearExamineDetailTable.tsx b/src/pages/reports/settlementAccount/component/YearExamineDetailTable.tsx index fa2a0d3..7baff1d 100644 --- a/src/pages/reports/settlementAccount/component/YearExamineDetailTable.tsx +++ b/src/pages/reports/settlementAccount/component/YearExamineDetailTable.tsx @@ -18,7 +18,7 @@ import './YearExamineDetailTable.less' import ProForm, { ProFormDateRangePicker, ProFormDigit, ProFormList, ProFormUploadButton } from "@ant-design/pro-form"; import { handleGetPictureList, handleRebuildClosedPeriod, handleRebuildReductionPeriod } from "../service"; import { ExclamationCircleOutlined, MinusCircleOutlined, PlusOutlined } from "@ant-design/icons"; -import { deletePicture, uploadPicture } from "@/services/picture"; +import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from "@/services/picture"; import PrintContent from "./printContent"; import { handleHighPrecision } from "@/utils/utils"; import HistoricalProjects from "./HistoricalProjects"; @@ -3030,7 +3030,8 @@ const YearExamineDetailTable = ({ parentRow, currentApprovalstate, onRef, setIsS icon: , async onOk() { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '3000') + // const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '3000') + const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, '', '3000') deleteLoading() if (success) { @@ -3059,7 +3060,7 @@ const YearExamineDetailTable = ({ parentRow, currentApprovalstate, onRef, setIsS formData.append('TableType', '1130'); formData.append('TableId', parentRow?.BUSINESSAPPROVAL_ID); - const success = await uploadPicture(formData) + const success = await uploadAHYDPicture(formData) console.log('success', success); if (success) { message.success("上传成功！") diff --git a/src/pages/reports/settlementAccount/component/yearExamineProcess.tsx b/src/pages/reports/settlementAccount/component/yearExamineProcess.tsx index 98212df..abb9cd1 100644 --- a/src/pages/reports/settlementAccount/component/yearExamineProcess.tsx +++ b/src/pages/reports/settlementAccount/component/yearExamineProcess.tsx @@ -18,7 +18,7 @@ import { handleApproveAccount, handleApproveMonthAccountProinst, handleRejectAcc import React from "react"; import { handleCreateSettlement, handleSynchroRevenueConfirmList } from "@/pages/reports/settlementDetail/service"; import Item from "antd/lib/list/Item"; -import { deletePicture, uploadPicture } from "@/services/picture"; +import { deletePicture, uploadAHYDPicture, uploadPicture } from "@/services/picture"; import { getProjectDetail } from "@/pages/BussinessProject/service"; const { confirm } = Modal; @@ -399,7 +399,7 @@ const YearExamineProcess = ({ currentUser, onShow, setOnShow, parentRow, setPare }) formData.append('TableType', '1130'); formData.append('TableId', detail?.BUSINESSAPPROVAL_ID); - const success = await uploadPicture(formData) + const success = await uploadAHYDPicture(formData) console.log('success', success); } diff --git a/src/pages/supplier/inspectionReport/index.tsx b/src/pages/supplier/inspectionReport/index.tsx index bdab0ca..918b1f8 100644 --- a/src/pages/supplier/inspectionReport/index.tsx +++ b/src/pages/supplier/inspectionReport/index.tsx @@ -1,51 +1,52 @@ -import type { FormInstance} from "antd"; -import {Button, Col, message, Row, Upload, Image, Popconfirm,DatePicker} from "antd"; -import React, {useEffect, useRef, useState} from "react"; +import type { FormInstance } from "antd"; +import { Button, Col, message, Row, Upload, Image, Popconfirm, DatePicker } from "antd"; +import React, { useEffect, useRef, useState } from "react"; import './index.less' -import {UploadOutlined} from "@ant-design/icons"; -import ProForm, {ProFormDatePicker, ProFormText, ProFormUploadButton} from "@ant-design/pro-form"; +import { UploadOutlined } from "@ant-design/icons"; +import ProForm, { ProFormDatePicker, ProFormText, ProFormUploadButton } from "@ant-design/pro-form"; import { deletePicture, GetPictureList, handleUploadPicture } from "@/pages/supplier/inspectionReport/service"; -import type {CurrentUser} from "@/models/user"; -import {connect} from "umi"; -import type {ConnectState} from "@/models/connect"; +import type { CurrentUser } from "@/models/user"; +import { connect } from "umi"; +import type { ConnectState } from "@/models/connect"; import moment from "moment"; import LoadingBox from "@/pages/reports/Finance/businessAnalysis/components/loading"; +import { deleteAHYDPicture } from "@/services/picture"; -const InspectionReport: React.FC<{ currentUser?: CurrentUser}> = ({ currentUser }) => { +const InspectionReport: React.FC<{ currentUser?: CurrentUser }> = ({ currentUser }) => { const formRef = useRef(); - const [pictureList,setPictureList] = useState() - const [pictureListLoading,setPictureListLoading] = useState(false) + const [pictureList, setPictureList] = useState() + const [pictureListLoading, setPictureListLoading] = useState(false) // 开始保存 - const [saveLoading,setSaveLoading] = useState(false) + const [saveLoading, setSaveLoading] = useState(false) // 查询时间 - const [searchDate,setSearchDate] = useState(moment()) + const [searchDate, setSearchDate] = useState(moment()) // 获得图片列表 - const handleGetPictureList = async (time?: any)=>{ + const handleGetPictureList = async (time?: any) => { setPictureListLoading(true) const req: any = { TableId: currentUser?.SupplierID, TableType: 1127, - ImageIndex: time?moment(time).format('YYYYMMDD'):searchDate?moment(searchDate).format('YYYYMMDD'):'' + ImageIndex: time ? moment(time).format('YYYYMMDD') : searchDate ? moment(searchDate).format('YYYYMMDD') : '' } const data = await GetPictureList(req) - console.log('data',data) - if (data && data.length>0){ + console.log('data', data) + if (data && data.length > 0) { setPictureList(data) - }else{ + } else { setPictureList([]) } setPictureListLoading(false) } - useEffect(()=>{ + useEffect(() => { handleGetPictureList(searchDate) - },[]) + }, []) return (
@@ -54,7 +55,7 @@ const InspectionReport: React.FC<{ currentUser?: CurrentUser}> = ({ currentUser formRef={formRef} // layout={'horizontal'} submitter={{ - render:(_,record)=> { + render: (_, record) => { } }} @@ -68,14 +69,14 @@ const InspectionReport: React.FC<{ currentUser?: CurrentUser}> = ({ currentUser name: 'file', // actions: 'http://220.180.35.180:8000/EShangApiMain', beforeUpload: (file) => { - console.log('file',file) - const isLength = file.name.indexOf('.')<=19 + console.log('file', file) + const isLength = file.name.indexOf('.') <= 19 const isPNG = file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/jpeg'; if (!isPNG) { message.error(`仅支持上传png、jpg、jpeg格式的图片文件！`); } - if (!isLength){ + if (!isLength) { message.error(`文件名称过长！不大于20字`); } @@ -119,30 +120,30 @@ const InspectionReport: React.FC<{ currentUser?: CurrentUser}> = ({ currentUser /> - @@ -178,12 +179,12 @@ const InspectionReport: React.FC<{ currentUser?: CurrentUser}> = ({ currentUser {/* 图片展示的列表 */}
{ - pictureListLoading? - : + pictureListLoading ? + :
{ - pictureList && pictureList.length>0? - pictureList.map((item: any)=>{ + pictureList && pictureList.length > 0 ? + pictureList.map((item: any) => { return
= ({ currentUser
{ - const data = await deletePicture(item.ImagePath,item.ImageId,'',9000) - if (data.Result_Code===100){ + onConfirm={async () => { + // const data = await deletePicture(item.ImagePath,item.ImageId,'',9000) + const data = await deleteAHYDPicture(item.ImagePath, item.ImageId, '', 9000) + if (data.Result_Code === 100) { message.success('删除成功！') handleGetPictureList() - }else{ + } else { message.error(data.Result_Desc) } }} @@ -209,7 +211,7 @@ const InspectionReport: React.FC<{ currentUser?: CurrentUser}> = ({ currentUser
- }):'' + }) : '' }
} diff --git a/src/pages/supplier/inspectionReport/service.ts b/src/pages/supplier/inspectionReport/service.ts index 3d08eb8..0faad22 100644 --- a/src/pages/supplier/inspectionReport/service.ts +++ b/src/pages/supplier/inspectionReport/service.ts @@ -2,7 +2,7 @@ import request from "@/utils/requestUpLoad"; import requestNormal from "@/utils/request"; // 上传图片 -export async function handleUploadPicture(params?: any) { +export async function handleuploadAHYDPicture(params?: any) { const data = await request(`/Picture/UploadPicture`, { method: 'POST', data: params diff --git a/src/pages/supplier/supplierList/components/addNewShop.tsx b/src/pages/supplier/supplierList/components/addNewShop.tsx index fc08468..3b9155f 100644 --- a/src/pages/supplier/supplierList/components/addNewShop.tsx +++ b/src/pages/supplier/supplierList/components/addNewShop.tsx @@ -21,11 +21,11 @@ import { Select, Checkbox } from "antd"; -import type {ActionType} from "@ant-design/pro-table"; +import type { ActionType } from "@ant-design/pro-table"; import ProTable from "@ant-design/pro-table"; -import React, {useEffect, useImperativeHandle, useRef, useState} from "react"; +import React, { useEffect, useImperativeHandle, useRef, useState } from "react"; import useRequest from "@ahooksjs/use-request"; -import {handleSupplierList} from "@/pages/Setting/Roles/service"; +import { handleSupplierList } from "@/pages/Setting/Roles/service"; import { getUserList, handleSelectShopList, @@ -35,12 +35,12 @@ import { handleValidateShop, importFile, handleFilterShopList } from "@/pages/supplier/supplierList/service"; -import { wrapTreeNode} from "@/utils/format"; +import { wrapTreeNode } from "@/utils/format"; import moment from "moment"; -import { PlusOutlined} from "@ant-design/icons"; -import type {UploadFile} from "antd/lib/upload/interface"; -import {exportExcel, getBase64} from "@/utils/utils"; -import type {RcFile} from "antd/es/upload"; +import { PlusOutlined } from "@ant-design/icons"; +import type { UploadFile } from "antd/lib/upload/interface"; +import { exportExcel, getBase64 } from "@/utils/utils"; +import type { RcFile } from "antd/es/upload"; import shopIcon from '@/assets/supplier/shopIcon.png' @@ -68,71 +68,72 @@ import like6st from '@/assets/supplier/like6st.png' import like7st from '@/assets/supplier/like7st.png' import selectSupplier from '@/assets/supplier/selectSupplier.png' -import {antdImportExcel, importsExcel} from "@/utils/excel"; +import { antdImportExcel, importsExcel } from "@/utils/excel"; import WinSupplier from "@/pages/supplier/supplierList/components/winSupplier"; -import type {RangePickerProps} from "antd/lib/date-picker"; +import type { RangePickerProps } from "antd/lib/date-picker"; import Draggable from "react-draggable"; +import { uploadAHYDFile } from '@/pages/busniess/PaymentConfirm/service'; -const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList,handleSearchQualification}: {allSupplierList?: any,currentUser: any,type: string,onRef?: any,currentItem?: any,shopList?: any,handleSearchQualification?: any})=>{ +const AddNewShop = ({ currentUser, type, onRef, currentItem, shopList, allSupplierList, handleSearchQualification }: { allSupplierList?: any, currentUser: any, type: string, onRef?: any, currentItem?: any, shopList?: any, handleSearchQualification?: any }) => { const addNewShopFormRef = useRef() const actionRef = useRef() const supplierFormRef = useRef() // 配送单位名称 - const [SUPPLIERNAME,setSUPPLIERNAME] = useState() + const [SUPPLIERNAME, setSUPPLIERNAME] = useState() // 配送供应商名称 - const [SERVERPARTNAME,setSERVERPARTNAME] = useState() - const [choseShop,setChoseShop] = useState(false) + const [SERVERPARTNAME, setSERVERPARTNAME] = useState() + const [choseShop, setChoseShop] = useState(false) // 从树状选择器里面选中的类型 - const [selectType,setSelectType] = useState() + const [selectType, setSelectType] = useState() // 树状选择选择的value数组 - const [selectTypeValueList,setSelectTypeValueList] = useState() + const [selectTypeValueList, setSelectTypeValueList] = useState() // 树状选择器 选择的value数组 保存历史有的 - const [editTableData,setEditTableData] = useState() - const [typeTree,setTypeTree] = useState() + const [editTableData, setEditTableData] = useState() + const [typeTree, setTypeTree] = useState() // 选择悬浮框的商品默认选中的数据 - const [defaultSelect,setDefaultSelect] = useState() + const [defaultSelect, setDefaultSelect] = useState() // 参加报价的供应商列表 - const [selectSupplierList,setSelectSupplierList] = useState() + const [selectSupplierList, setSelectSupplierList] = useState() // 选择悬浮框的商品默认选中的数据Key - const [defaultSelectKey,setDefaultSelectKey]= useState() + const [defaultSelectKey, setDefaultSelectKey] = useState() // 选中的商品数组 - const [selectShop,setSelectShop] = useState() + const [selectShop, setSelectShop] = useState() // 选中商品的rowKey - const [selectShopRowKey,setSelectShopRowKey] = useState() + const [selectShopRowKey, setSelectShopRowKey] = useState() // 选中抽屉的detail - const [drawerDetail,setDrawerDetail] = useState() + const [drawerDetail, setDrawerDetail] = useState() // 当前的供应商名称 - const [currentSupplierName,setCurrentSupplierName] = useState() + const [currentSupplierName, setCurrentSupplierName] = useState() // 预览图片是否显示 - const [showPreview,setShowPreview] = useState(false) + const [showPreview, setShowPreview] = useState(false) // 预览图片 - const [previewImg,setPreviewImg] = useState() + const [previewImg, setPreviewImg] = useState() // 剩余时间 - const [residue,setResidue] = useState('') + const [residue, setResidue] = useState('') // 颜色列表 const colorList: any = [ - {bg:'#FEF2E5',icon:'#FB8300',like:like1st}, - {bg:'#E5F6FB',icon:'#00A6DC',like:like2st}, - {bg:'#EEEFFC',icon:'#5764EA',like:like3st}, - {bg:'#F7F3DE',icon:'#C1A200',like:like4st}, - {bg:'#EBF8E9',icon:'#3BBD25',like:like5st}, - {bg:'#F7EDFC',icon:'#B64FE6',like:like6st}, - {bg:'#FFECED',icon:'#FF4850',like:like7st}, + { bg: '#FEF2E5', icon: '#FB8300', like: like1st }, + { bg: '#E5F6FB', icon: '#00A6DC', like: like2st }, + { bg: '#EEEFFC', icon: '#5764EA', like: like3st }, + { bg: '#F7F3DE', icon: '#C1A200', like: like4st }, + { bg: '#EBF8E9', icon: '#3BBD25', like: like5st }, + { bg: '#F7EDFC', icon: '#B64FE6', like: like6st }, + { bg: '#FFECED', icon: '#FF4850', like: like7st }, ] // 比价时间可以选择的范围 - const [compareTimeRange,setCompareTimeRange] = useState() + const [compareTimeRange, setCompareTimeRange] = useState() // 点击中标的供应商出现抽屉 - const [showWinSupplier,setShopWinSupplier] = useState(false) + const [showWinSupplier, setShopWinSupplier] = useState(false) // 比价时间下面的供应商带颜色的列表 const [supplierColorList, setSupplierColorList] = useState() // 最后提交的时候 选择的供应商列表 - const [submitSelectList,setSubmitSelectList] = useState() + const [submitSelectList, setSubmitSelectList] = useState() // 供应商保存时候的切换 - const [submitSupplier,setSubmitSupplier] = useState(currentUser?.SupplierID) + const [submitSupplier, setSubmitSupplier] = useState(currentUser?.SupplierID) // 商品信息 - const [showShopDetailDeleteBtn,setShowShopDetailDeleteBtn] = useState(false) + const [showShopDetailDeleteBtn, setShowShopDetailDeleteBtn] = useState(false) // 全部删除是否选中 - const [allDeleteSelect,setAllDeleteSelect] = useState(false) + const [allDeleteSelect, setAllDeleteSelect] = useState(false) // 供应商点进来抽屉显示的商品列表 const supplierColumns: any = [ { @@ -149,11 +150,11 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList title: '商品名称', dataIndex: 'COMMODITY_NAME', hideInSearch: true, - render:(text, record, _, action)=>{ - return
- - {record.COMMODITY_NAME} -
+ render: (text, record, _, action) => { + return
+ + {record.COMMODITY_NAME} +
} }, { @@ -165,7 +166,7 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList title: '商品供应商', dataIndex: 'SUPPLIER_NAME', hideInSearch: true, - render:(text, record, _, action)=>{ + render: (text, record, _, action) => { return currentUser?.UserPattern === 4000 ? SERVERPARTNAME : record.SUPPLIER_NAME } }, @@ -182,22 +183,22 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList { title: '商品备注', dataIndex: 'COMMODITY_DESC', - width:200, + width: 200, hideInSearch: true, }, { title: '价格', dataIndex: 'COMMODITY_OFFER', hideInSearch: true, - width:100, - render:(text, record, _, action)=>{ + width: 100, + render: (text, record, _, action) => { return <> { - type==='edit' && currentUser?.UserPattern !== 4000? - {record.COMMODITY_OFFER}: - { + type === 'edit' && currentUser?.UserPattern !== 4000 ? + {record.COMMODITY_OFFER} : + { record.COMMODITY_OFFER = e.target.value - }}/> + }} /> } } @@ -206,13 +207,13 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList title: '税率', dataIndex: 'DUTY_PARAGRAPH', hideInSearch: true, - width:100, - render:(text, record, _, action)=>{ + width: 100, + render: (text, record, _, action) => { return <> { - type==='edit' && currentUser?.UserPattern !== 4000?{record.DUTY_PARAGRAPH}:{ + type === 'edit' && currentUser?.UserPattern !== 4000 ? {record.DUTY_PARAGRAPH} : { record.DUTY_PARAGRAPH = e.target.value - }}/> + }} /> } @@ -222,43 +223,44 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList title: '附件图片', dataIndex: 'IMAGE_URL_1 ', hideInSearch: true, - width:200, - render:(text, record)=>{ + width: 200, + render: (text, record) => { return <> { - type==='edit' && currentUser?.UserPattern !== 4000? - record.IMAGE_URL_1? - :'' + type === 'edit' && currentUser?.UserPattern !== 4000 ? + record.IMAGE_URL_1 ? + : '' : 0?[previewImg]:[]} - onChange={ (e: any)=>{ - if (e.fileList && e.fileList.length>0){ - if (e.file.status==='done'){ + onChange={(e: any) => { + if (e.fileList && e.fileList.length > 0) { + if (e.file.status === 'done') { const formData = new FormData(); formData.append('files', e.fileList[0].originFileObj); formData.append('TableName', 'BIDSUPPLIER'); formData.append('TableType', '1126'); formData.append('ImageName', typeof e.file !== 'string' ? e.file?.name : ''); if (e.file.name) { - uploadFile(formData).then(success=>{ + // uploadFile(formData).then(success=>{ + uploadAHYDFile(formData).then(success => { record.IMAGE_URL_1 = success.ImageUrl setPreviewImg(success.ImageUrl) }) } } - }else{ + } else { record.IMAGE_URL_1 = "" } }} - onPreview={async (file: any)=>{ - if (record.IMAGE_URL_1){ + onPreview={async (file: any) => { + if (record.IMAGE_URL_1) { setPreviewImg(record.IMAGE_URL_1) setShowPreview(true) - }else{ + } else { const img = await getBase64(file.originFileObj as RcFile) setPreviewImg(img) setShowPreview(true) @@ -272,13 +274,13 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList } {
{ - setShowPreview(vis) - } - }}> - {previewImg?:''} + preview={{ + visible: showPreview, + onVisibleChange: vis => { + setShowPreview(vis) + } + }}> + {previewImg ? : ''} {/* { */} {/* previewImg.map((n) => */} {/* */} @@ -326,21 +328,21 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList width: 200 }, { - title:'操作', + title: '操作', valueType: 'option', render: (text, record, _, action) => [ { + onConfirm={() => { const list: any = JSON.parse(JSON.stringify(editTableData)) const newList: any = [] - list.forEach((item: any)=>{ - if (item.SELLERCOMMODITY_ID !== record.SELLERCOMMODITY_ID ){ + list.forEach((item: any) => { + if (item.SELLERCOMMODITY_ID !== record.SELLERCOMMODITY_ID) { newList.push(item) } }) - newList.forEach((item: any,index: number)=>{ - item.key = index+1 + newList.forEach((item: any, index: number) => { + item.key = index + 1 }) setEditTableData(newList) }} @@ -398,33 +400,33 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList // 弹出框拖动效果 const [bounds, setBounds] = useState<{ left: number, right: number, top: number, bottom: number }>() // 移动的位置 // 新增商品的查看明细 - const [addShopModalDetail,setAddShopModalDetail] = useState(false) + const [addShopModalDetail, setAddShopModalDetail] = useState(false) // 查看明细的表格数据 - const [addShopDetailData,setAddShopDetailData] = useState() + const [addShopDetailData, setAddShopDetailData] = useState() // 商品批量删除的选中行 - const [selectDeleteList,setSelectDeleteList] = useState() + const [selectDeleteList, setSelectDeleteList] = useState() // 选中删除行的key - const [selectDeleteKey,setSelectDeleteKey] = useState() + const [selectDeleteKey, setSelectDeleteKey] = useState() // 更新查看明细悬浮框里面的数据 - const handleUpdateTableData = (table?: any,select?: any)=>{ + const handleUpdateTableData = (table?: any, select?: any) => { const tableData: any = table || editTableData const selectData: any = select || selectShop - if (tableData && tableData?.length>0 || selectData && selectData?.length>0){ + if (tableData && tableData?.length > 0 || selectData && selectData?.length > 0) { const idList: any = [] const dataList: any = [] // SELLERCOMMODITY_ID - if (tableData && tableData?.length>0){ - tableData.forEach((item=>{ - if (idList.indexOf(item.SELLERCOMMODITY_ID)===-1){ + if (tableData && tableData?.length > 0) { + tableData.forEach((item => { + if (idList.indexOf(item.SELLERCOMMODITY_ID) === -1) { idList.push(item.SELLERCOMMODITY_ID) dataList.push(item) } })) } - if (selectData && selectData?.length>0){ - selectData.forEach((item=>{ - if (idList.indexOf(item.SELLERCOMMODITY_ID)===-1){ + if (selectData && selectData?.length > 0) { + selectData.forEach((item => { + if (idList.indexOf(item.SELLERCOMMODITY_ID) === -1) { idList.push(item.SELLERCOMMODITY_ID) dataList.push(item) } @@ -432,25 +434,25 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList } setAddShopDetailData(dataList) setAddShopModalDetail(true); - }else{ + } else { message.error('暂未选择商品') } } // 商品明细里面的删除方法 - const handleShopDetailDelete = (record?: any)=>{ + const handleShopDetailDelete = (record?: any) => { const list: any = [] const listRowKey: any = [] const editList: any = [] - selectShop.forEach((item: any)=>{ - if (item.SELLERCOMMODITY_ID!==record.SELLERCOMMODITY_ID){ + selectShop.forEach((item: any) => { + if (item.SELLERCOMMODITY_ID !== record.SELLERCOMMODITY_ID) { list.push(item) listRowKey.push(item.SELLERCOMMODITY_ID) } }) - if (editTableData && editTableData.length>0){ - editTableData.forEach((item: any)=>{ - if (item.SELLERCOMMODITY_ID!==record.SELLERCOMMODITY_ID){ + if (editTableData && editTableData.length > 0) { + editTableData.forEach((item: any) => { + if (item.SELLERCOMMODITY_ID !== record.SELLERCOMMODITY_ID) { editList.push(item) } }) @@ -459,7 +461,7 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList setSelectShop(list) setSelectShopRowKey(listRowKey) setEditTableData(editList) - handleUpdateTableData(editList,list) + handleUpdateTableData(editList, list) } const onDraggaleStart = (event, uiData) => { const { clientWidth, clientHeight } = window.document.documentElement; @@ -482,23 +484,23 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList }) // 拿到供应商的名称 - const supplierName = data.filter(item=>{ + const supplierName = data.filter(item => { return item.value === currentUser?.SupplierID }) - if (supplierName && supplierName.length>0){ + if (supplierName && supplierName.length > 0) { setSERVERPARTNAME(supplierName[0].label) } return data }) // 获取配送单位列表 - const { data: deliveryUnit } = useRequest(async ()=>{ + const { data: deliveryUnit } = useRequest(async () => { const req = { - SearchParameter:{ + SearchParameter: { SELLER_ID: currentUser?.SellerId }, - PageIndex:1, - PageSize:20, - SortStr:"WAREHOUSE_TYPE,WAREHOUSE_CODE" + PageIndex: 1, + PageSize: 20, + SortStr: "WAREHOUSE_TYPE,WAREHOUSE_CODE" } // 一些处理写在调用接口的地方了 点进去可以看 return await getUserList(req) @@ -507,14 +509,14 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList const rowSelection: any = { onChange: (selectedRowKeys: any, selectedRows: any) => { setSelectShopRowKey(selectedRowKeys) - if (defaultSelect && defaultSelect.length>0){ + if (defaultSelect && defaultSelect.length > 0) { setSelectShop(selectedRows) - }else{ + } else { setSelectShop(selectedRows) } }, getCheckboxProps: (record: any) => ({ - disabled: record.PURCHASE_STATE !== 1 , + disabled: record.PURCHASE_STATE !== 1, }), }; // 商品明细的批量删除 @@ -522,19 +524,19 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList selectedRowKeys: selectDeleteKey, onChange: (selectedRowKeys: any, selectedRows: any) => { setSelectDeleteKey(selectedRowKeys) - if (defaultSelect && defaultSelect.length>0){ + if (defaultSelect && defaultSelect.length > 0) { setSelectDeleteList(selectedRows) - }else{ + } else { setSelectDeleteList(selectedRows) } }, } // 导入excel 然后转成json 然后变成表格内的数据的方法 直接用 不用看懂 - const handleImportFile = ()=>{ + const handleImportFile = () => { const inputFile = document.getElementsByClassName("importFile")[0] - if (inputFile){ - inputFile.click(); + if (inputFile) { + inputFile.click(); // inputFile.onchange = async (event) => { // // } @@ -554,11 +556,11 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList handleGetDetail })); - const handleGetDetail = async (SupplierID?: any)=>{ + const handleGetDetail = async (SupplierID?: any) => { // 查看更加具体的详情 const data = await handleBIDDetail({ - BIDId:currentItem.BID_ID, - SupplierID:SupplierID || (currentUser?.UserPattern === 4000?currentUser?.SupplierID:null) + BIDId: currentItem.BID_ID, + SupplierID: SupplierID || (currentUser?.UserPattern === 4000 ? currentUser?.SupplierID : null) }) const res = data.Result_Data setDrawerDetail(res) @@ -566,25 +568,25 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList let residueStr: string = '' - if (res.END_DATE){ + if (res.END_DATE) { // 计算右上角显示的还剩的时间 const nowTime: number = new Date().getTime() const endTime: number = new Date(res.END_DATE).getTime() // 差多少秒 const residueTime: number = (endTime - nowTime) / 1000 - if (residueTime<0){ - residueStr='已关闭' - }else{ - if (residueTime<86400 && residueTime>0){ - residueStr=`还剩${Math.floor(residueTime/3600)}小时` - }else if(residueTime>86400){ - residueStr=`还剩${Math.floor(residueTime/86400)}天` - }else{ - residueStr='-' + if (residueTime < 0) { + residueStr = '已关闭' + } else { + if (residueTime < 86400 && residueTime > 0) { + residueStr = `还剩${Math.floor(residueTime / 3600)}小时` + } else if (residueTime > 86400) { + residueStr = `还剩${Math.floor(residueTime / 86400)}天` + } else { + residueStr = '-' } } - }else{ - residueStr='-' + } else { + residueStr = '-' } // if (residueTime<86400 && residueTime>0){ @@ -601,12 +603,12 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList setResidue(residueStr) // 配送单位的id数组 const unitNameList: any = [] - res.SERVERPART_IDS.split(',').forEach((item: any)=>{ + res.SERVERPART_IDS.split(',').forEach((item: any) => { unitNameList.push(Number(item)) }) // 供应商id的数组 const supplierNameList: any = [] - res.SUPPLIER_IDS.split(',').forEach((item: any)=>{ + res.SUPPLIER_IDS.split(',').forEach((item: any) => { supplierNameList.push(Number(item)) }) @@ -615,20 +617,20 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList // 给页面的表单赋值 addNewShopFormRef.current?.setFieldsValue({ - businessName:res.BID_NAME, - unitName:unitNameList, - supplierName:currentUser?.UserPattern === 4000?[currentUser?.SupplierID]:supplierNameList, - selectTime:[moment(res.EFFECT_STARTDATE),moment(res.EFFECT_ENDDATE)], - compareTime:[moment(res.START_DATE),moment(res.END_DATE)], - businessDesc:res.BID_DESC + businessName: res.BID_NAME, + unitName: unitNameList, + supplierName: currentUser?.UserPattern === 4000 ? [currentUser?.SupplierID] : supplierNameList, + selectTime: [moment(res.EFFECT_STARTDATE), moment(res.EFFECT_ENDDATE)], + compareTime: [moment(res.START_DATE), moment(res.END_DATE)], + businessDesc: res.BID_DESC }) // 自己造列表序号 const tableList: any = [] - if (res.BIDGOODSList && res.BIDGOODSList.length>0){ - res.BIDGOODSList.forEach((item: any,index: number)=>{ + if (res.BIDGOODSList && res.BIDGOODSList.length > 0) { + res.BIDGOODSList.forEach((item: any, index: number) => { item.key = index + 1 - if (item.children && item.children.length>0){ - item.children.forEach((subItem: any,subIndex: number)=>{ + if (item.children && item.children.length > 0) { + item.children.forEach((subItem: any, subIndex: number) => { subItem.key = `${index + 1}-${subIndex + 1}` }) } @@ -641,25 +643,25 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList const SUPPLIERList = res.SUPPLIER_NAME.split(',') // 去除数组里每项的未参加 const SUPPLIERNAMEList: any = [] - SUPPLIERList.forEach((item: any)=>{ - SUPPLIERNAMEList.push({label:item.split('（未参加）')[0],type:item.indexOf('（未参加）')===-1}) + SUPPLIERList.forEach((item: any) => { + SUPPLIERNAMEList.push({ label: item.split('（未参加）')[0], type: item.indexOf('（未参加）') === -1 }) }) // 拿到参加的供应商列表 label value格式 const selectList: any = [] - if (allSupplierList && allSupplierList.length>0){ - SUPPLIERNAMEList.forEach((item: any)=>{ - const name = allSupplierList.filter(subItem=> { + if (allSupplierList && allSupplierList.length > 0) { + SUPPLIERNAMEList.forEach((item: any) => { + const name = allSupplierList.filter(subItem => { return item.label === subItem.label }) - if (name && name.length>0){ + if (name && name.length > 0) { selectList.push(name[0]) } }) } setSelectSupplierList(selectList) - selectList.forEach((item: any)=>{ - if (item.value===currentUser?.SupplierID){ + selectList.forEach((item: any) => { + if (item.value === currentUser?.SupplierID) { setCurrentSupplierName(item.label) } }) @@ -668,44 +670,44 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList const detailSupplierList: any = [] // 要把参加了的先放前面 所以分两次遍历 let i: number = 0 - SUPPLIERNAMEList.forEach((item: any,index: number)=>{ - if (item.type){ - if (index<6){ - detailSupplierList.push({label:item.label,bg:colorList[i].bg,icon:colorList[i].icon,like:colorList[i].like}) + SUPPLIERNAMEList.forEach((item: any, index: number) => { + if (item.type) { + if (index < 6) { + detailSupplierList.push({ label: item.label, bg: colorList[i].bg, icon: colorList[i].icon, like: colorList[i].like }) i++ - }else{ - detailSupplierList.push({label:item.label,bg:colorList[6].bg,icon:colorList[6].icon,like:colorList[i].like}) + } else { + detailSupplierList.push({ label: item.label, bg: colorList[6].bg, icon: colorList[6].icon, like: colorList[i].like }) } } }) - SUPPLIERNAMEList.forEach((item: any,index: number)=>{ - if (!item.type){ - detailSupplierList.push({label:`${item.label}（未参加）`,bg:'#EFF0F3',icon:null}) + SUPPLIERNAMEList.forEach((item: any, index: number) => { + if (!item.type) { + detailSupplierList.push({ label: `${item.label}（未参加）`, bg: '#EFF0F3', icon: null }) } }) setSupplierColorList(detailSupplierList) // 给商品信息列表增加背景图 - if (tableList && tableList.length>0){ - tableList.forEach((item: any)=>{ - if (item.children && item.children.length>0){ - item.children.forEach((subItem: any,index: number)=>{ - detailSupplierList.forEach((thirdItem: any)=>{ - if (thirdItem.label===subItem.SUPPLIER_NAME){ + if (tableList && tableList.length > 0) { + tableList.forEach((item: any) => { + if (item.children && item.children.length > 0) { + item.children.forEach((subItem: any, index: number) => { + detailSupplierList.forEach((thirdItem: any) => { + if (thirdItem.label === subItem.SUPPLIER_NAME) { subItem.bg = thirdItem.bg subItem.icon = thirdItem.icon - if (subItem.MinimumPrice===1){ + if (subItem.MinimumPrice === 1) { // subItem.like = colorList[index].like - const selectColor = colorList.filter((filterItem: any) =>{ + const selectColor = colorList.filter((filterItem: any) => { return filterItem.bg === thirdItem.bg }) - console.log('selectColor',selectColor) - if (selectColor && selectColor.length>0){ + console.log('selectColor', selectColor) + if (selectColor && selectColor.length > 0) { subItem.like = selectColor[0].like } } - }else{ - if (subItem.MinimumPrice===1){ + } else { + if (subItem.MinimumPrice === 1) { // subItem.like = colorList[index].like } } @@ -719,30 +721,30 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList // 当监听到表格数据变化的时候 就重新给表格的序号赋值 useEffect(() => { - if (editTableData && editTableData.length>0){ + if (editTableData && editTableData.length > 0) { setDefaultSelect(editTableData) const list: any = [] - editTableData.forEach((item: any)=>{ - if (list.indexOf(`1-${item.SELLERCOMMODITYTYPE_ID}`)===-1){ + editTableData.forEach((item: any) => { + if (list.indexOf(`1-${item.SELLERCOMMODITYTYPE_ID}`) === -1) { list.push(`1-${item.SELLERCOMMODITYTYPE_ID}`) } }) setSelectTypeValueList(list) - }else{ + } else { setDefaultSelect([]) } }, [editTableData]); // 当抽屉打开是编辑的状态的时候 调用的方法 useEffect(async () => { - if (type==='edit'){ + if (type === 'edit') { handleGetDetail() } }, [type]); useEffect(() => { - if (shopList && shopList.length>0){ + if (shopList && shopList.length > 0) { const newList: any = [] - shopList.forEach((item: any,index: number)=>{ - item.key = index+1 + shopList.forEach((item: any, index: number) => { + item.key = index + 1 item.COMMODITY_BOXCODE = item.BID_GOODS_ID newList.push(item) }) @@ -751,28 +753,28 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList }, [shopList]); return (
-
{type==='add'?'比价询价申请':'详情'}
+
{type === 'add' ? '比价询价申请' : '详情'}
{ - type==='edit'? + type === 'edit' ?
- +

{drawerDetail?.BID_NAME}

- + {drawerDetail?.BID_DESC}
- + - {drawerDetail?.BID_STATE===2000?residue.indexOf('还剩')!==-1?'还剩':'':''} - {drawerDetail?.BID_STATE===2000?residue.split('还剩')[1]:drawerDetail?.BID_STATE===9000?'已关闭':''} + {drawerDetail?.BID_STATE === 2000 ? residue.indexOf('还剩') !== -1 ? '还剩' : '' : ''} + {drawerDetail?.BID_STATE === 2000 ? residue.split('还剩')[1] : drawerDetail?.BID_STATE === 9000 ? '已关闭' : ''}
@@ -780,80 +782,80 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList
{/* 配送时间 */}
- + {`${moment(drawerDetail?.EFFECT_STARTDATE).format('YYYY-MM-DD')}-${moment(drawerDetail?.EFFECT_ENDDATE).format('YYYY-MM-DD')}`} {'（配送时间）'}
{/* 服务区标签 */}
{ - drawerDetail?.SERVERPART_NAME.split(',').map((item: string)=>{ - return
{item}
+ drawerDetail?.SERVERPART_NAME.split(',').map((item: string) => { + return
{item}
}) }
{/* 比价时间 */} -
- +
+ {`${moment(drawerDetail?.START_DATE).format('YYYY-MM-DD')}-${moment(drawerDetail?.END_DATE).format('YYYY-MM-DD')}`} {'（比价时间）'}
{/* 供应商 */}
- { - currentUser?.UserPattern === 1000? - <> - { - supplierColorList && supplierColorList.length>0 && supplierColorList.map((item: any,index: number)=>{ - return
- { - item.icon? -
6?6:index].icon}}>
- :'' - } - {item.label} - { - handleSearchQualification(item.label) - }} title={'点击查看资质详情'}/> -
- }) - } - : - <> - { + setSubmitSupplier(e) + setEditTableData([]) + handleGetDetail(e) + // setDrawerDetail(res) + }} + /> + {currentSupplierName} + + }
{/* 中标供应商 */}
- + 中标供应商
{/* 中标列表 */} { - drawerDetail?.WinSupplier? + drawerDetail?.WinSupplier ?
-
{ - if (currentUser?.UserPattern===1000){ +
{ + if (currentUser?.UserPattern === 1000) { setShopWinSupplier(true) } }}> -
- {drawerDetail?.WinSupplier} +
+ {drawerDetail?.WinSupplier}
-
:'' +
: '' }
@@ -864,94 +866,94 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList 商品信息
{ - currentUser?.UserPattern === 4000 && drawerDetail?.BID_STATE!==9000? - <> - - - { - const tableList: any = await antdImportExcel(e) - const newList: any = [] - let isTrue: boolean = true - if (tableList && tableList.length>0){ - tableList.forEach((item: any)=>{ - if (item['商品条码']===undefined){ - isTrue = false + currentUser?.UserPattern === 4000 && drawerDetail?.BID_STATE !== 9000 ? + <> + + + { + const tableList: any = await antdImportExcel(e) + const newList: any = [] + let isTrue: boolean = true + if (tableList && tableList.length > 0) { + tableList.forEach((item: any) => { + if (item['商品条码'] === undefined) { + isTrue = false + } }) - editTableData.forEach((item: any)=>{ - newList.forEach((subItem: any)=>{ - if (item.COMMODITY_BARCODE === subItem.COMMODITY_BARCODE){ - item.COMMODITY_OFFER = subItem.COMMODITY_OFFER - item.DUTY_PARAGRAPH = subItem.DUTY_PARAGRAPH - } + if (isTrue) { + tableList.forEach((item: any) => { + newList.push({ + COMMODITY_OFFER: item['价格'], + COMMODITY_BARCODE: item['商品条码'].replace(" ", '').replace("\n", '').replace("\t", '').replace("\r", ''), + DUTY_PARAGRAPH: item["税率"] + }) }) - }) - const req = { - BID_Id:drawerDetail.BID_ID, - bid_supplierModel_list: editTableData - } - const result = await importFile(req) - const resList: any = [] - if (result.Result_Data && result.Result_Data.length>0){ - editTableData.forEach((item: any)=>{ - const subItem = result.Result_Data.filter((filterItem: any) => item.COMMODITY_BARCODE===filterItem.COMMODITY_BARCODE) - item.COMMODITY_OFFER = subItem[0].COMMODITY_OFFER - item.DUTY_PARAGRAPH = subItem[0].DUTY_PARAGRAPH - resList.push(item) + editTableData.forEach((item: any) => { + newList.forEach((subItem: any) => { + if (item.COMMODITY_BARCODE === subItem.COMMODITY_BARCODE) { + item.COMMODITY_OFFER = subItem.COMMODITY_OFFER + item.DUTY_PARAGRAPH = subItem.DUTY_PARAGRAPH + } + }) }) + const req = { + BID_Id: drawerDetail.BID_ID, + bid_supplierModel_list: editTableData + } + const result = await importFile(req) + const resList: any = [] + if (result.Result_Data && result.Result_Data.length > 0) { + editTableData.forEach((item: any) => { + const subItem = result.Result_Data.filter((filterItem: any) => item.COMMODITY_BARCODE === filterItem.COMMODITY_BARCODE) + item.COMMODITY_OFFER = subItem[0].COMMODITY_OFFER + item.DUTY_PARAGRAPH = subItem[0].DUTY_PARAGRAPH + resList.push(item) + }) + } + setEditTableData([]) + setEditTableData(resList) + supplierFormRef.current?.reload() + message.success('导入成功！') + } else { + message.error('导入文件格式错误') } - setEditTableData([]) - setEditTableData(resList) - supplierFormRef.current?.reload() - message.success('导入成功！') - }else{ + } else { message.error('导入文件格式错误') } - }else{ - message.error('导入文件格式错误') - } - }} - > - - - : + }} + > + + + : <> @@ -960,174 +962,175 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList
-
+
{ - currentUser?.UserPattern === 4000? + currentUser?.UserPattern === 4000 ? <> - {/* 表头 */} -
- {/* 商品名称 */} -
- - 商品名称 -
- {/* 商品单位 */} -
- - 商品单位 -
- {/* 商品规格 */} -
- - 商品规格 -
- {/* 价格 */} -
- - 价格 -
- {/* 税率 */} -
- - 税率 -
- {/* 附件图片 */} -
- - 附件图片 -
+ {/* 表头 */} +
+ {/* 商品名称 */} +
+ + 商品名称
+ {/* 商品单位 */} +
+ + 商品单位 +
+ {/* 商品规格 */} +
+ + 商品规格 +
+ {/* 价格 */} +
+ + 价格 +
+ {/* 税率 */} +
+ + 税率 +
+ {/* 附件图片 */} +
+ + 附件图片 +
+
- {/* 表格内容 */} - { - editTableData && editTableData.length>0? - editTableData.map((item: any,index: number)=>{ - return
-
{index + 1}
-
- - {item.COMMODITY_NAME} -
-
{item.COMMODITY_UNIT}
-
{item.COMMODITY_RULE}
-
- { - drawerDetail?.BID_STATE===9000? - {item.COMMODITY_OFFER} - :{ - const list = JSON.parse(JSON.stringify(editTableData)) - list[index].COMMODITY_OFFER = e.target.value - setEditTableData(list) - }} - /> - } -
-
- { - drawerDetail?.BID_STATE===9000? - {item.DUTY_PARAGRAPH}: - { - const list = JSON.parse(JSON.stringify(editTableData)) - list[index].DUTY_PARAGRAPH = e.target.value - setEditTableData(list) - }} - /> - } + {/* 表格内容 */} + { + editTableData && editTableData.length > 0 ? + editTableData.map((item: any, index: number) => { + return
+
{index + 1}
+
+ + {item.COMMODITY_NAME} +
+
{item.COMMODITY_UNIT}
+
{item.COMMODITY_RULE}
+
+ { + drawerDetail?.BID_STATE === 9000 ? + {item.COMMODITY_OFFER} + : { + const list = JSON.parse(JSON.stringify(editTableData)) + list[index].COMMODITY_OFFER = e.target.value + setEditTableData(list) + }} + /> + } +
+
+ { + drawerDetail?.BID_STATE === 9000 ? + {item.DUTY_PARAGRAPH} : + { + const list = JSON.parse(JSON.stringify(editTableData)) + list[index].DUTY_PARAGRAPH = e.target.value + setEditTableData(list) + }} + /> + } -
-
- { - drawerDetail?.BID_STATE!==9000? - <> - 0?[previewImg]:[]} - onChange={ (e: any)=>{ - if (e.fileList && e.fileList.length>0){ - if (e.file.status==='done'){ - const formData = new FormData(); - formData.append('files', e.fileList[0].originFileObj); - formData.append('TableName', 'BIDSUPPLIER'); - formData.append('TableType', '1126'); - formData.append('ImageName', typeof e.file !== 'string' ? e.file?.name : ''); - if (e.file.name) { - uploadFile(formData).then(success=>{ - item.IMAGE_URL_1 = success.ImageUrl - setPreviewImg(success.ImageUrl) - }) - } +
+
+ { + drawerDetail?.BID_STATE !== 9000 ? + <> + 0?[previewImg]:[]} + onChange={(e: any) => { + if (e.fileList && e.fileList.length > 0) { + if (e.file.status === 'done') { + const formData = new FormData(); + formData.append('files', e.fileList[0].originFileObj); + formData.append('TableName', 'BIDSUPPLIER'); + formData.append('TableType', '1126'); + formData.append('ImageName', typeof e.file !== 'string' ? e.file?.name : ''); + if (e.file.name) { + // uploadFile(formData).then(success => { + uploadAHYDFile(formData).then(success => { + item.IMAGE_URL_1 = success.ImageUrl + setPreviewImg(success.ImageUrl) + }) } - }else{ - item.IMAGE_URL_1 = "" } - }} - onPreview={async (file: any)=>{ - if (item.IMAGE_URL_1){ - setPreviewImg(item.IMAGE_URL_1) - setShowPreview(true) - }else{ - const img = await getBase64(file.originFileObj as RcFile) - setPreviewImg(img) - setShowPreview(true) - } - }} - > -
- -
- - {
- { - setShowPreview(vis) - } - }}> - {previewImg?:''} - -
} - : - <> - {item.IMAGE_URL_1? - { - setPreviewImg(item.IMAGE_URL_1) - setShowPreview(true) - }}/>:'' + } else { + item.IMAGE_URL_1 = "" } - {
- { - setShowPreview(vis) - } - }}> - {previewImg?:''} - -
} - - } -
-
- }):'' - } - : + }} + onPreview={async (file: any) => { + if (item.IMAGE_URL_1) { + setPreviewImg(item.IMAGE_URL_1) + setShowPreview(true) + } else { + const img = await getBase64(file.originFileObj as RcFile) + setPreviewImg(img) + setShowPreview(true) + } + }} + > +
+ +
+ + {
+ { + setShowPreview(vis) + } + }}> + {previewImg ? : ''} + +
} + : + <> + {item.IMAGE_URL_1 ? + { + setPreviewImg(item.IMAGE_URL_1) + setShowPreview(true) + }} /> : '' + } + {
+ { + setShowPreview(vis) + } + }}> + {previewImg ? : ''} + +
} + + } +
+
+ }) : '' + } + : <> { - editTableData && editTableData.length>0? - editTableData.map((listItem: any)=>{ + editTableData && editTableData.length > 0 ? + editTableData.map((listItem: any) => { return
- +
{listItem.COMMODITY_NAME} {`${listItem.COMMODITY_RULE}/${listItem.COMMODITY_UNIT}/元`} @@ -1136,26 +1139,26 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList
{ - listItem.children && listItem.children.length>0? - listItem.children.map((childrenItem: any,index: number)=>{ - return
+ listItem.children && listItem.children.length > 0 ? + listItem.children.map((childrenItem: any, index: number) => { + return
{ - childrenItem.like? - - :'' + childrenItem.like ? + + : '' }

{childrenItem.COMMODITY_OFFER || '-'}

- - {childrenItem.DUTY_PARAGRAPH || '-'} - - { - if (childrenItem.IMAGE_URL && childrenItem.IMAGE_URL.split(',').length>0){ + + {childrenItem.DUTY_PARAGRAPH || '-'} + + { + if (childrenItem.IMAGE_URL && childrenItem.IMAGE_URL.split(',').length > 0) { setPreviewImg(childrenItem.IMAGE_URL) setShowPreview(true) } - }}>{childrenItem.IMAGE_URL?childrenItem.IMAGE_URL.split(',').length : '0'} + }}>{childrenItem.IMAGE_URL ? childrenItem.IMAGE_URL.split(',').length : '0'} {
- {previewImg?:''} + {previewImg ? : ''}
}
- }):'' + }) : '' }
- }):'' + }) : '' } }
-
: +
:
{ + onChange: (_, options) => { let str: string = '' - options.forEach((item: any)=>{ - if (str){ - str+=`,${item.label}` - }else{ + options.forEach((item: any) => { + if (str) { + str += `,${item.label}` + } else { str = item.label } }) @@ -1241,7 +1244,7 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList { + onChange: (_, options) => { let str: string = '' - options.forEach((item: any)=>{ - if (str){ - str+=`,${item.label}` - }else{ + options.forEach((item: any) => { + if (str) { + str += `,${item.label}` + } else { str = item.label } }) @@ -1272,22 +1275,22 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList 0} + disabled={type === 'edit' || editTableData && editTableData.length > 0} rules={[ { - required:true, + required: true, message: '请选择比价时间', } ]} fieldProps={{ - disabledDate:(current: any)=>{ + disabledDate: (current: any) => { return current && current < moment().startOf('day'); }, - onChange:(e: any)=> { - if (e){ + onChange: (e: any) => { + if (e) { setCompareTimeRange(moment(e[1]._d)) } } @@ -1298,19 +1301,19 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList { + disabledDate: (current: any) => { return current && current < moment(compareTimeRange).endOf('day'); } }} @@ -1320,12 +1323,12 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList @@ -1338,37 +1341,37 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList 商品信息
{ - showShopDetailDeleteBtn? + showShopDetailDeleteBtn ? { + onConfirm={() => { const list = JSON.parse(JSON.stringify(editTableData)) const newList: any = [] - list.forEach((listItem: any)=>{ - if (!listItem.check){ + list.forEach((listItem: any) => { + if (!listItem.check) { newList.push(listItem) } }) setEditTableData(newList) - if (newList.length===0){ + if (newList.length === 0) { setAllDeleteSelect(false) } }} okText="确定" cancelText="取消"> - + - :'' + : '' } -
@@ -1520,48 +1523,48 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList zIndex={30} onOk={async () => { const formData: any = addNewShopFormRef.current?.getFieldsValue() - if (selectShop && selectShop.length>0){ + if (selectShop && selectShop.length > 0) { const idList: number[] = [] const list: any = [] - if (defaultSelect && defaultSelect.length>0){ - defaultSelect.forEach((item: any)=>{ - if (idList.indexOf(item.SELLERCOMMODITY_ID)===-1){ + if (defaultSelect && defaultSelect.length > 0) { + defaultSelect.forEach((item: any) => { + if (idList.indexOf(item.SELLERCOMMODITY_ID) === -1) { idList.push(item.SELLERCOMMODITY_ID) list.push(item) } }) } - selectShop.forEach((item: any)=>{ - if (idList.indexOf(item.SELLERCOMMODITY_ID)===-1){ + selectShop.forEach((item: any) => { + if (idList.indexOf(item.SELLERCOMMODITY_ID) === -1) { idList.push(item.SELLERCOMMODITY_ID) list.push(item) } }) let SERVERPARTIDSSTR: string = '' - formData.unitName.forEach((item: any)=>{ - if (SERVERPARTIDSSTR){ - SERVERPARTIDSSTR+=`,${item}` - }else{ + formData.unitName.forEach((item: any) => { + if (SERVERPARTIDSSTR) { + SERVERPARTIDSSTR += `,${item}` + } else { SERVERPARTIDSSTR = item } }) const req = { - EFFECT_STARTDATE:moment(formData.compareTime[0]).format('YYYY-MM-DD'), - EFFECT_ENDDATE:moment(formData.compareTime[1]).format('YYYY-MM-DD'), - SERVERPART_IDS:SERVERPARTIDSSTR, - GoodsList:list + EFFECT_STARTDATE: moment(formData.compareTime[0]).format('YYYY-MM-DD'), + EFFECT_ENDDATE: moment(formData.compareTime[1]).format('YYYY-MM-DD'), + SERVERPART_IDS: SERVERPARTIDSSTR, + GoodsList: list } - const data= await handleValidateShop(req) + const data = await handleValidateShop(req) - if (data.Result_Code===100){ + if (data.Result_Code === 100) { // message.success(data.Result_Desc) - list.forEach((item: any,index: number)=>{ - item.key = index+1 + list.forEach((item: any, index: number) => { + item.key = index + 1 item.check = false }) setEditTableData(list) - }else{ + } else { message.error(data.Result_Desc) } // const list = JSON.parse(JSON.stringify(selectShop)) @@ -1573,10 +1576,10 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList // setChoseShop(false) }}> -
-
-
可选类别
-
+
+
+
可选类别
+
{ let str: string = '' - checkedKeys.forEach((item: any)=>{ - if (str){ + checkedKeys.forEach((item: any) => { + if (str) { str += `,${item.split('-')[1]}` - }else{ - str = item.split('-')[1] + } else { + str = item.split('-')[1] } }) setSelectType(str) @@ -1601,19 +1604,19 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList >
-
+
{ - return row.PURCHASE_STATE!==1?'grayRow':'' + rowClassName={(row, index) => { + return row.PURCHASE_STATE !== 1 ? 'grayRow' : '' }} toolbar={{ actions: [ @@ -1629,54 +1632,54 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList , ], }} - request={async (params: any)=>{ + request={async (params: any) => { let selectStr: string = '' - if (selectTypeValueList && selectTypeValueList.length>0){ - selectTypeValueList.forEach((item: any)=>{ - if (selectStr){ + if (selectTypeValueList && selectTypeValueList.length > 0) { + selectTypeValueList.forEach((item: any) => { + if (selectStr) { selectStr += `,${item.split('-')[1]}` - }else{ - selectStr = item.split('-')[1] + } else { + selectStr = item.split('-')[1] } }) - }else{ + } else { selectStr = selectType } const formData: any = addNewShopFormRef.current?.getFieldsValue() let SERVERPARTIDSSTR: string = '' - formData.unitName.forEach((item: any)=>{ - if (SERVERPARTIDSSTR){ - SERVERPARTIDSSTR+=`,${item}` - }else{ + formData.unitName.forEach((item: any) => { + if (SERVERPARTIDSSTR) { + SERVERPARTIDSSTR += `,${item}` + } else { SERVERPARTIDSSTR = item } }) const req: any = { - searchModel:{ - QueryType:0, - SearchParameter:{ - COMMODITY_STATES:1, + searchModel: { + QueryType: 0, + SearchParameter: { + COMMODITY_STATES: 1, SELLERCOMMODITYTYPE_IDS: selectStr || null }, - PageIndex:1, - PageSize:99999, - SortStr:'SELLERCOMMODITYTYPE_ID', - keyWord:{ - Key:'COMMODITY_NAME', - value:params.COMMODITY_NAME + PageIndex: 1, + PageSize: 99999, + SortStr: 'SELLERCOMMODITYTYPE_ID', + keyWord: { + Key: 'COMMODITY_NAME', + value: params.COMMODITY_NAME } }, - bidModel:{ - SERVERPART_IDS:SERVERPARTIDSSTR, - EFFECT_STARTDATE:moment(formData.compareTime[0]).format('YYYY-MM-DD'), - EFFECT_ENDDATE:moment(formData.compareTime[1]).format('YYYY-MM-DD'), + bidModel: { + SERVERPART_IDS: SERVERPARTIDSSTR, + EFFECT_STARTDATE: moment(formData.compareTime[0]).format('YYYY-MM-DD'), + EFFECT_ENDDATE: moment(formData.compareTime[1]).format('YYYY-MM-DD'), SELLER_ID: currentUser?.SellerId }, } - if (selectStr){ + if (selectStr) { const res = await handleFilterShopList(req) - res.data.forEach((item: any,index: number)=>{ - item.key = index+1 + res.data.forEach((item: any, index: number) => { + item.key = index + 1 }) return res } @@ -1698,7 +1701,7 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList open={addShopModalDetail} destroyOnClose footer={null} - onCancel={()=>{ + onCancel={() => { setSelectDeleteKey([]) setSelectDeleteList([]) setAddShopModalDetail(false); @@ -1712,12 +1715,12 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList columns={[ ...shopColumns, { - title:'操作', + title: '操作', valueType: 'option', render: (text, record, _, action) => { return { + onConfirm={() => { handleShopDetailDelete(record) }} okText="确定" @@ -1732,30 +1735,30 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList type: 'checkbox', ...selectShopDetailRow, }} - scroll={{y: 400}} + scroll={{ y: 400 }} dataSource={addShopDetailData} toolbar={{ - actions:[ + actions: [ { - if (selectDeleteList && selectDeleteList.length>0){ + onConfirm={() => { + if (selectDeleteList && selectDeleteList.length > 0) { const selectDelete: any = [] - selectDeleteList.forEach((item: any)=>{ + selectDeleteList.forEach((item: any) => { selectDelete.push(item.SELLERCOMMODITY_ID) }) const list: any = [] const listRowKey: any = [] const editList: any = [] - selectShop.forEach((item: any)=>{ - if (selectDelete.indexOf(item.SELLERCOMMODITY_ID)===-1){ + selectShop.forEach((item: any) => { + if (selectDelete.indexOf(item.SELLERCOMMODITY_ID) === -1) { list.push(item) listRowKey.push(item.SELLERCOMMODITY_ID) } }) - if (editTableData && editTableData.length>0){ - editTableData.forEach((item: any)=>{ - if (selectDelete.indexOf(item.SELLERCOMMODITY_ID)===-1){ + if (editTableData && editTableData.length > 0) { + editTableData.forEach((item: any) => { + if (selectDelete.indexOf(item.SELLERCOMMODITY_ID) === -1) { editList.push(item) } }) @@ -1765,8 +1768,8 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList setEditTableData(editList) setSelectDeleteKey([]) setSelectDeleteList([]) - handleUpdateTableData(editList,list) - }else{ + handleUpdateTableData(editList, list) + } else { message.error('请选择删除的商品！') } }} @@ -1794,11 +1797,11 @@ const AddNewShop = ({currentUser,type,onRef,currentItem,shopList,allSupplierList destroyOnClose={true} bodyStyle={{ backgroundColor: "#f9f9f9", padding: 0 }} closable={false} - title={
+ title={
{'中标商品信息'}
} > - +
) diff --git a/src/pages/supplier/supplierList/list.tsx b/src/pages/supplier/supplierList/list.tsx index 60696de..7da3ad7 100644 --- a/src/pages/supplier/supplierList/list.tsx +++ b/src/pages/supplier/supplierList/list.tsx @@ -35,7 +35,7 @@ import { } from "@ant-design/pro-form"; import useRequest from "@ahooksjs/use-request"; import { handleSupplierList } from "@/pages/Setting/Roles/service"; -import { deletePicture, uploadPicture } from "@/services/picture"; +import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from "@/services/picture"; import type { QualificationModel } from "@/pages/merchantManagement/supplier/Qualifications/data"; import { getFieldEnum } from "@/services/options"; import type { UploadFile } from "antd/es/upload/interface"; @@ -82,7 +82,7 @@ const customUploadRequest = async (fileList: UploadFile[], tableId: string) => { formData.append('TableName', 'QUALIFICATION'); formData.append('TableId', tableId); - const success = await uploadPicture(formData) + const success = await uploadAHYDPicture(formData) if (success) { return true } @@ -1197,7 +1197,8 @@ const SupplierList: React.FC<{ currentUser: CurrentUser | undefined }> = ({ curr icon: , async onOk() { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.deletepath, info.file?.uid, 'QUALIFICATION') + // const success = await deletePicture(info.file?.deletepath, info.file?.uid, 'QUALIFICATION') + const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, 'QUALIFICATION') deleteLoading() if (success) { diff --git a/src/pages/travelMember/HomepageAds/index.tsx b/src/pages/travelMember/HomepageAds/index.tsx index d1eb9ae..ed0eaf0 100644 --- a/src/pages/travelMember/HomepageAds/index.tsx +++ b/src/pages/travelMember/HomepageAds/index.tsx @@ -22,7 +22,7 @@ import type { FormInstance } from 'antd'; import PageTitleBox from '@/components/PageTitleBox'; import { handeGetUSERDEFINEDTYPEList, handlDeleteUSERDEFINEDTYPE, handlSynchroUSERDEFINEDTYPE } from '../service'; import { render } from 'react-dom'; -import { uploadPicture } from '@/services/picture'; +import { uploadAHYDPicture, uploadPicture } from '@/services/picture'; import { handleSetlogSave } from '@/utils/format'; import ModalFooter from '../scenicSpotConfig/component/modalFooter'; @@ -489,7 +489,7 @@ const HomepageAds: React.FC<{ currentUser: CurrentUser | undefined }> = (props) formData.append('TableType', selectTab === "1" ? '1214' : "1213"); formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : ''); if (info.filename) { - const success = await uploadPicture(formData) + const success = await uploadAHYDPicture(formData) if (success) { const list = [{ // uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败 diff --git a/src/pages/travelMember/LostandFoundAPPliance/index.tsx b/src/pages/travelMember/LostandFoundAPPliance/index.tsx index 6264288..c1dc609 100644 --- a/src/pages/travelMember/LostandFoundAPPliance/index.tsx +++ b/src/pages/travelMember/LostandFoundAPPliance/index.tsx @@ -19,7 +19,7 @@ import ProForm, { ProFormDatePicker, ProFormDateRangePicker, ProFormSelect, ProF import { handleGetPictureList } from "@/pages/reports/settlementAccount/service"; import session from "@/utils/session"; import { handeDeleteSUGGESTION, handeGetPictureList, handeGetSUGGESTIONList, handeSynchroSUGGESTION } from "../service"; -import { deletePicture, uploadPicture } from "@/services/picture"; +import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from "@/services/picture"; const beforeUpload = (file: any) => { const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png'; @@ -279,7 +279,7 @@ const LostandFoundAPPliance: React.FC<{ currentUser: CurrentUser }> = (props) => formData.append('TableType', "1306"); console.log('formData', formData); - let res = await uploadPicture(formData) + let res = await uploadAHYDPicture(formData) } // 删除 @@ -569,7 +569,8 @@ const LostandFoundAPPliance: React.FC<{ currentUser: CurrentUser }> = (props) => async onOk() { if (info.file.ImageId) { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '') + // const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '') + const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '') deleteLoading() if (success) { diff --git a/src/pages/travelMember/LostandFoundReview/index.tsx b/src/pages/travelMember/LostandFoundReview/index.tsx index 11c8965..b9a561b 100644 --- a/src/pages/travelMember/LostandFoundReview/index.tsx +++ b/src/pages/travelMember/LostandFoundReview/index.tsx @@ -10,7 +10,7 @@ import moment from 'moment' import ProForm, { ProFormDatePicker, ProFormSelect, ProFormText, ProFormTextArea, ProFormUploadButton } from "@ant-design/pro-form"; import session from "@/utils/session"; import { ExclamationCircleOutlined } from "@ant-design/icons"; -import { deletePicture } from "@/services/picture"; +import { deleteAHYDPicture, deletePicture } from "@/services/picture"; const beforeUpload = (file: any) => { const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png'; @@ -364,7 +364,8 @@ const LostandFoundReview: React.FC<{ currentUser: CurrentUser | undefined }> = ( async onOk() { if (info.file.ImageId) { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '') + // const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '') + const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '') deleteLoading() if (success) { diff --git a/src/pages/travelMember/MallBrandManage/index.tsx b/src/pages/travelMember/MallBrandManage/index.tsx index cc5ef5d..fcc616f 100644 --- a/src/pages/travelMember/MallBrandManage/index.tsx +++ b/src/pages/travelMember/MallBrandManage/index.tsx @@ -19,7 +19,7 @@ import Draggable from "react-draggable"; import ProForm, { ProFormDatePicker, ProFormDigit, ProFormMoney, ProFormSelect, ProFormText, ProFormTextArea, ProFormUploadButton } from "@ant-design/pro-form"; import moment from 'moment' import PageTitleBox from "@/components/PageTitleBox"; -import { deletePicture, uploadPicture } from "@/services/picture"; +import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from "@/services/picture"; import { handleSetlogSave } from "@/utils/format"; import ModalFooter from "../scenicSpotConfig/component/modalFooter"; import { highlightText } from "@/utils/highlightText"; @@ -232,7 +232,7 @@ const MallBrandManage: React.FC<{ currentUser: CurrentUser }> = (props) => { // formData.append('imageType', "1204"); formData.append('TableType', "1125"); - let imgRes = await uploadPicture(formData) + let imgRes = await uploadAHYDPicture(formData) console.log('imgResimgResimgResimgRes', imgRes); imgData = imgRes.Result_Data.ImageUrl } @@ -576,7 +576,8 @@ const MallBrandManage: React.FC<{ currentUser: CurrentUser }> = (props) => { async onOk() { if (info.file.ImageId) { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000') + // const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000') + const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '', '6000') deleteLoading() if (success) { const files = [...fileList] diff --git a/src/pages/travelMember/MallClassificationManage/index.tsx b/src/pages/travelMember/MallClassificationManage/index.tsx index 747e770..6e535fc 100644 --- a/src/pages/travelMember/MallClassificationManage/index.tsx +++ b/src/pages/travelMember/MallClassificationManage/index.tsx @@ -23,7 +23,7 @@ import type { FormInstance } from 'antd'; import { getFieldEnumTree, getFieldEnumName } from "@/services/options"; // 枚举的引用，没有使用可以删除 import { handlDeleteUSERDEFINEDTYPE, handlGetUSERDEFINEDTYPEList, handlSynchroUSERDEFINEDTYPE } from '../service'; import PageTitleBox from '@/components/PageTitleBox'; -import { uploadPicture } from '@/services/picture'; +import { uploadAHYDPicture, uploadPicture } from '@/services/picture'; import defaultIcon from '../../../assets/brand/defaultIcon.png' import ModalFooter from '../scenicSpotConfig/component/modalFooter'; import { handleSetlogSave } from '@/utils/format'; @@ -625,7 +625,7 @@ const MallClassificationManage: React.FC<{ currentUser: CurrentUser | undefined formData.append('TableType', '1215'); formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : ''); if (info.filename) { - const success = await uploadPicture(formData) + const success = await uploadAHYDPicture(formData) if (success) { const list = [{ // uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败 diff --git a/src/pages/travelMember/OrderCategoryManage/index.tsx b/src/pages/travelMember/OrderCategoryManage/index.tsx index 109ea2f..d9decb9 100644 --- a/src/pages/travelMember/OrderCategoryManage/index.tsx +++ b/src/pages/travelMember/OrderCategoryManage/index.tsx @@ -23,7 +23,7 @@ import type { FormInstance } from 'antd'; import { getFieldEnumTree, getFieldEnumName } from "@/services/options"; // 枚举的引用，没有使用可以删除 import { handlDeleteUSERDEFINEDTYPE, handlGetUSERDEFINEDTYPEList, handlSynchroUSERDEFINEDTYPE } from '../service'; import PageTitleBox from '@/components/PageTitleBox'; -import { uploadPicture } from '@/services/picture'; +import { uploadAHYDPicture, uploadPicture } from '@/services/picture'; import defaultIcon from '../../../assets/brand/defaultIcon.png' import classNames from 'classnames'; import ModalFooter from '../scenicSpotConfig/component/modalFooter'; @@ -613,7 +613,7 @@ const OrderCategoryManage: React.FC<{ currentUser: CurrentUser | undefined }> = formData.append('TableType', '1215'); formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : ''); if (info.filename) { - const success = await uploadPicture(formData) + const success = await uploadAHYDPicture(formData) if (success) { const list = [{ // uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败 diff --git a/src/pages/travelMember/OrderProductManage/index.tsx b/src/pages/travelMember/OrderProductManage/index.tsx index 5fd43c4..c82cb28 100644 --- a/src/pages/travelMember/OrderProductManage/index.tsx +++ b/src/pages/travelMember/OrderProductManage/index.tsx @@ -23,7 +23,7 @@ import type { FormInstance } from 'antd'; import { getFieldEnumTree, getFieldEnumName } from "@/services/options"; // 枚举的引用，没有使用可以删除 import { handeDeleteCOMMODITY, handeGetBusinessCommodityList, handeGetCOMMODITYList, handeGetSellerCommodityList, handeSynchroCOMMODITY, handeSyncSellerCommodityInfo, handlDeleteUSERDEFINEDTYPE, handlGetUSERDEFINEDTYPEList, handlSynchroUSERDEFINEDTYPE } from '../service'; import PageTitleBox from '@/components/PageTitleBox'; -import { deletePicture, SavePicture, uploadPicture } from '@/services/picture'; +import { deleteAHYDPicture, deletePicture, SavePicture, uploadPicture } from '@/services/picture'; import defaultIcon from '../../../assets/brand/defaultIcon.png' import OrderCategoryTree from './components/OrderCategoryTree'; import OrderCategoryManage from '../OrderCategoryManage'; @@ -859,7 +859,8 @@ const OrderProductManage: React.FC<{ currentUser: CurrentUser | undefined }> = ( async onOk() { if (info.file.ImageId) { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000') + // const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000') + const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '', '6000') await handeSyncSellerCommodityInfo({ list: [{ ...currentRow, diff --git a/src/pages/travelMember/ProductListingManagement/index.tsx b/src/pages/travelMember/ProductListingManagement/index.tsx index 59c0686..1bad982 100644 --- a/src/pages/travelMember/ProductListingManagement/index.tsx +++ b/src/pages/travelMember/ProductListingManagement/index.tsx @@ -26,7 +26,7 @@ import PageTitleBox from "@/components/PageTitleBox"; import LeftSelectMallType from './component/LeftSelectMallType'; import { handeDeleteCOMMODITY, handeDeleteRTCOMMODITY_MULTI, handeGetCOMMODITY_MULTIList, handeGetCOMMODITYDetail, handeGetCOMMODITYList, handeGetMERCHANTSList, handeGetRTCOMMODITY_MULTIList, handeSetCommodityState, handeSynchroCOMMODITY, handeSynchroRTCOMMODITYMULTIList, handleGetBRANDList, handlGetUSERDEFINEDTYPEList } from '../service'; import session from '@/utils/session'; -import { deletePicture, uploadPicture } from '@/services/picture'; +import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from '@/services/picture'; import { handleSetlogSave } from '@/utils/format'; import { highlightText } from '@/utils/highlightText'; @@ -592,7 +592,7 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop formData.append('TableType', "1207"); console.log('formData', formData); - let res = await uploadPicture(formData) + let res = await uploadAHYDPicture(formData) } // 头部轮播图 @@ -607,7 +607,7 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop formData.append('TableType', "1207"); console.log('formData', formData); - let res = await uploadPicture(formData) + let res = await uploadAHYDPicture(formData) } // 头部轮播图 @@ -622,7 +622,7 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop formData.append('TableType', "1207"); console.log('formData', formData); - let res = await uploadPicture(formData) + let res = await uploadAHYDPicture(formData) } } @@ -1427,7 +1427,8 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop async onOk() { if (info.file.ImageId) { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000') + // const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000') + const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '', '6000') deleteLoading() if (success) { @@ -1486,7 +1487,8 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop async onOk() { if (info.file.ImageId) { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000') + const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '', '6000') + // const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000') deleteLoading() if (success) { @@ -1545,7 +1547,8 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop async onOk() { if (info.file.ImageId) { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000') + // const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000') + const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '', '6000') deleteLoading() if (success) { diff --git a/src/pages/travelMember/ProductSpecificationManage/index.tsx b/src/pages/travelMember/ProductSpecificationManage/index.tsx index b2785c6..a1e8f4a 100644 --- a/src/pages/travelMember/ProductSpecificationManage/index.tsx +++ b/src/pages/travelMember/ProductSpecificationManage/index.tsx @@ -26,7 +26,7 @@ import { handeDeleteCOMMODITY_MULTI, handeSynchroCOMMODITY_MULTI, handlDeleteUSE import { render } from 'react-dom'; import ModalFooter from '../scenicSpotConfig/component/modalFooter'; import { handleSetlogSave } from '@/utils/format'; -import { uploadPicture } from '@/services/picture'; +import { uploadAHYDPicture, uploadPicture } from '@/services/picture'; import defaultIcon from '../../../assets/brand/defaultIcon.png' import { highlightText } from '@/utils/highlightText'; @@ -698,7 +698,7 @@ const ProductSpecificationManage: React.FC<{ currentUser: CurrentUser | undefine formData.append('TableType', '1215'); formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : ''); if (info.filename) { - const success = await uploadPicture(formData) + const success = await uploadAHYDPicture(formData) if (success) { const list = [{ // uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败 diff --git a/src/pages/travelMember/ShoppingMallProductSearch/index.tsx b/src/pages/travelMember/ShoppingMallProductSearch/index.tsx index 527f1d2..438983e 100644 --- a/src/pages/travelMember/ShoppingMallProductSearch/index.tsx +++ b/src/pages/travelMember/ShoppingMallProductSearch/index.tsx @@ -25,7 +25,7 @@ import { getList, delcommodity, updatecommodity } from './service'; // 接口相 import PageTitleBox from "@/components/PageTitleBox"; import { handeDeleteCOMMODITY, handeDeleteRTCOMMODITY_MULTI, handeGetCOMMODITY_MULTIList, handeGetCOMMODITYDetail, handeGetCOMMODITYList, handeGetMERCHANTSList, handeGetRTCOMMODITY_MULTIList, handeSynchroCOMMODITY, handeSynchroRTCOMMODITYMULTIList, handleGetBRANDList, handlGetUSERDEFINEDTYPEList } from '../service'; import session from '@/utils/session'; -import { deletePicture, uploadPicture } from '@/services/picture'; +import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from '@/services/picture'; import LeftSelectMallType from '../ProductListingManagement/component/LeftSelectMallType'; import { handleSetlogSave } from '@/utils/format'; import { highlightText } from '@/utils/highlightText'; @@ -568,7 +568,7 @@ const ShoppingMallProductSearch: React.FC<{ currentUser: CurrentUser | undefined formData.append('TableType', "1207"); console.log('formData', formData); - let res = await uploadPicture(formData) + let res = await uploadAHYDPicture(formData) } // 头部轮播图 @@ -583,7 +583,7 @@ const ShoppingMallProductSearch: React.FC<{ currentUser: CurrentUser | undefined formData.append('TableType', "1207"); console.log('formData', formData); - let res = await uploadPicture(formData) + let res = await uploadAHYDPicture(formData) } // 头部轮播图 @@ -598,7 +598,7 @@ const ShoppingMallProductSearch: React.FC<{ currentUser: CurrentUser | undefined formData.append('TableType', "1207"); console.log('formData', formData); - let res = await uploadPicture(formData) + let res = await uploadAHYDPicture(formData) } } @@ -1333,7 +1333,8 @@ const ShoppingMallProductSearch: React.FC<{ currentUser: CurrentUser | undefined async onOk() { if (info.file.ImageId) { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000') + // const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000') + const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '', '6000') deleteLoading() if (success) { @@ -1390,7 +1391,8 @@ const ShoppingMallProductSearch: React.FC<{ currentUser: CurrentUser | undefined async onOk() { if (info.file.ImageId) { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000') + // const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000') + const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '', '6000') deleteLoading() if (success) { @@ -1449,7 +1451,8 @@ const ShoppingMallProductSearch: React.FC<{ currentUser: CurrentUser | undefined async onOk() { if (info.file.ImageId) { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000') + // const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000') + const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '', '6000') deleteLoading() if (success) { diff --git a/src/pages/travelMember/scenicSpotConfig/index.tsx b/src/pages/travelMember/scenicSpotConfig/index.tsx index f11a672..b278b06 100644 --- a/src/pages/travelMember/scenicSpotConfig/index.tsx +++ b/src/pages/travelMember/scenicSpotConfig/index.tsx @@ -24,7 +24,7 @@ import { getFieldEnumTree, getFieldEnumName } from "@/services/options"; // 枚 import PageTitleBox from "@/components/PageTitleBox"; import { handeDeleteSCENICAREA, handeGetSCENICAREAList, handeSynchroSCENICAREA } from '../service'; import session from '@/utils/session'; -import { deletePicture, uploadPicture } from '@/services/picture'; +import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from '@/services/picture'; import ModalFooter from './component/modalFooter'; import { handleSetlogSave } from '@/utils/format'; import { highlightText } from '@/utils/highlightText'; @@ -366,7 +366,7 @@ const scenicSpotConfig: React.FC<{ currentUser: CurrentUser | undefined }> = (pr formData.append('TableType', '1305'); console.log('formData', formData); - await uploadPicture(formData) + await uploadAHYDPicture(formData) } handleSetlogSave(`${currentRow?.SCENICAREA_ID ? `更新${currentRow?.SCENICAREA_NAME}景区` : `新增${data.Result_Data.SCENICAREA_NAME}`}信息`) @@ -713,7 +713,8 @@ const scenicSpotConfig: React.FC<{ currentUser: CurrentUser | undefined }> = (pr async onOk() { if (info.file.ImageId) { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '5000') + // const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '5000') + const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '', '5000') deleteLoading() if (success) { diff --git a/src/pages/travelMember/serverpartInfo/index.tsx b/src/pages/travelMember/serverpartInfo/index.tsx index 0f86e09..8713356 100644 --- a/src/pages/travelMember/serverpartInfo/index.tsx +++ b/src/pages/travelMember/serverpartInfo/index.tsx @@ -15,7 +15,7 @@ import useRequest from "@ahooksjs/use-request"; import { getServerpartTree } from "@/services/options"; import { handleSynchroNOTICEINFO } from "@/pages/basicManage/highwayHeadlines/service"; import ProForm, { ProFormText, ProFormUploadButton } from "@ant-design/pro-form"; -import { deletePicture, getPictureList, uploadPicture } from "@/services/picture"; +import { deleteAHYDPicture, deletePicture, getPictureList, uploadAHYDPicture, uploadPicture } from "@/services/picture"; import { handeGetPictureList } from "../service"; import SubMenu from "antd/lib/menu/SubMenu"; import Draggable from "react-draggable"; @@ -780,7 +780,7 @@ const serverpartInfo: React.FC<{ currentUser: CurrentUser }> = (props) => { formData.append('TableType', selectActiveKey === '1' ? '1123' : selectActiveKey === '2' ? '1131' : selectActiveKey === '3' ? '1131' : selectActiveKey === '4' ? '1131' : selectActiveKey === '5' ? '1131' : ''); console.log('formData', formData); - let res = await uploadPicture(formData) + let res = await uploadAHYDPicture(formData) console.log('resresresres', res); let serverpartObj = session.get('serverpartObj') if (res.Result_Code === 100) { @@ -911,7 +911,8 @@ const serverpartInfo: React.FC<{ currentUser: CurrentUser }> = (props) => { async onOk() { if (info.file.ImageId) { const deleteLoading = message.loading('正在删除...') - const success = await deletePicture(info.file?.ImagePath, info.file?.uid, selectActiveKey === '1' ? 'SERVERPART' : selectActiveKey === '2' ? 'SERVERPARTINFO' : selectActiveKey === '3' ? 'SERVERPARTINFO' : selectActiveKey === '4' ? 'SERVERPARTINFO' : selectActiveKey === '5' ? 'SERVERPARTINFO' : '', selectActiveKey === '1' ? '1123' : selectActiveKey === '2' ? '1131' : selectActiveKey === '3' ? '1131' : selectActiveKey === '4' ? '1131' : selectActiveKey === '5' ? '1131' : '') + // const success = await deletePicture(info.file?.ImagePath, info.file?.uid, selectActiveKey === '1' ? 'SERVERPART' : selectActiveKey === '2' ? 'SERVERPARTINFO' : selectActiveKey === '3' ? 'SERVERPARTINFO' : selectActiveKey === '4' ? 'SERVERPARTINFO' : selectActiveKey === '5' ? 'SERVERPARTINFO' : '', selectActiveKey === '1' ? '1123' : selectActiveKey === '2' ? '1131' : selectActiveKey === '3' ? '1131' : selectActiveKey === '4' ? '1131' : selectActiveKey === '5' ? '1131' : '') + const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, selectActiveKey === '1' ? 'SERVERPART' : selectActiveKey === '2' ? 'SERVERPARTINFO' : selectActiveKey === '3' ? 'SERVERPARTINFO' : selectActiveKey === '4' ? 'SERVERPARTINFO' : selectActiveKey === '5' ? 'SERVERPARTINFO' : '', selectActiveKey === '1' ? '1123' : selectActiveKey === '2' ? '1131' : selectActiveKey === '3' ? '1131' : selectActiveKey === '4' ? '1131' : selectActiveKey === '5' ? '1131' : '') deleteLoading() if (success) { diff --git a/src/services/picture.ts b/src/services/picture.ts index 890916f..6c0483a 100644 --- a/src/services/picture.ts +++ b/src/services/picture.ts @@ -53,6 +53,21 @@ export async function getPictureList(id: number, TableType?: string) { } return tableList(data.Result_Data); } + +// 删除图片 +export async function deleteAHYDPicture(imagepath: string, id: number, TableName?: string, TableType?: string) { + + const data = await requestAHYD(`/Picture/DeletePicture?imagepath=${imagepath}&imageid=${id}&TableName=${TableName || ''}&TableType=${TableType || ''}`, { + method: 'POST' + }) + + if (data.Result_Code !== 100) { + return false + } + + return true +} + // 删除图片 export async function deletePicture(imagepath: string, id: number, TableName?: string, TableType?: string) { diff --git a/src/versionEnv.ts b/src/versionEnv.ts index 41f471b..b2e2610 100644 --- a/src/versionEnv.ts +++ b/src/versionEnv.ts @@ -1,4 +1,4 @@ // 由 scripts/writeVersion.js 自动生成 -export const VERSION = "4.5.49"; -export const GIT_HASH = "f5c66f8"; -export const BUILD_TIME = "2025-09-05T01:51:31.828Z"; +export const VERSION = "4.5.50"; +export const GIT_HASH = "169c5fa"; +export const BUILD_TIME = "2025-09-05T11:01:12.391Z";