diff --git a/dist.zip b/dist.zip deleted file mode 100644 index 6f60bbe..0000000 Binary files a/dist.zip and /dev/null differ diff --git a/src/pages/MerchantMgm/InvoiceConf/index.scss b/src/pages/MerchantMgm/InvoiceConf/index.scss index 08172d7..fe4e982 100644 --- a/src/pages/MerchantMgm/InvoiceConf/index.scss +++ b/src/pages/MerchantMgm/InvoiceConf/index.scss @@ -382,7 +382,7 @@ $color-primary : var(--color-primary); .item-title { display: inline-block; - width: 100px; + width: 120px; text-align-last: end; white-space: nowrap; } @@ -403,7 +403,7 @@ $color-primary : var(--color-primary); .item-title { display: inline-block; - width: 100px; + width: 120px; text-align-last: end; white-space: nowrap; } diff --git a/src/pages/MerchantMgm/InvoiceConf/loadable.jsx b/src/pages/MerchantMgm/InvoiceConf/loadable.jsx index 0b427da..a79bb93 100644 --- a/src/pages/MerchantMgm/InvoiceConf/loadable.jsx +++ b/src/pages/MerchantMgm/InvoiceConf/loadable.jsx @@ -251,7 +251,7 @@ function InvoiceConf(props) { } //获取商户名称的下拉 const getTenantNamePull = () => { - ajax.getTenantJobOperator().then( + ajax.getSelectOperator1().then( res => { if (res.status == 20000) { setTenantPull(res.data) diff --git a/src/pages/OperationCenter/OperationSales/AdsMgm/loadable.jsx b/src/pages/OperationCenter/OperationSales/AdsMgm/loadable.jsx index 6c3f663..9bc3995 100644 --- a/src/pages/OperationCenter/OperationSales/AdsMgm/loadable.jsx +++ b/src/pages/OperationCenter/OperationSales/AdsMgm/loadable.jsx @@ -121,6 +121,7 @@ function AdsMgm() { const [showArr1, setShowArr1] = useState([]); //区域的下拉数据 const [areaList, setAreaList] = useState([]); + const [areaListEdit, setAreaListEdit] = useState([]); // 广告应用路径 const [pathList, setPathList] = useState([]); // 设置分类数组 @@ -457,7 +458,12 @@ function AdsMgm() { ajaxCom.getAreaTree().then( (res) => { if (parseInt(res?.status) === 20000) { + let arr = [] setAreaList(res?.data || []); + if(res?.data?.length) { + arr = res?.data?.filter((value) => value?.name != "全部") + } + setAreaListEdit(arr || []) } else { message.error(res?.message); } @@ -692,6 +698,7 @@ function AdsMgm() { // 修改展示时间 const updateTime = (num, arr) => { + if(arr[0] == arr[1]) return message.error("开始时间不能与结束时间相同!") let newList = [...rowData?.publishList]; if (arr && arr?.length == 2) { newList[num]["lowerTime"] = arr[0]; @@ -1074,7 +1081,7 @@ function AdsMgm() { value: "id", children: "children", }} - options={areaList || []} + options={areaListEdit || []} value={rowData?.areaIds || []} onChange={(e) => handleForm("areaIds", e)} /> diff --git a/src/pages/OperationCenter/OperationSales/InformationMgm/loadable.jsx b/src/pages/OperationCenter/OperationSales/InformationMgm/loadable.jsx index 175cef3..2c4814e 100644 --- a/src/pages/OperationCenter/OperationSales/InformationMgm/loadable.jsx +++ b/src/pages/OperationCenter/OperationSales/InformationMgm/loadable.jsx @@ -126,6 +126,7 @@ function InformationMgm() { //区域的下拉数据 const [areaList, setAreaList] = useState([]); + const [areaListEdit, setAreaListEdit] = useState([]); // 所有下拉菜单 const [allSelect, setAllSelect] = useState({ release: [], // 发布渠道 @@ -137,7 +138,7 @@ function InformationMgm() { const [checkId, setCheckId] = useState(""); // 折叠树节点 const [foldIds, setFoldIds] = useState([]); - + const [cascaderKey, setCascaderKey] = useState("1"); // 访问接口,获取下拉 useEffect(() => { getSelectList(); @@ -492,7 +493,12 @@ function InformationMgm() { ajaxCom.getAreaTree().then( (res) => { if (parseInt(res?.status) === 20000) { + let arr = [] setAreaList(res?.data || []); + if(res?.data?.length) { + arr = res?.data?.filter((value) => value?.name != "全部") + } + setAreaListEdit(arr || []) } else { message.error(res?.message); } @@ -1102,6 +1108,7 @@ function InformationMgm() {