修改字段

src/pages/contract/manage/add/addList.tsx

@@ -128,6 +128,7 @@ const addList = () => {
       // 甲方不同意签订合同都可以修改
       return (
         <div>
+          <span style={{ color: '#00B37A', cursor: 'pointer', marginRight: 10 }} onClick={() => submit(record.id)}>提交</span>
           {
             record.innerStatus == '1' || record.outerStatus == '1' || record.outerStatus == '3' || record.outerStatus == '5' ? <span style={{ color: '#00B37A', cursor: 'pointer', marginRight: 10 }} onClick={() => edit(record)}>修改</span> : ''
           }
@@ -141,12 +142,12 @@ const addList = () => {
               cancelText="否"
             >
               <Button
-                style={{ marginRight: 10 }}
+                // style={{ margin: 10 }}
                 type="link"
               >删除</Button>
             </Popconfirm>
           }
-          <span style={{ color: '#00B37A', cursor: 'pointer', marginRight: 10 }} onClick={() => submit(record.id)}>提交</span>
+
         </div >
       )
     }

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

@@ -136,14 +136,13 @@ const FormList = (props: any) => {
             bidCount: sourceType == '1' ? item.awardTaxProbability * item.purchaseCount / 100 : sourceType == '2' ? item.awardTenderRatio * item.inviteTenderMateriel.count / 100 : item.purchaseCount,
             bidAmount: sourceType == '1' ? item.awardTaxProbability * item.purchaseCount / 100 * item.taxUnitPrice : sourceType == '2' ? item.awardTenderRatio * item.inviteTenderMateriel.count / 100 * item.price : item.price,
             // productBrand
-            associatedType: _filter(sourceType, item, ['', 'productAttributeJson', 'commodityCategory', '']).split('-')[1],
-            associatedBrand: _filter(sourceType, item, ['', 'productBrand', 'commodityBrand', '']),
             associatedDataId: _filter(sourceType, item, ['', 'productId', 'commoditySkuId']), // 关联商品id
+            associatedGoods: _filter(sourceType, item, ['', 'productAttributeJson', 'commodityAttribute', '']), //关联
             associatedMaterielNo: _filter(sourceType, item, ['', 'number', 'commodityCode']), // 关联物料编号
             associatedMaterielName: _filter(sourceType, item, ['', 'productName', 'commodityName']), // 关联商品名称
-            associatedGoods: _filter(sourceType, item, ['', 'productAttributeJson', 'commodityAttribute', '']), //关联规格
-            // associatedMaterielName: sourceType == '1' ? item.productName : sourceType == '2' ? item.commodityName : '',
-            // associatedGoods: sourceType == '1' ? item.productAttributeJson : sourceType == '2' ? item.commodityBrand : '',// 关联品牌
+            associatedType: _filter(sourceType, item, ['', 'productAttributeJson', 'commodityCategory', '']).split('-')[1], //规格型号
+            associatedCategory: _filter(sourceType, item, ['', 'productAttributeJson', 'commodityCategory', '']),  // 关联商品品类
+            associatedBrand: _filter(sourceType, item, ['', 'productBrand', 'commodityBrand', '']),// 关联品牌
             rowId: index,
           }
         })
@@ -358,7 +357,7 @@ const FormList = (props: any) => {
       </div>
       <div className={styles.text}>
         <p>规格：{record.associatedGoods}</p>
-        <p>品类：{record.associatedType}</p>
+        <p>品类：{record.associatedCategory}</p>
       </div>
       <div className={styles.text}>
         <p>品牌:{record.associatedBrand}</p>

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

@@ -292,10 +292,10 @@ const Details = (props: any) => {
       </div>
       <div className={style.text}>
         <p>商品编号：{record.associatedMaterielNo}</p>
-        <p className={style.nowrap}>商品名称：{record.associatedGoods}</p>
+        <p className={style.nowrap}>商品名称：{record.associatedMaterielName}</p>
       </div>
       <div className={style.text}>
-        <p>规格型号：{record.associatedType}</p>
+        <p>规格型号：{record.associatedGoods}</p>
         <p>品类：{record.associatedCategory}</p>
       </div>
       <div className={style.text}>