Merge branch 'v3.5.1' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into v3.5.1

src/components/SelectButton/NewTypeSelect.jsx

@@ -23,20 +23,20 @@ const NewsTypeSelect = (props) => {
   const [ data, setData ] = useState([])
   const [ value, setValue ] = useState('')
   const preProps = usePrevious(props)
-
+  
   if ((!preProps || !preProps.value) && props.value && !value) {
     setValue(props.value)
   }
 
   useEffect(() => {
     getNewsTypeList();
-  },[])
+  },[props.buildingId])
 
   const getNewsTypeList = (e) => {
     request({
         url: '/api/admin/taNewsType',
         method: 'GET',
-        params: {pageNum: 1,pageSize: 999},
+        params: {pageNum: 1,pageSize: 999,buildingId: props.buildingId},
         action: 'admin.taNewsType.get',
     }).then((data) => {
         setData(data.records)

src/pages/integralMall/editGoods.jsx

@@ -119,9 +119,13 @@ const header = props => {
     },
   ]
 
-   
-  const handleSubmit = (values) => {
-    if(goodsId){
+  const handleSubmit = values => {
+    if (values.inventory > values.totalNum) {
+      message.error('商品剩余数量不能大于商品总数量')
+      return
+  }
+
+    if (goodsId) {
       values.goodsId = goodsId
       request({ ...apis.integralMall.updateTaGoods, data: values,}).then((data) => {
         cancelPage()

src/pages/news/list/editNewsList.jsx

@@ -30,6 +30,7 @@ const { TextArea } = Input;
   const [ tab, changeTab ] = useState('basic')
   const newsId = props.location.query.newsId
   const [ dynamicData, setDynamicData ] = useState({})
+  
   if(newsId){
     useEffect(() => {
       getDynamicData(newsId);
@@ -46,6 +47,8 @@ const { TextArea } = Input;
     }
   }
 
+  
+
   const cancelPage = () =>{
     router.push({
       pathname: '/news/list/NewsList',
@@ -53,11 +56,17 @@ const { TextArea } = Input;
   }
 
   const Basic = (props) => {
+    const [ changeBuildingId, setChangeBuildingIdData ] = useState('')
+    
+    const handleBuildingChange = (e) => {
+      console.log(e)
+      setChangeBuildingIdData(e)
+    }
     const fields = [
       {
         label: '意向项目',
         name: 'buildingId',
-        render: <BuildSelect />,
+        render: <BuildSelect onChange={(e => handleBuildingChange(e))}/>,
         value: dynamicData.buildingId,
         rules: [
           {required: true, message: '请选择所属项目'},
@@ -85,7 +94,7 @@ const { TextArea } = Input;
       {
         label: '资讯类型',
         name: 'newsTypeId',
-        render: <NewsTypeSelect />,
+        render: <NewsTypeSelect buildingId={changeBuildingId || dynamicData.buildingId}/>,
         value: dynamicData.newsTypeId,
         rules: [
           {required: true, message: '请选择资讯类型'},