Merge branch 'v2-220218' of…

.gitlab/merge_request_templates/feature.md

+# 新功能概况
+
+1. 功能描述(必填)
+
+2. 预期效果/行为是什么
+
+3. 可能影响到的模块是什么
+
+4. 禅道需求地址

.gitlab/merge_request_templates/fixbug.md

+# bug概况
+
+1. 重现步骤(必填)
+
+2. 目前的错误行为是什么
+
+3. 预期效果/行为是什么
+
+4. 相关日志/屏幕截图(如果可以提供的话，方便追踪)
+
+5. 测试通过后希望同步的分支
+
+6. 禅道bug地址

env.js

@@ -198,5 +198,12 @@ module.exports = {
     USE_ROUTE_CONFIG: true,
     SOCKET_URL: 'ws://lingxi-scm-gateway.shushangyun.com',
     YAPI_URL: 'http://10.0.0.25:4000/'
-  }
+  },
+  "v2-220218": {
+    SITE_ID: '1',
+    BACK_GATEWAY: 'http://10.0.1.156:8100',
+    USE_ROUTE_CONFIG: true,
+    SOCKET_URL: 'ws://10.0.1.156:8100',
+    YAPI_URL: 'http://10.0.0.25:4000/'
+  },
 }

package.json

@@ -35,6 +35,7 @@
     "build:v2scm": "cross-env PRO_ENV=v2scm yarn build",
     "build:v2-demo": "cross-env PRO_ENV=v2-demo yarn build",
     "build:v2-ali-demo": "cross-env PRO_ENV=v2-ali-demo yarn build",
+    "build:v2-220218": "cross-env PRO_ENV=v2-220218 yarn build",
     "build:v2Test": "cross-env SITE_ID=1 BACK_GATEWAY=http://lx-pre-gateway.shushangyun.com USE_ROUTE_CONFIG=false SOCKET_URL=ws://lx-pre-gateway.shushangyun.com yarn build",
     "postinstall": "node ./scripts/init && umi generate tmp",
     "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
@@ -49,7 +50,8 @@
     "start:v2": "cross-env PRO_ENV=v2 yarn start",
     "start-noApi:v2": "cross-env PRO_ENV=v2 yarn start-noApi",
     "start:v2Preview": "cross-env PRO_ENV=v2Preview yarn start",
-    "start:v2scm": "cross-env PRO_ENV=v2scm yarn start"
+    "start:v2scm": "cross-env PRO_ENV=v2scm yarn start",
+    "start:v2-220218": "cross-env PRO_ENV=v2-220218 yarn start"
   },
   "lint-staged": {
     "*.{js,jsx,less,md,json}": [

src/pages/procurement/callForBids/addRemarkBidCommittee/index.tsx

@@ -146,12 +146,22 @@ const AddRemarkBidCommittee: React.FC<AddRemarkBidCommitteeProps> = (props) => {
     const inviteTenderId = value['inviteTender']['id']
     let _value = omit(value, ['code', 'createTime', 'openTenderTime', 'projectName', 'remarkTime', 'status', 'inviteTender'])
     _value.inviteTender = { id: inviteTenderId }
-    _value.expertExtractRecordList = value?.expertExtractRecordList?.length ? value.expertExtractRecordList.map(item => ({
-      id: item.id,
-      expert: { id: item.expert.id },
-      source: item.source,
-      status: item.status
-    })) : []
+    _value.expertExtractRecordList = value?.expertExtractRecordList?.length ? value.expertExtractRecordList.map(item => {
+      if(pageStatus === PageStatus.ADD) {
+        return {
+          expert: { id: item.expert.id },
+          source: item.source,
+          status: item.status
+        }
+      } else {
+        return {
+          id: item.id,
+          expert: { id: item.expert.id },
+          source: item.source,
+          status: item.status
+        }
+      }
+    }) : []
     _value.expertExtractQueryList = value.expertExtractQueryList.map(item => omit(item, ['excludeArea', 'needArea']))
     if (_value.expertExtractRecordList?.length) {
       postPurchaseExpertExtractSaveOrUpdateExpertExtract(_value).then(res => {