Merge branch 'jinfa-0518' into 'jinfa-0518'

src/pages/contract/manage/add/components/Information.tsx

@@ -100,8 +100,8 @@ const Information = (props: any) => {
   };
   /* 时间选中 */
   const onChange = (value: any) => {
-    let startTime = moment(Number(value[0])).format('YYYY-MM-DD')
-    let endTime = moment(Number(value[1])).format('YYYY-MM-DD')
+    let startTime = value ? moment(Number(value?.[0])).format('YYYY-MM-DD HH:mm:ss') : null
+    let endTime = value ? moment(Number(value?.[1])).format('YYYY-MM-DD HH:mm:ss') : null
     getbasicsVO({
       ...basicsVO,
       startTime,

src/pages/contract/manage/editing/components/ContractText.tsx

@@ -107,6 +107,10 @@ const ContractText = (props: any) => {
         (await purchaseMate.current.length) != 0
           ? await purchaseMate.current.get()
           : [];
+      if(!purchaseMaterielList?.data?.list?.length) {
+        message.info('采购物料不可以为空！')
+        return
+      }
       getOtherInfo().then(datas => {
         if (!isEmpty(picker) && !(picker.endTime && picker.startTime)) {
           message.info('生成合同日期不可以为空！')