Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2

src/pages/contract/contractexecution/details/index.tsx

@@ -178,7 +178,7 @@ const Details = (props: any) => {
         return (
           <div>
             <EyePreview
-              url={`/memberCenter/afterService/returnApplication/returnQuery/detail?id=${record.orderId}`}
+              url={record.orderType === 1 ? `/memberCenter/tranactionAbility/purchaseOrder/orderList/preview?id=${record.orderId}` : `/memberCenter/afterService/returnApplication/returnQuery/detail?id=${record.orderId}`}
             >
               {text}
             </EyePreview>

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

@@ -120,7 +120,7 @@ const FormList = (props: any) => {
       if (res.code === 1000) {
         let data = res.data.data.map((item, index) => {
           return {
-            materielId: _filterArr(sourceType, item, ['', 'productId', 'id', '']),
+            materielId: _filterArr(sourceType, item, ['', 'goodsId', 'id', '']),
             code: _filter(sourceType, item, ['', 'number', 'code', 'number']),// 物料编号
             name: _filter(sourceType, item, ['', 'name', 'name', 'name']),//物料名称
             type: _filter(sourceType, item, ['', 'model', 'type', 'model']),//物料规格