ylj/cloud-JG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ylj20011123 2025-09-05 19:13:20 +08:00
parent 169c5fad49
commit 1f62f3878b
48 changed files with 1993 additions and 1897 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "ant-design-pro", "name": "ant-design-pro",
"version": "4.5.49", "version": "4.5.50",
"private": true, "private": true,
"description": "An out-of-box UI solution for enterprise applications", "description": "An out-of-box UI solution for enterprise applications",
"scripts": { "scripts": {

92
public/static/uploadPhoto/index.html
View File

@ -2,24 +2,24 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>图片上传</title> <title>图片上传</title>
<!-- <script src="https://unpkg.com/vue@next"></script>--> <!-- <script src="https://unpkg.com/vue@next"></script>-->
<script src="js/vue.js"></script> <script src="js/vue.js"></script>
<!-- import CSS --> <!-- import CSS -->
<!-- <link rel="stylesheet" href="https://unpkg.com/element-plus@1.2.0-beta.5/dist/index.css">--> <!-- <link rel="stylesheet" href="https://unpkg.com/element-plus@1.2.0-beta.5/dist/index.css">-->
<link rel="stylesheet" href="css/element-plus@1.2.0-beta.5.index.css"> <link rel="stylesheet" href="css/element-plus@1.2.0-beta.5.index.css">
<link rel="stylesheet" href="css/index.css"> <link rel="stylesheet" href="css/index.css">
</link> </link>
<!-- import JavaScript --> <!-- import JavaScript -->
<!-- <script src="https://unpkg.com/element-plus@1.2.0-beta.5"></script>--> <!-- <script src="https://unpkg.com/element-plus@1.2.0-beta.5"></script>-->
<script src="js/element-plus@1.2.0-beta.5.dist.index.full.js"></script> <script src="js/element-plus@1.2.0-beta.5.dist.index.full.js"></script>
<script src="js/axios@0.26.0.min.js"></script> <script src="js/axios@0.26.0.min.js"></script>
</head> </head>
<body> <body>
@ -42,9 +42,9 @@
@click="submitUpload">保存单据</el-button> @click="submitUpload">保存单据</el-button>
</div> </div>
</el-upload> </el-upload>
<div class="upload-footer footer-tip" style="padding: 10px 0"> <div class="upload-footer footer-tip" style="padding: 10px 0">
注意：上传文件大小小于4M, 上传文件格式：jpg、png、gif 注意：上传文件大小小于4M, 上传文件格式：jpg、png、gif
</div> </div>
<div class="image-list" v-loading="loading"> <div class="image-list" v-loading="loading">
<el-empty description="还未上传凭证" v-if="!loading && !imageList.length"></el-empty> <el-empty description="还未上传凭证" v-if="!loading && !imageList.length"></el-empty>
@ -61,13 +61,33 @@
<span class="el-upload-list__item-actions"> <span class="el-upload-list__item-actions">
<span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)"> <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
<svg t="1646800324230" class="icon" viewBox="0 0 1024 1024" version="1.1" <svg t="1646800324230" class="icon" viewBox="0 0 1024 1024" version="1.1"
xmlns="http://www.w3.org/2000/svg" p-id="3120" width="20" height="20"><path d="M942.2 486.2C847.4 286.5 704.1 186 512 186c-192.2 0-335.4 100.5-430.2 300.3-7.7 16.2-7.7 35.2 0 51.5C176.6 737.5 319.9 838 512 838c192.2 0 335.4-100.5 430.2-300.3 7.7-16.2 7.7-35 0-51.5zM512 766c-161.3 0-279.4-81.8-362.7-254C232.6 339.8 350.7 258 512 258c161.3 0 279.4 81.8 362.7 254C791.5 684.2 673.4 766 512 766z" p-id="3121" fill="#ffffff"></path><path d="M508 336c-97.2 0-176 78.8-176 176s78.8 176 176 176 176-78.8 176-176-78.8-176-176-176z m0 288c-61.9 0-112-50.1-112-112s50.1-112 112-112 112 50.1 112 112-50.1 112-112 112z" p-id="3122" fill="#ffffff"></path></svg>预览 xmlns="http://www.w3.org/2000/svg" p-id="3120" width="20" height="20">
<path
d="M942.2 486.2C847.4 286.5 704.1 186 512 186c-192.2 0-335.4 100.5-430.2 300.3-7.7 16.2-7.7 35.2 0 51.5C176.6 737.5 319.9 838 512 838c192.2 0 335.4-100.5 430.2-300.3 7.7-16.2 7.7-35 0-51.5zM512 766c-161.3 0-279.4-81.8-362.7-254C232.6 339.8 350.7 258 512 258c161.3 0 279.4 81.8 362.7 254C791.5 684.2 673.4 766 512 766z"
p-id="3121" fill="#ffffff"></path>
<path
d="M508 336c-97.2 0-176 78.8-176 176s78.8 176 176 176 176-78.8 176-176-78.8-176-176-176z m0 288c-61.9 0-112-50.1-112-112s50.1-112 112-112 112 50.1 112 112-50.1 112-112 112z"
p-id="3122" fill="#ffffff"></path>
</svg>预览
</span> </span>
<span class="el-upload-list__item-delete" @click="handleRemove(file)" v-if="!readonly"> <span class="el-upload-list__item-delete" @click="handleRemove(file)" v-if="!readonly">
<svg t="1646799675443" class="icon" viewBox="0 0 1024 1024" version="1.1" <svg t="1646799675443" class="icon" viewBox="0 0 1024 1024" version="1.1"
xmlns="http://www.w3.org/2000/svg" p-id="2158" width="20" height="18"><path d="M768 384c-19.2 0-32 12.8-32 32l0 377.6c0 25.6-19.2 38.4-38.4 38.4L326.4 832c-25.6 0-38.4-19.2-38.4-38.4L288 416C288 396.8 275.2 384 256 384S224 396.8 224 416l0 377.6c0 57.6 44.8 102.4 102.4 102.4l364.8 0c57.6 0 102.4-44.8 102.4-102.4L793.6 416C800 396.8 787.2 384 768 384z" p-id="2159" fill="#ffffff"></path><path d="M460.8 736l0-320C460.8 396.8 448 384 435.2 384S396.8 396.8 396.8 416l0 320c0 19.2 12.8 32 32 32S460.8 755.2 460.8 736z" p-id="2160" fill="#ffffff"></path><path d="M627.2 736l0-320C627.2 396.8 608 384 588.8 384S563.2 396.8 563.2 416l0 320C563.2 755.2 576 768 588.8 768S627.2 755.2 627.2 736z" p-id="2161" fill="#ffffff"></path><path d="M832 256l-160 0L672 211.2C672 166.4 633.6 128 588.8 128L435.2 128C390.4 128 352 166.4 352 211.2L352 256 192 256C172.8 256 160 268.8 160 288S172.8 320 192 320l640 0c19.2 0 32-12.8 32-32S851.2 256 832 256zM416 211.2C416 198.4 422.4 192 435.2 192l153.6 0c12.8 0 19.2 6.4 19.2 19.2L608 256l-192 0L416 211.2z" p-id="2162" fill="#ffffff"></path></svg> xmlns="http://www.w3.org/2000/svg" p-id="2158" width="20" height="18">
<path
d="M768 384c-19.2 0-32 12.8-32 32l0 377.6c0 25.6-19.2 38.4-38.4 38.4L326.4 832c-25.6 0-38.4-19.2-38.4-38.4L288 416C288 396.8 275.2 384 256 384S224 396.8 224 416l0 377.6c0 57.6 44.8 102.4 102.4 102.4l364.8 0c57.6 0 102.4-44.8 102.4-102.4L793.6 416C800 396.8 787.2 384 768 384z"
p-id="2159" fill="#ffffff"></path>
<path
d="M460.8 736l0-320C460.8 396.8 448 384 435.2 384S396.8 396.8 396.8 416l0 320c0 19.2 12.8 32 32 32S460.8 755.2 460.8 736z"
p-id="2160" fill="#ffffff"></path>
<path
d="M627.2 736l0-320C627.2 396.8 608 384 588.8 384S563.2 396.8 563.2 416l0 320C563.2 755.2 576 768 588.8 768S627.2 755.2 627.2 736z"
p-id="2161" fill="#ffffff"></path>
<path
d="M832 256l-160 0L672 211.2C672 166.4 633.6 128 588.8 128L435.2 128C390.4 128 352 166.4 352 211.2L352 256 192 256C172.8 256 160 268.8 160 288S172.8 320 192 320l640 0c19.2 0 32-12.8 32-32S851.2 256 832 256zM416 211.2C416 198.4 422.4 192 435.2 192l153.6 0c12.8 0 19.2 6.4 19.2 19.2L608 256l-192 0L416 211.2z"
p-id="2162" fill="#ffffff"></path>
</svg>
删除 删除
</span> </span>
</span> </span>
@ -77,7 +97,7 @@
</el-upload> </el-upload>
</div> </div>
<el-image style="width: 0px;height: 0px;" ref="showPreviewRef" :src="url && url[previewIndex]" <el-image style="width: 0px;height: 0px;" ref="showPreviewRef" :src="url && url[previewIndex]"
:preview-src-list="url" :initial-index="previewIndex"> :preview-src-list="url" :initial-index="previewIndex">
</el-image> </el-image>
@ -113,7 +133,7 @@
const tableType = getreqstr('tabletype'); const tableType = getreqstr('tabletype');
const deleteType = getreqstr('deletetype'); const deleteType = getreqstr('deletetype');
const readonly = getreqstr('readonly') ? true : false; 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 uploadRef = ref(null)
let showPreviewRef = ref(null) let showPreviewRef = ref(null)
let filename = ref('') let filename = ref('')
@ -206,20 +226,20 @@
const handleRemove = (file) => { const handleRemove = (file) => {
var msg = "您真的确定要删除吗？\n\n请确认！"; var msg = "您真的确定要删除吗？\n\n请确认！";
if (confirm(msg)) { if (confirm(msg)) {
loading.value = true loading.value = true
// const index = url.value.findIndex(n => n === file.ImageUrl) // const index = url.value.findIndex(n => n === file.ImageUrl)
axios.get(actions + '/Picture/DeletePicture?imageid=' + file.ImageId + '&TableName=' + axios.get(actions + '/Picture/DeletePicture?imageid=' + file.ImageId + '&TableName=' +
tableName + '&TableType=' + deleteType + '&ImagePath=' + file.ImagePath).then(res => { tableName + '&TableType=' + deleteType + '&ImagePath=' + file.ImagePath).then(res => {
const data = res.data const data = res.data
imageList.value = [] imageList.value = []
if (data.Result_Code === 100) { if (data.Result_Code === 100) {
getImages(tableId) getImages(tableId)
ElMessage({ ElMessage({
type: 'success', type: 'success',
message: '删除成功!' message: '删除成功!'
}) })
} }
}) })
} }
} }
// 获取图片列表 // 获取图片列表

2057
src/pages/BussinessProject/components/PaymentConfirmTable.tsx
View File

File diff suppressed because it is too large Load Diff

4
src/pages/CardInformation/CardInformationManager/components/CardInfo.tsx
View File

@ -6,7 +6,7 @@ import ProForm, { ProFormDatePicker, ProFormSelect, ProFormText, ProFormTextArea
import { handeGetCOUPONDetail, handeGetWECHATAPPSIGNList } from "@/pages/travelMember/service"; import { handeGetCOUPONDetail, handeGetWECHATAPPSIGNList } from "@/pages/travelMember/service";
import session from "@/utils/session"; import session from "@/utils/session";
import { handleDeleteCOUPON, handleGetCOOPSHOP_RULEList, handleSynchroCOUPONService } from "../../service"; 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 { ExclamationCircleOutlined } from "@ant-design/icons";
import ModalFooter from "@/pages/travelMember/scenicSpotConfig/component/modalFooter"; import ModalFooter from "@/pages/travelMember/scenicSpotConfig/component/modalFooter";
import { handleSetlogSave } from "@/utils/format"; import { handleSetlogSave } from "@/utils/format";
@ -638,7 +638,7 @@ const CardInfo = ({ showDetail, currentRow, currentUser, parentRef, setShowDetai
formData.append('TableType', '1208'); formData.append('TableType', '1208');
formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : ''); formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : '');
if (info.filename) { if (info.filename) {
const success = await uploadPicture(formData) const success = await uploadAHYDPicture(formData)
if (success) { if (success) {
const list = [{ const list = [{
// uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败 // uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败

2
src/pages/CardInformation/CardInformationManager/index.tsx
View File

@ -833,7 +833,7 @@ const CardInformationManager: React.FC<{ currentUser: CurrentUser }> = (props) =
formData.append('TableType', '1208'); formData.append('TableType', '1208');
formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : ''); formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : '');
if (info.filename) { if (info.filename) {
const success = await uploadPicture(formData) const success = await uploadAHYDPicture(formData)
if (success) { if (success) {
const list = [{ const list = [{
// uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败 // uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败

7
src/pages/DataVerification/list/components/auditDetail.tsx
View File

@ -6,7 +6,7 @@ import {Col, Row, Image, Modal, Upload, Button, message} from "antd";
import ProTable from "@ant-design/pro-table"; import ProTable from "@ant-design/pro-table";
import {handleGetAuditDetail} from "@/pages/DataVerification/list/service"; import {handleGetAuditDetail} from "@/pages/DataVerification/list/service";
import moment from "moment"; 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"; 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('TableName', 'CHECKACCOUNT');
formData.append('TableId', tableId); formData.append('TableId', tableId);
const success = await uploadPicture(formData) const success = await uploadAHYDPicture(formData)
if (success) { if (success) {
return true return true
} }
@ -247,7 +247,8 @@ const auditDetail: React.FC<{isShow: boolean,rowDetail: any,currentDetail?: any,
onRemove={async (file)=>{ onRemove={async (file)=>{
console.log('file',file) console.log('file',file)
const list: any = [] 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) console.log('success',success)
picList.forEach((item=>{ picList.forEach((item=>{
if (item.uid!==file.uid){ if (item.uid!==file.uid){

6
src/pages/DataVerification/list/components/detailBasicInfo.tsx
View File

@ -3,7 +3,7 @@ import type { ConnectState } from "@/models/connect";
import ProForm, { ProFormText, ProFormTextArea } from "@ant-design/pro-form"; import ProForm, { ProFormText, ProFormTextArea } from "@ant-design/pro-form";
import { useRef } from "react"; import { useRef } from "react";
import billBasic from '@/assets/DataVerification/billBasic.png' 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 billSale from '@/assets/DataVerification/billSale.png'
import billCheck from '@/assets/DataVerification/billCheck.png' import billCheck from '@/assets/DataVerification/billCheck.png'
import ProTable from "@ant-design/pro-table"; import ProTable from "@ant-design/pro-table";
@ -31,7 +31,7 @@ type DetailProps = {
imgList: any; imgList: any;
formRef: 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 = [ const columns: any = [
{ {
dataIndex: 'Check_Info', dataIndex: 'Check_Info',
@ -477,7 +477,7 @@ const DetailBasicInfo = ({ formRef,imgList,handleGetShopPriceData, setShowChange
width={'100%'} width={'100%'}
height={370} 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={`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/ // http://saas.eshangtech.com/cloud/
: :

14
src/pages/account/company/components/CompanyInfo.tsx
View File

@ -12,7 +12,7 @@ import { Alert, Card, Col, Result, Row, Typography, Modal, Image, message, Form,
import { connect, history } from "umi"; import { connect, history } from "umi";
import { useRef, useState } from "react"; import { useRef, useState } from "react";
import { ExclamationCircleOutlined } from "@ant-design/icons"; 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 { getBase64 } from "@/utils/utils";
import { createPermissionProInst } from "../../center/sevice"; import { createPermissionProInst } from "../../center/sevice";
@ -219,7 +219,8 @@ const CompanyInfo: React.FC<{ currentUser?: CurrentUser, dispatch: Dispatch }> =
icon: <ExclamationCircleOutlined />, icon: <ExclamationCircleOutlined />,
async onOk() { async onOk() {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {
const files = [...fileList] const files = [...fileList]
@ -278,7 +279,8 @@ const CompanyInfo: React.FC<{ currentUser?: CurrentUser, dispatch: Dispatch }> =
icon: <ExclamationCircleOutlined />, icon: <ExclamationCircleOutlined />,
async onOk() { async onOk() {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {
const files = [...fileList] const files = [...fileList]
@ -386,7 +388,8 @@ const CompanyInfo: React.FC<{ currentUser?: CurrentUser, dispatch: Dispatch }> =
async onOk() { async onOk() {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {
@ -480,7 +483,8 @@ const CompanyInfo: React.FC<{ currentUser?: CurrentUser, dispatch: Dispatch }> =
icon: <ExclamationCircleOutlined />, icon: <ExclamationCircleOutlined />,
async onOk() { async onOk() {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {
const files = [...fileList] const files = [...fileList]

17
src/pages/basicManage/Brand/components/addEdit.tsx
View File

@ -50,7 +50,7 @@ const customUploadRequest = async (fileList: UploadFile[], tableId: string, imag
formData.append('ImageType', imageType); formData.append('ImageType', imageType);
formData.append('TableType', '1125'); formData.append('TableType', '1125');
formData.append('TableId', tableId); formData.append('TableId', tableId);
// const success = await uploadPicture(formData) // const success = await uploadAHYDPicture(formData)
const success = await uploadAHYDPicture(formData) const success = await uploadAHYDPicture(formData)
if (success) { if (success) {
return true return true
@ -531,7 +531,8 @@ const AddEdit = ({ clickType, modalVisible, handleCloseAddEdit, currentRow, hand
icon: <ExclamationCircleOutlined />, icon: <ExclamationCircleOutlined />,
async onOk() { async onOk() {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {
const files = [...list1001] const files = [...list1001]
@ -594,7 +595,8 @@ const AddEdit = ({ clickType, modalVisible, handleCloseAddEdit, currentRow, hand
icon: <ExclamationCircleOutlined />, icon: <ExclamationCircleOutlined />,
async onOk() { async onOk() {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {
const files = [...list1004] const files = [...list1004]
@ -658,7 +660,8 @@ const AddEdit = ({ clickType, modalVisible, handleCloseAddEdit, currentRow, hand
icon: <ExclamationCircleOutlined />, icon: <ExclamationCircleOutlined />,
async onOk() { async onOk() {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {
const files = [...list1005] const files = [...list1005]
@ -723,7 +726,8 @@ const AddEdit = ({ clickType, modalVisible, handleCloseAddEdit, currentRow, hand
icon: <ExclamationCircleOutlined />, icon: <ExclamationCircleOutlined />,
async onOk() { async onOk() {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {
const files = [...list1002] const files = [...list1002]
@ -789,7 +793,8 @@ const AddEdit = ({ clickType, modalVisible, handleCloseAddEdit, currentRow, hand
icon: <ExclamationCircleOutlined />, icon: <ExclamationCircleOutlined />,
async onOk() { async onOk() {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {
const files = [...list1003] const files = [...list1003]

7
src/pages/basicManage/QualificationDelay/index.tsx
View File

@ -29,7 +29,7 @@ import { getFieldEnum, getServerpartTree } from "@/services/options"; // 枚举
import { getList, delcommodity_temp, updatecommodity_temp } from './service'; import { getList, delcommodity_temp, updatecommodity_temp } from './service';
import { getBase64 } from '@/utils/utils'; 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 { UploadFile } from 'antd/es/upload/interface';
import type { PictureModel } from '@/services/options/typings'; import type { PictureModel } from '@/services/options/typings';
@ -83,7 +83,7 @@ const customUploadRequest = async (fileList: UploadFile[], tableId: string) => {
formData.append('Tabletype', '1114'); formData.append('Tabletype', '1114');
formData.append('TableId', tableId); formData.append('TableId', tableId);
const success = await uploadPicture(formData) const success = await uploadAHYDPicture(formData)
if (success) { if (success) {
return true return true
} }
@ -668,7 +668,8 @@ const Commodity_tempTable: React.FC<{ currentUser: CurrentUser | undefined }> =
icon: <ExclamationCircleOutlined />, icon: <ExclamationCircleOutlined />,
async onOk() { async onOk() {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {
const files = [...fileList] const files = [...fileList]

9
src/pages/basicManage/highwayHeadlines/index.tsx
View File

@ -17,7 +17,7 @@ import PageTitleBox from "@/components/PageTitleBox";
import { handleDeleteNOTICEINFO, handleGetNOTICEINFOList, handleSynchroNOTICEINFO } from "./service"; import { handleDeleteNOTICEINFO, handleGetNOTICEINFOList, handleSynchroNOTICEINFO } from "./service";
import moment from 'moment' import moment from 'moment'
import ProForm, { ProFormDatePicker, ProFormSelect, ProFormText, ProFormTextArea, ProFormTreeSelect, ProFormUploadButton } from "@ant-design/pro-form"; 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 { handleGetPictureList } from "@/pages/reports/settlementAccount/service";
import { truncate } from "lodash"; import { truncate } from "lodash";
import Popconfirm from "antd/es/popconfirm"; import Popconfirm from "antd/es/popconfirm";
@ -239,7 +239,7 @@ const highwayHeadlines: React.FC<{ currentUser: CurrentUser }> = (props) => {
}) })
formData.append('TableType', '1401'); formData.append('TableType', '1401');
formData.append('TableId', data.Result_Data.NOTICEINFO_ID.toString()); formData.append('TableId', data.Result_Data.NOTICEINFO_ID.toString());
// const success = await uploadPicture(formData) // const success = await uploadAHYDPicture(formData)
const success = await uploadAHYDPicture(formData) const success = await uploadAHYDPicture(formData)
console.log('success', success); console.log('success', success);
} }
@ -540,7 +540,8 @@ const highwayHeadlines: React.FC<{ currentUser: CurrentUser }> = (props) => {
icon: <ExclamationCircleOutlined />, icon: <ExclamationCircleOutlined />,
async onOk() { async onOk() {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {
@ -602,7 +603,7 @@ const highwayHeadlines: React.FC<{ currentUser: CurrentUser }> = (props) => {
// }) // })
// formData.append('TableType', '1401'); // formData.append('TableType', '1401');
// formData.append('TableId', currentRow?.NOTICEINFO_ID.toString()); // formData.append('TableId', currentRow?.NOTICEINFO_ID.toString());
// const success = await uploadPicture(formData) // const success = await uploadAHYDPicture(formData)
// console.log('success', success); // console.log('success', success);
// } // }
// } // }

4
src/pages/basicManage/serverpartAssets/component/assetsEditor.tsx
View File

@ -9,7 +9,7 @@ import HistoryTable from "./historyTable";
import ProForm, { ProFormSelect, ProFormText, ProFormTreeSelect, ProFormUploadButton } from "@ant-design/pro-form"; import ProForm, { ProFormSelect, ProFormText, ProFormTreeSelect, ProFormUploadButton } from "@ant-design/pro-form";
import { handleGetPictureList } from "@/pages/DataVerification/list/service"; import { handleGetPictureList } from "@/pages/DataVerification/list/service";
import { getFieldEnumTreeNoSession } from "@/services/options"; import { getFieldEnumTreeNoSession } from "@/services/options";
import { uploadPicture } from "@/services/picture"; import { uploadAHYDPicture, uploadPicture } from "@/services/picture";
import RelatedShop from "./relatedShop"; import RelatedShop from "./relatedShop";
type DetailProps = { type DetailProps = {
@ -832,7 +832,7 @@ const AssetsEditor = ({ onShow, handleClose, setOnShow, currentUser, id, parentR
console.log('formData', formData); console.log('formData', formData);
if (info.filename) { if (info.filename) {
const success = await uploadPicture(formData) const success = await uploadAHYDPicture(formData)
console.log('success', success); console.log('success', success);
if (success.Result_Code === 100) { if (success.Result_Code === 100) {

4
src/pages/basicManage/serverpartAssets/index.tsx
View File

@ -28,7 +28,7 @@ import Draggable from "react-draggable";
import RelatedShop from "./component/relatedShop"; import RelatedShop from "./component/relatedShop";
import AssetsDetail from "./component/assetsDetail"; import AssetsDetail from "./component/assetsDetail";
import { getBase64 } from "@/utils/utils"; 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 { handleGetPictureList } from "@/pages/DataVerification/list/service";
import Item from "antd/lib/list/Item"; import Item from "antd/lib/list/Item";
import HistoryTable from "./component/historyTable"; import HistoryTable from "./component/historyTable";
@ -1395,7 +1395,7 @@ const serverpartAssets: React.FC<{ currentUser: CurrentUser }> = (props) => {
console.log('formData', formData); console.log('formData', formData);
if (info.filename) { if (info.filename) {
const success = await uploadPicture(formData) const success = await uploadAHYDPicture(formData)
console.log('success', success); console.log('success', success);
if (success.Result_Code === 100) { if (success.Result_Code === 100) {

6
src/pages/busniess/PaymentConfirm/detail.tsx
View File

@ -26,7 +26,8 @@ import type { AccountReceivablesModel, PaymentConfirmModel, RemarksModel } from
import { getFieldEnum } from "@/services/options"; import { getFieldEnum } from "@/services/options";
import { import {
getPaymentConfirmList, getMerchantsReceivables, updatePaymentConfirm, uploadFile, getPaymentConfirmList, getMerchantsReceivables, updatePaymentConfirm, uploadFile,
savePaymentRecord, getRemarksList, updateSynchroRemarks, delPaymentConfirm savePaymentRecord, getRemarksList, updateSynchroRemarks, delPaymentConfirm,
uploadAHYDFile
} from "./service"; } from "./service";
import EditPaymentTable from "./components/EditPaymentTable"; import EditPaymentTable from "./components/EditPaymentTable";
@ -797,7 +798,8 @@ const MerchartsPayment: React.FC = (props: any) => {
formData.append('TableName', 'PAYMENTCONFIRM'); formData.append('TableName', 'PAYMENTCONFIRM');
formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : ''); formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : '');
if (info.filename) { if (info.filename) {
const success = await uploadFile(formData) // const success = await uploadFile(formData)
const success = await uploadAHYDFile(formData)
if (success) { if (success) {

7
src/pages/busniess/ShopExpense/components/fileDrawer.tsx
View File

@ -4,7 +4,7 @@ import { Drawer, Image, message, Modal } from "antd";
import ProForm, { ProFormUploadButton } from "@ant-design/pro-form"; import ProForm, { ProFormUploadButton } from "@ant-design/pro-form";
import { GetPictureListNormal } from "@/pages/supplier/inspectionReport/service"; import { GetPictureListNormal } from "@/pages/supplier/inspectionReport/service";
import { useState } from "react"; import { useState } from "react";
import { deletePicture, uploadPicture } from "@/services/picture"; import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from "@/services/picture";
import { ExclamationCircleOutlined } from "@ant-design/icons"; import { ExclamationCircleOutlined } from "@ant-design/icons";
type DetailProps = { type DetailProps = {
@ -115,7 +115,8 @@ const FileDrawer = ({ onShow, onFileCancel, currentRow, readOnly, isCanChange, p
icon: <ExclamationCircleOutlined />, icon: <ExclamationCircleOutlined />,
async onOk() { async onOk() {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {
@ -147,7 +148,7 @@ const FileDrawer = ({ onShow, onFileCancel, currentRow, readOnly, isCanChange, p
formData.append('TableType', '1129'); formData.append('TableType', '1129');
formData.append('TableId', currentRow?.SHOPEXPENSE_ID.toString()); formData.append('TableId', currentRow?.SHOPEXPENSE_ID.toString());
const success = await uploadPicture(formData) const success = await uploadAHYDPicture(formData)
console.log('success', success); console.log('success', success);
if (parentRef) { if (parentRef) {
parentRef.current?.reload() parentRef.current?.reload()

11
src/pages/busniess/ShopExpense/index.tsx
View File

@ -38,7 +38,7 @@ import { isNumber } from 'lodash';
import EditLog from './components/editLog'; import EditLog from './components/editLog';
import { uploadFile } from '../PaymentConfirm/service'; import { uploadFile } from '../PaymentConfirm/service';
import { GetPictureList, GetPictureListNormal, handleUploadPicture } from '@/pages/supplier/inspectionReport/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 http from '@/assets/supplier/http.png'
import httpBlue from '@/assets/supplier/httpBlue.png' import httpBlue from '@/assets/supplier/httpBlue.png'
import FileDrawer from './components/fileDrawer'; import FileDrawer from './components/fileDrawer';
@ -1259,7 +1259,7 @@ const SHOPEXPENSETablePage: React.FC<{
formData.append('ImageName', item.name); formData.append('ImageName', item.name);
}) })
formData.append('TableId', result?.SHOPEXPENSE_ID); formData.append('TableId', result?.SHOPEXPENSE_ID);
const success = await uploadPicture(formData) const success = await uploadAHYDPicture(formData)
console.log('success', success); console.log('success', success);
} }
handleModalVisible(false); handleModalVisible(false);
@ -1310,7 +1310,7 @@ const SHOPEXPENSETablePage: React.FC<{
}) })
formData.append('TableId', result?.SHOPEXPENSE_ID); formData.append('TableId', result?.SHOPEXPENSE_ID);
const success = await uploadPicture(formData) const success = await uploadAHYDPicture(formData)
console.log('success', success); console.log('success', success);
} }
@ -1554,7 +1554,8 @@ const SHOPEXPENSETablePage: React.FC<{
icon: <ExclamationCircleOutlined />, icon: <ExclamationCircleOutlined />,
async onOk() { async onOk() {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {
@ -1583,7 +1584,7 @@ const SHOPEXPENSETablePage: React.FC<{
formData.append('TableType', '1129'); formData.append('TableType', '1129');
formData.append('TableId', currentRow?.SHOPEXPENSE_ID.toString()); formData.append('TableId', currentRow?.SHOPEXPENSE_ID.toString());
const success = await uploadPicture(formData) const success = await uploadAHYDPicture(formData)
console.log('success', success); console.log('success', success);
await handleGetFileList(currentRow) await handleGetFileList(currentRow)
} }

58
src/pages/busniess/ShopExpenseFince/index.tsx
View File

@ -38,7 +38,7 @@ import { isNumber } from 'lodash';
import EditLog from './components/editLog'; import EditLog from './components/editLog';
import { uploadFile } from '../PaymentConfirm/service'; import { uploadFile } from '../PaymentConfirm/service';
import { GetPictureList, GetPictureListNormal, handleUploadPicture } from '@/pages/supplier/inspectionReport/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 http from '@/assets/supplier/http.png'
import httpBlue from '@/assets/supplier/httpBlue.png' import httpBlue from '@/assets/supplier/httpBlue.png'
import FileDrawer from './components/fileDrawer'; import FileDrawer from './components/fileDrawer';
@ -399,7 +399,7 @@ const SHOPEXPENSETablePage: React.FC<{
render: (_, record) => { render: (_, record) => {
// return record?.SHOPEXPENSE_TYPE ? SHOPEXPENSE_TYPEOBJ[record?.SHOPEXPENSE_TYPE] : '-' // return record?.SHOPEXPENSE_TYPE ? SHOPEXPENSE_TYPEOBJ[record?.SHOPEXPENSE_TYPE] : '-'
return <div> return <div>
<span>{record?.SHOPEXPENSE_TYPE&& SHOPEXPENSETYPEObj ? SHOPEXPENSETYPEObj[record?.SHOPEXPENSE_TYPE] : ''}</span> <span>{record?.SHOPEXPENSE_TYPE && SHOPEXPENSETYPEObj ? SHOPEXPENSETYPEObj[record?.SHOPEXPENSE_TYPE] : ''}</span>
{ {
record?.ChangeFlag ? record?.ChangeFlag ?
<Tooltip title={'有修改'}> <Tooltip title={'有修改'}>
@ -1257,7 +1257,7 @@ const SHOPEXPENSETablePage: React.FC<{
formData.append('ImageName', item.name); formData.append('ImageName', item.name);
}) })
formData.append('TableId', result?.SHOPEXPENSE_ID); formData.append('TableId', result?.SHOPEXPENSE_ID);
const success = await uploadPicture(formData) const success = await uploadAHYDPicture(formData)
console.log('success', success); console.log('success', success);
} }
handleModalVisible(false); handleModalVisible(false);
@ -1308,7 +1308,7 @@ const SHOPEXPENSETablePage: React.FC<{
}) })
formData.append('TableId', result?.SHOPEXPENSE_ID); formData.append('TableId', result?.SHOPEXPENSE_ID);
const success = await uploadPicture(formData) const success = await uploadAHYDPicture(formData)
console.log('success', success); console.log('success', success);
} }
@ -1541,32 +1541,42 @@ const SHOPEXPENSETablePage: React.FC<{
// 如果在待上传列表中找到，则说明当前图片没有上传服务器，可直接删除 // 如果在待上传列表中找到，则说明当前图片没有上传服务器，可直接删除
const index = fileList.findIndex(n => n.uid === info.file.uid); const index = fileList.findIndex(n => n.uid === info.file.uid);
if (info.file.imgUrl) {
confirm({
title: '确认删除该文件吗？',
icon: <ExclamationCircleOutlined />,
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" && ) { // if (info.file?.status === "removed" && ) {
// const newFileList = fileList.slice(); // const newFileList = fileList.slice();
// newFileList.splice(index, 1); // newFileList.splice(index, 1);
// setFileList(newFileList) // setFileList(newFileList)
// return // return
// } // }
confirm({
title: '确认删除该文件吗？',
icon: <ExclamationCircleOutlined />,
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 { } else {
if (currentRow?.SHOPEXPENSE_ID && info.fileList && info.fileList.length > 0) { if (currentRow?.SHOPEXPENSE_ID && info.fileList && info.fileList.length > 0) {
@ -1581,7 +1591,7 @@ const SHOPEXPENSETablePage: React.FC<{
formData.append('TableType', '1129'); formData.append('TableType', '1129');
formData.append('TableId', currentRow?.SHOPEXPENSE_ID.toString()); formData.append('TableId', currentRow?.SHOPEXPENSE_ID.toString());
const success = await uploadPicture(formData) const success = await uploadAHYDPicture(formData)
console.log('success', success); console.log('success', success);
await handleGetFileList(currentRow) await handleGetFileList(currentRow)
} }

4
src/pages/contract/components/detail.tsx
View File

@ -506,7 +506,7 @@ const ContractDetail = ({ contractId, currentRow, clickedId }: { contractId: num
console.log('item', item); console.log('item', item);
console.log('historyList.current', historyList.current); console.log('historyList.current', historyList.current);
console.log('clickedId', clickedId); 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)) let list: any = JSON.parse(JSON.stringify(clickedId))
list.push(item.REGISTERCOMPACT_ID) list.push(item.REGISTERCOMPACT_ID)
historyList.current = list historyList.current = list
@ -824,7 +824,7 @@ const ContractDetail = ({ contractId, currentRow, clickedId }: { contractId: num
closable={false} closable={false}
bodyStyle={{ backgroundColor: "#f9f9f9", padding: 0 }} bodyStyle={{ backgroundColor: "#f9f9f9", padding: 0 }}
> >
<ContractDetail contractId={childrenRow?.REGISTERCOMPACT_ID} clickedId={historyList.current}/> <ContractDetail contractId={childrenRow?.REGISTERCOMPACT_ID} clickedId={historyList.current} />
</Drawer> </Drawer>
{/* 日志抽屉 */} {/* 日志抽屉 */}

7
src/pages/contract/components/editor.tsx
View File

@ -60,7 +60,7 @@ import {
} from '../service'; } from '../service';
import { getBase64 } from '@/utils/utils'; 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 { UploadFile } from 'antd/es/upload/interface';
import type { PictureModel } from '@/services/options/typings'; import type { PictureModel } from '@/services/options/typings';
@ -123,7 +123,7 @@ const customUploadRequest = async (fileList: UploadFile[], tableId: string) => {
}); });
formData.append('TableType', '1115'); formData.append('TableType', '1115');
formData.append('TableId', tableId); formData.append('TableId', tableId);
const success = await uploadPicture(formData) const success = await uploadAHYDPicture(formData)
if (success) { if (success) {
return true return true
} }
@ -641,7 +641,8 @@ const EditContract = ({ contractId: id, actionRef, setShowDetail, showDelete, cu
icon: <ExclamationCircleOutlined />, icon: <ExclamationCircleOutlined />,
async onOk() { async onOk() {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {
const files = [...fileList] const files = [...fileList]

7
src/pages/contract/list.tsx
View File

@ -29,7 +29,7 @@ import { delCompact, getList, handleContractSupple } from "./service";
import ProForm, { ProFormDatePicker, ProFormSelect, ProFormTextArea, ProFormUploadButton } from "@ant-design/pro-form"; import ProForm, { ProFormDatePicker, ProFormSelect, ProFormTextArea, ProFormUploadButton } from "@ant-design/pro-form";
import { getProjectList } from "@/pages/BussinessProject/service"; import { getProjectList } from "@/pages/BussinessProject/service";
import useRequest from "@ahooksjs/use-request"; 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 type { UploadFile } from "antd/es/upload/interface";
import fileIcon from '@/assets/detail/fileIcon.svg' import fileIcon from '@/assets/detail/fileIcon.svg'
import session from "@/utils/session"; import session from "@/utils/session";
@ -67,7 +67,7 @@ const customUploadRequest = async (fileList: UploadFile[], tableId: string) => {
}); });
formData.append('TableType', '1115'); formData.append('TableType', '1115');
formData.append('TableId', tableId); formData.append('TableId', tableId);
const success = await uploadPicture(formData) const success = await uploadAHYDPicture(formData)
if (success) { if (success) {
return true return true
} }
@ -799,7 +799,8 @@ const ContractTable: React.FC<{ currentUser: CurrentUser }> = (props) => {
icon: <ExclamationCircleOutlined />, icon: <ExclamationCircleOutlined />,
async onOk() { async onOk() {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {
const files = [...fileList] const files = [...fileList]

2
src/pages/market/marketResearch/index.tsx
View File

@ -292,7 +292,7 @@ const marketResearch: React.FC<{ currentUser: CurrentUser }> = (props) => {
}) })
formData.append('TableId', id) formData.append('TableId', id)
formData.append('TableType', '1128') formData.append('TableType', '1128')
const data = await handleUploadPicture(formData) const data = await handleuploadAHYDPicture(formData)
console.log('data', data) console.log('data', data)
} }
} }

5
src/pages/merchantManagement/Shops/components/AddShopModal.tsx
View File

@ -19,7 +19,7 @@ import type { PermissionApplyModel, PermissionProinstModel } from "@/pages/accou
import { getServerpartOption } from "@/services/options"; import { getServerpartOption } from "@/services/options";
import { createPermissionProInst } from "@/pages/account/center/sevice"; import { createPermissionProInst } from "@/pages/account/center/sevice";
import { ExclamationCircleOutlined } from "@ant-design/icons"; import { ExclamationCircleOutlined } from "@ant-design/icons";
import { deletePicture, SavePicture } from '@/services/picture'; import { deleteAHYDPicture, deletePicture, SavePicture } from '@/services/picture';
const { confirm } = Modal const { confirm } = Modal
type ShopProps = { type ShopProps = {
@ -222,7 +222,8 @@ const AddShopModal: React.FC<ShopProps> = ({ currentUser, createModalVisible, ha
async onOk() { async onOk() {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {

7
src/pages/merchantManagement/brand/index.tsx
View File

@ -28,7 +28,7 @@ import { getTreeSelectOption } from '@/utils/format';
import { ExclamationCircleOutlined } from "@ant-design/icons"; import { ExclamationCircleOutlined } from "@ant-design/icons";
import React from "react"; import React from "react";
import Draggable from "react-draggable"; import Draggable from "react-draggable";
import { uploadFile } from "@/pages/busniess/PaymentConfirm/service"; import { uploadAHYDFile, uploadFile } from "@/pages/busniess/PaymentConfirm/service";
const { confirm } = Modal; const { confirm } = Modal;
@ -288,7 +288,7 @@ const BrandTable: React.FC = () => {
setCurrentRow(undefined); setCurrentRow(undefined);
setShowDetail(false); setShowDetail(false);
}} }}
bodyStyle={{backgroundColor: "#f9f9f9", padding: 16}} bodyStyle={{ backgroundColor: "#f9f9f9", padding: 16 }}
closable={false} closable={false}
> >
{currentRow?.BRAND_NAME && ( {currentRow?.BRAND_NAME && (
@ -488,7 +488,8 @@ const BrandTable: React.FC = () => {
formData.append('TableName', 'BRAND'); formData.append('TableName', 'BRAND');
formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : ''); formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : '');
if (info.filename) { if (info.filename) {
const success = await uploadFile(formData) // const success = await uploadFile(formData)
const success = await uploadAHYDFile(formData)
if (success) { if (success) {
const list = [{ const list = [{
uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败 uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败

9
src/pages/merchantManagement/supplier/Management/index.tsx
View File

@ -18,7 +18,7 @@ import type { CurrentUser } from 'umi';
import { getSupplierList, delSupplier, updateSupplier, getSupplierDetail, getBusinessManList } from './service'; import { getSupplierList, delSupplier, updateSupplier, getSupplierDetail, getBusinessManList } from './service';
import type { UploadFile } from 'antd/lib/upload/interface'; 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 { getQualificationList } from '../Qualifications/service';
import { groupBy } from 'lodash'; import { groupBy } from 'lodash';
import type { QualificationModel } from '../Qualifications/data'; import type { QualificationModel } from '../Qualifications/data';
@ -74,7 +74,7 @@ const customUploadRequest = async (fileList: UploadFile[], tableId: string) => {
formData.append('TableName', 'SUPPLIER'); formData.append('TableName', 'SUPPLIER');
formData.append('TableId', tableId); formData.append('TableId', tableId);
const success = await uploadPicture(formData) const success = await uploadAHYDPicture(formData)
if (success) { if (success) {
return true return true
} }
@ -355,7 +355,7 @@ const SupplierTable: React.FC<{ currentUser?: CurrentUser }> = ({ currentUser })
}} }}
/></Tooltip> </>} /></Tooltip> </>}
actionRef={actionRef} actionRef={actionRef}
search={{ span: 6 ,labelWidth:'auto'}} search={{ span: 6, labelWidth: 'auto' }}
request={async (params) => { request={async (params) => {
const searchUser = currentUser?.UserPattern === 2000 ? { OWNERUNIT_ID: currentUser?.BusinessManID } : { PROVINCE_CODE: currentUser?.ProvinceCode } const searchUser = currentUser?.UserPattern === 2000 ? { OWNERUNIT_ID: currentUser?.BusinessManID } : { PROVINCE_CODE: currentUser?.ProvinceCode }
const data = await getSupplierList({ const data = await getSupplierList({
@ -708,7 +708,8 @@ const SupplierTable: React.FC<{ currentUser?: CurrentUser }> = ({ currentUser })
async onOk() { async onOk() {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {

7
src/pages/merchantManagement/supplier/Qualifications/index.tsx
View File

@ -19,7 +19,7 @@ import type { PictureModel } from '@/services/options/typings';
import { getQualificationList, delQualification, updateQualification, getQualificationDetail, relateBusinessCommodity } from './service'; import { getQualificationList, delQualification, updateQualification, getQualificationDetail, relateBusinessCommodity } from './service';
import { getSupplierList } from '../Management/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 { getFieldEnum } from '@/services/options';
import { transferImg } from '@/utils/format'; import { transferImg } from '@/utils/format';
import { getBase64 } from '@/utils/utils'; import { getBase64 } from '@/utils/utils';
@ -93,7 +93,7 @@ const customUploadRequest = async (fileList: UploadFile[], tableId: string) => {
formData.append('TableName', 'QUALIFICATION'); formData.append('TableName', 'QUALIFICATION');
formData.append('TableId', tableId); formData.append('TableId', tableId);
const success = await uploadPicture(formData) const success = await uploadAHYDPicture(formData)
if (success) { if (success) {
return true return true
} }
@ -701,7 +701,8 @@ const CommdityTable: React.FC<{ currentUser?: CurrentUser }> = ({ currentUser })
icon: <ExclamationCircleOutlined />, icon: <ExclamationCircleOutlined />,
async onOk() { async onOk() {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {

17
src/pages/operatingMerchants/MerchantInformation/index.tsx
View File

@ -24,7 +24,7 @@ import LeftSelectTree from '@/pages/reports/settlementAccount/component/leftSele
import session from '@/utils/session'; import session from '@/utils/session';
import PageTitleBox from '@/components/PageTitleBox'; import PageTitleBox from '@/components/PageTitleBox';
import { handeDeleteSERVERPARTSELLER, handeGetCOMMENTList, handeGetPictureList, handeGetRevenueReport } from '@/pages/travelMember/service'; 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 { handleGetServerPartShopNewList } from '@/pages/basicManage/serviceArea/service';
import { handleGetServerpartShopList } from '@/pages/DataVerification/service'; import { handleGetServerpartShopList } from '@/pages/DataVerification/service';
import ModalFooter from '@/pages/travelMember/scenicSpotConfig/component/modalFooter'; 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('imageType', "1000");
formData.append('TableType', "1204"); formData.append('TableType', "1204");
let res = await uploadPicture(formData) let res = await uploadAHYDPicture(formData)
} }
if (formValue.DoorImage && formValue.DoorImage.length > 0) { if (formValue.DoorImage && formValue.DoorImage.length > 0) {
@ -714,7 +714,7 @@ const MerchantInformation: React.FC<{ currentUser: CurrentUser | undefined }> =
formData.append('imageType', "2000"); formData.append('imageType', "2000");
formData.append('TableType', "1204"); formData.append('TableType', "1204");
let res = await uploadPicture(formData) let res = await uploadAHYDPicture(formData)
} }
if (formValue.InteriorImage && formValue.InteriorImage.length > 0) { if (formValue.InteriorImage && formValue.InteriorImage.length > 0) {
@ -727,7 +727,7 @@ const MerchantInformation: React.FC<{ currentUser: CurrentUser | undefined }> =
formData.append('imageType', "3000"); formData.append('imageType', "3000");
formData.append('TableType', "1204"); 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() { async onOk() {
if (info.file.ImageId) { if (info.file.ImageId) {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {
@ -1730,7 +1731,8 @@ const MerchantInformation: React.FC<{ currentUser: CurrentUser | undefined }> =
async onOk() { async onOk() {
if (info.file.ImageId) { if (info.file.ImageId) {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {
@ -1779,7 +1781,8 @@ const MerchantInformation: React.FC<{ currentUser: CurrentUser | undefined }> =
async onOk() { async onOk() {
if (info.file.ImageId) { if (info.file.ImageId) {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {

7
src/pages/reports/contractWarningQuery/index.tsx
View File

@ -17,7 +17,7 @@ import { exportExcel, getBase64 } from '@/utils/utils';
import ProForm, { ProFormDatePicker, ProFormSelect, ProFormTextArea, ProFormUploadButton } from "@ant-design/pro-form"; import ProForm, { ProFormDatePicker, ProFormSelect, ProFormTextArea, ProFormUploadButton } from "@ant-design/pro-form";
import { getProjectList } from "@/pages/BussinessProject/service"; import { getProjectList } from "@/pages/BussinessProject/service";
import useRequest from "@ahooksjs/use-request"; 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 type { UploadFile } from "antd/es/upload/interface";
import fileIcon from '@/assets/detail/fileIcon.svg' import fileIcon from '@/assets/detail/fileIcon.svg'
import session from "@/utils/session"; import session from "@/utils/session";
@ -61,7 +61,7 @@ const customUploadRequest = async (fileList: UploadFile[], tableId: string) => {
}); });
formData.append('TableType', '1115'); formData.append('TableType', '1115');
formData.append('TableId', tableId); formData.append('TableId', tableId);
const success = await uploadPicture(formData) const success = await uploadAHYDPicture(formData)
if (success) { if (success) {
return true return true
} }
@ -919,7 +919,8 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) =>
icon: <ExclamationCircleOutlined />, icon: <ExclamationCircleOutlined />,
async onOk() { async onOk() {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {
const files = [...fileList] const files = [...fileList]

9
src/pages/reports/revenueConfirmation/components/compareList.tsx
View File

@ -46,7 +46,7 @@ import { handleGetAPPROVALROUTEList } from "@/pages/Setting/serviceConfig/servic
import { handleSolidProjectRevenue } from "../../revenueDifference/service"; import { handleSolidProjectRevenue } from "../../revenueDifference/service";
import MonthSettlement from "./monthSettlement"; import MonthSettlement from "./monthSettlement";
import MonthTopTable from "./monthTopTable"; 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 { ExclamationCircleOutlined } from "@ant-design/icons";
import { handleGetPictureList, handleGetProjectExpenseList } from "../../settlementAccount/service"; import { handleGetPictureList, handleGetProjectExpenseList } from "../../settlementAccount/service";
import PrintContent from "../../settlementAccount/component/printContent"; import PrintContent from "../../settlementAccount/component/printContent";
@ -3750,7 +3750,7 @@ const compareList: React.FC<{
}) })
formData.append('TableType', '1130'); formData.append('TableType', '1130');
formData.append('TableId', detail?.BUSINESSAPPROVAL_ID); formData.append('TableId', detail?.BUSINESSAPPROVAL_ID);
const success = await uploadPicture(formData) const success = await uploadAHYDPicture(formData)
console.log('success', success); console.log('success', success);
} }
@ -4118,7 +4118,8 @@ const compareList: React.FC<{
icon: <ExclamationCircleOutlined />, icon: <ExclamationCircleOutlined />,
async onOk() { async onOk() {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {
@ -4147,7 +4148,7 @@ const compareList: React.FC<{
formData.append('TableType', '1130'); formData.append('TableType', '1130');
formData.append('TableId', compareCurrent?.BUSINESSAPPROVAL_ID); formData.append('TableId', compareCurrent?.BUSINESSAPPROVAL_ID);
const success = await uploadPicture(formData) const success = await uploadAHYDPicture(formData)
console.log('success', success); console.log('success', success);
if (success) { if (success) {
message.success("上传成功！") message.success("上传成功！")

7
src/pages/reports/settlementAccount/component/YearExamineDetailTable.tsx
View File

@ -18,7 +18,7 @@ import './YearExamineDetailTable.less'
import ProForm, { ProFormDateRangePicker, ProFormDigit, ProFormList, ProFormUploadButton } from "@ant-design/pro-form"; import ProForm, { ProFormDateRangePicker, ProFormDigit, ProFormList, ProFormUploadButton } from "@ant-design/pro-form";
import { handleGetPictureList, handleRebuildClosedPeriod, handleRebuildReductionPeriod } from "../service"; import { handleGetPictureList, handleRebuildClosedPeriod, handleRebuildReductionPeriod } from "../service";
import { ExclamationCircleOutlined, MinusCircleOutlined, PlusOutlined } from "@ant-design/icons"; 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 PrintContent from "./printContent";
import { handleHighPrecision } from "@/utils/utils"; import { handleHighPrecision } from "@/utils/utils";
import HistoricalProjects from "./HistoricalProjects"; import HistoricalProjects from "./HistoricalProjects";
@ -3030,7 +3030,8 @@ const YearExamineDetailTable = ({ parentRow, currentApprovalstate, onRef, setIsS
icon: <ExclamationCircleOutlined />, icon: <ExclamationCircleOutlined />,
async onOk() { async onOk() {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {
@ -3059,7 +3060,7 @@ const YearExamineDetailTable = ({ parentRow, currentApprovalstate, onRef, setIsS
formData.append('TableType', '1130'); formData.append('TableType', '1130');
formData.append('TableId', parentRow?.BUSINESSAPPROVAL_ID); formData.append('TableId', parentRow?.BUSINESSAPPROVAL_ID);
const success = await uploadPicture(formData) const success = await uploadAHYDPicture(formData)
console.log('success', success); console.log('success', success);
if (success) { if (success) {
message.success("上传成功！") message.success("上传成功！")

4
src/pages/reports/settlementAccount/component/yearExamineProcess.tsx
View File

@ -18,7 +18,7 @@ import { handleApproveAccount, handleApproveMonthAccountProinst, handleRejectAcc
import React from "react"; import React from "react";
import { handleCreateSettlement, handleSynchroRevenueConfirmList } from "@/pages/reports/settlementDetail/service"; import { handleCreateSettlement, handleSynchroRevenueConfirmList } from "@/pages/reports/settlementDetail/service";
import Item from "antd/lib/list/Item"; 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"; import { getProjectDetail } from "@/pages/BussinessProject/service";
const { confirm } = Modal; const { confirm } = Modal;
@ -399,7 +399,7 @@ const YearExamineProcess = ({ currentUser, onShow, setOnShow, parentRow, setPare
}) })
formData.append('TableType', '1130'); formData.append('TableType', '1130');
formData.append('TableId', detail?.BUSINESSAPPROVAL_ID); formData.append('TableId', detail?.BUSINESSAPPROVAL_ID);
const success = await uploadPicture(formData) const success = await uploadAHYDPicture(formData)
console.log('success', success); console.log('success', success);
} }

108
src/pages/supplier/inspectionReport/index.tsx
View File

@ -1,51 +1,52 @@
import type { FormInstance} from "antd"; import type { FormInstance } from "antd";
import {Button, Col, message, Row, Upload, Image, Popconfirm,DatePicker} from "antd"; import { Button, Col, message, Row, Upload, Image, Popconfirm, DatePicker } from "antd";
import React, {useEffect, useRef, useState} from "react"; import React, { useEffect, useRef, useState } from "react";
import './index.less' import './index.less'
import {UploadOutlined} from "@ant-design/icons"; import { UploadOutlined } from "@ant-design/icons";
import ProForm, {ProFormDatePicker, ProFormText, ProFormUploadButton} from "@ant-design/pro-form"; import ProForm, { ProFormDatePicker, ProFormText, ProFormUploadButton } from "@ant-design/pro-form";
import { import {
deletePicture, deletePicture,
GetPictureList, GetPictureList,
handleUploadPicture handleUploadPicture
} from "@/pages/supplier/inspectionReport/service"; } from "@/pages/supplier/inspectionReport/service";
import type {CurrentUser} from "@/models/user"; import type { CurrentUser } from "@/models/user";
import {connect} from "umi"; import { connect } from "umi";
import type {ConnectState} from "@/models/connect"; import type { ConnectState } from "@/models/connect";
import moment from "moment"; import moment from "moment";
import LoadingBox from "@/pages/reports/Finance/businessAnalysis/components/loading"; 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<FormInstance>(); const formRef = useRef<FormInstance>();
const [pictureList,setPictureList] = useState<any>() const [pictureList, setPictureList] = useState<any>()
const [pictureListLoading,setPictureListLoading] = useState<any>(false) const [pictureListLoading, setPictureListLoading] = useState<any>(false)
// 开始保存 // 开始保存
const [saveLoading,setSaveLoading] = useState<boolean>(false) const [saveLoading, setSaveLoading] = useState<boolean>(false)
// 查询时间 // 查询时间
const [searchDate,setSearchDate] = useState<any>(moment()) const [searchDate, setSearchDate] = useState<any>(moment())
// 获得图片列表 // 获得图片列表
const handleGetPictureList = async (time?: any)=>{ const handleGetPictureList = async (time?: any) => {
setPictureListLoading(true) setPictureListLoading(true)
const req: any = { const req: any = {
TableId: currentUser?.SupplierID, TableId: currentUser?.SupplierID,
TableType: 1127, 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) const data = await GetPictureList(req)
console.log('data',data) console.log('data', data)
if (data && data.length>0){ if (data && data.length > 0) {
setPictureList(data) setPictureList(data)
}else{ } else {
setPictureList([]) setPictureList([])
} }
setPictureListLoading(false) setPictureListLoading(false)
} }
useEffect(()=>{ useEffect(() => {
handleGetPictureList(searchDate) handleGetPictureList(searchDate)
},[]) }, [])
return ( return (
<div className={'InspectionReport'}> <div className={'InspectionReport'}>
@ -54,7 +55,7 @@ const InspectionReport: React.FC<{ currentUser?: CurrentUser}> = ({ currentUser
formRef={formRef} formRef={formRef}
// layout={'horizontal'} // layout={'horizontal'}
submitter={{ submitter={{
render:(_,record)=> { render: (_, record) => {
} }
}} }}
@ -68,14 +69,14 @@ const InspectionReport: React.FC<{ currentUser?: CurrentUser}> = ({ currentUser
name: 'file', name: 'file',
// actions: 'http://220.180.35.180:8000/EShangApiMain', // actions: 'http://220.180.35.180:8000/EShangApiMain',
beforeUpload: (file) => { beforeUpload: (file) => {
console.log('file',file) console.log('file', file)
const isLength = file.name.indexOf('.')<=19 const isLength = file.name.indexOf('.') <= 19
const isPNG = file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/jpeg'; const isPNG = file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/jpeg';
if (!isPNG) { if (!isPNG) {
message.error(`仅支持上传png、jpg、jpeg格式的图片文件！`); message.error(`仅支持上传png、jpg、jpeg格式的图片文件！`);
} }
if (!isLength){ if (!isLength) {
message.error(`文件名称过长！不大于20字`); message.error(`文件名称过长！不大于20字`);
} }
@ -119,30 +120,30 @@ const InspectionReport: React.FC<{ currentUser?: CurrentUser}> = ({ currentUser
/> />
</Col> </Col>
<Col span={6}> <Col span={6}>
<Button type={'primary'} loading={saveLoading} onClick={()=>{ <Button type={'primary'} loading={saveLoading} onClick={() => {
console.log('currentUser',currentUser) console.log('currentUser', currentUser)
formRef.current?.validateFields().then(async (res: any)=>{ formRef.current?.validateFields().then(async (res: any) => {
if (res){ if (res) {
setSaveLoading(true) setSaveLoading(true)
console.log('res',res) console.log('res', res)
const formData = new FormData() const formData = new FormData()
if (res.file && res.file.length>0){ if (res.file && res.file.length > 0) {
res.file.forEach((item: any)=>{ res.file.forEach((item: any) => {
formData.append('files[]',item.originFileObj) formData.append('files[]', item.originFileObj)
}) })
formData.append('TableId',currentUser?.SupplierID.toString()) formData.append('TableId', currentUser?.SupplierID.toString())
formData.append('TableType','1127') formData.append('TableType', '1127')
// formData.append('ImageName',res.fileName) // formData.append('ImageName',res.fileName)
formData.append('ImageType','2000') formData.append('ImageType', '2000')
formData.append('ImageIndex',res.time?moment(res.time).format('YYYYMMDD'):'') formData.append('ImageIndex', res.time ? moment(res.time).format('YYYYMMDD') : '')
} }
const data= await handleUploadPicture(formData) const data = await handleuploadAHYDPicture(formData)
console.log('data',data) console.log('data', data)
if (data.Result_Code===100){ if (data.Result_Code === 100) {
formRef.current?.resetFields() formRef.current?.resetFields()
message.success('保存成功！') message.success('保存成功！')
handleGetPictureList() handleGetPictureList()
}else{ } else {
message.error(data.Result_Desc) message.error(data.Result_Desc)
} }
setSaveLoading(false) setSaveLoading(false)
@ -154,21 +155,21 @@ const InspectionReport: React.FC<{ currentUser?: CurrentUser}> = ({ currentUser
</ProForm> </ProForm>
{/* 查询项 */} {/* 查询项 */}
<div style={{width:'100%',marginBottom:'12px'}}> <div style={{ width: '100%', marginBottom: '12px' }}>
<Row> <Row>
<Col span={6}> <Col span={6}>
<span>查询时间：</span> <span>查询时间：</span>
<DatePicker <DatePicker
disabledDate={(current: any) => current > moment()} disabledDate={(current: any) => current > moment()}
value={searchDate} value={searchDate}
onChange={(e: any)=>{ onChange={(e: any) => {
console.log('e',e) console.log('e', e)
setSearchDate(moment(e._d)) setSearchDate(moment(e._d))
}} }}
/> />
</Col> </Col>
<Col span={6}> <Col span={6}>
<Button type={'primary'} onClick={()=>{ <Button type={'primary'} onClick={() => {
handleGetPictureList() handleGetPictureList()
}}>查询</Button> }}>查询</Button>
</Col> </Col>
@ -178,12 +179,12 @@ const InspectionReport: React.FC<{ currentUser?: CurrentUser}> = ({ currentUser
{/* 图片展示的列表 */} {/* 图片展示的列表 */}
<div className={'pictureListBox'}> <div className={'pictureListBox'}>
{ {
pictureListLoading? pictureListLoading ?
<LoadingBox/>: <LoadingBox /> :
<div className={'imageItemListBox'} > <div className={'imageItemListBox'} >
{ {
pictureList && pictureList.length>0? pictureList && pictureList.length > 0 ?
pictureList.map((item: any)=>{ pictureList.map((item: any) => {
return <div className={'imageItem'}> return <div className={'imageItem'}>
<div className={'imgBox'}> <div className={'imgBox'}>
<Image <Image
@ -195,12 +196,13 @@ const InspectionReport: React.FC<{ currentUser?: CurrentUser}> = ({ currentUser
<div className={'imgBtn'}> <div className={'imgBtn'}>
<Popconfirm <Popconfirm
title="确认删除？" title="确认删除？"
onConfirm={async ()=>{ onConfirm={async () => {
const data = await deletePicture(item.ImagePath,item.ImageId,'',9000) // const data = await deletePicture(item.ImagePath,item.ImageId,'',9000)
if (data.Result_Code===100){ const data = await deleteAHYDPicture(item.ImagePath, item.ImageId, '', 9000)
if (data.Result_Code === 100) {
message.success('删除成功！') message.success('删除成功！')
handleGetPictureList() handleGetPictureList()
}else{ } else {
message.error(data.Result_Desc) message.error(data.Result_Desc)
} }
}} }}
@ -209,7 +211,7 @@ const InspectionReport: React.FC<{ currentUser?: CurrentUser}> = ({ currentUser
</Popconfirm> </Popconfirm>
</div> </div>
</div> </div>
}):'' }) : ''
} }
</div> </div>
} }

2
src/pages/supplier/inspectionReport/service.ts
View File

@ -2,7 +2,7 @@ import request from "@/utils/requestUpLoad";
import requestNormal from "@/utils/request"; import requestNormal from "@/utils/request";
// 上传图片 // 上传图片
export async function handleUploadPicture(params?: any) { export async function handleuploadAHYDPicture(params?: any) {
const data = await request(`/Picture/UploadPicture`, { const data = await request(`/Picture/UploadPicture`, {
method: 'POST', method: 'POST',
data: params data: params

1259
src/pages/supplier/supplierList/components/addNewShop.tsx
View File

File diff suppressed because it is too large Load Diff

7
src/pages/supplier/supplierList/list.tsx
View File

@ -35,7 +35,7 @@ import {
} from "@ant-design/pro-form"; } from "@ant-design/pro-form";
import useRequest from "@ahooksjs/use-request"; import useRequest from "@ahooksjs/use-request";
import { handleSupplierList } from "@/pages/Setting/Roles/service"; 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 type { QualificationModel } from "@/pages/merchantManagement/supplier/Qualifications/data";
import { getFieldEnum } from "@/services/options"; import { getFieldEnum } from "@/services/options";
import type { UploadFile } from "antd/es/upload/interface"; 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('TableName', 'QUALIFICATION');
formData.append('TableId', tableId); formData.append('TableId', tableId);
const success = await uploadPicture(formData) const success = await uploadAHYDPicture(formData)
if (success) { if (success) {
return true return true
} }
@ -1197,7 +1197,8 @@ const SupplierList: React.FC<{ currentUser: CurrentUser | undefined }> = ({ curr
icon: <ExclamationCircleOutlined />, icon: <ExclamationCircleOutlined />,
async onOk() { async onOk() {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {

4
src/pages/travelMember/HomepageAds/index.tsx
View File

@ -22,7 +22,7 @@ import type { FormInstance } from 'antd';
import PageTitleBox from '@/components/PageTitleBox'; import PageTitleBox from '@/components/PageTitleBox';
import { handeGetUSERDEFINEDTYPEList, handlDeleteUSERDEFINEDTYPE, handlSynchroUSERDEFINEDTYPE } from '../service'; import { handeGetUSERDEFINEDTYPEList, handlDeleteUSERDEFINEDTYPE, handlSynchroUSERDEFINEDTYPE } from '../service';
import { render } from 'react-dom'; import { render } from 'react-dom';
import { uploadPicture } from '@/services/picture'; import { uploadAHYDPicture, uploadPicture } from '@/services/picture';
import { handleSetlogSave } from '@/utils/format'; import { handleSetlogSave } from '@/utils/format';
import ModalFooter from '../scenicSpotConfig/component/modalFooter'; 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('TableType', selectTab === "1" ? '1214' : "1213");
formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : ''); formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : '');
if (info.filename) { if (info.filename) {
const success = await uploadPicture(formData) const success = await uploadAHYDPicture(formData)
if (success) { if (success) {
const list = [{ const list = [{
// uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败 // uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败

7
src/pages/travelMember/LostandFoundAPPliance/index.tsx
View File

@ -19,7 +19,7 @@ import ProForm, { ProFormDatePicker, ProFormDateRangePicker, ProFormSelect, ProF
import { handleGetPictureList } from "@/pages/reports/settlementAccount/service"; import { handleGetPictureList } from "@/pages/reports/settlementAccount/service";
import session from "@/utils/session"; import session from "@/utils/session";
import { handeDeleteSUGGESTION, handeGetPictureList, handeGetSUGGESTIONList, handeSynchroSUGGESTION } from "../service"; 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 beforeUpload = (file: any) => {
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png'; 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"); formData.append('TableType', "1306");
console.log('formData', formData); 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() { async onOk() {
if (info.file.ImageId) { if (info.file.ImageId) {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {

5
src/pages/travelMember/LostandFoundReview/index.tsx
View File

@ -10,7 +10,7 @@ import moment from 'moment'
import ProForm, { ProFormDatePicker, ProFormSelect, ProFormText, ProFormTextArea, ProFormUploadButton } from "@ant-design/pro-form"; import ProForm, { ProFormDatePicker, ProFormSelect, ProFormText, ProFormTextArea, ProFormUploadButton } from "@ant-design/pro-form";
import session from "@/utils/session"; import session from "@/utils/session";
import { ExclamationCircleOutlined } from "@ant-design/icons"; import { ExclamationCircleOutlined } from "@ant-design/icons";
import { deletePicture } from "@/services/picture"; import { deleteAHYDPicture, deletePicture } from "@/services/picture";
const beforeUpload = (file: any) => { const beforeUpload = (file: any) => {
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png'; const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
@ -364,7 +364,8 @@ const LostandFoundReview: React.FC<{ currentUser: CurrentUser | undefined }> = (
async onOk() { async onOk() {
if (info.file.ImageId) { if (info.file.ImageId) {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {

7
src/pages/travelMember/MallBrandManage/index.tsx
View File

@ -19,7 +19,7 @@ import Draggable from "react-draggable";
import ProForm, { ProFormDatePicker, ProFormDigit, ProFormMoney, ProFormSelect, ProFormText, ProFormTextArea, ProFormUploadButton } from "@ant-design/pro-form"; import ProForm, { ProFormDatePicker, ProFormDigit, ProFormMoney, ProFormSelect, ProFormText, ProFormTextArea, ProFormUploadButton } from "@ant-design/pro-form";
import moment from 'moment' import moment from 'moment'
import PageTitleBox from "@/components/PageTitleBox"; 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 { handleSetlogSave } from "@/utils/format";
import ModalFooter from "../scenicSpotConfig/component/modalFooter"; import ModalFooter from "../scenicSpotConfig/component/modalFooter";
import { highlightText } from "@/utils/highlightText"; import { highlightText } from "@/utils/highlightText";
@ -232,7 +232,7 @@ const MallBrandManage: React.FC<{ currentUser: CurrentUser }> = (props) => {
// formData.append('imageType', "1204"); // formData.append('imageType', "1204");
formData.append('TableType', "1125"); formData.append('TableType', "1125");
let imgRes = await uploadPicture(formData) let imgRes = await uploadAHYDPicture(formData)
console.log('imgResimgResimgResimgRes', imgRes); console.log('imgResimgResimgResimgRes', imgRes);
imgData = imgRes.Result_Data.ImageUrl imgData = imgRes.Result_Data.ImageUrl
} }
@ -576,7 +576,8 @@ const MallBrandManage: React.FC<{ currentUser: CurrentUser }> = (props) => {
async onOk() { async onOk() {
if (info.file.ImageId) { if (info.file.ImageId) {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {
const files = [...fileList] const files = [...fileList]

4
src/pages/travelMember/MallClassificationManage/index.tsx
View File

@ -23,7 +23,7 @@ import type { FormInstance } from 'antd';
import { getFieldEnumTree, getFieldEnumName } from "@/services/options"; // 枚举的引用，没有使用可以删除 import { getFieldEnumTree, getFieldEnumName } from "@/services/options"; // 枚举的引用，没有使用可以删除
import { handlDeleteUSERDEFINEDTYPE, handlGetUSERDEFINEDTYPEList, handlSynchroUSERDEFINEDTYPE } from '../service'; import { handlDeleteUSERDEFINEDTYPE, handlGetUSERDEFINEDTYPEList, handlSynchroUSERDEFINEDTYPE } from '../service';
import PageTitleBox from '@/components/PageTitleBox'; import PageTitleBox from '@/components/PageTitleBox';
import { uploadPicture } from '@/services/picture'; import { uploadAHYDPicture, uploadPicture } from '@/services/picture';
import defaultIcon from '../../../assets/brand/defaultIcon.png' import defaultIcon from '../../../assets/brand/defaultIcon.png'
import ModalFooter from '../scenicSpotConfig/component/modalFooter'; import ModalFooter from '../scenicSpotConfig/component/modalFooter';
import { handleSetlogSave } from '@/utils/format'; import { handleSetlogSave } from '@/utils/format';
@ -625,7 +625,7 @@ const MallClassificationManage: React.FC<{ currentUser: CurrentUser | undefined
formData.append('TableType', '1215'); formData.append('TableType', '1215');
formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : ''); formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : '');
if (info.filename) { if (info.filename) {
const success = await uploadPicture(formData) const success = await uploadAHYDPicture(formData)
if (success) { if (success) {
const list = [{ const list = [{
// uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败 // uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败

4
src/pages/travelMember/OrderCategoryManage/index.tsx
View File

@ -23,7 +23,7 @@ import type { FormInstance } from 'antd';
import { getFieldEnumTree, getFieldEnumName } from "@/services/options"; // 枚举的引用，没有使用可以删除 import { getFieldEnumTree, getFieldEnumName } from "@/services/options"; // 枚举的引用，没有使用可以删除
import { handlDeleteUSERDEFINEDTYPE, handlGetUSERDEFINEDTYPEList, handlSynchroUSERDEFINEDTYPE } from '../service'; import { handlDeleteUSERDEFINEDTYPE, handlGetUSERDEFINEDTYPEList, handlSynchroUSERDEFINEDTYPE } from '../service';
import PageTitleBox from '@/components/PageTitleBox'; import PageTitleBox from '@/components/PageTitleBox';
import { uploadPicture } from '@/services/picture'; import { uploadAHYDPicture, uploadPicture } from '@/services/picture';
import defaultIcon from '../../../assets/brand/defaultIcon.png' import defaultIcon from '../../../assets/brand/defaultIcon.png'
import classNames from 'classnames'; import classNames from 'classnames';
import ModalFooter from '../scenicSpotConfig/component/modalFooter'; import ModalFooter from '../scenicSpotConfig/component/modalFooter';
@ -613,7 +613,7 @@ const OrderCategoryManage: React.FC<{ currentUser: CurrentUser | undefined }> =
formData.append('TableType', '1215'); formData.append('TableType', '1215');
formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : ''); formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : '');
if (info.filename) { if (info.filename) {
const success = await uploadPicture(formData) const success = await uploadAHYDPicture(formData)
if (success) { if (success) {
const list = [{ const list = [{
// uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败 // uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败

5
src/pages/travelMember/OrderProductManage/index.tsx
View File

@ -23,7 +23,7 @@ import type { FormInstance } from 'antd';
import { getFieldEnumTree, getFieldEnumName } from "@/services/options"; // 枚举的引用，没有使用可以删除 import { getFieldEnumTree, getFieldEnumName } from "@/services/options"; // 枚举的引用，没有使用可以删除
import { handeDeleteCOMMODITY, handeGetBusinessCommodityList, handeGetCOMMODITYList, handeGetSellerCommodityList, handeSynchroCOMMODITY, handeSyncSellerCommodityInfo, handlDeleteUSERDEFINEDTYPE, handlGetUSERDEFINEDTYPEList, handlSynchroUSERDEFINEDTYPE } from '../service'; import { handeDeleteCOMMODITY, handeGetBusinessCommodityList, handeGetCOMMODITYList, handeGetSellerCommodityList, handeSynchroCOMMODITY, handeSyncSellerCommodityInfo, handlDeleteUSERDEFINEDTYPE, handlGetUSERDEFINEDTYPEList, handlSynchroUSERDEFINEDTYPE } from '../service';
import PageTitleBox from '@/components/PageTitleBox'; 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 defaultIcon from '../../../assets/brand/defaultIcon.png'
import OrderCategoryTree from './components/OrderCategoryTree'; import OrderCategoryTree from './components/OrderCategoryTree';
import OrderCategoryManage from '../OrderCategoryManage'; import OrderCategoryManage from '../OrderCategoryManage';
@ -859,7 +859,8 @@ const OrderProductManage: React.FC<{ currentUser: CurrentUser | undefined }> = (
async onOk() { async onOk() {
if (info.file.ImageId) { if (info.file.ImageId) {
const deleteLoading = message.loading('正在删除...') 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({ await handeSyncSellerCommodityInfo({
list: [{ list: [{
...currentRow, ...currentRow,

17
src/pages/travelMember/ProductListingManagement/index.tsx
View File

@ -26,7 +26,7 @@ import PageTitleBox from "@/components/PageTitleBox";
import LeftSelectMallType from './component/LeftSelectMallType'; import LeftSelectMallType from './component/LeftSelectMallType';
import { handeDeleteCOMMODITY, handeDeleteRTCOMMODITY_MULTI, handeGetCOMMODITY_MULTIList, handeGetCOMMODITYDetail, handeGetCOMMODITYList, handeGetMERCHANTSList, handeGetRTCOMMODITY_MULTIList, handeSetCommodityState, handeSynchroCOMMODITY, handeSynchroRTCOMMODITYMULTIList, handleGetBRANDList, handlGetUSERDEFINEDTYPEList } from '../service'; import { handeDeleteCOMMODITY, handeDeleteRTCOMMODITY_MULTI, handeGetCOMMODITY_MULTIList, handeGetCOMMODITYDetail, handeGetCOMMODITYList, handeGetMERCHANTSList, handeGetRTCOMMODITY_MULTIList, handeSetCommodityState, handeSynchroCOMMODITY, handeSynchroRTCOMMODITYMULTIList, handleGetBRANDList, handlGetUSERDEFINEDTYPEList } from '../service';
import session from '@/utils/session'; 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 { handleSetlogSave } from '@/utils/format';
import { highlightText } from '@/utils/highlightText'; import { highlightText } from '@/utils/highlightText';
@ -592,7 +592,7 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop
formData.append('TableType', "1207"); formData.append('TableType', "1207");
console.log('formData', formData); 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"); formData.append('TableType', "1207");
console.log('formData', formData); 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"); formData.append('TableType', "1207");
console.log('formData', formData); 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() { async onOk() {
if (info.file.ImageId) { if (info.file.ImageId) {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {
@ -1486,7 +1487,8 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop
async onOk() { async onOk() {
if (info.file.ImageId) { if (info.file.ImageId) {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {
@ -1545,7 +1547,8 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop
async onOk() { async onOk() {
if (info.file.ImageId) { if (info.file.ImageId) {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {

4
src/pages/travelMember/ProductSpecificationManage/index.tsx
View File

@ -26,7 +26,7 @@ import { handeDeleteCOMMODITY_MULTI, handeSynchroCOMMODITY_MULTI, handlDeleteUSE
import { render } from 'react-dom'; import { render } from 'react-dom';
import ModalFooter from '../scenicSpotConfig/component/modalFooter'; import ModalFooter from '../scenicSpotConfig/component/modalFooter';
import { handleSetlogSave } from '@/utils/format'; import { handleSetlogSave } from '@/utils/format';
import { uploadPicture } from '@/services/picture'; import { uploadAHYDPicture, uploadPicture } from '@/services/picture';
import defaultIcon from '../../../assets/brand/defaultIcon.png' import defaultIcon from '../../../assets/brand/defaultIcon.png'
import { highlightText } from '@/utils/highlightText'; import { highlightText } from '@/utils/highlightText';
@ -698,7 +698,7 @@ const ProductSpecificationManage: React.FC<{ currentUser: CurrentUser | undefine
formData.append('TableType', '1215'); formData.append('TableType', '1215');
formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : ''); formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : '');
if (info.filename) { if (info.filename) {
const success = await uploadPicture(formData) const success = await uploadAHYDPicture(formData)
if (success) { if (success) {
const list = [{ const list = [{
// uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败 // uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败

17
src/pages/travelMember/ShoppingMallProductSearch/index.tsx
View File

@ -25,7 +25,7 @@ import { getList, delcommodity, updatecommodity } from './service'; // 接口相
import PageTitleBox from "@/components/PageTitleBox"; import PageTitleBox from "@/components/PageTitleBox";
import { handeDeleteCOMMODITY, handeDeleteRTCOMMODITY_MULTI, handeGetCOMMODITY_MULTIList, handeGetCOMMODITYDetail, handeGetCOMMODITYList, handeGetMERCHANTSList, handeGetRTCOMMODITY_MULTIList, handeSynchroCOMMODITY, handeSynchroRTCOMMODITYMULTIList, handleGetBRANDList, handlGetUSERDEFINEDTYPEList } from '../service'; import { handeDeleteCOMMODITY, handeDeleteRTCOMMODITY_MULTI, handeGetCOMMODITY_MULTIList, handeGetCOMMODITYDetail, handeGetCOMMODITYList, handeGetMERCHANTSList, handeGetRTCOMMODITY_MULTIList, handeSynchroCOMMODITY, handeSynchroRTCOMMODITYMULTIList, handleGetBRANDList, handlGetUSERDEFINEDTYPEList } from '../service';
import session from '@/utils/session'; 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 LeftSelectMallType from '../ProductListingManagement/component/LeftSelectMallType';
import { handleSetlogSave } from '@/utils/format'; import { handleSetlogSave } from '@/utils/format';
import { highlightText } from '@/utils/highlightText'; import { highlightText } from '@/utils/highlightText';
@ -568,7 +568,7 @@ const ShoppingMallProductSearch: React.FC<{ currentUser: CurrentUser | undefined
formData.append('TableType', "1207"); formData.append('TableType', "1207");
console.log('formData', formData); 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"); formData.append('TableType', "1207");
console.log('formData', formData); 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"); formData.append('TableType', "1207");
console.log('formData', formData); 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() { async onOk() {
if (info.file.ImageId) { if (info.file.ImageId) {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {
@ -1390,7 +1391,8 @@ const ShoppingMallProductSearch: React.FC<{ currentUser: CurrentUser | undefined
async onOk() { async onOk() {
if (info.file.ImageId) { if (info.file.ImageId) {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {
@ -1449,7 +1451,8 @@ const ShoppingMallProductSearch: React.FC<{ currentUser: CurrentUser | undefined
async onOk() { async onOk() {
if (info.file.ImageId) { if (info.file.ImageId) {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {

7
src/pages/travelMember/scenicSpotConfig/index.tsx
View File

@ -24,7 +24,7 @@ import { getFieldEnumTree, getFieldEnumName } from "@/services/options"; // 枚
import PageTitleBox from "@/components/PageTitleBox"; import PageTitleBox from "@/components/PageTitleBox";
import { handeDeleteSCENICAREA, handeGetSCENICAREAList, handeSynchroSCENICAREA } from '../service'; import { handeDeleteSCENICAREA, handeGetSCENICAREAList, handeSynchroSCENICAREA } from '../service';
import session from '@/utils/session'; 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 ModalFooter from './component/modalFooter';
import { handleSetlogSave } from '@/utils/format'; import { handleSetlogSave } from '@/utils/format';
import { highlightText } from '@/utils/highlightText'; import { highlightText } from '@/utils/highlightText';
@ -366,7 +366,7 @@ const scenicSpotConfig: React.FC<{ currentUser: CurrentUser | undefined }> = (pr
formData.append('TableType', '1305'); formData.append('TableType', '1305');
console.log('formData', formData); console.log('formData', formData);
await uploadPicture(formData) await uploadAHYDPicture(formData)
} }
handleSetlogSave(`${currentRow?.SCENICAREA_ID ? `更新${currentRow?.SCENICAREA_NAME}景区` : `新增${data.Result_Data.SCENICAREA_NAME}`}信息`) 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() { async onOk() {
if (info.file.ImageId) { if (info.file.ImageId) {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {

7
src/pages/travelMember/serverpartInfo/index.tsx
View File

@ -15,7 +15,7 @@ import useRequest from "@ahooksjs/use-request";
import { getServerpartTree } from "@/services/options"; import { getServerpartTree } from "@/services/options";
import { handleSynchroNOTICEINFO } from "@/pages/basicManage/highwayHeadlines/service"; import { handleSynchroNOTICEINFO } from "@/pages/basicManage/highwayHeadlines/service";
import ProForm, { ProFormText, ProFormUploadButton } from "@ant-design/pro-form"; 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 { handeGetPictureList } from "../service";
import SubMenu from "antd/lib/menu/SubMenu"; import SubMenu from "antd/lib/menu/SubMenu";
import Draggable from "react-draggable"; 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' : ''); formData.append('TableType', selectActiveKey === '1' ? '1123' : selectActiveKey === '2' ? '1131' : selectActiveKey === '3' ? '1131' : selectActiveKey === '4' ? '1131' : selectActiveKey === '5' ? '1131' : '');
console.log('formData', formData); console.log('formData', formData);
let res = await uploadPicture(formData) let res = await uploadAHYDPicture(formData)
console.log('resresresres', res); console.log('resresresres', res);
let serverpartObj = session.get('serverpartObj') let serverpartObj = session.get('serverpartObj')
if (res.Result_Code === 100) { if (res.Result_Code === 100) {
@ -911,7 +911,8 @@ const serverpartInfo: React.FC<{ currentUser: CurrentUser }> = (props) => {
async onOk() { async onOk() {
if (info.file.ImageId) { if (info.file.ImageId) {
const deleteLoading = message.loading('正在删除...') 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() deleteLoading()
if (success) { if (success) {

15
src/services/picture.ts
View File

@ -53,6 +53,21 @@ export async function getPictureList(id: number, TableType?: string) {
} }
return tableList(data.Result_Data); 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) { export async function deletePicture(imagepath: string, id: number, TableName?: string, TableType?: string) {

6
src/versionEnv.ts
View File

@ -1,4 +1,4 @@
// 由 scripts/writeVersion.js 自动生成 // 由 scripts/writeVersion.js 自动生成
export const VERSION = "4.5.49"; export const VERSION = "4.5.50";
export const GIT_HASH = "f5c66f8"; export const GIT_HASH = "169c5fa";
export const BUILD_TIME = "2025-09-05T01:51:31.828Z"; export const BUILD_TIME = "2025-09-05T11:01:12.391Z";