update
This commit is contained in:
ylj20011123
parent
169c5fad49
commit
1f62f3878b
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "ant-design-pro",
|
||||
"version": "4.5.49",
|
||||
"version": "4.5.50",
|
||||
"private": true,
|
||||
"description": "An out-of-box UI solution for enterprise applications",
|
||||
"scripts": {
|
||||
|
||||
@ -61,13 +61,33 @@
|
||||
<span class="el-upload-list__item-actions">
|
||||
<span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
|
||||
<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 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"
|
||||
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>
|
||||
@ -113,7 +133,7 @@
|
||||
const tableType = getreqstr('tabletype');
|
||||
const deleteType = getreqstr('deletetype');
|
||||
const readonly = getreqstr('readonly') ? true : false;
|
||||
const actions = 'https://api.eshangtech.com/EShangApiMain'
|
||||
const actions = 'https://ahyd.eshangtech.com/EShangApiMain'
|
||||
let uploadRef = ref(null)
|
||||
let showPreviewRef = ref(null)
|
||||
let filename = ref('')
|
||||
|
||||
@ -29,6 +29,7 @@ import {
|
||||
getRemarksList, saveHisPaymentAccount,
|
||||
updatePaymentConfirm,
|
||||
updateSynchroRemarks,
|
||||
uploadAHYDFile,
|
||||
uploadFile
|
||||
} from "@/pages/busniess/PaymentConfirm/service";
|
||||
import {
|
||||
@ -50,14 +51,14 @@ import type { BusinessProjectModel } from "@/pages/BussinessProject/data";
|
||||
import type { ProFormInstance } from "@ant-design/pro-form";
|
||||
|
||||
import IconFont from "@/components/IconFont";
|
||||
import {getPaymentConfirmList, getPaymentConfirmListGet, getSelectList} from "../service";
|
||||
import { getPaymentConfirmList, getPaymentConfirmListGet, getSelectList } from "../service";
|
||||
import type { CurrentUser } from "umi";
|
||||
import type { ConnectState } from "@/models/connect";
|
||||
import PaymentRecord from "./PaymentRecord";
|
||||
// import { getBusinessMerchatsList } from "@/pages/basicManage/service";
|
||||
import './PaymentConfirmTable.less'
|
||||
import Draggable from "react-draggable";
|
||||
import {fmoney, noDecimal} from "@/services/options";
|
||||
import { fmoney, noDecimal } from "@/services/options";
|
||||
import ProDescriptions from "@ant-design/pro-descriptions";
|
||||
import DescriptionItem from "@/pages/DataVerification/list/components/DescriptionItem";
|
||||
|
||||
@ -75,7 +76,7 @@ const handleAddUpdate = async (fields: PaymentConfirmModel, remark?: RemarksMode
|
||||
message.error(`${result.Result_Desc}` || `${result.Result_Code}:提交失败`);
|
||||
return false;
|
||||
}
|
||||
await updateSynchroRemarks({ REMARKS_CONTENT: remark,REMARKS_ID:fields?.REMARKS_ID, TABLE_ID: fields?.TABLE_ID || result.Result_Data.PAYMENTCONFIRM_ID,TABLE_NAME: "T_PAYMENTCONFIRM" })
|
||||
await updateSynchroRemarks({ REMARKS_CONTENT: remark, REMARKS_ID: fields?.REMARKS_ID, TABLE_ID: fields?.TABLE_ID || result.Result_Data.PAYMENTCONFIRM_ID, TABLE_NAME: "T_PAYMENTCONFIRM" })
|
||||
message.success("提交成功！")
|
||||
return result.Result_Data;
|
||||
};
|
||||
@ -114,9 +115,9 @@ const handleDelete = async (id: number) => {
|
||||
* @return {*}
|
||||
* @LastEditTime: Do not edit
|
||||
*/
|
||||
const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,showType }: {
|
||||
const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser, showType }: {
|
||||
props: BusinessProjectModel & any, handleModalVisible: (value: boolean) => void,
|
||||
editable?: boolean | true, currentUser?: CurrentUser,showType?: any
|
||||
editable?: boolean | true, currentUser?: CurrentUser, showType?: any
|
||||
}) => {
|
||||
const [currentRow, setCurrentRow] = useState<PaymentConfirmModel>()
|
||||
const bussinessRef = useRef<ProFormInstance>()
|
||||
@ -125,49 +126,51 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
const [showDetail, setShowDetail] = useState<boolean>(false) // 是否显示租金拆分日志
|
||||
// const [createModalVisible, handleModalVisible] = useState<boolean>(false)
|
||||
const actionRef = useRef<ActionType>()
|
||||
const [businessDetail,setBussinessDetail] = useState<boolean>(false)// 点击商家缴款出现的抽屉
|
||||
const [businessDetail, setBussinessDetail] = useState<boolean>(false)// 点击商家缴款出现的抽屉
|
||||
const { run: getRemark, loading: remarkLoading, data: remarkList = [] } = useRequest((params) => {
|
||||
return getRemarksList({ ...params, TABLE_NAME: 'T_PAYMENTCONFIRM' })
|
||||
}, { manual: true })
|
||||
const [fileList, setFileList] = useState<any[]>([])
|
||||
const [imagePreviewVisible, setImagePreviewVisible] = useState<boolean>(false) // 预览图片
|
||||
// 商家缴款里面的款项类型
|
||||
const {loading:moneyTypeLoading, data:moneyTypeList } = useRequest(async ()=>{
|
||||
const { loading: moneyTypeLoading, data: moneyTypeList } = useRequest(async () => {
|
||||
const list = JSON.parse(JSON.stringify(props.FieldEnum))
|
||||
delete list[9000];
|
||||
return list
|
||||
})
|
||||
// 应缴
|
||||
const [payableRes,setPayableRes] = useState<any>({ label1000:0,
|
||||
label1100:0,
|
||||
label1200:0,
|
||||
label1300:0,
|
||||
label8000:0,
|
||||
label2000:0,
|
||||
label3000:0,
|
||||
label4000:0,
|
||||
label5000:0,})
|
||||
const [payableRes, setPayableRes] = useState<any>({
|
||||
label1000: 0,
|
||||
label1100: 0,
|
||||
label1200: 0,
|
||||
label1300: 0,
|
||||
label8000: 0,
|
||||
label2000: 0,
|
||||
label3000: 0,
|
||||
label4000: 0,
|
||||
label5000: 0,
|
||||
})
|
||||
// 是否显示应缴汇总
|
||||
const [showPayableRes,setShowPayableRes] = useState<boolean>(false)
|
||||
const [showPayableRes, setShowPayableRes] = useState<boolean>(false)
|
||||
// 已缴
|
||||
const [paidRes,setPaidRes] = useState<any>({
|
||||
label1000:0,
|
||||
label1100:0,
|
||||
label1200:0,
|
||||
label1300:0,
|
||||
label8000:0,
|
||||
label2000:0,
|
||||
label3000:0,
|
||||
label4000:0,
|
||||
label5000:0,
|
||||
const [paidRes, setPaidRes] = useState<any>({
|
||||
label1000: 0,
|
||||
label1100: 0,
|
||||
label1200: 0,
|
||||
label1300: 0,
|
||||
label8000: 0,
|
||||
label2000: 0,
|
||||
label3000: 0,
|
||||
label4000: 0,
|
||||
label5000: 0,
|
||||
})
|
||||
// 是否显示已缴汇总
|
||||
const [showPaidRes,setShowPaidRes] = useState<boolean>(false)
|
||||
const [showPaidRes, setShowPaidRes] = useState<boolean>(false)
|
||||
|
||||
// 汇总的商家欠款
|
||||
const [otherNumber,setOtherNumber] = useState<any>()
|
||||
const [otherNumber, setOtherNumber] = useState<any>()
|
||||
// 是否是第一次调用
|
||||
const [isFirst,setIsFirst] = useState<boolean>(true)
|
||||
const [isFirst, setIsFirst] = useState<boolean>(true)
|
||||
const [disabled, setDraggleDisabled] = useState<boolean>() // 是否拖动
|
||||
const [bounds, setBounds] = useState<{ left: number, right: number, top: number, bottom: number }>() // 移动的位置
|
||||
const draggleRef = React.createRef<any>()
|
||||
@ -176,12 +179,12 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
PAYMENTCONFIRM_DESC: {
|
||||
show: false,
|
||||
},
|
||||
STAFF_NAME:{
|
||||
show:false
|
||||
STAFF_NAME: {
|
||||
show: false
|
||||
}
|
||||
});
|
||||
const [pageData,setPageData]= useState<any>()
|
||||
const [tableLoading,setTableLoading] = useState<boolean>(false)
|
||||
const [pageData, setPageData] = useState<any>()
|
||||
const [tableLoading, setTableLoading] = useState<boolean>(false)
|
||||
const onDraggaleStart = (event, uiData) => {
|
||||
const { clientWidth, clientHeight } = window.document.documentElement;
|
||||
const targetRect = draggleRef.current?.getBoundingClientRect();
|
||||
@ -195,7 +198,7 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
bottom: clientHeight - (targetRect.bottom - uiData.y),
|
||||
});
|
||||
};
|
||||
const { loading: selectLoading, data: selectDateList } = useRequest(async ()=>{
|
||||
const { loading: selectLoading, data: selectDateList } = useRequest(async () => {
|
||||
const req = {
|
||||
searchParameter: {
|
||||
BUSINESSPROJECT_ID: props?.BUSINESSPROJECT_ID,
|
||||
@ -206,8 +209,8 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
}
|
||||
const data = await getSelectList(req)
|
||||
const list: any = []
|
||||
if (data && data.data && data.data.length>0){
|
||||
data.data.forEach((item: any)=>{
|
||||
if (data && data.data && data.data.length > 0) {
|
||||
data.data.forEach((item: any) => {
|
||||
list.push({
|
||||
label: `${moment(item.STARTDATE).format('YYYY/MM/DD')}-${moment(item.ENDDATE).format('YYYY/MM/DD')}`,
|
||||
value: `${moment(item.STARTDATE).format('YYYY/MM/DD')}-${moment(item.ENDDATE).format('YYYY/MM/DD')}`
|
||||
@ -217,24 +220,24 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
// 默认设置时间
|
||||
const lastDay = new Date(moment().subtract(1, 'day').startOf('day').format('YYYY-MM-DD')).getTime()
|
||||
let date: string = ''
|
||||
list.forEach((item: any)=>{
|
||||
list.forEach((item: any) => {
|
||||
const timeList = item.label.split('-')
|
||||
const start = new Date(timeList[0]).getTime()
|
||||
const end = new Date(timeList[1]).getTime()
|
||||
if (start<lastDay && lastDay<end){
|
||||
if (start < lastDay && lastDay < end) {
|
||||
date = item.value
|
||||
|
||||
}
|
||||
})
|
||||
if (date){
|
||||
if (date) {
|
||||
accountDate.current = date
|
||||
if (isFirst){
|
||||
if (isFirst) {
|
||||
setIsFirst(false)
|
||||
handleGetPageData(date)
|
||||
}
|
||||
}else{
|
||||
} else {
|
||||
accountDate.current = list[0].value
|
||||
if (isFirst){
|
||||
if (isFirst) {
|
||||
setIsFirst(false)
|
||||
handleGetPageData(list[0].value)
|
||||
}
|
||||
@ -272,7 +275,7 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
|
||||
};
|
||||
// 刷新列表
|
||||
const handleRefreshTable = ()=>{
|
||||
const handleRefreshTable = () => {
|
||||
actionRef.current?.reload()
|
||||
}
|
||||
|
||||
@ -329,20 +332,20 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
title: "款项说明",
|
||||
ellipsis: true,
|
||||
valueType: "select",
|
||||
valueEnum:{
|
||||
false:{ text: '全部款项' },
|
||||
true:{ text: '有备注' }
|
||||
valueEnum: {
|
||||
false: { text: '全部款项' },
|
||||
true: { text: '有备注' }
|
||||
},
|
||||
render:(_,record)=>{
|
||||
return <span style={{ color:'#1890ff',cursor:'pointer' }} onClick={()=>{
|
||||
render: (_, record) => {
|
||||
return <span style={{ color: '#1890ff', cursor: 'pointer' }} onClick={() => {
|
||||
getRemark({ TABLE_ID: record.PAYMENTCONFIRM_ID }).then(res => {
|
||||
if (res && res.length>0){
|
||||
if (res && res.length > 0) {
|
||||
setCurrentRow({
|
||||
...record,
|
||||
REMARKS_DESC:res[0].REMARKS_CONTENT,
|
||||
REMARKS_ID:res[0].REMARKS_ID
|
||||
REMARKS_DESC: res[0].REMARKS_CONTENT,
|
||||
REMARKS_ID: res[0].REMARKS_ID
|
||||
})
|
||||
}else{
|
||||
} else {
|
||||
setCurrentRow(record)
|
||||
}
|
||||
handleModalVisible(true)
|
||||
@ -363,15 +366,15 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
hideInTable: true,
|
||||
width: 140,
|
||||
sorter: true,
|
||||
renderFormItem:(_,record)=>{
|
||||
renderFormItem: (_, record) => {
|
||||
return <Select
|
||||
options={selectDateList}
|
||||
value={accountDate.current}
|
||||
allowClear
|
||||
onChange={(e: string) => {
|
||||
if(e){
|
||||
if (e) {
|
||||
accountDate.current = e
|
||||
}else{
|
||||
} else {
|
||||
accountDate.current = null
|
||||
}
|
||||
actionRef.current?.reload()
|
||||
@ -409,10 +412,10 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
width: 140,
|
||||
render: (_, record) => {
|
||||
if (record.CURRENTBALANCE === 0) {
|
||||
return <Text style={{ paddingRight: 16 }} type="secondary">{record.ACCOUNT_AMOUNT?fmoney(record.ACCOUNT_AMOUNT,2):'-'}</Text>
|
||||
return <Text style={{ paddingRight: 16 }} type="secondary">{record.ACCOUNT_AMOUNT ? fmoney(record.ACCOUNT_AMOUNT, 2) : '-'}</Text>
|
||||
}
|
||||
return <Text style={{ paddingRight: 16 }} type={record.ACCOUNT_TYPE === "9000" ? "success" : undefined}>
|
||||
{record?.ACCOUNT_AMOUNT ? fmoney(record?.ACCOUNT_AMOUNT,2) : '-'}</Text>
|
||||
{record?.ACCOUNT_AMOUNT ? fmoney(record?.ACCOUNT_AMOUNT, 2) : '-'}</Text>
|
||||
}
|
||||
|
||||
},
|
||||
@ -425,10 +428,10 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
width: 140,
|
||||
render: (_, record) => {
|
||||
if (record.CURRENTBALANCE === 0) {
|
||||
return <Text style={{ paddingRight: 16 }} type="secondary">{record.ACTUAL_PAYMENT?fmoney(record.ACTUAL_PAYMENT,2):'-'}</Text>
|
||||
return <Text style={{ paddingRight: 16 }} type="secondary">{record.ACTUAL_PAYMENT ? fmoney(record.ACTUAL_PAYMENT, 2) : '-'}</Text>
|
||||
}
|
||||
return <Text style={{ paddingRight: 16 }} type={record.ACCOUNT_TYPE === "9000" ? "success" : undefined}>
|
||||
{record?.ACTUAL_PAYMENT ? fmoney(record?.ACTUAL_PAYMENT,2) : '-'}</Text>
|
||||
{record?.ACTUAL_PAYMENT ? fmoney(record?.ACTUAL_PAYMENT, 2) : '-'}</Text>
|
||||
}
|
||||
},
|
||||
{
|
||||
@ -439,10 +442,10 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
width: 140,
|
||||
render: (_, record) => {
|
||||
if (record.CURRENTBALANCE === 0) {
|
||||
return <Text style={{ paddingRight: 16 }} type="secondary">{record.CURRENTBALANCE?fmoney(record.CURRENTBALANCE,2):'-'}</Text>
|
||||
return <Text style={{ paddingRight: 16 }} type="secondary">{record.CURRENTBALANCE ? fmoney(record.CURRENTBALANCE, 2) : '-'}</Text>
|
||||
}
|
||||
return <Text style={{ paddingRight: 16 }} type={record.ACCOUNT_TYPE === "9000" ? "danger" : undefined}>
|
||||
{record?.CURRENTBALANCE ? fmoney(record?.CURRENTBALANCE,2) : '-'}</Text>
|
||||
{record?.CURRENTBALANCE ? fmoney(record?.CURRENTBALANCE, 2) : '-'}</Text>
|
||||
},
|
||||
filters: [
|
||||
{
|
||||
@ -456,22 +459,22 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
{
|
||||
dataIndex: 'STAFF_NAME',
|
||||
title: '更新人',
|
||||
hideInSearch:true
|
||||
hideInSearch: true
|
||||
},
|
||||
{
|
||||
dataIndex: 'CONFIRMDATE',
|
||||
title: '更新时间',
|
||||
hideInSearch:true,
|
||||
width:150,
|
||||
defaultSortOrder:'descend',
|
||||
hideInSearch: true,
|
||||
width: 150,
|
||||
defaultSortOrder: 'descend',
|
||||
sorter: (a, b) => new Date(a.CONFIRMDATE).getTime() - new Date(b.CONFIRMDATE).getTime(),
|
||||
},
|
||||
{
|
||||
dataIndex:'',
|
||||
title:'商家欠款',
|
||||
hideInTable:true,
|
||||
renderFormItem:(_,record)=>{
|
||||
return <span style={{color:'orangered',fontSize:'18px'}}>{otherNumber?`¥${fmoney(otherNumber,2)}`:0}</span>
|
||||
dataIndex: '',
|
||||
title: '商家欠款',
|
||||
hideInTable: true,
|
||||
renderFormItem: (_, record) => {
|
||||
return <span style={{ color: 'orangered', fontSize: '18px' }}>{otherNumber ? `¥${fmoney(otherNumber, 2)}` : 0}</span>
|
||||
}
|
||||
},
|
||||
{
|
||||
@ -482,7 +485,7 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
width: 200,
|
||||
align: 'center',
|
||||
hideInSearch: true,
|
||||
hideInTable: showType==='Nooperate',
|
||||
hideInTable: showType === 'Nooperate',
|
||||
render: (_, record) => {
|
||||
return <Space>
|
||||
{/* { */}
|
||||
@ -546,93 +549,93 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
},
|
||||
];
|
||||
// 获得页面数据
|
||||
const handleGetPageData = async (time?: any,params?: any, sorter?: any, filter?: any)=>{
|
||||
const handleGetPageData = async (time?: any, params?: any, sorter?: any, filter?: any) => {
|
||||
setTableLoading(true)
|
||||
// const sortstr = Object.keys(sorter).map(n => {
|
||||
// const value = sorter[n]
|
||||
// return value ? `${n} ${value.replace('end', '')}` : ''
|
||||
// })
|
||||
let req = {}
|
||||
if (accountDate.current || time){
|
||||
if (accountDate.current || time) {
|
||||
const timeList = time.split('-')
|
||||
|
||||
if (filter && filter.ACCOUNT_TYPE && filter.ACCOUNT_TYPE.length>0){
|
||||
if (filter && filter.ACCOUNT_TYPE && filter.ACCOUNT_TYPE.length > 0) {
|
||||
req = {
|
||||
BusinessProjectId: props.BUSINESSPROJECT_ID,
|
||||
StartDate: timeList[0],
|
||||
EndDate: timeList[1],
|
||||
ShowRemarks: params?.REMARKS_DESC,
|
||||
}
|
||||
}else{
|
||||
} else {
|
||||
req = {
|
||||
BusinessProjectId: props.BUSINESSPROJECT_ID,
|
||||
StartDate: timeList[0],
|
||||
EndDate: timeList[1],
|
||||
ShowRemarks: params?.REMARKS_DESC,
|
||||
WholeAccountType:0,
|
||||
WholeAccountType: 0,
|
||||
}
|
||||
}
|
||||
}else{
|
||||
if (filter.ACCOUNT_TYPE && filter.ACCOUNT_TYPE.length>0){
|
||||
} else {
|
||||
if (filter.ACCOUNT_TYPE && filter.ACCOUNT_TYPE.length > 0) {
|
||||
req = {
|
||||
BusinessProjectId: props.BUSINESSPROJECT_ID,
|
||||
ShowRemarks: params?.REMARKS_DESC,
|
||||
// StartDate:moment(props.PROJECT_STARTDATE).format('YYYY-MM-DD')
|
||||
}
|
||||
}else{
|
||||
} else {
|
||||
req = {
|
||||
BusinessProjectId: props.BUSINESSPROJECT_ID,
|
||||
ShowRemarks: params?.REMARKS_DESC,
|
||||
WholeAccountType:0,
|
||||
WholeAccountType: 0,
|
||||
// StartDate:moment(props.PROJECT_STARTDATE).format('YYYY-MM-DD')
|
||||
}
|
||||
}
|
||||
}
|
||||
const data = await getPaymentConfirmListGet(req)
|
||||
setPageData(data.data)
|
||||
if (data.otherData && data.otherData.length>0){
|
||||
if (data.otherData && data.otherData.length > 0) {
|
||||
const payableObj: any = {
|
||||
label1000:0,
|
||||
label1100:0,
|
||||
label1200:0,
|
||||
label1300:0,
|
||||
label8000:0,
|
||||
label2000:0,
|
||||
label3000:0,
|
||||
label4000:0,
|
||||
label5000:0,
|
||||
label1000: 0,
|
||||
label1100: 0,
|
||||
label1200: 0,
|
||||
label1300: 0,
|
||||
label8000: 0,
|
||||
label2000: 0,
|
||||
label3000: 0,
|
||||
label4000: 0,
|
||||
label5000: 0,
|
||||
}// 应缴
|
||||
const paidObj: any = {
|
||||
label1000:0,
|
||||
label1100:0,
|
||||
label1200:0,
|
||||
label1300:0,
|
||||
label8000:0,
|
||||
label2000:0,
|
||||
label3000:0,
|
||||
label4000:0,
|
||||
label5000:0,
|
||||
label1000: 0,
|
||||
label1100: 0,
|
||||
label1200: 0,
|
||||
label1300: 0,
|
||||
label8000: 0,
|
||||
label2000: 0,
|
||||
label3000: 0,
|
||||
label4000: 0,
|
||||
label5000: 0,
|
||||
}// 已缴
|
||||
data.otherData.forEach((item: any)=>{
|
||||
if (item.type===1){
|
||||
data.otherData.forEach((item: any) => {
|
||||
if (item.type === 1) {
|
||||
payableObj[`label${item.label}`] = item.value
|
||||
}else if (item.type===2){
|
||||
} else if (item.type === 2) {
|
||||
paidObj[`label${item.label}`] = item.value
|
||||
}else{
|
||||
} else {
|
||||
setOtherNumber(item.value)
|
||||
}
|
||||
})
|
||||
|
||||
let payShow: boolean = false
|
||||
let paidShow: boolean = false
|
||||
for (const key in payableObj){
|
||||
if (payableObj[key]){
|
||||
for (const key in payableObj) {
|
||||
if (payableObj[key]) {
|
||||
payShow = true
|
||||
}
|
||||
}
|
||||
|
||||
for (const key in paidObj){
|
||||
if (paidObj[key]){
|
||||
for (const key in paidObj) {
|
||||
if (paidObj[key]) {
|
||||
paidShow = true
|
||||
}
|
||||
}
|
||||
@ -665,7 +668,7 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
onChange: setColumnsStateMap,
|
||||
}}
|
||||
loading={tableLoading}
|
||||
tableExtraRender={()=>{
|
||||
tableExtraRender={() => {
|
||||
return <div style={{ paddingLeft: 30, paddingBottom: 0 }}>
|
||||
{/* <ProDescriptions column={5} className="other"> */}
|
||||
{/* <ProDescriptions.Item></ProDescriptions.Item> */}
|
||||
@ -676,94 +679,94 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
{/* </ProDescriptions> */}
|
||||
|
||||
{
|
||||
showPayableRes?
|
||||
showPayableRes ?
|
||||
<>
|
||||
<Descriptions className="commity-sale-description" column={5} title={<Text type="success" style={{ color: "#1890ff", fontSize: 14 }}>应缴汇总</Text>}>
|
||||
{
|
||||
payableRes?.label1000?
|
||||
<Descriptions.Item label="项目租金" contentStyle={{ color: 'orangered' }}>{fmoney(payableRes?.label1000,2)}</Descriptions.Item> :''
|
||||
payableRes?.label1000 ?
|
||||
<Descriptions.Item label="项目租金" contentStyle={{ color: 'orangered' }}>{fmoney(payableRes?.label1000, 2)}</Descriptions.Item> : ''
|
||||
}
|
||||
{
|
||||
payableRes.label1100!==0?
|
||||
<Descriptions.Item label="履约保证金" contentStyle={{ color: 'orangered' }}>{fmoney(payableRes?.label1100,2)}</Descriptions.Item> :''
|
||||
payableRes.label1100 !== 0 ?
|
||||
<Descriptions.Item label="履约保证金" contentStyle={{ color: 'orangered' }}>{fmoney(payableRes?.label1100, 2)}</Descriptions.Item> : ''
|
||||
}
|
||||
{
|
||||
payableRes?.label1200?
|
||||
<Descriptions.Item label="安全保证金" contentStyle={{ color: 'orangered' }}>{fmoney(payableRes?.label1200,2)}</Descriptions.Item>:''
|
||||
payableRes?.label1200 ?
|
||||
<Descriptions.Item label="安全保证金" contentStyle={{ color: 'orangered' }}>{fmoney(payableRes?.label1200, 2)}</Descriptions.Item> : ''
|
||||
}
|
||||
{
|
||||
payableRes?.label1300?
|
||||
<Descriptions.Item label="设备质保金" contentStyle={{ color: 'orangered' }}>{fmoney(payableRes?.label1300,2)}</Descriptions.Item>:''
|
||||
payableRes?.label1300 ?
|
||||
<Descriptions.Item label="设备质保金" contentStyle={{ color: 'orangered' }}>{fmoney(payableRes?.label1300, 2)}</Descriptions.Item> : ''
|
||||
}
|
||||
{
|
||||
payableRes?.label8000?
|
||||
<Descriptions.Item label="租金减免" contentStyle={{ color: 'orangered' }}>{fmoney(payableRes?.label8000,2)}</Descriptions.Item>:''
|
||||
payableRes?.label8000 ?
|
||||
<Descriptions.Item label="租金减免" contentStyle={{ color: 'orangered' }}>{fmoney(payableRes?.label8000, 2)}</Descriptions.Item> : ''
|
||||
}
|
||||
</Descriptions>
|
||||
<Descriptions column={5}>
|
||||
{
|
||||
payableRes?.label2000?
|
||||
<Descriptions.Item label="物业费" contentStyle={{ color: 'orangered' }}>{fmoney(payableRes?.label2000 ,2)}</Descriptions.Item>:''
|
||||
payableRes?.label2000 ?
|
||||
<Descriptions.Item label="物业费" contentStyle={{ color: 'orangered' }}>{fmoney(payableRes?.label2000, 2)}</Descriptions.Item> : ''
|
||||
}
|
||||
{
|
||||
payableRes?.label3000?
|
||||
<Descriptions.Item label="水电费" contentStyle={{ color: 'orangered' }}>{fmoney(payableRes?.label3000,2)}</Descriptions.Item>:''
|
||||
payableRes?.label3000 ?
|
||||
<Descriptions.Item label="水电费" contentStyle={{ color: 'orangered' }}>{fmoney(payableRes?.label3000, 2)}</Descriptions.Item> : ''
|
||||
}
|
||||
{
|
||||
payableRes?.label4000?
|
||||
<Descriptions.Item label="住宿费" contentStyle={{ color: 'orangered' }}>{fmoney(payableRes?.label4000,2)}</Descriptions.Item>:''
|
||||
payableRes?.label4000 ?
|
||||
<Descriptions.Item label="住宿费" contentStyle={{ color: 'orangered' }}>{fmoney(payableRes?.label4000, 2)}</Descriptions.Item> : ''
|
||||
}
|
||||
{
|
||||
payableRes?.label5000?
|
||||
<Descriptions.Item label="就餐费" contentStyle={{ color: 'orangered' }}>{fmoney(payableRes?.label5000,2)}</Descriptions.Item>:''
|
||||
payableRes?.label5000 ?
|
||||
<Descriptions.Item label="就餐费" contentStyle={{ color: 'orangered' }}>{fmoney(payableRes?.label5000, 2)}</Descriptions.Item> : ''
|
||||
}
|
||||
</Descriptions>
|
||||
</>:''
|
||||
</> : ''
|
||||
}
|
||||
{
|
||||
showPaidRes?
|
||||
showPaidRes ?
|
||||
<>
|
||||
<Descriptions className="commity-sale-description" column={5} title={<Text type="success" style={{ color: "#1890ff", fontSize: 14 }}>已缴汇总</Text>}>
|
||||
{
|
||||
paidRes?.label1000?
|
||||
<Descriptions.Item label="项目租金" contentStyle={{ color: 'orangered' }}>{fmoney(paidRes?.label1000,2)}</Descriptions.Item>:''
|
||||
paidRes?.label1000 ?
|
||||
<Descriptions.Item label="项目租金" contentStyle={{ color: 'orangered' }}>{fmoney(paidRes?.label1000, 2)}</Descriptions.Item> : ''
|
||||
}
|
||||
{
|
||||
paidRes?.label1100?
|
||||
<Descriptions.Item label="履约保证金" contentStyle={{ color: 'orangered' }}>{fmoney(paidRes?.label1100,2)}</Descriptions.Item>:''
|
||||
paidRes?.label1100 ?
|
||||
<Descriptions.Item label="履约保证金" contentStyle={{ color: 'orangered' }}>{fmoney(paidRes?.label1100, 2)}</Descriptions.Item> : ''
|
||||
}
|
||||
{
|
||||
paidRes?.label1200?
|
||||
<Descriptions.Item label="安全保证金" contentStyle={{ color: 'orangered' }}>{fmoney(paidRes?.label1200,2)}</Descriptions.Item>:''
|
||||
paidRes?.label1200 ?
|
||||
<Descriptions.Item label="安全保证金" contentStyle={{ color: 'orangered' }}>{fmoney(paidRes?.label1200, 2)}</Descriptions.Item> : ''
|
||||
}
|
||||
{
|
||||
paidRes?.label1300?
|
||||
<Descriptions.Item label="设备质保金" contentStyle={{ color: 'orangered' }}>{fmoney(paidRes?.label1300,2)}</Descriptions.Item>:''
|
||||
paidRes?.label1300 ?
|
||||
<Descriptions.Item label="设备质保金" contentStyle={{ color: 'orangered' }}>{fmoney(paidRes?.label1300, 2)}</Descriptions.Item> : ''
|
||||
}
|
||||
{
|
||||
paidRes?.label8000?
|
||||
<Descriptions.Item label="租金减免" contentStyle={{ color: 'orangered' }}>{fmoney(paidRes?.label8000,2)}</Descriptions.Item>:''
|
||||
paidRes?.label8000 ?
|
||||
<Descriptions.Item label="租金减免" contentStyle={{ color: 'orangered' }}>{fmoney(paidRes?.label8000, 2)}</Descriptions.Item> : ''
|
||||
}
|
||||
</Descriptions>
|
||||
<Descriptions column={5}>
|
||||
{
|
||||
paidRes?.label2000?
|
||||
<Descriptions.Item label="物业费" contentStyle={{ color: 'orangered' }}>{fmoney(paidRes?.label2000,2)}</Descriptions.Item>:''
|
||||
paidRes?.label2000 ?
|
||||
<Descriptions.Item label="物业费" contentStyle={{ color: 'orangered' }}>{fmoney(paidRes?.label2000, 2)}</Descriptions.Item> : ''
|
||||
}
|
||||
{
|
||||
paidRes?.label3000?
|
||||
<Descriptions.Item label="水电费" contentStyle={{ color: 'orangered' }}>{fmoney(paidRes?.label3000,2)}</Descriptions.Item>:''
|
||||
paidRes?.label3000 ?
|
||||
<Descriptions.Item label="水电费" contentStyle={{ color: 'orangered' }}>{fmoney(paidRes?.label3000, 2)}</Descriptions.Item> : ''
|
||||
}
|
||||
{
|
||||
paidRes?.label4000?
|
||||
<Descriptions.Item label="住宿费" contentStyle={{ color: 'orangered' }}>{fmoney(paidRes?.label4000,2)}</Descriptions.Item>:''
|
||||
paidRes?.label4000 ?
|
||||
<Descriptions.Item label="住宿费" contentStyle={{ color: 'orangered' }}>{fmoney(paidRes?.label4000, 2)}</Descriptions.Item> : ''
|
||||
}
|
||||
{
|
||||
paidRes?.label5000?
|
||||
<Descriptions.Item label="就餐费" contentStyle={{ color: 'orangered' }}>{fmoney(paidRes?.label5000,2)}</Descriptions.Item>:''
|
||||
paidRes?.label5000 ?
|
||||
<Descriptions.Item label="就餐费" contentStyle={{ color: 'orangered' }}>{fmoney(paidRes?.label5000, 2)}</Descriptions.Item> : ''
|
||||
}
|
||||
</Descriptions>
|
||||
</>:''
|
||||
</> : ''
|
||||
}
|
||||
</div>
|
||||
}}
|
||||
@ -783,8 +786,8 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
// }}
|
||||
className="table"
|
||||
request={async (params, sorter, filter) => {
|
||||
if (!isFirst){
|
||||
handleGetPageData(accountDate.current,params,sorter,filter)
|
||||
if (!isFirst) {
|
||||
handleGetPageData(accountDate.current, params, sorter, filter)
|
||||
}
|
||||
}}
|
||||
dataSource={pageData}
|
||||
@ -793,8 +796,8 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
// options={false}
|
||||
search={{
|
||||
span: 6,
|
||||
defaultCollapsed:false,
|
||||
optionRender:(searchConfig, formProps, dom)=> [
|
||||
defaultCollapsed: false,
|
||||
optionRender: (searchConfig, formProps, dom) => [
|
||||
...dom.reverse(),
|
||||
<Button
|
||||
key="new"
|
||||
@ -832,7 +835,7 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
ACCOUNT_AMOUNT: `${currentRow.ACCOUNT_AMOUNT}`
|
||||
} : {})
|
||||
if (currentRow?.ATTACHMENT_FILES) {
|
||||
setFileList([{url:currentRow.ATTACHMENT_FILES}])
|
||||
setFileList([{ url: currentRow.ATTACHMENT_FILES }])
|
||||
}
|
||||
}
|
||||
}}
|
||||
@ -855,7 +858,7 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
TABLE_ID: currentRow.PAYMENTCONFIRM_ID,
|
||||
TABLE_NAME: 'T_PAYMENTCONFIRM',
|
||||
ACTUAL_PAYMENT: 0,
|
||||
CONFIRMDATE:moment().format('YYYY-MM-DD HH:mm:ss')
|
||||
CONFIRMDATE: moment().format('YYYY-MM-DD HH:mm:ss')
|
||||
}
|
||||
|
||||
} else {
|
||||
@ -865,9 +868,9 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
}
|
||||
}
|
||||
newValue.MANAGEMONTH = moment(newValue.ACCOUNT_DATE).format("YYYYMM")
|
||||
if (fileList && fileList.length>0) {
|
||||
if (fileList && fileList.length > 0) {
|
||||
newValue.ATTACHMENT_FILES = fileList.map(n => n.url).toString()
|
||||
}else{
|
||||
} else {
|
||||
newValue.ATTACHMENT_FILES = ['']
|
||||
}
|
||||
const remark = { ...myRemark, TABLE_NAME: 'T_PAYMENTCONFIRM', REMARKS_CONTENT: newValue.REMARKS_DESC }
|
||||
@ -949,7 +952,8 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
formData.append('TableName', 'PAYMENTCONFIRM');
|
||||
formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : '');
|
||||
if (info.filename) {
|
||||
const success = await uploadFile(formData)
|
||||
// const success = await uploadFile(formData)
|
||||
const success = await uploadAHYDFile(formData)
|
||||
|
||||
if (success) {
|
||||
|
||||
@ -977,15 +981,15 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
<List
|
||||
itemLayout="horizontal"
|
||||
dataSource={remarkList.filter((item: any) => item.STAFF_ID !== currentUser?.ID)}
|
||||
style={{paddingLeft: 85, paddingRight: 85}}
|
||||
style={{ paddingLeft: 85, paddingRight: 85 }}
|
||||
renderItem={(item: RemarksModel) => (
|
||||
<List.Item>
|
||||
<List.Item.Meta
|
||||
avatar={<IconFont name="icon-touxiang" size="36"></IconFont>}
|
||||
title={<div style={{display: "flex", justifyContent: "space-between", width: "100%"}}>
|
||||
title={<div style={{ display: "flex", justifyContent: "space-between", width: "100%" }}>
|
||||
<Typography.Text>{item.STAFF_NAME}:</Typography.Text>
|
||||
<Typography.Text
|
||||
style={{color: "#BBBFC7", fontWeight: 400}}>{item.OPERATE_DATE}</Typography.Text></div>}
|
||||
style={{ color: "#BBBFC7", fontWeight: 400 }}>{item.OPERATE_DATE}</Typography.Text></div>}
|
||||
description={<Typography.Text type="secondary">{item.REMARKS_CONTENT}</Typography.Text>}
|
||||
/>
|
||||
</List.Item>
|
||||
@ -1004,7 +1008,7 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
{/* 商家缴款抽屉 */}
|
||||
<ModalForm
|
||||
layout={'horizontal'}
|
||||
wrapperCol={{span: 16}}
|
||||
wrapperCol={{ span: 16 }}
|
||||
labelCol={{ span: 6 }}
|
||||
width={600}
|
||||
title={
|
||||
@ -1028,7 +1032,7 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
</div>
|
||||
}
|
||||
modalProps={{
|
||||
modalRender:(modal)=>{
|
||||
modalRender: (modal) => {
|
||||
return <Draggable
|
||||
disabled={disabled}
|
||||
bounds={bounds}
|
||||
@ -1042,7 +1046,7 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
formRef={bussinessRef}
|
||||
onVisibleChange={(value) => {
|
||||
setBussinessDetail(value)
|
||||
if (!value){
|
||||
if (!value) {
|
||||
bussinessRef.current?.resetFields();
|
||||
setFileList([])
|
||||
}
|
||||
@ -1056,13 +1060,13 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
MERCHANTS_ID: props.MERCHANTS_ID,
|
||||
MERCHANTS_NAME: props.MERCHANTS_NAME,
|
||||
BUSINESS_TYPE: props.BUSINESS_TYPE,
|
||||
ACTUAL_PAYMENT:values.ACCOUNT_AMOUNT,
|
||||
ACCOUNT_AMOUNT:values.ACCOUNT_AMOUNT,
|
||||
ACTUAL_PAYMENT: values.ACCOUNT_AMOUNT,
|
||||
ACCOUNT_AMOUNT: values.ACCOUNT_AMOUNT,
|
||||
PAYMENTCONFIRM_VALID: 1
|
||||
}
|
||||
if (fileList && fileList.length>0) {
|
||||
if (fileList && fileList.length > 0) {
|
||||
req.ATTACHMENT_FILES = fileList.map(n => n.url).toString()
|
||||
}else{
|
||||
} else {
|
||||
req.ATTACHMENT_FILES = null
|
||||
}
|
||||
const data = await saveHisPaymentAccount(req)
|
||||
@ -1073,7 +1077,7 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
actionRef.current.reload();
|
||||
bussinessRef.current?.resetFields();
|
||||
setFileList([])
|
||||
}else{
|
||||
} else {
|
||||
message.error(`${data.Result_Desc}` || `${data.Result_Code}:提交失败`);
|
||||
}
|
||||
}}
|
||||
@ -1102,7 +1106,7 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
width="md"
|
||||
fieldProps={{
|
||||
formatter: value => value ? `${value}元` : '',
|
||||
placeholder:'默认单位：元'
|
||||
placeholder: '默认单位：元'
|
||||
}}
|
||||
rules={[
|
||||
{
|
||||
@ -1124,10 +1128,10 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
]}
|
||||
fieldProps={{
|
||||
disabledDate: (current) => current && current < moment(props?.PROJECT_STARTDATE).endOf('day') && current > moment(props?.PROJECT_ENDDATE).endOf('day'),
|
||||
onChange: (e)=>{
|
||||
bussinessRef.current?.setFieldsValue({PAYMENTDATE: e})
|
||||
onChange: (e) => {
|
||||
bussinessRef.current?.setFieldsValue({ PAYMENTDATE: e })
|
||||
},
|
||||
placeholder:'款项应收日期,用于账期归口统计'
|
||||
placeholder: '款项应收日期,用于账期归口统计'
|
||||
}}
|
||||
/>
|
||||
<ProFormDatePicker
|
||||
@ -1143,7 +1147,7 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
]}
|
||||
fieldProps={{
|
||||
disabledDate: (current) => current && current < moment(props?.PROJECT_STARTDATE).endOf('day') && current > moment(props?.PROJECT_ENDDATE).endOf('day'),
|
||||
placeholder:'商家打款日期,用户核对款项到账'
|
||||
placeholder: '商家打款日期,用户核对款项到账'
|
||||
}}
|
||||
/>
|
||||
|
||||
@ -1153,7 +1157,7 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
placeholder="请输入说明"
|
||||
width="md"
|
||||
fieldProps={{
|
||||
placeholder:'请填写款项备注说明'
|
||||
placeholder: '请填写款项备注说明'
|
||||
}}
|
||||
/>
|
||||
<ProFormUploadButton
|
||||
@ -1171,7 +1175,8 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
formData.append('TableName', 'PAYMENTCONFIRM');
|
||||
formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : '');
|
||||
if (info.filename) {
|
||||
const success = await uploadFile(formData)
|
||||
// const success = await uploadFile(formData)
|
||||
const success = await uploadAHYDFile(formData)
|
||||
if (success) {
|
||||
|
||||
const list = [...fileList, {
|
||||
@ -1227,7 +1232,7 @@ const PaymentConfirmTable = ({ props, handleModalVisible, editable, currentUser,
|
||||
closable={false}
|
||||
>
|
||||
{/* 抽屉打开时 加载项目详情组件 */}
|
||||
{showDetail && <PaymentRecord handleRefreshTable={handleRefreshTable} PAYMENTCONFIRM_ID={currentRow?.PAYMENTCONFIRM_ID} currentRow={currentRow}/>}
|
||||
{showDetail && <PaymentRecord handleRefreshTable={handleRefreshTable} PAYMENTCONFIRM_ID={currentRow?.PAYMENTCONFIRM_ID} currentRow={currentRow} />}
|
||||
</Drawer>
|
||||
</>
|
||||
}
|
||||
|
||||
@ -6,7 +6,7 @@ import ProForm, { ProFormDatePicker, ProFormSelect, ProFormText, ProFormTextArea
|
||||
import { handeGetCOUPONDetail, handeGetWECHATAPPSIGNList } from "@/pages/travelMember/service";
|
||||
import session from "@/utils/session";
|
||||
import { handleDeleteCOUPON, handleGetCOOPSHOP_RULEList, handleSynchroCOUPONService } from "../../service";
|
||||
import { uploadPicture } from "@/services/picture";
|
||||
import { uploadAHYDPicture, uploadPicture } from "@/services/picture";
|
||||
import { ExclamationCircleOutlined } from "@ant-design/icons";
|
||||
import ModalFooter from "@/pages/travelMember/scenicSpotConfig/component/modalFooter";
|
||||
import { handleSetlogSave } from "@/utils/format";
|
||||
@ -638,7 +638,7 @@ const CardInfo = ({ showDetail, currentRow, currentUser, parentRef, setShowDetai
|
||||
formData.append('TableType', '1208');
|
||||
formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : '');
|
||||
if (info.filename) {
|
||||
const success = await uploadPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
if (success) {
|
||||
const list = [{
|
||||
// uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败
|
||||
|
||||
@ -833,7 +833,7 @@ const CardInformationManager: React.FC<{ currentUser: CurrentUser }> = (props) =
|
||||
formData.append('TableType', '1208');
|
||||
formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : '');
|
||||
if (info.filename) {
|
||||
const success = await uploadPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
if (success) {
|
||||
const list = [{
|
||||
// uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败
|
||||
|
||||
@ -6,7 +6,7 @@ import {Col, Row, Image, Modal, Upload, Button, message} from "antd";
|
||||
import ProTable from "@ant-design/pro-table";
|
||||
import {handleGetAuditDetail} from "@/pages/DataVerification/list/service";
|
||||
import moment from "moment";
|
||||
import {deletePicture, uploadPicture} from "@/services/picture";
|
||||
import {deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture} from "@/services/picture";
|
||||
import type {UploadFile} from "antd/es/upload/interface";
|
||||
|
||||
// 上传资质图片
|
||||
@ -22,7 +22,7 @@ const customUploadRequest = async (fileList: UploadFile[], tableId: string) => {
|
||||
|
||||
formData.append('TableName', 'CHECKACCOUNT');
|
||||
formData.append('TableId', tableId);
|
||||
const success = await uploadPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
if (success) {
|
||||
return true
|
||||
}
|
||||
@ -247,7 +247,8 @@ const auditDetail: React.FC<{isShow: boolean,rowDetail: any,currentDetail?: any,
|
||||
onRemove={async (file)=>{
|
||||
console.log('file',file)
|
||||
const list: any = []
|
||||
const success = await deletePicture(file.ImagePath, file.uid)
|
||||
// const success = await deletePicture(file.ImagePath, file.uid)
|
||||
const success = await deleteAHYDPicture(file.ImagePath, file.uid)
|
||||
console.log('success',success)
|
||||
picList.forEach((item=>{
|
||||
if (item.uid!==file.uid){
|
||||
|
||||
@ -3,7 +3,7 @@ import type { ConnectState } from "@/models/connect";
|
||||
import ProForm, { ProFormText, ProFormTextArea } from "@ant-design/pro-form";
|
||||
import { useRef } from "react";
|
||||
import billBasic from '@/assets/DataVerification/billBasic.png'
|
||||
import { Button, Col, Row,Image } from "antd";
|
||||
import { Button, Col, Row, Image } from "antd";
|
||||
import billSale from '@/assets/DataVerification/billSale.png'
|
||||
import billCheck from '@/assets/DataVerification/billCheck.png'
|
||||
import ProTable from "@ant-design/pro-table";
|
||||
@ -31,7 +31,7 @@ type DetailProps = {
|
||||
imgList: any;
|
||||
formRef: any;
|
||||
}
|
||||
const DetailBasicInfo = ({ formRef,imgList,handleGetShopPriceData, setShowChangeLoading, selectTab, handleGetQueryRecords, setAuditRowDetail, setShowAuditDrawer, auditTableData, leftTimeList, disableBtn, setPayDetail, setFlowFlush, currentDetail }: DetailProps) => {
|
||||
const DetailBasicInfo = ({ formRef, imgList, handleGetShopPriceData, setShowChangeLoading, selectTab, handleGetQueryRecords, setAuditRowDetail, setShowAuditDrawer, auditTableData, leftTimeList, disableBtn, setPayDetail, setFlowFlush, currentDetail }: DetailProps) => {
|
||||
const columns: any = [
|
||||
{
|
||||
dataIndex: 'Check_Info',
|
||||
@ -477,7 +477,7 @@ const DetailBasicInfo = ({ formRef,imgList,handleGetShopPriceData, setShowChange
|
||||
width={'100%'}
|
||||
height={370}
|
||||
// src={`http://10.104.1.69:8000/cloud/static/uploadPhoto/index.html?id=${currentDetail?.Endaccount_Id}&tablename=ENDACCOUNT&readonly=&PopDialogName=IMAGEPage&Module_ID=3CD350DC5905D75D`}
|
||||
src={`${REACT_APP_ENV === 'dev' ? 'http://10.104.1.69:8000/' : 'http://saas.eshangtech.com/cloud/'}static/uploadPhoto/index.html?id=${currentDetail?.Endaccount_Id}&tablename=ENDACCOUNT&readonly=&PopDialogName=IMAGEPage&Module_ID=3CD350DC5905D75D`}
|
||||
src={`${REACT_APP_ENV === 'dev' ? 'http://192.168.1.207:8000/' : 'http://saas.eshangtech.com/cloud/'}static/uploadPhoto/index.html?id=${currentDetail?.Endaccount_Id}&tablename=ENDACCOUNT&readonly=&PopDialogName=IMAGEPage&Module_ID=3CD350DC5905D75D`}
|
||||
/>
|
||||
// http://saas.eshangtech.com/cloud/
|
||||
:
|
||||
|
||||
@ -12,7 +12,7 @@ import { Alert, Card, Col, Result, Row, Typography, Modal, Image, message, Form,
|
||||
import { connect, history } from "umi";
|
||||
import { useRef, useState } from "react";
|
||||
import { ExclamationCircleOutlined } from "@ant-design/icons";
|
||||
import { deletePicture, SavePicture } from '@/services/picture';
|
||||
import { deleteAHYDPicture, deletePicture, SavePicture } from '@/services/picture';
|
||||
import { getBase64 } from "@/utils/utils";
|
||||
import { createPermissionProInst } from "../../center/sevice";
|
||||
|
||||
@ -219,7 +219,8 @@ const CompanyInfo: React.FC<{ currentUser?: CurrentUser, dispatch: Dispatch }> =
|
||||
icon: <ExclamationCircleOutlined />,
|
||||
async onOk() {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'PERMISSIONAPPLY')
|
||||
// const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'PERMISSIONAPPLY')
|
||||
const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.ImageId, 'PERMISSIONAPPLY')
|
||||
deleteLoading()
|
||||
if (success) {
|
||||
const files = [...fileList]
|
||||
@ -278,7 +279,8 @@ const CompanyInfo: React.FC<{ currentUser?: CurrentUser, dispatch: Dispatch }> =
|
||||
icon: <ExclamationCircleOutlined />,
|
||||
async onOk() {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'PERMISSIONAPPLY')
|
||||
// const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'PERMISSIONAPPLY')
|
||||
const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.ImageId, 'PERMISSIONAPPLY')
|
||||
deleteLoading()
|
||||
if (success) {
|
||||
const files = [...fileList]
|
||||
@ -386,7 +388,8 @@ const CompanyInfo: React.FC<{ currentUser?: CurrentUser, dispatch: Dispatch }> =
|
||||
async onOk() {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
|
||||
const success = await deletePicture(info.file?.deletepath, info.file?.uid, 'PERMISSIONAPPLY')
|
||||
const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, 'PERMISSIONAPPLY')
|
||||
// const success = await deletePicture(info.file?.deletepath, info.file?.uid, 'PERMISSIONAPPLY')
|
||||
deleteLoading()
|
||||
|
||||
if (success) {
|
||||
@ -480,7 +483,8 @@ const CompanyInfo: React.FC<{ currentUser?: CurrentUser, dispatch: Dispatch }> =
|
||||
icon: <ExclamationCircleOutlined />,
|
||||
async onOk() {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'PERMISSIONAPPLY')
|
||||
// const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'PERMISSIONAPPLY')
|
||||
const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.ImageId, 'PERMISSIONAPPLY')
|
||||
deleteLoading()
|
||||
if (success) {
|
||||
const files = [...fileList]
|
||||
|
||||
@ -50,7 +50,7 @@ const customUploadRequest = async (fileList: UploadFile[], tableId: string, imag
|
||||
formData.append('ImageType', imageType);
|
||||
formData.append('TableType', '1125');
|
||||
formData.append('TableId', tableId);
|
||||
// const success = await uploadPicture(formData)
|
||||
// const success = await uploadAHYDPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
if (success) {
|
||||
return true
|
||||
@ -531,7 +531,8 @@ const AddEdit = ({ clickType, modalVisible, handleCloseAddEdit, currentRow, hand
|
||||
icon: <ExclamationCircleOutlined />,
|
||||
async onOk() {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000')
|
||||
// const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000')
|
||||
const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000')
|
||||
deleteLoading()
|
||||
if (success) {
|
||||
const files = [...list1001]
|
||||
@ -594,7 +595,8 @@ const AddEdit = ({ clickType, modalVisible, handleCloseAddEdit, currentRow, hand
|
||||
icon: <ExclamationCircleOutlined />,
|
||||
async onOk() {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000')
|
||||
// const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000')
|
||||
const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000')
|
||||
deleteLoading()
|
||||
if (success) {
|
||||
const files = [...list1004]
|
||||
@ -658,7 +660,8 @@ const AddEdit = ({ clickType, modalVisible, handleCloseAddEdit, currentRow, hand
|
||||
icon: <ExclamationCircleOutlined />,
|
||||
async onOk() {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000')
|
||||
// const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000')
|
||||
const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000')
|
||||
deleteLoading()
|
||||
if (success) {
|
||||
const files = [...list1005]
|
||||
@ -723,7 +726,8 @@ const AddEdit = ({ clickType, modalVisible, handleCloseAddEdit, currentRow, hand
|
||||
icon: <ExclamationCircleOutlined />,
|
||||
async onOk() {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000')
|
||||
// const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000')
|
||||
const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000')
|
||||
deleteLoading()
|
||||
if (success) {
|
||||
const files = [...list1002]
|
||||
@ -789,7 +793,8 @@ const AddEdit = ({ clickType, modalVisible, handleCloseAddEdit, currentRow, hand
|
||||
icon: <ExclamationCircleOutlined />,
|
||||
async onOk() {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000')
|
||||
// const success = await deletePicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000')
|
||||
const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.ImageId, 'BRAND', '6000')
|
||||
deleteLoading()
|
||||
if (success) {
|
||||
const files = [...list1003]
|
||||
|
||||
@ -29,7 +29,7 @@ import { getFieldEnum, getServerpartTree } from "@/services/options"; // 枚举
|
||||
import { getList, delcommodity_temp, updatecommodity_temp } from './service';
|
||||
|
||||
import { getBase64 } from '@/utils/utils';
|
||||
import { deletePicture, uploadPicture, getPictureList } from '@/services/picture';
|
||||
import { deletePicture, uploadPicture, getPictureList, uploadAHYDPicture, deleteAHYDPicture } from '@/services/picture';
|
||||
import type { UploadFile } from 'antd/es/upload/interface';
|
||||
import type { PictureModel } from '@/services/options/typings';
|
||||
|
||||
@ -83,7 +83,7 @@ const customUploadRequest = async (fileList: UploadFile[], tableId: string) => {
|
||||
|
||||
formData.append('Tabletype', '1114');
|
||||
formData.append('TableId', tableId);
|
||||
const success = await uploadPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
if (success) {
|
||||
return true
|
||||
}
|
||||
@ -668,7 +668,8 @@ const Commodity_tempTable: React.FC<{ currentUser: CurrentUser | undefined }> =
|
||||
icon: <ExclamationCircleOutlined />,
|
||||
async onOk() {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '1010')
|
||||
// const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '1010')
|
||||
const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, '', '1010')
|
||||
deleteLoading()
|
||||
if (success) {
|
||||
const files = [...fileList]
|
||||
|
||||
@ -17,7 +17,7 @@ import PageTitleBox from "@/components/PageTitleBox";
|
||||
import { handleDeleteNOTICEINFO, handleGetNOTICEINFOList, handleSynchroNOTICEINFO } from "./service";
|
||||
import moment from 'moment'
|
||||
import ProForm, { ProFormDatePicker, ProFormSelect, ProFormText, ProFormTextArea, ProFormTreeSelect, ProFormUploadButton } from "@ant-design/pro-form";
|
||||
import { deletePicture, uploadAHYDPicture, uploadPicture } from "@/services/picture";
|
||||
import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from "@/services/picture";
|
||||
import { handleGetPictureList } from "@/pages/reports/settlementAccount/service";
|
||||
import { truncate } from "lodash";
|
||||
import Popconfirm from "antd/es/popconfirm";
|
||||
@ -239,7 +239,7 @@ const highwayHeadlines: React.FC<{ currentUser: CurrentUser }> = (props) => {
|
||||
})
|
||||
formData.append('TableType', '1401');
|
||||
formData.append('TableId', data.Result_Data.NOTICEINFO_ID.toString());
|
||||
// const success = await uploadPicture(formData)
|
||||
// const success = await uploadAHYDPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
console.log('success', success);
|
||||
}
|
||||
@ -540,7 +540,8 @@ const highwayHeadlines: React.FC<{ currentUser: CurrentUser }> = (props) => {
|
||||
icon: <ExclamationCircleOutlined />,
|
||||
async onOk() {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '5000')
|
||||
// const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '5000')
|
||||
const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, '', '5000')
|
||||
deleteLoading()
|
||||
|
||||
if (success) {
|
||||
@ -602,7 +603,7 @@ const highwayHeadlines: React.FC<{ currentUser: CurrentUser }> = (props) => {
|
||||
// })
|
||||
// formData.append('TableType', '1401');
|
||||
// formData.append('TableId', currentRow?.NOTICEINFO_ID.toString());
|
||||
// const success = await uploadPicture(formData)
|
||||
// const success = await uploadAHYDPicture(formData)
|
||||
// console.log('success', success);
|
||||
// }
|
||||
// }
|
||||
|
||||
@ -9,7 +9,7 @@ import HistoryTable from "./historyTable";
|
||||
import ProForm, { ProFormSelect, ProFormText, ProFormTreeSelect, ProFormUploadButton } from "@ant-design/pro-form";
|
||||
import { handleGetPictureList } from "@/pages/DataVerification/list/service";
|
||||
import { getFieldEnumTreeNoSession } from "@/services/options";
|
||||
import { uploadPicture } from "@/services/picture";
|
||||
import { uploadAHYDPicture, uploadPicture } from "@/services/picture";
|
||||
import RelatedShop from "./relatedShop";
|
||||
|
||||
type DetailProps = {
|
||||
@ -832,7 +832,7 @@ const AssetsEditor = ({ onShow, handleClose, setOnShow, currentUser, id, parentR
|
||||
console.log('formData', formData);
|
||||
|
||||
if (info.filename) {
|
||||
const success = await uploadPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
console.log('success', success);
|
||||
|
||||
if (success.Result_Code === 100) {
|
||||
|
||||
@ -28,7 +28,7 @@ import Draggable from "react-draggable";
|
||||
import RelatedShop from "./component/relatedShop";
|
||||
import AssetsDetail from "./component/assetsDetail";
|
||||
import { getBase64 } from "@/utils/utils";
|
||||
import { deletePicture, uploadPicture } from "@/services/picture";
|
||||
import { deletePicture, uploadAHYDPicture, uploadPicture } from "@/services/picture";
|
||||
import { handleGetPictureList } from "@/pages/DataVerification/list/service";
|
||||
import Item from "antd/lib/list/Item";
|
||||
import HistoryTable from "./component/historyTable";
|
||||
@ -1395,7 +1395,7 @@ const serverpartAssets: React.FC<{ currentUser: CurrentUser }> = (props) => {
|
||||
console.log('formData', formData);
|
||||
|
||||
if (info.filename) {
|
||||
const success = await uploadPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
console.log('success', success);
|
||||
|
||||
if (success.Result_Code === 100) {
|
||||
|
||||
@ -26,7 +26,8 @@ import type { AccountReceivablesModel, PaymentConfirmModel, RemarksModel } from
|
||||
import { getFieldEnum } from "@/services/options";
|
||||
import {
|
||||
getPaymentConfirmList, getMerchantsReceivables, updatePaymentConfirm, uploadFile,
|
||||
savePaymentRecord, getRemarksList, updateSynchroRemarks, delPaymentConfirm
|
||||
savePaymentRecord, getRemarksList, updateSynchroRemarks, delPaymentConfirm,
|
||||
uploadAHYDFile
|
||||
} from "./service";
|
||||
|
||||
import EditPaymentTable from "./components/EditPaymentTable";
|
||||
@ -797,7 +798,8 @@ const MerchartsPayment: React.FC = (props: any) => {
|
||||
formData.append('TableName', 'PAYMENTCONFIRM');
|
||||
formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : '');
|
||||
if (info.filename) {
|
||||
const success = await uploadFile(formData)
|
||||
// const success = await uploadFile(formData)
|
||||
const success = await uploadAHYDFile(formData)
|
||||
|
||||
if (success) {
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@ import { Drawer, Image, message, Modal } from "antd";
|
||||
import ProForm, { ProFormUploadButton } from "@ant-design/pro-form";
|
||||
import { GetPictureListNormal } from "@/pages/supplier/inspectionReport/service";
|
||||
import { useState } from "react";
|
||||
import { deletePicture, uploadPicture } from "@/services/picture";
|
||||
import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from "@/services/picture";
|
||||
import { ExclamationCircleOutlined } from "@ant-design/icons";
|
||||
|
||||
type DetailProps = {
|
||||
@ -115,7 +115,8 @@ const FileDrawer = ({ onShow, onFileCancel, currentRow, readOnly, isCanChange, p
|
||||
icon: <ExclamationCircleOutlined />,
|
||||
async onOk() {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '1129')
|
||||
// const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '1129')
|
||||
const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, '', '1129')
|
||||
deleteLoading()
|
||||
|
||||
if (success) {
|
||||
@ -147,7 +148,7 @@ const FileDrawer = ({ onShow, onFileCancel, currentRow, readOnly, isCanChange, p
|
||||
formData.append('TableType', '1129');
|
||||
formData.append('TableId', currentRow?.SHOPEXPENSE_ID.toString());
|
||||
|
||||
const success = await uploadPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
console.log('success', success);
|
||||
if (parentRef) {
|
||||
parentRef.current?.reload()
|
||||
|
||||
@ -38,7 +38,7 @@ import { isNumber } from 'lodash';
|
||||
import EditLog from './components/editLog';
|
||||
import { uploadFile } from '../PaymentConfirm/service';
|
||||
import { GetPictureList, GetPictureListNormal, handleUploadPicture } from '@/pages/supplier/inspectionReport/service';
|
||||
import { deletePicture, uploadPicture } from '@/services/picture';
|
||||
import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from '@/services/picture';
|
||||
import http from '@/assets/supplier/http.png'
|
||||
import httpBlue from '@/assets/supplier/httpBlue.png'
|
||||
import FileDrawer from './components/fileDrawer';
|
||||
@ -1259,7 +1259,7 @@ const SHOPEXPENSETablePage: React.FC<{
|
||||
formData.append('ImageName', item.name);
|
||||
})
|
||||
formData.append('TableId', result?.SHOPEXPENSE_ID);
|
||||
const success = await uploadPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
console.log('success', success);
|
||||
}
|
||||
handleModalVisible(false);
|
||||
@ -1310,7 +1310,7 @@ const SHOPEXPENSETablePage: React.FC<{
|
||||
})
|
||||
formData.append('TableId', result?.SHOPEXPENSE_ID);
|
||||
|
||||
const success = await uploadPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
console.log('success', success);
|
||||
}
|
||||
|
||||
@ -1554,7 +1554,8 @@ const SHOPEXPENSETablePage: React.FC<{
|
||||
icon: <ExclamationCircleOutlined />,
|
||||
async onOk() {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '1129')
|
||||
// const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '1129')
|
||||
const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, '', '1129')
|
||||
deleteLoading()
|
||||
|
||||
if (success) {
|
||||
@ -1583,7 +1584,7 @@ const SHOPEXPENSETablePage: React.FC<{
|
||||
formData.append('TableType', '1129');
|
||||
formData.append('TableId', currentRow?.SHOPEXPENSE_ID.toString());
|
||||
|
||||
const success = await uploadPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
console.log('success', success);
|
||||
await handleGetFileList(currentRow)
|
||||
}
|
||||
|
||||
@ -38,7 +38,7 @@ import { isNumber } from 'lodash';
|
||||
import EditLog from './components/editLog';
|
||||
import { uploadFile } from '../PaymentConfirm/service';
|
||||
import { GetPictureList, GetPictureListNormal, handleUploadPicture } from '@/pages/supplier/inspectionReport/service';
|
||||
import { deletePicture, uploadPicture } from '@/services/picture';
|
||||
import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from '@/services/picture';
|
||||
import http from '@/assets/supplier/http.png'
|
||||
import httpBlue from '@/assets/supplier/httpBlue.png'
|
||||
import FileDrawer from './components/fileDrawer';
|
||||
@ -399,7 +399,7 @@ const SHOPEXPENSETablePage: React.FC<{
|
||||
render: (_, record) => {
|
||||
// return record?.SHOPEXPENSE_TYPE ? SHOPEXPENSE_TYPEOBJ[record?.SHOPEXPENSE_TYPE] : '-'
|
||||
return <div>
|
||||
<span>{record?.SHOPEXPENSE_TYPE&& SHOPEXPENSETYPEObj ? SHOPEXPENSETYPEObj[record?.SHOPEXPENSE_TYPE] : ''}</span>
|
||||
<span>{record?.SHOPEXPENSE_TYPE && SHOPEXPENSETYPEObj ? SHOPEXPENSETYPEObj[record?.SHOPEXPENSE_TYPE] : ''}</span>
|
||||
{
|
||||
record?.ChangeFlag ?
|
||||
<Tooltip title={'有修改'}>
|
||||
@ -1257,7 +1257,7 @@ const SHOPEXPENSETablePage: React.FC<{
|
||||
formData.append('ImageName', item.name);
|
||||
})
|
||||
formData.append('TableId', result?.SHOPEXPENSE_ID);
|
||||
const success = await uploadPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
console.log('success', success);
|
||||
}
|
||||
handleModalVisible(false);
|
||||
@ -1308,7 +1308,7 @@ const SHOPEXPENSETablePage: React.FC<{
|
||||
})
|
||||
formData.append('TableId', result?.SHOPEXPENSE_ID);
|
||||
|
||||
const success = await uploadPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
console.log('success', success);
|
||||
}
|
||||
|
||||
@ -1541,18 +1541,14 @@ const SHOPEXPENSETablePage: React.FC<{
|
||||
// 如果在待上传列表中找到，则说明当前图片没有上传服务器，可直接删除
|
||||
const index = fileList.findIndex(n => n.uid === info.file.uid);
|
||||
|
||||
// if (info.file?.status === "removed" && ) {
|
||||
// const newFileList = fileList.slice();
|
||||
// newFileList.splice(index, 1);
|
||||
// setFileList(newFileList)
|
||||
// return
|
||||
// }
|
||||
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 deletePicture(info.file?.deletepath, info.file?.uid, '', '1129')
|
||||
const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, '', '1129')
|
||||
deleteLoading()
|
||||
|
||||
if (success) {
|
||||
@ -1567,6 +1563,20 @@ const SHOPEXPENSETablePage: React.FC<{
|
||||
onCancel() {
|
||||
},
|
||||
});
|
||||
} else {
|
||||
const newFileList = fileList.slice();
|
||||
newFileList.splice(index, 1);
|
||||
setFileList(newFileList)
|
||||
return
|
||||
}
|
||||
|
||||
// if (info.file?.status === "removed" && ) {
|
||||
// const newFileList = fileList.slice();
|
||||
// newFileList.splice(index, 1);
|
||||
// setFileList(newFileList)
|
||||
// return
|
||||
// }
|
||||
|
||||
} else {
|
||||
if (currentRow?.SHOPEXPENSE_ID && info.fileList && info.fileList.length > 0) {
|
||||
|
||||
@ -1581,7 +1591,7 @@ const SHOPEXPENSETablePage: React.FC<{
|
||||
formData.append('TableType', '1129');
|
||||
formData.append('TableId', currentRow?.SHOPEXPENSE_ID.toString());
|
||||
|
||||
const success = await uploadPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
console.log('success', success);
|
||||
await handleGetFileList(currentRow)
|
||||
}
|
||||
|
||||
@ -506,7 +506,7 @@ const ContractDetail = ({ contractId, currentRow, clickedId }: { contractId: num
|
||||
console.log('item', item);
|
||||
console.log('historyList.current', historyList.current);
|
||||
console.log('clickedId', clickedId);
|
||||
if (clickedId.indexOf(item.REGISTERCOMPACT_ID) === -1) {
|
||||
if (clickedId && clickedId.indexOf(item.REGISTERCOMPACT_ID) === -1) {
|
||||
let list: any = JSON.parse(JSON.stringify(clickedId))
|
||||
list.push(item.REGISTERCOMPACT_ID)
|
||||
historyList.current = list
|
||||
@ -824,7 +824,7 @@ const ContractDetail = ({ contractId, currentRow, clickedId }: { contractId: num
|
||||
closable={false}
|
||||
bodyStyle={{ backgroundColor: "#f9f9f9", padding: 0 }}
|
||||
>
|
||||
<ContractDetail contractId={childrenRow?.REGISTERCOMPACT_ID} clickedId={historyList.current}/>
|
||||
<ContractDetail contractId={childrenRow?.REGISTERCOMPACT_ID} clickedId={historyList.current} />
|
||||
</Drawer>
|
||||
|
||||
{/* 日志抽屉 */}
|
||||
|
||||
@ -60,7 +60,7 @@ import {
|
||||
} from '../service';
|
||||
|
||||
import { getBase64 } from '@/utils/utils';
|
||||
import { getPictureList, deletePicture, uploadPicture } from '@/services/picture';
|
||||
import { getPictureList, deletePicture, uploadPicture, uploadAHYDPicture, deleteAHYDPicture } from '@/services/picture';
|
||||
import type { UploadFile } from 'antd/es/upload/interface';
|
||||
import type { PictureModel } from '@/services/options/typings';
|
||||
|
||||
@ -123,7 +123,7 @@ const customUploadRequest = async (fileList: UploadFile[], tableId: string) => {
|
||||
});
|
||||
formData.append('TableType', '1115');
|
||||
formData.append('TableId', tableId);
|
||||
const success = await uploadPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
if (success) {
|
||||
return true
|
||||
}
|
||||
@ -641,7 +641,8 @@ const EditContract = ({ contractId: id, actionRef, setShowDetail, showDelete, cu
|
||||
icon: <ExclamationCircleOutlined />,
|
||||
async onOk() {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '3000')
|
||||
// const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '3000')
|
||||
const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, '', '3000')
|
||||
deleteLoading()
|
||||
if (success) {
|
||||
const files = [...fileList]
|
||||
|
||||
@ -29,7 +29,7 @@ import { delCompact, getList, handleContractSupple } from "./service";
|
||||
import ProForm, { ProFormDatePicker, ProFormSelect, ProFormTextArea, ProFormUploadButton } from "@ant-design/pro-form";
|
||||
import { getProjectList } from "@/pages/BussinessProject/service";
|
||||
import useRequest from "@ahooksjs/use-request";
|
||||
import { deletePicture, uploadPicture } from "@/services/picture";
|
||||
import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from "@/services/picture";
|
||||
import type { UploadFile } from "antd/es/upload/interface";
|
||||
import fileIcon from '@/assets/detail/fileIcon.svg'
|
||||
import session from "@/utils/session";
|
||||
@ -67,7 +67,7 @@ const customUploadRequest = async (fileList: UploadFile[], tableId: string) => {
|
||||
});
|
||||
formData.append('TableType', '1115');
|
||||
formData.append('TableId', tableId);
|
||||
const success = await uploadPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
if (success) {
|
||||
return true
|
||||
}
|
||||
@ -799,7 +799,8 @@ const ContractTable: React.FC<{ currentUser: CurrentUser }> = (props) => {
|
||||
icon: <ExclamationCircleOutlined />,
|
||||
async onOk() {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '3000')
|
||||
// const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '3000')
|
||||
const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, '', '3000')
|
||||
deleteLoading()
|
||||
if (success) {
|
||||
const files = [...fileList]
|
||||
|
||||
@ -292,7 +292,7 @@ const marketResearch: React.FC<{ currentUser: CurrentUser }> = (props) => {
|
||||
})
|
||||
formData.append('TableId', id)
|
||||
formData.append('TableType', '1128')
|
||||
const data = await handleUploadPicture(formData)
|
||||
const data = await handleuploadAHYDPicture(formData)
|
||||
console.log('data', data)
|
||||
}
|
||||
}
|
||||
|
||||
@ -19,7 +19,7 @@ import type { PermissionApplyModel, PermissionProinstModel } from "@/pages/accou
|
||||
import { getServerpartOption } from "@/services/options";
|
||||
import { createPermissionProInst } from "@/pages/account/center/sevice";
|
||||
import { ExclamationCircleOutlined } from "@ant-design/icons";
|
||||
import { deletePicture, SavePicture } from '@/services/picture';
|
||||
import { deleteAHYDPicture, deletePicture, SavePicture } from '@/services/picture';
|
||||
|
||||
const { confirm } = Modal
|
||||
type ShopProps = {
|
||||
@ -222,7 +222,8 @@ const AddShopModal: React.FC<ShopProps> = ({ currentUser, createModalVisible, ha
|
||||
async onOk() {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
|
||||
const success = await deletePicture(info.file?.deletepath, info.file?.uid, 'PERMISSIONAPPLY')
|
||||
// const success = await deletePicture(info.file?.deletepath, info.file?.uid, 'PERMISSIONAPPLY')
|
||||
const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, 'PERMISSIONAPPLY')
|
||||
deleteLoading()
|
||||
|
||||
if (success) {
|
||||
|
||||
@ -28,7 +28,7 @@ import { getTreeSelectOption } from '@/utils/format';
|
||||
import { ExclamationCircleOutlined } from "@ant-design/icons";
|
||||
import React from "react";
|
||||
import Draggable from "react-draggable";
|
||||
import { uploadFile } from "@/pages/busniess/PaymentConfirm/service";
|
||||
import { uploadAHYDFile, uploadFile } from "@/pages/busniess/PaymentConfirm/service";
|
||||
|
||||
const { confirm } = Modal;
|
||||
|
||||
@ -288,7 +288,7 @@ const BrandTable: React.FC = () => {
|
||||
setCurrentRow(undefined);
|
||||
setShowDetail(false);
|
||||
}}
|
||||
bodyStyle={{backgroundColor: "#f9f9f9", padding: 16}}
|
||||
bodyStyle={{ backgroundColor: "#f9f9f9", padding: 16 }}
|
||||
closable={false}
|
||||
>
|
||||
{currentRow?.BRAND_NAME && (
|
||||
@ -488,7 +488,8 @@ const BrandTable: React.FC = () => {
|
||||
formData.append('TableName', 'BRAND');
|
||||
formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : '');
|
||||
if (info.filename) {
|
||||
const success = await uploadFile(formData)
|
||||
// const success = await uploadFile(formData)
|
||||
const success = await uploadAHYDFile(formData)
|
||||
if (success) {
|
||||
const list = [{
|
||||
uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败
|
||||
|
||||
@ -18,7 +18,7 @@ import type { CurrentUser } from 'umi';
|
||||
|
||||
import { getSupplierList, delSupplier, updateSupplier, getSupplierDetail, getBusinessManList } from './service';
|
||||
import type { UploadFile } from 'antd/lib/upload/interface';
|
||||
import { deletePicture, uploadPicture } from '@/services/picture';
|
||||
import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from '@/services/picture';
|
||||
import { getQualificationList } from '../Qualifications/service';
|
||||
import { groupBy } from 'lodash';
|
||||
import type { QualificationModel } from '../Qualifications/data';
|
||||
@ -74,7 +74,7 @@ const customUploadRequest = async (fileList: UploadFile[], tableId: string) => {
|
||||
|
||||
formData.append('TableName', 'SUPPLIER');
|
||||
formData.append('TableId', tableId);
|
||||
const success = await uploadPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
if (success) {
|
||||
return true
|
||||
}
|
||||
@ -355,7 +355,7 @@ const SupplierTable: React.FC<{ currentUser?: CurrentUser }> = ({ currentUser })
|
||||
}}
|
||||
/></Tooltip> </>}
|
||||
actionRef={actionRef}
|
||||
search={{ span: 6 ,labelWidth:'auto'}}
|
||||
search={{ span: 6, labelWidth: 'auto' }}
|
||||
request={async (params) => {
|
||||
const searchUser = currentUser?.UserPattern === 2000 ? { OWNERUNIT_ID: currentUser?.BusinessManID } : { PROVINCE_CODE: currentUser?.ProvinceCode }
|
||||
const data = await getSupplierList({
|
||||
@ -708,7 +708,8 @@ const SupplierTable: React.FC<{ currentUser?: CurrentUser }> = ({ currentUser })
|
||||
async onOk() {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
|
||||
const success = await deletePicture(info.file?.deletepath, info.file?.uid, 'SUPPLIER')
|
||||
// const success = await deletePicture(info.file?.deletepath, info.file?.uid, 'SUPPLIER')
|
||||
const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, 'SUPPLIER')
|
||||
deleteLoading()
|
||||
|
||||
if (success) {
|
||||
|
||||
@ -19,7 +19,7 @@ import type { PictureModel } from '@/services/options/typings';
|
||||
|
||||
import { getQualificationList, delQualification, updateQualification, getQualificationDetail, relateBusinessCommodity } from './service';
|
||||
import { getSupplierList } from '../Management/service';
|
||||
import { deletePicture, uploadPicture } from '@/services/picture';
|
||||
import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from '@/services/picture';
|
||||
import { getFieldEnum } from '@/services/options';
|
||||
import { transferImg } from '@/utils/format';
|
||||
import { getBase64 } from '@/utils/utils';
|
||||
@ -93,7 +93,7 @@ const customUploadRequest = async (fileList: UploadFile[], tableId: string) => {
|
||||
|
||||
formData.append('TableName', 'QUALIFICATION');
|
||||
formData.append('TableId', tableId);
|
||||
const success = await uploadPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
if (success) {
|
||||
return true
|
||||
}
|
||||
@ -701,7 +701,8 @@ const CommdityTable: React.FC<{ currentUser?: CurrentUser }> = ({ currentUser })
|
||||
icon: <ExclamationCircleOutlined />,
|
||||
async onOk() {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.deletepath, info.file?.uid, 'QUALIFICATION')
|
||||
// const success = await deletePicture(info.file?.deletepath, info.file?.uid, 'QUALIFICATION')
|
||||
const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, 'QUALIFICATION')
|
||||
deleteLoading()
|
||||
|
||||
if (success) {
|
||||
|
||||
@ -24,7 +24,7 @@ import LeftSelectTree from '@/pages/reports/settlementAccount/component/leftSele
|
||||
import session from '@/utils/session';
|
||||
import PageTitleBox from '@/components/PageTitleBox';
|
||||
import { handeDeleteSERVERPARTSELLER, handeGetCOMMENTList, handeGetPictureList, handeGetRevenueReport } from '@/pages/travelMember/service';
|
||||
import { deletePicture, uploadPicture } from '@/services/picture';
|
||||
import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from '@/services/picture';
|
||||
import { handleGetServerPartShopNewList } from '@/pages/basicManage/serviceArea/service';
|
||||
import { handleGetServerpartShopList } from '@/pages/DataVerification/service';
|
||||
import ModalFooter from '@/pages/travelMember/scenicSpotConfig/component/modalFooter';
|
||||
@ -701,7 +701,7 @@ const MerchantInformation: React.FC<{ currentUser: CurrentUser | undefined }> =
|
||||
formData.append('imageType', "1000");
|
||||
formData.append('TableType', "1204");
|
||||
|
||||
let res = await uploadPicture(formData)
|
||||
let res = await uploadAHYDPicture(formData)
|
||||
}
|
||||
|
||||
if (formValue.DoorImage && formValue.DoorImage.length > 0) {
|
||||
@ -714,7 +714,7 @@ const MerchantInformation: React.FC<{ currentUser: CurrentUser | undefined }> =
|
||||
formData.append('imageType', "2000");
|
||||
formData.append('TableType', "1204");
|
||||
|
||||
let res = await uploadPicture(formData)
|
||||
let res = await uploadAHYDPicture(formData)
|
||||
}
|
||||
|
||||
if (formValue.InteriorImage && formValue.InteriorImage.length > 0) {
|
||||
@ -727,7 +727,7 @@ const MerchantInformation: React.FC<{ currentUser: CurrentUser | undefined }> =
|
||||
formData.append('imageType', "3000");
|
||||
formData.append('TableType', "1204");
|
||||
|
||||
let res = await uploadPicture(formData)
|
||||
let res = await uploadAHYDPicture(formData)
|
||||
}
|
||||
}
|
||||
|
||||
@ -1681,7 +1681,8 @@ const MerchantInformation: React.FC<{ currentUser: CurrentUser | undefined }> =
|
||||
async onOk() {
|
||||
if (info.file.ImageId) {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
// const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
deleteLoading()
|
||||
|
||||
if (success) {
|
||||
@ -1730,7 +1731,8 @@ const MerchantInformation: React.FC<{ currentUser: CurrentUser | undefined }> =
|
||||
async onOk() {
|
||||
if (info.file.ImageId) {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
// const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
deleteLoading()
|
||||
|
||||
if (success) {
|
||||
@ -1779,7 +1781,8 @@ const MerchantInformation: React.FC<{ currentUser: CurrentUser | undefined }> =
|
||||
async onOk() {
|
||||
if (info.file.ImageId) {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
// const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
deleteLoading()
|
||||
|
||||
if (success) {
|
||||
|
||||
@ -17,7 +17,7 @@ import { exportExcel, getBase64 } from '@/utils/utils';
|
||||
import ProForm, { ProFormDatePicker, ProFormSelect, ProFormTextArea, ProFormUploadButton } from "@ant-design/pro-form";
|
||||
import { getProjectList } from "@/pages/BussinessProject/service";
|
||||
import useRequest from "@ahooksjs/use-request";
|
||||
import { deletePicture, uploadPicture } from "@/services/picture";
|
||||
import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from "@/services/picture";
|
||||
import type { UploadFile } from "antd/es/upload/interface";
|
||||
import fileIcon from '@/assets/detail/fileIcon.svg'
|
||||
import session from "@/utils/session";
|
||||
@ -61,7 +61,7 @@ const customUploadRequest = async (fileList: UploadFile[], tableId: string) => {
|
||||
});
|
||||
formData.append('TableType', '1115');
|
||||
formData.append('TableId', tableId);
|
||||
const success = await uploadPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
if (success) {
|
||||
return true
|
||||
}
|
||||
@ -919,7 +919,8 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) =>
|
||||
icon: <ExclamationCircleOutlined />,
|
||||
async onOk() {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '3000')
|
||||
// const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '3000')
|
||||
const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, '', '3000')
|
||||
deleteLoading()
|
||||
if (success) {
|
||||
const files = [...fileList]
|
||||
|
||||
@ -46,7 +46,7 @@ import { handleGetAPPROVALROUTEList } from "@/pages/Setting/serviceConfig/servic
|
||||
import { handleSolidProjectRevenue } from "../../revenueDifference/service";
|
||||
import MonthSettlement from "./monthSettlement";
|
||||
import MonthTopTable from "./monthTopTable";
|
||||
import { deletePicture, uploadPicture } from "@/services/picture";
|
||||
import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from "@/services/picture";
|
||||
import { ExclamationCircleOutlined } from "@ant-design/icons";
|
||||
import { handleGetPictureList, handleGetProjectExpenseList } from "../../settlementAccount/service";
|
||||
import PrintContent from "../../settlementAccount/component/printContent";
|
||||
@ -3750,7 +3750,7 @@ const compareList: React.FC<{
|
||||
})
|
||||
formData.append('TableType', '1130');
|
||||
formData.append('TableId', detail?.BUSINESSAPPROVAL_ID);
|
||||
const success = await uploadPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
console.log('success', success);
|
||||
}
|
||||
|
||||
@ -4118,7 +4118,8 @@ const compareList: React.FC<{
|
||||
icon: <ExclamationCircleOutlined />,
|
||||
async onOk() {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '3000')
|
||||
// const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '3000')
|
||||
const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, '', '3000')
|
||||
deleteLoading()
|
||||
|
||||
if (success) {
|
||||
@ -4147,7 +4148,7 @@ const compareList: React.FC<{
|
||||
formData.append('TableType', '1130');
|
||||
formData.append('TableId', compareCurrent?.BUSINESSAPPROVAL_ID);
|
||||
|
||||
const success = await uploadPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
console.log('success', success);
|
||||
if (success) {
|
||||
message.success("上传成功！")
|
||||
|
||||
@ -18,7 +18,7 @@ import './YearExamineDetailTable.less'
|
||||
import ProForm, { ProFormDateRangePicker, ProFormDigit, ProFormList, ProFormUploadButton } from "@ant-design/pro-form";
|
||||
import { handleGetPictureList, handleRebuildClosedPeriod, handleRebuildReductionPeriod } from "../service";
|
||||
import { ExclamationCircleOutlined, MinusCircleOutlined, PlusOutlined } from "@ant-design/icons";
|
||||
import { deletePicture, uploadPicture } from "@/services/picture";
|
||||
import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from "@/services/picture";
|
||||
import PrintContent from "./printContent";
|
||||
import { handleHighPrecision } from "@/utils/utils";
|
||||
import HistoricalProjects from "./HistoricalProjects";
|
||||
@ -3030,7 +3030,8 @@ const YearExamineDetailTable = ({ parentRow, currentApprovalstate, onRef, setIsS
|
||||
icon: <ExclamationCircleOutlined />,
|
||||
async onOk() {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '3000')
|
||||
// const success = await deletePicture(info.file?.deletepath, info.file?.uid, '', '3000')
|
||||
const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, '', '3000')
|
||||
deleteLoading()
|
||||
|
||||
if (success) {
|
||||
@ -3059,7 +3060,7 @@ const YearExamineDetailTable = ({ parentRow, currentApprovalstate, onRef, setIsS
|
||||
formData.append('TableType', '1130');
|
||||
formData.append('TableId', parentRow?.BUSINESSAPPROVAL_ID);
|
||||
|
||||
const success = await uploadPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
console.log('success', success);
|
||||
if (success) {
|
||||
message.success("上传成功！")
|
||||
|
||||
@ -18,7 +18,7 @@ import { handleApproveAccount, handleApproveMonthAccountProinst, handleRejectAcc
|
||||
import React from "react";
|
||||
import { handleCreateSettlement, handleSynchroRevenueConfirmList } from "@/pages/reports/settlementDetail/service";
|
||||
import Item from "antd/lib/list/Item";
|
||||
import { deletePicture, uploadPicture } from "@/services/picture";
|
||||
import { deletePicture, uploadAHYDPicture, uploadPicture } from "@/services/picture";
|
||||
import { getProjectDetail } from "@/pages/BussinessProject/service";
|
||||
|
||||
const { confirm } = Modal;
|
||||
@ -399,7 +399,7 @@ const YearExamineProcess = ({ currentUser, onShow, setOnShow, parentRow, setPare
|
||||
})
|
||||
formData.append('TableType', '1130');
|
||||
formData.append('TableId', detail?.BUSINESSAPPROVAL_ID);
|
||||
const success = await uploadPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
console.log('success', success);
|
||||
}
|
||||
|
||||
|
||||
@ -1,51 +1,52 @@
|
||||
import type { FormInstance} from "antd";
|
||||
import {Button, Col, message, Row, Upload, Image, Popconfirm,DatePicker} from "antd";
|
||||
import React, {useEffect, useRef, useState} from "react";
|
||||
import type { FormInstance } from "antd";
|
||||
import { Button, Col, message, Row, Upload, Image, Popconfirm, DatePicker } from "antd";
|
||||
import React, { useEffect, useRef, useState } from "react";
|
||||
import './index.less'
|
||||
import {UploadOutlined} from "@ant-design/icons";
|
||||
import ProForm, {ProFormDatePicker, ProFormText, ProFormUploadButton} from "@ant-design/pro-form";
|
||||
import { UploadOutlined } from "@ant-design/icons";
|
||||
import ProForm, { ProFormDatePicker, ProFormText, ProFormUploadButton } from "@ant-design/pro-form";
|
||||
import {
|
||||
deletePicture,
|
||||
GetPictureList,
|
||||
handleUploadPicture
|
||||
} from "@/pages/supplier/inspectionReport/service";
|
||||
import type {CurrentUser} from "@/models/user";
|
||||
import {connect} from "umi";
|
||||
import type {ConnectState} from "@/models/connect";
|
||||
import type { CurrentUser } from "@/models/user";
|
||||
import { connect } from "umi";
|
||||
import type { ConnectState } from "@/models/connect";
|
||||
import moment from "moment";
|
||||
import LoadingBox from "@/pages/reports/Finance/businessAnalysis/components/loading";
|
||||
import { deleteAHYDPicture } from "@/services/picture";
|
||||
|
||||
const InspectionReport: React.FC<{ currentUser?: CurrentUser}> = ({ currentUser }) => {
|
||||
const InspectionReport: React.FC<{ currentUser?: CurrentUser }> = ({ currentUser }) => {
|
||||
|
||||
const formRef = useRef<FormInstance>();
|
||||
const [pictureList,setPictureList] = useState<any>()
|
||||
const [pictureListLoading,setPictureListLoading] = useState<any>(false)
|
||||
const [pictureList, setPictureList] = useState<any>()
|
||||
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)
|
||||
const req: any = {
|
||||
TableId: currentUser?.SupplierID,
|
||||
TableType: 1127,
|
||||
ImageIndex: time?moment(time).format('YYYYMMDD'):searchDate?moment(searchDate).format('YYYYMMDD'):''
|
||||
ImageIndex: time ? moment(time).format('YYYYMMDD') : searchDate ? moment(searchDate).format('YYYYMMDD') : ''
|
||||
}
|
||||
const data = await GetPictureList(req)
|
||||
console.log('data',data)
|
||||
if (data && data.length>0){
|
||||
console.log('data', data)
|
||||
if (data && data.length > 0) {
|
||||
setPictureList(data)
|
||||
}else{
|
||||
} else {
|
||||
setPictureList([])
|
||||
}
|
||||
setPictureListLoading(false)
|
||||
}
|
||||
|
||||
useEffect(()=>{
|
||||
useEffect(() => {
|
||||
handleGetPictureList(searchDate)
|
||||
},[])
|
||||
}, [])
|
||||
|
||||
return (
|
||||
<div className={'InspectionReport'}>
|
||||
@ -54,7 +55,7 @@ const InspectionReport: React.FC<{ currentUser?: CurrentUser}> = ({ currentUser
|
||||
formRef={formRef}
|
||||
// layout={'horizontal'}
|
||||
submitter={{
|
||||
render:(_,record)=> {
|
||||
render: (_, record) => {
|
||||
|
||||
}
|
||||
}}
|
||||
@ -68,14 +69,14 @@ const InspectionReport: React.FC<{ currentUser?: CurrentUser}> = ({ currentUser
|
||||
name: 'file',
|
||||
// actions: 'http://220.180.35.180:8000/EShangApiMain',
|
||||
beforeUpload: (file) => {
|
||||
console.log('file',file)
|
||||
const isLength = file.name.indexOf('.')<=19
|
||||
console.log('file', file)
|
||||
const isLength = file.name.indexOf('.') <= 19
|
||||
|
||||
const isPNG = file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/jpeg';
|
||||
if (!isPNG) {
|
||||
message.error(`仅支持上传png、jpg、jpeg格式的图片文件！`);
|
||||
}
|
||||
if (!isLength){
|
||||
if (!isLength) {
|
||||
message.error(`文件名称过长！不大于20字`);
|
||||
}
|
||||
|
||||
@ -119,30 +120,30 @@ const InspectionReport: React.FC<{ currentUser?: CurrentUser}> = ({ currentUser
|
||||
/>
|
||||
</Col>
|
||||
<Col span={6}>
|
||||
<Button type={'primary'} loading={saveLoading} onClick={()=>{
|
||||
console.log('currentUser',currentUser)
|
||||
formRef.current?.validateFields().then(async (res: any)=>{
|
||||
if (res){
|
||||
<Button type={'primary'} loading={saveLoading} onClick={() => {
|
||||
console.log('currentUser', currentUser)
|
||||
formRef.current?.validateFields().then(async (res: any) => {
|
||||
if (res) {
|
||||
setSaveLoading(true)
|
||||
console.log('res',res)
|
||||
console.log('res', res)
|
||||
const formData = new FormData()
|
||||
if (res.file && res.file.length>0){
|
||||
res.file.forEach((item: any)=>{
|
||||
formData.append('files[]',item.originFileObj)
|
||||
if (res.file && res.file.length > 0) {
|
||||
res.file.forEach((item: any) => {
|
||||
formData.append('files[]', item.originFileObj)
|
||||
})
|
||||
formData.append('TableId',currentUser?.SupplierID.toString())
|
||||
formData.append('TableType','1127')
|
||||
formData.append('TableId', currentUser?.SupplierID.toString())
|
||||
formData.append('TableType', '1127')
|
||||
// formData.append('ImageName',res.fileName)
|
||||
formData.append('ImageType','2000')
|
||||
formData.append('ImageIndex',res.time?moment(res.time).format('YYYYMMDD'):'')
|
||||
formData.append('ImageType', '2000')
|
||||
formData.append('ImageIndex', res.time ? moment(res.time).format('YYYYMMDD') : '')
|
||||
}
|
||||
const data= await handleUploadPicture(formData)
|
||||
console.log('data',data)
|
||||
if (data.Result_Code===100){
|
||||
const data = await handleuploadAHYDPicture(formData)
|
||||
console.log('data', data)
|
||||
if (data.Result_Code === 100) {
|
||||
formRef.current?.resetFields()
|
||||
message.success('保存成功！')
|
||||
handleGetPictureList()
|
||||
}else{
|
||||
} else {
|
||||
message.error(data.Result_Desc)
|
||||
}
|
||||
setSaveLoading(false)
|
||||
@ -154,21 +155,21 @@ const InspectionReport: React.FC<{ currentUser?: CurrentUser}> = ({ currentUser
|
||||
</ProForm>
|
||||
|
||||
{/* 查询项 */}
|
||||
<div style={{width:'100%',marginBottom:'12px'}}>
|
||||
<div style={{ width: '100%', marginBottom: '12px' }}>
|
||||
<Row>
|
||||
<Col span={6}>
|
||||
<span>查询时间：</span>
|
||||
<DatePicker
|
||||
disabledDate={(current: any) => current > moment()}
|
||||
value={searchDate}
|
||||
onChange={(e: any)=>{
|
||||
console.log('e',e)
|
||||
onChange={(e: any) => {
|
||||
console.log('e', e)
|
||||
setSearchDate(moment(e._d))
|
||||
}}
|
||||
/>
|
||||
</Col>
|
||||
<Col span={6}>
|
||||
<Button type={'primary'} onClick={()=>{
|
||||
<Button type={'primary'} onClick={() => {
|
||||
handleGetPictureList()
|
||||
}}>查询</Button>
|
||||
</Col>
|
||||
@ -178,12 +179,12 @@ const InspectionReport: React.FC<{ currentUser?: CurrentUser}> = ({ currentUser
|
||||
{/* 图片展示的列表 */}
|
||||
<div className={'pictureListBox'}>
|
||||
{
|
||||
pictureListLoading?
|
||||
<LoadingBox/>:
|
||||
pictureListLoading ?
|
||||
<LoadingBox /> :
|
||||
<div className={'imageItemListBox'} >
|
||||
{
|
||||
pictureList && pictureList.length>0?
|
||||
pictureList.map((item: any)=>{
|
||||
pictureList && pictureList.length > 0 ?
|
||||
pictureList.map((item: any) => {
|
||||
return <div className={'imageItem'}>
|
||||
<div className={'imgBox'}>
|
||||
<Image
|
||||
@ -195,12 +196,13 @@ const InspectionReport: React.FC<{ currentUser?: CurrentUser}> = ({ currentUser
|
||||
<div className={'imgBtn'}>
|
||||
<Popconfirm
|
||||
title="确认删除？"
|
||||
onConfirm={async ()=>{
|
||||
const data = await deletePicture(item.ImagePath,item.ImageId,'',9000)
|
||||
if (data.Result_Code===100){
|
||||
onConfirm={async () => {
|
||||
// const data = await deletePicture(item.ImagePath,item.ImageId,'',9000)
|
||||
const data = await deleteAHYDPicture(item.ImagePath, item.ImageId, '', 9000)
|
||||
if (data.Result_Code === 100) {
|
||||
message.success('删除成功！')
|
||||
handleGetPictureList()
|
||||
}else{
|
||||
} else {
|
||||
message.error(data.Result_Desc)
|
||||
}
|
||||
}}
|
||||
@ -209,7 +211,7 @@ const InspectionReport: React.FC<{ currentUser?: CurrentUser}> = ({ currentUser
|
||||
</Popconfirm>
|
||||
</div>
|
||||
</div>
|
||||
}):''
|
||||
}) : ''
|
||||
}
|
||||
</div>
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@ import request from "@/utils/requestUpLoad";
|
||||
import requestNormal from "@/utils/request";
|
||||
|
||||
// 上传图片
|
||||
export async function handleUploadPicture(params?: any) {
|
||||
export async function handleuploadAHYDPicture(params?: any) {
|
||||
const data = await request(`/Picture/UploadPicture`, {
|
||||
method: 'POST',
|
||||
data: params
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -35,7 +35,7 @@ import {
|
||||
} from "@ant-design/pro-form";
|
||||
import useRequest from "@ahooksjs/use-request";
|
||||
import { handleSupplierList } from "@/pages/Setting/Roles/service";
|
||||
import { deletePicture, uploadPicture } from "@/services/picture";
|
||||
import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from "@/services/picture";
|
||||
import type { QualificationModel } from "@/pages/merchantManagement/supplier/Qualifications/data";
|
||||
import { getFieldEnum } from "@/services/options";
|
||||
import type { UploadFile } from "antd/es/upload/interface";
|
||||
@ -82,7 +82,7 @@ const customUploadRequest = async (fileList: UploadFile[], tableId: string) => {
|
||||
|
||||
formData.append('TableName', 'QUALIFICATION');
|
||||
formData.append('TableId', tableId);
|
||||
const success = await uploadPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
if (success) {
|
||||
return true
|
||||
}
|
||||
@ -1197,7 +1197,8 @@ const SupplierList: React.FC<{ currentUser: CurrentUser | undefined }> = ({ curr
|
||||
icon: <ExclamationCircleOutlined />,
|
||||
async onOk() {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.deletepath, info.file?.uid, 'QUALIFICATION')
|
||||
// const success = await deletePicture(info.file?.deletepath, info.file?.uid, 'QUALIFICATION')
|
||||
const success = await deleteAHYDPicture(info.file?.deletepath, info.file?.uid, 'QUALIFICATION')
|
||||
deleteLoading()
|
||||
|
||||
if (success) {
|
||||
|
||||
@ -22,7 +22,7 @@ import type { FormInstance } from 'antd';
|
||||
import PageTitleBox from '@/components/PageTitleBox';
|
||||
import { handeGetUSERDEFINEDTYPEList, handlDeleteUSERDEFINEDTYPE, handlSynchroUSERDEFINEDTYPE } from '../service';
|
||||
import { render } from 'react-dom';
|
||||
import { uploadPicture } from '@/services/picture';
|
||||
import { uploadAHYDPicture, uploadPicture } from '@/services/picture';
|
||||
import { handleSetlogSave } from '@/utils/format';
|
||||
import ModalFooter from '../scenicSpotConfig/component/modalFooter';
|
||||
|
||||
@ -489,7 +489,7 @@ const HomepageAds: React.FC<{ currentUser: CurrentUser | undefined }> = (props)
|
||||
formData.append('TableType', selectTab === "1" ? '1214' : "1213");
|
||||
formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : '');
|
||||
if (info.filename) {
|
||||
const success = await uploadPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
if (success) {
|
||||
const list = [{
|
||||
// uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败
|
||||
|
||||
@ -19,7 +19,7 @@ import ProForm, { ProFormDatePicker, ProFormDateRangePicker, ProFormSelect, ProF
|
||||
import { handleGetPictureList } from "@/pages/reports/settlementAccount/service";
|
||||
import session from "@/utils/session";
|
||||
import { handeDeleteSUGGESTION, handeGetPictureList, handeGetSUGGESTIONList, handeSynchroSUGGESTION } from "../service";
|
||||
import { deletePicture, uploadPicture } from "@/services/picture";
|
||||
import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from "@/services/picture";
|
||||
|
||||
const beforeUpload = (file: any) => {
|
||||
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
|
||||
@ -279,7 +279,7 @@ const LostandFoundAPPliance: React.FC<{ currentUser: CurrentUser }> = (props) =>
|
||||
formData.append('TableType', "1306");
|
||||
|
||||
console.log('formData', formData);
|
||||
let res = await uploadPicture(formData)
|
||||
let res = await uploadAHYDPicture(formData)
|
||||
}
|
||||
|
||||
// 删除
|
||||
@ -569,7 +569,8 @@ const LostandFoundAPPliance: React.FC<{ currentUser: CurrentUser }> = (props) =>
|
||||
async onOk() {
|
||||
if (info.file.ImageId) {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '')
|
||||
// const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '')
|
||||
const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '')
|
||||
deleteLoading()
|
||||
|
||||
if (success) {
|
||||
|
||||
@ -10,7 +10,7 @@ import moment from 'moment'
|
||||
import ProForm, { ProFormDatePicker, ProFormSelect, ProFormText, ProFormTextArea, ProFormUploadButton } from "@ant-design/pro-form";
|
||||
import session from "@/utils/session";
|
||||
import { ExclamationCircleOutlined } from "@ant-design/icons";
|
||||
import { deletePicture } from "@/services/picture";
|
||||
import { deleteAHYDPicture, deletePicture } from "@/services/picture";
|
||||
|
||||
const beforeUpload = (file: any) => {
|
||||
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
|
||||
@ -364,7 +364,8 @@ const LostandFoundReview: React.FC<{ currentUser: CurrentUser | undefined }> = (
|
||||
async onOk() {
|
||||
if (info.file.ImageId) {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '')
|
||||
// const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '')
|
||||
const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '')
|
||||
deleteLoading()
|
||||
|
||||
if (success) {
|
||||
|
||||
@ -19,7 +19,7 @@ import Draggable from "react-draggable";
|
||||
import ProForm, { ProFormDatePicker, ProFormDigit, ProFormMoney, ProFormSelect, ProFormText, ProFormTextArea, ProFormUploadButton } from "@ant-design/pro-form";
|
||||
import moment from 'moment'
|
||||
import PageTitleBox from "@/components/PageTitleBox";
|
||||
import { deletePicture, uploadPicture } from "@/services/picture";
|
||||
import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from "@/services/picture";
|
||||
import { handleSetlogSave } from "@/utils/format";
|
||||
import ModalFooter from "../scenicSpotConfig/component/modalFooter";
|
||||
import { highlightText } from "@/utils/highlightText";
|
||||
@ -232,7 +232,7 @@ const MallBrandManage: React.FC<{ currentUser: CurrentUser }> = (props) => {
|
||||
// formData.append('imageType', "1204");
|
||||
formData.append('TableType', "1125");
|
||||
|
||||
let imgRes = await uploadPicture(formData)
|
||||
let imgRes = await uploadAHYDPicture(formData)
|
||||
console.log('imgResimgResimgResimgRes', imgRes);
|
||||
imgData = imgRes.Result_Data.ImageUrl
|
||||
}
|
||||
@ -576,7 +576,8 @@ const MallBrandManage: React.FC<{ currentUser: CurrentUser }> = (props) => {
|
||||
async onOk() {
|
||||
if (info.file.ImageId) {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
// const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
deleteLoading()
|
||||
if (success) {
|
||||
const files = [...fileList]
|
||||
|
||||
@ -23,7 +23,7 @@ import type { FormInstance } from 'antd';
|
||||
import { getFieldEnumTree, getFieldEnumName } from "@/services/options"; // 枚举的引用，没有使用可以删除
|
||||
import { handlDeleteUSERDEFINEDTYPE, handlGetUSERDEFINEDTYPEList, handlSynchroUSERDEFINEDTYPE } from '../service';
|
||||
import PageTitleBox from '@/components/PageTitleBox';
|
||||
import { uploadPicture } from '@/services/picture';
|
||||
import { uploadAHYDPicture, uploadPicture } from '@/services/picture';
|
||||
import defaultIcon from '../../../assets/brand/defaultIcon.png'
|
||||
import ModalFooter from '../scenicSpotConfig/component/modalFooter';
|
||||
import { handleSetlogSave } from '@/utils/format';
|
||||
@ -625,7 +625,7 @@ const MallClassificationManage: React.FC<{ currentUser: CurrentUser | undefined
|
||||
formData.append('TableType', '1215');
|
||||
formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : '');
|
||||
if (info.filename) {
|
||||
const success = await uploadPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
if (success) {
|
||||
const list = [{
|
||||
// uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败
|
||||
|
||||
@ -23,7 +23,7 @@ import type { FormInstance } from 'antd';
|
||||
import { getFieldEnumTree, getFieldEnumName } from "@/services/options"; // 枚举的引用，没有使用可以删除
|
||||
import { handlDeleteUSERDEFINEDTYPE, handlGetUSERDEFINEDTYPEList, handlSynchroUSERDEFINEDTYPE } from '../service';
|
||||
import PageTitleBox from '@/components/PageTitleBox';
|
||||
import { uploadPicture } from '@/services/picture';
|
||||
import { uploadAHYDPicture, uploadPicture } from '@/services/picture';
|
||||
import defaultIcon from '../../../assets/brand/defaultIcon.png'
|
||||
import classNames from 'classnames';
|
||||
import ModalFooter from '../scenicSpotConfig/component/modalFooter';
|
||||
@ -613,7 +613,7 @@ const OrderCategoryManage: React.FC<{ currentUser: CurrentUser | undefined }> =
|
||||
formData.append('TableType', '1215');
|
||||
formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : '');
|
||||
if (info.filename) {
|
||||
const success = await uploadPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
if (success) {
|
||||
const list = [{
|
||||
// uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败
|
||||
|
||||
@ -23,7 +23,7 @@ import type { FormInstance } from 'antd';
|
||||
import { getFieldEnumTree, getFieldEnumName } from "@/services/options"; // 枚举的引用，没有使用可以删除
|
||||
import { handeDeleteCOMMODITY, handeGetBusinessCommodityList, handeGetCOMMODITYList, handeGetSellerCommodityList, handeSynchroCOMMODITY, handeSyncSellerCommodityInfo, handlDeleteUSERDEFINEDTYPE, handlGetUSERDEFINEDTYPEList, handlSynchroUSERDEFINEDTYPE } from '../service';
|
||||
import PageTitleBox from '@/components/PageTitleBox';
|
||||
import { deletePicture, SavePicture, uploadPicture } from '@/services/picture';
|
||||
import { deleteAHYDPicture, deletePicture, SavePicture, uploadPicture } from '@/services/picture';
|
||||
import defaultIcon from '../../../assets/brand/defaultIcon.png'
|
||||
import OrderCategoryTree from './components/OrderCategoryTree';
|
||||
import OrderCategoryManage from '../OrderCategoryManage';
|
||||
@ -859,7 +859,8 @@ const OrderProductManage: React.FC<{ currentUser: CurrentUser | undefined }> = (
|
||||
async onOk() {
|
||||
if (info.file.ImageId) {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
// const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
await handeSyncSellerCommodityInfo({
|
||||
list: [{
|
||||
...currentRow,
|
||||
|
||||
@ -26,7 +26,7 @@ import PageTitleBox from "@/components/PageTitleBox";
|
||||
import LeftSelectMallType from './component/LeftSelectMallType';
|
||||
import { handeDeleteCOMMODITY, handeDeleteRTCOMMODITY_MULTI, handeGetCOMMODITY_MULTIList, handeGetCOMMODITYDetail, handeGetCOMMODITYList, handeGetMERCHANTSList, handeGetRTCOMMODITY_MULTIList, handeSetCommodityState, handeSynchroCOMMODITY, handeSynchroRTCOMMODITYMULTIList, handleGetBRANDList, handlGetUSERDEFINEDTYPEList } from '../service';
|
||||
import session from '@/utils/session';
|
||||
import { deletePicture, uploadPicture } from '@/services/picture';
|
||||
import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from '@/services/picture';
|
||||
import { handleSetlogSave } from '@/utils/format';
|
||||
import { highlightText } from '@/utils/highlightText';
|
||||
|
||||
@ -592,7 +592,7 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop
|
||||
formData.append('TableType', "1207");
|
||||
|
||||
console.log('formData', formData);
|
||||
let res = await uploadPicture(formData)
|
||||
let res = await uploadAHYDPicture(formData)
|
||||
}
|
||||
|
||||
// 头部轮播图
|
||||
@ -607,7 +607,7 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop
|
||||
formData.append('TableType', "1207");
|
||||
|
||||
console.log('formData', formData);
|
||||
let res = await uploadPicture(formData)
|
||||
let res = await uploadAHYDPicture(formData)
|
||||
}
|
||||
|
||||
// 头部轮播图
|
||||
@ -622,7 +622,7 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop
|
||||
formData.append('TableType', "1207");
|
||||
|
||||
console.log('formData', formData);
|
||||
let res = await uploadPicture(formData)
|
||||
let res = await uploadAHYDPicture(formData)
|
||||
}
|
||||
}
|
||||
|
||||
@ -1427,7 +1427,8 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop
|
||||
async onOk() {
|
||||
if (info.file.ImageId) {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
// const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
deleteLoading()
|
||||
|
||||
if (success) {
|
||||
@ -1486,7 +1487,8 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop
|
||||
async onOk() {
|
||||
if (info.file.ImageId) {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
// const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
deleteLoading()
|
||||
|
||||
if (success) {
|
||||
@ -1545,7 +1547,8 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop
|
||||
async onOk() {
|
||||
if (info.file.ImageId) {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
// const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
deleteLoading()
|
||||
|
||||
if (success) {
|
||||
|
||||
@ -26,7 +26,7 @@ import { handeDeleteCOMMODITY_MULTI, handeSynchroCOMMODITY_MULTI, handlDeleteUSE
|
||||
import { render } from 'react-dom';
|
||||
import ModalFooter from '../scenicSpotConfig/component/modalFooter';
|
||||
import { handleSetlogSave } from '@/utils/format';
|
||||
import { uploadPicture } from '@/services/picture';
|
||||
import { uploadAHYDPicture, uploadPicture } from '@/services/picture';
|
||||
import defaultIcon from '../../../assets/brand/defaultIcon.png'
|
||||
import { highlightText } from '@/utils/highlightText';
|
||||
|
||||
@ -698,7 +698,7 @@ const ProductSpecificationManage: React.FC<{ currentUser: CurrentUser | undefine
|
||||
formData.append('TableType', '1215');
|
||||
formData.append('ImageName', typeof info.file !== 'string' ? info.file?.name : '');
|
||||
if (info.filename) {
|
||||
const success = await uploadPicture(formData)
|
||||
const success = await uploadAHYDPicture(formData)
|
||||
if (success) {
|
||||
const list = [{
|
||||
// uid: `${success.ImageId}`, // 注意，这个uid一定不能少，否则上传失败
|
||||
|
||||
@ -25,7 +25,7 @@ import { getList, delcommodity, updatecommodity } from './service'; // 接口相
|
||||
import PageTitleBox from "@/components/PageTitleBox";
|
||||
import { handeDeleteCOMMODITY, handeDeleteRTCOMMODITY_MULTI, handeGetCOMMODITY_MULTIList, handeGetCOMMODITYDetail, handeGetCOMMODITYList, handeGetMERCHANTSList, handeGetRTCOMMODITY_MULTIList, handeSynchroCOMMODITY, handeSynchroRTCOMMODITYMULTIList, handleGetBRANDList, handlGetUSERDEFINEDTYPEList } from '../service';
|
||||
import session from '@/utils/session';
|
||||
import { deletePicture, uploadPicture } from '@/services/picture';
|
||||
import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from '@/services/picture';
|
||||
import LeftSelectMallType from '../ProductListingManagement/component/LeftSelectMallType';
|
||||
import { handleSetlogSave } from '@/utils/format';
|
||||
import { highlightText } from '@/utils/highlightText';
|
||||
@ -568,7 +568,7 @@ const ShoppingMallProductSearch: React.FC<{ currentUser: CurrentUser | undefined
|
||||
formData.append('TableType', "1207");
|
||||
|
||||
console.log('formData', formData);
|
||||
let res = await uploadPicture(formData)
|
||||
let res = await uploadAHYDPicture(formData)
|
||||
}
|
||||
|
||||
// 头部轮播图
|
||||
@ -583,7 +583,7 @@ const ShoppingMallProductSearch: React.FC<{ currentUser: CurrentUser | undefined
|
||||
formData.append('TableType', "1207");
|
||||
|
||||
console.log('formData', formData);
|
||||
let res = await uploadPicture(formData)
|
||||
let res = await uploadAHYDPicture(formData)
|
||||
}
|
||||
|
||||
// 头部轮播图
|
||||
@ -598,7 +598,7 @@ const ShoppingMallProductSearch: React.FC<{ currentUser: CurrentUser | undefined
|
||||
formData.append('TableType', "1207");
|
||||
|
||||
console.log('formData', formData);
|
||||
let res = await uploadPicture(formData)
|
||||
let res = await uploadAHYDPicture(formData)
|
||||
}
|
||||
}
|
||||
|
||||
@ -1333,7 +1333,8 @@ const ShoppingMallProductSearch: React.FC<{ currentUser: CurrentUser | undefined
|
||||
async onOk() {
|
||||
if (info.file.ImageId) {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
// const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
deleteLoading()
|
||||
|
||||
if (success) {
|
||||
@ -1390,7 +1391,8 @@ const ShoppingMallProductSearch: React.FC<{ currentUser: CurrentUser | undefined
|
||||
async onOk() {
|
||||
if (info.file.ImageId) {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
// const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
deleteLoading()
|
||||
|
||||
if (success) {
|
||||
@ -1449,7 +1451,8 @@ const ShoppingMallProductSearch: React.FC<{ currentUser: CurrentUser | undefined
|
||||
async onOk() {
|
||||
if (info.file.ImageId) {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
// const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '', '6000')
|
||||
deleteLoading()
|
||||
|
||||
if (success) {
|
||||
|
||||
@ -24,7 +24,7 @@ import { getFieldEnumTree, getFieldEnumName } from "@/services/options"; // 枚
|
||||
import PageTitleBox from "@/components/PageTitleBox";
|
||||
import { handeDeleteSCENICAREA, handeGetSCENICAREAList, handeSynchroSCENICAREA } from '../service';
|
||||
import session from '@/utils/session';
|
||||
import { deletePicture, uploadPicture } from '@/services/picture';
|
||||
import { deleteAHYDPicture, deletePicture, uploadAHYDPicture, uploadPicture } from '@/services/picture';
|
||||
import ModalFooter from './component/modalFooter';
|
||||
import { handleSetlogSave } from '@/utils/format';
|
||||
import { highlightText } from '@/utils/highlightText';
|
||||
@ -366,7 +366,7 @@ const scenicSpotConfig: React.FC<{ currentUser: CurrentUser | undefined }> = (pr
|
||||
formData.append('TableType', '1305');
|
||||
|
||||
console.log('formData', formData);
|
||||
await uploadPicture(formData)
|
||||
await uploadAHYDPicture(formData)
|
||||
}
|
||||
|
||||
handleSetlogSave(`${currentRow?.SCENICAREA_ID ? `更新${currentRow?.SCENICAREA_NAME}景区` : `新增${data.Result_Data.SCENICAREA_NAME}`}信息`)
|
||||
@ -713,7 +713,8 @@ const scenicSpotConfig: React.FC<{ currentUser: CurrentUser | undefined }> = (pr
|
||||
async onOk() {
|
||||
if (info.file.ImageId) {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '5000')
|
||||
// const success = await deletePicture(info.file?.ImagePath, info.file?.uid, '', '5000')
|
||||
const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, '', '5000')
|
||||
deleteLoading()
|
||||
|
||||
if (success) {
|
||||
|
||||
@ -15,7 +15,7 @@ import useRequest from "@ahooksjs/use-request";
|
||||
import { getServerpartTree } from "@/services/options";
|
||||
import { handleSynchroNOTICEINFO } from "@/pages/basicManage/highwayHeadlines/service";
|
||||
import ProForm, { ProFormText, ProFormUploadButton } from "@ant-design/pro-form";
|
||||
import { deletePicture, getPictureList, uploadPicture } from "@/services/picture";
|
||||
import { deleteAHYDPicture, deletePicture, getPictureList, uploadAHYDPicture, uploadPicture } from "@/services/picture";
|
||||
import { handeGetPictureList } from "../service";
|
||||
import SubMenu from "antd/lib/menu/SubMenu";
|
||||
import Draggable from "react-draggable";
|
||||
@ -780,7 +780,7 @@ const serverpartInfo: React.FC<{ currentUser: CurrentUser }> = (props) => {
|
||||
formData.append('TableType', selectActiveKey === '1' ? '1123' : selectActiveKey === '2' ? '1131' : selectActiveKey === '3' ? '1131' : selectActiveKey === '4' ? '1131' : selectActiveKey === '5' ? '1131' : '');
|
||||
|
||||
console.log('formData', formData);
|
||||
let res = await uploadPicture(formData)
|
||||
let res = await uploadAHYDPicture(formData)
|
||||
console.log('resresresres', res);
|
||||
let serverpartObj = session.get('serverpartObj')
|
||||
if (res.Result_Code === 100) {
|
||||
@ -911,7 +911,8 @@ const serverpartInfo: React.FC<{ currentUser: CurrentUser }> = (props) => {
|
||||
async onOk() {
|
||||
if (info.file.ImageId) {
|
||||
const deleteLoading = message.loading('正在删除...')
|
||||
const success = await deletePicture(info.file?.ImagePath, info.file?.uid, selectActiveKey === '1' ? 'SERVERPART' : selectActiveKey === '2' ? 'SERVERPARTINFO' : selectActiveKey === '3' ? 'SERVERPARTINFO' : selectActiveKey === '4' ? 'SERVERPARTINFO' : selectActiveKey === '5' ? 'SERVERPARTINFO' : '', selectActiveKey === '1' ? '1123' : selectActiveKey === '2' ? '1131' : selectActiveKey === '3' ? '1131' : selectActiveKey === '4' ? '1131' : selectActiveKey === '5' ? '1131' : '')
|
||||
// const success = await deletePicture(info.file?.ImagePath, info.file?.uid, selectActiveKey === '1' ? 'SERVERPART' : selectActiveKey === '2' ? 'SERVERPARTINFO' : selectActiveKey === '3' ? 'SERVERPARTINFO' : selectActiveKey === '4' ? 'SERVERPARTINFO' : selectActiveKey === '5' ? 'SERVERPARTINFO' : '', selectActiveKey === '1' ? '1123' : selectActiveKey === '2' ? '1131' : selectActiveKey === '3' ? '1131' : selectActiveKey === '4' ? '1131' : selectActiveKey === '5' ? '1131' : '')
|
||||
const success = await deleteAHYDPicture(info.file?.ImagePath, info.file?.uid, selectActiveKey === '1' ? 'SERVERPART' : selectActiveKey === '2' ? 'SERVERPARTINFO' : selectActiveKey === '3' ? 'SERVERPARTINFO' : selectActiveKey === '4' ? 'SERVERPARTINFO' : selectActiveKey === '5' ? 'SERVERPARTINFO' : '', selectActiveKey === '1' ? '1123' : selectActiveKey === '2' ? '1131' : selectActiveKey === '3' ? '1131' : selectActiveKey === '4' ? '1131' : selectActiveKey === '5' ? '1131' : '')
|
||||
deleteLoading()
|
||||
|
||||
if (success) {
|
||||
|
||||
@ -53,6 +53,21 @@ export async function getPictureList(id: number, TableType?: string) {
|
||||
}
|
||||
return tableList(data.Result_Data);
|
||||
}
|
||||
|
||||
// 删除图片
|
||||
export async function deleteAHYDPicture(imagepath: string, id: number, TableName?: string, TableType?: string) {
|
||||
|
||||
const data = await requestAHYD(`/Picture/DeletePicture?imagepath=${imagepath}&imageid=${id}&TableName=${TableName || ''}&TableType=${TableType || ''}`, {
|
||||
method: 'POST'
|
||||
})
|
||||
|
||||
if (data.Result_Code !== 100) {
|
||||
return false
|
||||
}
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
// 删除图片
|
||||
export async function deletePicture(imagepath: string, id: number, TableName?: string, TableType?: string) {
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// 由 scripts/writeVersion.js 自动生成
|
||||
export const VERSION = "4.5.49";
|
||||
export const GIT_HASH = "f5c66f8";
|
||||
export const BUILD_TIME = "2025-09-05T01:51:31.828Z";
|
||||
export const VERSION = "4.5.50";
|
||||
export const GIT_HASH = "169c5fa";
|
||||
export const BUILD_TIME = "2025-09-05T11:01:12.391Z";
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user