From 77825748b45440048a3501eca59cbeed7af8cf46 Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Thu, 29 Jul 2021 15:29:59 +0800
Subject: [PATCH 1/6] =?UTF-8?q?bug=EF=BC=9A=20=E6=A0=87=E5=87=86=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B--=E7=94=B3=E8=AF=B7=E4=BA=BA?=
 =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E9=A1=B5=E9=9D=A2=E5=8E=BB=E6=8E=89=E5=9C=88?=
 =?UTF-8?q?=E4=BD=8F=E7=9A=84=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=8F=91=E8=B5=B7?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=92=8C=E4=BF=AE=E8=AE=A2=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=BC=BA=E5=B0=91=E9=83=A8=E5=88=86=E4=BB=A3=E6=9B=BF=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E5=8F=B7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue          | 17 +++++++++++++++++
 .../pages/creatProcess/bzrk/step2.vue          | 11 ++++++++++-
 .../pages/creatProcess/bzrk/step3.vue          |  8 ++++++++
 .../pages/creatProcess/bzrk/step4.vue          | 18 ++++++++++++++++++
 4 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 493a8f6ae..9f0ac517a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -711,6 +711,20 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
+                                <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
+                                  <el-input
+                                      v-model="form.bfbdtbzh"
+                                      placeholder="请输入部分代替标准号"
+                                      clearable
+                                  ></el-input>
+                                  <el-button
+                                      type="primary"
+                                      class="common-button-primary"
+                                      size="mini"
+                                      style="position:absolute;top: 10px;right: 0;"
+                                      @click="selectLaws('bfbdtbzh'),config.attrName = '部分代替标准号'"
+                                  >{{'手动查找'}}</el-button>
+                                </el-form-item>
                                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
                                     <el-input
                                             v-model="form.yybj"
@@ -1332,6 +1346,7 @@
                     cbbh: '', // 采标编号
                     cbcd: '', // 采标程度
                     yybj: '', // 引用标准
+                    bfbdtbzh: '', // 部分代替标准号
                     byybj: '', // 被引用标准
                     glwj: '', // 关联文件
                     xglc: '', // 相关流程
@@ -1875,6 +1890,8 @@
                     this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'cbbh'){
                     this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
+                }else if(this.replaceLawType === 'bfbdtbzh'){
+                    this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',')
                 }else {
                     this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
                 }
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index d26ffa3b0..dd5c530aa 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -473,7 +473,15 @@
                               </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
+                              <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
+                                <el-input
+                                    disabled
+                                    v-model="form.bfbdtbzh"
+                                    placeholder="请输入部分代替标准号"
+                                    clearable
+                                ></el-input>
+                              </el-form-item>
+                              <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
                                             v-model="form.yybj"
@@ -749,6 +757,7 @@
                     zqyjg: '', // 征求意见稿
                     jdwj: '', // 解读文件
                     zbjbd: '', // 增补件
+                  bfbdtbzh: '', // 增补件
                     kwj: '', // 勘误件
                     caName: '', // 草案
                     fbgbjbdName: '', // 发布稿
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index 3e9ed0aff..e0b897644 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -466,6 +466,14 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
+                <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
+                  <el-input
+                      disabled
+                      v-model="form.bfbdtbzh"
+                      placeholder="请输入部分代替标准号"
+                      clearable
+                  ></el-input>
+                </el-form-item>
                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
                   <el-input
                       disabled
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 8863bb43e..7c849de38 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -695,6 +695,21 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
+                <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
+                  <el-input
+                      v-model="form.bfbdtbzh"
+                      placeholder="请输入部分代替标准号"
+                      clearable
+                  ></el-input>
+                  <el-button
+                      type="primary"
+                      class="common-button-primary"
+                      size="mini"
+                      style="position:absolute;top: 10px;right: 0;"
+                      @click="selectLaws('bfbdtbzh'),config.attrName = '部分代替标准号'"
+                  >{{'手动查找'}}</el-button>
+                </el-form-item>
+
                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
                   <el-input
                       v-model="form.yybj"
@@ -1173,6 +1188,7 @@ export default {
         kwj: '', // 勘误件
         caName: '', // 草案
         fbgbjbdName: '', // 发布稿
+        bfbdtbzh: '', // 发布稿
         xgdName: '', // 修改单
         bpgName: '', // 报批稿
         ssgName: '', // 送审稿
@@ -1411,6 +1427,8 @@ export default {
         this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
       }else if(this.replaceLawType === 'cbbh'){
         this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
+      }else if(this.replaceLawType === 'bfbdtbzh'){
+        this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',')
       } else {
         this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
       }

From 760f7bbfbc062cbe358dea022f06030b74241c5a Mon Sep 17 00:00:00 2001
From: fanlin <fanlin@91isoft.com>
Date: Thu, 29 Jul 2021 15:35:12 +0800
Subject: [PATCH 2/6] =?UTF-8?q?bug=EF=BC=9A=E6=A0=87=E5=87=86=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B--=E6=88=91=E5=8F=B8=E7=BD=B2?=
 =?UTF-8?q?=E5=90=8D=E4=BA=BA=E4=B8=8E=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=9A=84=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/creatProcess/bzrk/step1.vue      | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 9f0ac517a..73e8b0114 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -638,8 +638,13 @@
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
                                     <el-select :popper-append-to-body="false" v-model="form.wssmr" placeholder="请选择我司署名人" multiple>
-                                        <el-option label="署名人1" value="1"></el-option>
-                                        <el-option label="署名人2" value="2"></el-option>
+                                      <el-option
+                                          v-for="item in wssmrOptions"
+                                          placeholder="请选择"
+                                          :key="item.value"
+                                          :value="item.value"
+                                          :label="item.label"
+                                      ></el-option>
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">

From 9cff5a507063a6be443ef1ca9d9325f8091003bf Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Thu, 29 Jul 2021 16:59:48 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E6=B8=85=E7=A9=BA=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=EF=BC=8C=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E9=A1=B5=E7=9A=84=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/localTool/standAutoSplit/index.vue  |  38 +--
 .../standAutoSplit/pages/itemSplitInfo.vue    |  10 +-
 .../localTool/standardRecognition/index.vue   | 306 +++++++++---------
 .../page/listOfCountries.vue                  |   6 +-
 .../page/listOther.vue                        |   6 +-
 .../page/listProject.vue                      |   6 +-
 .../pages/addEdit.vue                         |   8 +-
 .../pages/details.vue                         |  12 +-
 .../pages/otherAddEit.vue                     |   8 +-
 .../pages/projectAddEit.vue                   |   8 +-
 10 files changed, 190 insertions(+), 218 deletions(-)

diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue
index e4306b6ee..3f07616db 100644
--- a/src/pages/localTool/standAutoSplit/index.vue
+++ b/src/pages/localTool/standAutoSplit/index.vue
@@ -51,20 +51,12 @@
                 prop="showNumber"
                 label="标准号/政策号"
                 align="center">
-              <template slot-scope="scope">
-                <div v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNumSplit }}</div>
-                <div v-else>{{ scope.row.showNumber }}</div>
-              </template>
             </el-table-column>
             <el-table-column
                 prop="standName"
                 label="标准名称/政策名称"
                 show-overflow-tooltip
                 align="center">
-              <template slot-scope="scope">
-                <span v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNameSplit }}</span>
-                <span v-else>{{ scope.row.standName }}</span>
-              </template>
             </el-table-column>
             <el-table-column
                 prop="fileTypeShow"
@@ -77,20 +69,14 @@
                 show-overflow-tooltip
                 align="center">
             </el-table-column>
-            <el-table-column
-                prop="splitStatus"
-                label="拆分状态"
-                align="center">
-              <template slot-scope="scope">
-                <div>{{ scope.row.splitStatus == '0' ? '编辑中' : (scope.row.splitStatus == '1' ? '审核中' : '已完成' +
-                    '') }}</div>
-              </template>
-            </el-table-column>
             <el-table-column
                 prop="creationTime"
                 label="拆分时间"
                 sortable
                 align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.creationTime ? $moment(scope.row.creationTime).format('YYYY-MM-DD') : '' }}</span>
+              </template>
             </el-table-column>
             <el-table-column
                 prop="result"
@@ -102,28 +88,12 @@
                 <el-tag type="danger" size="small" v-else>失败</el-tag>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="50" fixed="right">
+            <el-table-column label="操作" align="center" width="50">
               <template slot-scope="scope">
                 <el-dropdown trigger="click" @command="handleCommand">
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="''">查看</el-dropdown-item>
-<!--                    <el-dropdown-item-->
-<!--                        v-if="scope.row.collectBtn"-->
-<!--                        :command="[scope.row, '收藏']"-->
-<!--                        v-btn-permission="''"-->
-<!--                    >-->
-<!--                      收藏-->
-<!--                    </el-dropdown-item>-->
-<!--                    <el-dropdown-item-->
-<!--                        v-else-->
-<!--                        :command="[scope.row, '取消收藏']"-->
-<!--                        v-btn-permission="''"-->
-<!--                    >-->
-<!--                      取消收藏-->
-<!--                    </el-dropdown-item>-->
-<!--                    <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="''">分享</el-dropdown-item>-->
-<!--                    <el-dropdown-item :command="[scope.row, '关联']">关联</el-dropdown-item>-->
                     <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
index 7c38fa00b..a4035fe21 100644
--- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
@@ -2245,15 +2245,7 @@ export default {
       })
     },
     jurisdictionCheck() {
-      if (this.jurisdiction === '0') {
-        this.$message.warning('审核中，不可操作')
-        return false
-      } else if (this.jurisdiction === '1') {
-        this.$message.warning('编辑中，不可操作')
-        return false
-      } else {
-        return true
-      }
+      return true
     }
   },
   props: {},
diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue
index f4ece4368..47590915f 100644
--- a/src/pages/localTool/standardRecognition/index.vue
+++ b/src/pages/localTool/standardRecognition/index.vue
@@ -291,158 +291,158 @@ export default {
           label: "关联文件",
         },
       ],
-      // standRecoColumn: [
-      //   {
-      //     type: 'selection',
-      //     width: 60,
-      //     align: 'center'
-      //   },
-      //   {
-      //     title: '序号',
-      //     type: 'index',
-      //     align: 'center'
-      //   },
-      //   {
-      //     title: '资料类型',
-      //     key: 'fileType',
-      //     align: 'center',
-      //     render: (h, params) => {
-      //       let texts
-      //       if (params.row.fileType === '1') {
-      //         texts = '国内标准法规'
-      //       } else if (params.row.fileType === '2') {
-      //         texts = '海外标准法规'
-      //       } else if (params.row.fileType === '3') {
-      //         texts = '政策'
-      //       } else if (params.row.fileType === '4') {
-      //         texts = '企业标准'
-      //       } else {
-      //         texts = '标准'
-      //       }
-      //       return h('div', {
-      //         class: {
-      //           'text-overflow-hidden': true
-      //         },
-      //         attrs: {
-      //           title: texts
-      //         }
-      //       }, texts)
-      //     }
-      //   },
-      //   {
-      //     title: '标准号/政策号',
-      //     key: 'standNumber',
-      //     align: 'center'
-      //   },
-      //   {
-      //     title: '标准名称/政策名称',
-      //     key: 'standName',
-      //     align: 'center'
-      //   },
-      //   {
-      //     title: '文本状态',
-      //     key: 'fileStatus',
-      //     align: 'center',
-      //     render: (h, params) => {
-      //       let texts
-      //       if (params.row.fileType === 'STAND_FILE') {
-      //         texts = '标准文本'
-      //       } else if (params.row.fileType === 'DRAFT_FILE') {
-      //         texts = '草案'
-      //       } else if (params.row.fileType === 'OPINION_FILE') {
-      //         texts = '征求意见稿'
-      //       } else if (params.row.fileType === 'SENT_SCREEN_FILE') {
-      //         texts = '送审稿'
-      //       } else if (params.row.fileType === 'APPROVAL_FILE') {
-      //         texts = '报批稿'
-      //       } else if (params.row.fileType === 'RELEVANCE_FILE') {
-      //         texts = '关联文件'
-      //       }
-      //       return h('div', {
-      //         class: {
-      //           'text-overflow-hidden': true
-      //         },
-      //         attrs: {
-      //           title: texts
-      //         }
-      //       }, texts)
-      //     }
-      //   },
-      //   {
-      //     title: '转换结果',
-      //     key: 'resultContent',
-      //     align: 'center'
-      //   },
-      //   {
-      //     title: '消耗时间',
-      //     key: 'spendTime',
-      //     align: 'center'
-      //   },
-      //   {
-      //     title: '操作',
-      //     key: 'action',
-      //     width: 200,
-      //     align: 'center',
-      //     render: (h, params) => {
-      //       return h('div', [
-      //         h('Button', {
-      //           props: {
-      //             type: 'primary',
-      //             size: 'small'
-      //           },
-      //           style: {
-      //             marginRight: '5px'
-      //           },
-      //           on: {
-      //             click: () => {
-      //               this.downloadFile(params.row)
-      //             }
-      //           }
-      //         }, '获取文件'),
-      //         h('Button', {
-      //           props: {
-      //             type: 'warning',
-      //             size: 'small'
-      //           },
-      //           style: {
-      //             marginRight: '5px'
-      //           },
-      //           on: {
-      //             click: () => {
-      //               this.editOcrRecord(params.row)
-      //             }
-      //           }
-      //         }, '编辑'),
-      //         h('Dropdown', {
-      //           props: {
-      //             trigger: 'click'
-      //           },
-      //           on: {
-      //             'on-click': (value) => {}
-      //           }
-      //         }, [
-      //           h('Button', {
-      //             props: {
-      //               type: 'primary',
-      //               size: 'small'
-      //             }
-      //           }, '更多'),
-      //           h('DropdownMenu', {
-      //             slot: 'list'
-      //           },
-      //           this.dropdownItems.map(function (type) {
-      //             return h('DropdownItem', {
-      //               props: {
-      //                 name: type.val
-      //               }
-      //             }, type.val)
-      //           })
-      //           )
-      //         ])
-      //       ])
-      //     }
-      //   }
-      // ],
+/*      standRecoColumn: [
+        {
+          type: 'selection',
+          width: 60,
+          align: 'center'
+        },
+        {
+          title: '序号',
+          type: 'index',
+          align: 'center'
+        },
+        {
+          title: '资料类型',
+          key: 'fileType',
+          align: 'center',
+          render: (h, params) => {
+            let texts
+            if (params.row.fileType === '1') {
+              texts = '国内标准法规'
+            } else if (params.row.fileType === '2') {
+              texts = '海外标准法规'
+            } else if (params.row.fileType === '3') {
+              texts = '政策'
+            } else if (params.row.fileType === '4') {
+              texts = '企业标准'
+            } else {
+              texts = '标准'
+            }
+            return h('div', {
+              class: {
+                'text-overflow-hidden': true
+              },
+              attrs: {
+                title: texts
+              }
+            }, texts)
+          }
+        },
+        {
+          title: '标准号/政策号',
+          key: 'standNumber',
+          align: 'center'
+        },
+        {
+          title: '标准名称/政策名称',
+          key: 'standName',
+          align: 'center'
+        },
+        {
+          title: '文本状态',
+          key: 'fileStatus',
+          align: 'center',
+          render: (h, params) => {
+            let texts
+            if (params.row.fileType === 'STAND_FILE') {
+              texts = '标准文本'
+            } else if (params.row.fileType === 'DRAFT_FILE') {
+              texts = '草案'
+            } else if (params.row.fileType === 'OPINION_FILE') {
+              texts = '征求意见稿'
+            } else if (params.row.fileType === 'SENT_SCREEN_FILE') {
+              texts = '送审稿'
+            } else if (params.row.fileType === 'APPROVAL_FILE') {
+              texts = '报批稿'
+            } else if (params.row.fileType === 'RELEVANCE_FILE') {
+              texts = '关联文件'
+            }
+            return h('div', {
+              class: {
+                'text-overflow-hidden': true
+              },
+              attrs: {
+                title: texts
+              }
+            }, texts)
+          }
+        },
+        {
+          title: '转换结果',
+          key: 'resultContent',
+          align: 'center'
+        },
+        {
+          title: '消耗时间',
+          key: 'spendTime',
+          align: 'center'
+        },
+        {
+          title: '操作',
+          key: 'action',
+          width: 200,
+          align: 'center',
+          render: (h, params) => {
+            return h('div', [
+              h('Button', {
+                props: {
+                  type: 'primary',
+                  size: 'small'
+                },
+                style: {
+                  marginRight: '5px'
+                },
+                on: {
+                  click: () => {
+                    this.downloadFile(params.row)
+                  }
+                }
+              }, '获取文件'),
+              h('Button', {
+                props: {
+                  type: 'warning',
+                  size: 'small'
+                },
+                style: {
+                  marginRight: '5px'
+                },
+                on: {
+                  click: () => {
+                    this.editOcrRecord(params.row)
+                  }
+                }
+              }, '编辑'),
+              h('Dropdown', {
+                props: {
+                  trigger: 'click'
+                },
+                on: {
+                  'on-click': (value) => {}
+                }
+              }, [
+                h('Button', {
+                  props: {
+                    type: 'primary',
+                    size: 'small'
+                  }
+                }, '更多'),
+                h('DropdownMenu', {
+                  slot: 'list'
+                },
+                this.dropdownItems.map(function (type) {
+                  return h('DropdownItem', {
+                    props: {
+                      name: type.val
+                    }
+                  }, type.val)
+                })
+                )
+              ])
+            ])
+          }
+        }
+      ],*/
       modalType: "",
       standRecoList: [],
       selectTableData: [],
@@ -759,7 +759,7 @@ export default {
         (res) => {
           if (res.ok) {
             this.standRecoList = res.data.list;
-            this.total = res.data.count;
+            this.total = res.data.list.length;
           }
         },
         e => {}
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index f2c52fcc1..c4cfc9b43 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -267,16 +267,16 @@ export default {
     },
     pageChange(page) {
       this.sarSarAccessEOSearch.page = page;
-      this.searchSarAccess();
+      // this.searchSarAccess();
     },
     pageSizeChange(pageSize) {
       this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
-      this.searchSarAccess();
+      // this.searchSarAccess();
     },
     clearSearch() {
       this.sarSarAccessEOSearch.countryArea = ''
       this.sarSarAccessEOSearch.detailedListName = ''
-      this.searchSarAccess();
+      // this.searchSarAccess();
     },
     // 新增相关
     openModal(row, optType) {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
index 1340cb86d..b0af84fa9 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
@@ -283,16 +283,16 @@ export default {
     },
     pageChange(page) {
       this.sarSarAccessEOSearch.page = page;
-      this.searchSarAccess();
+      // this.searchSarAccess();
     },
     pageSizeChange(pageSize) {
       this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
-      this.searchSarAccess();
+      // this.searchSarAccess();
     },
     clearSearch() {
       this.sarSarAccessEOSearch.detailedList = ''
       this.sarSarAccessEOSearch.detailedListName = ''
-      this.searchSarAccess();
+      // this.searchSarAccess();
     },
     // 新增相关
     openModal(row, optType) {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
index 9cb9ccc1f..d45f42401 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
@@ -283,17 +283,17 @@ export default {
     },
     pageChange(page) {
       this.sarSarAccessEOSearch.page = page;
-      this.searchSarAccess();
+      // this.searchSarAccess();
     },
     pageSizeChange(pageSize) {
       this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
-      this.searchSarAccess();
+      // this.searchSarAccess();
     },
     //清空
     clearSearch() {
       this.sarSarAccessEOSearch.projectName = ''
       this.sarSarAccessEOSearch.detailedListName = ''
-      this.searchSarAccess()
+      // this.searchSarAccess()
 
     },
     // 新增相关
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 2c860654c..4a89f62c4 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -1176,6 +1176,7 @@ export default {
               // this.$refs.accessTypeSelect.clearSelection()
               this.$refs.entryTable.clearSelection()
               this.$refs.searchTable.clearSelection()
+            this.$message.warning('请勿添加重复数据')
             } else{
               this.sarAccessInfoList.push(item)
               // this.$refs.accessTypeSelect.clearSelection()
@@ -1183,7 +1184,6 @@ export default {
               this.$refs.searchTable.clearSelection()
             }
         })
-        this.$message.warning('请勿添加重复数据')
       } else {
         this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
       }
@@ -1295,17 +1295,17 @@ export default {
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
             if (this.sarAccessInfoList[i].putTime === null)  {
-              rowlist1.push(this.sarAccessInfoList[i].putTime = '')
+              rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
             }else {
               rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
             }
            if (this.sarAccessInfoList[i].xcxssrqgj === null) {
-             rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '')
+             rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
            }else {
              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
            }
            if (this.sarAccessInfoList[i].zccssrqgj === null) {
-             rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '')
+             rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
            }else {
              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
            }
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index 674ab98bd..a55938830 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -381,7 +381,7 @@ export default {
       heightShow: true,
       dataLoading: false,
       standardForm: {
-
+        zrbm: '',
         standNumber: "",
         standName: "",
         responseUnit: "",
@@ -389,6 +389,10 @@ export default {
         Size: this.$store.getters.userInfo.configContent
       },
       standardFormList: {
+        zrbm: '',
+        typeApplicable: '',
+        nylx: '',
+        sycpx: '',
         standNumber: '',
         standName: '',
         responseUnit: '',
@@ -493,8 +497,14 @@ export default {
     },
     // 重置搜索
     resetSelect() {
+      this.standardForm.zrbm = ''
       this.standardForm.standName = ''
       this.standardForm.responseUnit = ''
+      this.standardFormList.standName = ''
+      this.standardFormList.typeApplicable = ''
+      this.standardFormList.nylx = ''
+      this.standardFormList.zrbm = ''
+      this.standardFormList.sycpx = ''
       this.selectInfobyAccid()
     },
     exportStandard() {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 4a1bebbc0..76a9f2f86 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -1145,6 +1145,7 @@ export default {
             // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
+            this.$message.warning('请勿添加重复数据')
           } else{
             this.sarAccessInfoList.push(item)
             // this.$refs.accessTypeSelect.clearSelection()
@@ -1152,7 +1153,6 @@ export default {
             this.$refs.searchTable.clearSelection()
           }
         })
-        this.$message.warning('请勿添加重复数据')
         this.selectedAccInfoSearchList = []
         this.$refs.entryTable.clearSelection()
         this.$refs.searchTable.clearSelection()
@@ -1264,17 +1264,17 @@ export default {
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
             if (this.sarAccessInfoList[i].putTime === null)  {
-              rowlist1.push(this.sarAccessInfoList[i].putTime = '')
+              rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
             }else {
               rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
             }
             if (this.sarAccessInfoList[i].xcxssrqgj === null) {
-              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '')
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
             }else {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
             }
             if (this.sarAccessInfoList[i].zccssrqgj === null) {
-              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '')
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
             }else {
               rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
             }
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 8adf94499..1d4fe3bc6 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -1144,6 +1144,7 @@ export default {
             // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
+            this.$message.warning('请勿添加重复数据')
           } else{
             this.sarAccessInfoList.push(item)
             // this.$refs.accessTypeSelect.clearSelection()
@@ -1151,7 +1152,6 @@ export default {
             this.$refs.searchTable.clearSelection()
           }
         })
-        this.$message.warning('请勿添加重复数据')
         this.selectedAccInfoSearchList = []
         this.$refs.entryTable.clearSelection()
         this.$refs.searchTable.clearSelection()
@@ -1263,17 +1263,17 @@ export default {
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
             if (this.sarAccessInfoList[i].putTime === null)  {
-              rowlist1.push(this.sarAccessInfoList[i].putTime = '')
+              rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
             }else {
               rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
             }
             if (this.sarAccessInfoList[i].xcxssrqgj === null) {
-              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '')
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
             }else {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
             }
             if (this.sarAccessInfoList[i].zccssrqgj === null) {
-              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '')
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
             }else {
               rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
             }

From 2bbf4875ffcb5dda860db6ca597cb4b45b6e1adf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 29 Jul 2021 17:01:25 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/xmpg/step1.vue         | 76 ++++++++++++-------
 .../pages/creatProcess/xmpg/step2.vue         |  2 -
 2 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index 40db856ba..41331f01f 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -93,22 +93,23 @@
           <el-table-column
             prop="distributePerson"
             label="分发责任人">
-<!--            <template slot-scope="scope">-->
-<!--              <el-input-->
-<!--                v-model="scope.row.distributePerson"-->
-<!--                placeholder="请选择分发负责人"-->
-<!--                readonly-->
-<!--                @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"-->
-<!--                v-if="!scope.row.distributePerson"></el-input>-->
-<!--            </template>-->
-            <template slot-scope="scope,text" v-if="showColumn">
-              <div>
-                <div @click="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)">
-                  {{ listForm.dataList[scope.$index].distributePerson == null ? "请选择分发负责人" : listForm.dataList[scope.$index].distributePerson
-                  }}
-                </div>
-              </div>
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.distributePerson"
+                placeholder="请选择分发负责人"
+                readonly
+                @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"
+                v-if="!scope.row.distributePerson"></el-input>
+              <span v-else>{{ scope.row.distributePerson }}</span>
             </template>
+<!--            <template slot-scope="scope,text" v-if="showColumn">-->
+<!--              <div>-->
+<!--                <div  @click="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)">-->
+<!--                  {{ listForm.dataList[scope.$index].distributePerson == null ? "请选择分发负责人" : listForm.dataList[scope.$index].distributePerson-->
+<!--                  }}-->
+<!--                </div>-->
+<!--              </div>-->
+<!--            </template>-->
           </el-table-column>
         </el-table>
       </div>
@@ -445,6 +446,7 @@ export default {
       ListModel: false, //选择拆分标准抽屉状态
       treeData: [], // 人员数据
       selectList: [], //选择标准的选择框
+      currentIndex: -1, // 当前操作行索引
       isSubmit: false,
       saveLoading: false,
       selectedList: [],  //拆分标准的选择框
@@ -520,19 +522,29 @@ export default {
         this.listForm.certifiedEngineer = data[0].id;
         this.listForm.certifiedEngineerName = data[0].name;
       } else if (this.type === "distributePerson") {
-        this.dataList.distributePersonId = data[0].id;
-        this.dataList.distributePerson = data[0].name;
-        this.listForm.dataList[this.dsadadadsada].distributePersonId = data[0].id;
-        this.listForm.dataList[this.dsadadadsada].distributePerson = data[0].name;
-        console.log(this.dataList)
-        this.showColumn = false;
-        this.$nextTick(() => {
-          this.showColumn = true;
-        });
+        // 如果有勾选,则视为批量选择责任人
+        if (this.selectList.length) {
+          this.dataList.forEach((item, index) => {
+            if (this.selectList.includes(item.productLine)) {
+              const newItem = JSON.parse(JSON.stringify(item))
+              newItem.distributePersonId = data[0].id
+              newItem.distributePerson = data[0].name
+              this.$set(this.dataList, index, newItem)
+            }
+          })
+        } else {
+          const newItem = JSON.parse(JSON.stringify(this.dataList[this.currentIndex]))
+          newItem.distributePersonId = data[0].id
+          newItem.distributePerson = data[0].name
+          this.$set(this.dataList, this.currentIndex, newItem)
+          this.listForm.dataList[this.currentIndex].distributePersonId = data[0].id;
+          this.listForm.dataList[this.currentIndex].distributePerson = data[0].name;
+          this.currentIndex = -1
+        }
       }
       this.modalshowflag = false;
     },
-    cancleUserInfo() {
+    cancelUserInfo() {
       this.modalshowflag = false;
     },
     //tab发生变化
@@ -561,7 +573,9 @@ export default {
     //点击添加事件
     addList() {
       this.standModel = true;
-      this.$refs.projectTable.clearSelection();
+      this.$nextTick(() => {
+        this.$refs.projectTable.clearSelection();
+      })
     },
     // 点击批量删除事件
     deleteList() {
@@ -743,7 +757,7 @@ export default {
     },
     choiceZRR(scope, type, title, id) {
       if (scope != null) {
-        this.dsadadadsada = scope.$index;
+        this.currentIndex = scope.$index;
       }
       this.nodeList = [];
       this.nodeList.push(id);
@@ -810,6 +824,14 @@ export default {
     }
   },
   computed: {},
+  watch: {
+    dataList: {
+      deep: true,
+      handler (val) {
+        console.log('dataList update', val)
+      }
+    }
+  },
   mounted() {
     this.getTree();
     this.getProductData();
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
index 2d7414f24..3acb8e4a7 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
@@ -324,8 +324,6 @@ export default {
         this.listForm.breakdownList = item.breakdownList
       })
     },
-
-
     //驳回事件
     beforeBack () {
       if(this.commentText === null || this.commentText === undefined || this.commentText === ''){

From 7d00bbfa51d525cda7db8e4056decbbfd8b2f19e Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Fri, 30 Jul 2021 00:47:40 +0800
Subject: [PATCH 5/6] =?UTF-8?q?feat:=20=E5=9B=BD=E5=86=85=E5=A4=96?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=20=E5=8F=8D=E5=90=91=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomFormComponents/InputForStandards.vue |  4 ++++
 .../details/otherStandardDetails/index.vue     |  6 +++---
 .../domesticStandardsAndRegulations/index.vue  | 18 ++++++++++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue
index 3b9d5a974..946f39711 100644
--- a/src/components/CustomFormComponents/InputForStandards.vue
+++ b/src/components/CustomFormComponents/InputForStandards.vue
@@ -186,6 +186,7 @@ export default {
       replaceLawsNumRow: [], // 代替政策号 数组内容
       replaceTotal: 0,
       selectedListRep: [],
+      ids: [],
       replaceLoading: true,
       replacePage: 1
 
@@ -297,6 +298,7 @@ export default {
     // 代替政策编号确定
     replaceLawsNumModelBt () {
       let textArr = []
+      this.ids = []
 
       if (typeof this.value === 'string') {
         if (this.value) {
@@ -322,12 +324,14 @@ export default {
         } else {
           texts = item.standSortShow !== null ? item.standSortShow + ' ' + item.standNumber : item.standNumber
         }
+        this.ids.push(item.id);
         textArr.push(texts)
         textArr = [...new Set(textArr)]
         this.replaceLawsNumModel = false
       })
       // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
       this.$emit('input', textArr.join(','))
+      this.$emit('popoverHide', this.ids, this.config.attrField);
       this.$refs.selections.clearSelection()
     },
     // 点击查看
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index b7bc135d9..24f5c3bb9 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -72,7 +72,7 @@
               :key="child.id"
               class="modular-item"
               :class="!(childIndex === item.half.length - 1) || childIndex % 2 === 1 ? 'half' : ''"
-              v-if=" child.attrField === 'DTBJH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'XGLC' || child.attrField === 'BDTBZBH' || child.attrField === 'BFDTBZ' "
+              v-if=" child.attrField === 'DTBJH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'XGLC' || child.attrField === 'BDTBZBH' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ' "
             >
               <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
               <span
@@ -216,7 +216,7 @@
                 </p>
               </template>
               <template
-                v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ'"
+                v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ'"
               >
                 <p class="modular-content-p-val" v-if="child.value">
                   <span v-for="(item, index) in child.value.split(',')" :key="index">
@@ -310,7 +310,7 @@
                         </p>
                     </template>
                     <template
-                            v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ'"
+                            v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ'"
                     >
                         <p class="modular-content-p-val" v-if="child.value">
                   <span v-for="(item, index) in child.value.split(',')" :key="index">
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 59bd2bd9f..b47761910 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -448,6 +448,7 @@
                       :class="field.attrField === 'BYYBJ' ? 'classDisplay' : ''"
                       v-model="sarStandardsInfoEO[field.attrField]"
                       :disabled="formdisableflag"
+                      @popoverHide="popoverHideQuery"
                     ></custom-input-for-standards>
                   </template>
                   <template v-else-if="field.attrField === 'CYCVPPSBM'">
@@ -1698,6 +1699,8 @@ export default {
         svpps: '', // 关联模块-VPPS编码
         replaceStandNum: '', // 代替标准号
         replacedStandNum: '',  // 	被代替标准号
+        replacePartStandNum: '', // 代替标准号
+        replacedPartStandNum: '',  // 	被代替标准号
         citeStand: '',  // 	引用标准
         citedStand: '',  // 	被引用标准
         synopsis: '', // 内容摘要
@@ -1744,6 +1747,8 @@ export default {
         standNature: '',
         replaceStandNum: '',
         replacedStandNum: '',
+        replacePartStandNum: '', // 代替标准号
+        replacedPartStandNum: '',  // 	被代替标准号
         interStandNum: '',
         adoptExtent: '',
         emergyKind: '',
@@ -1814,10 +1819,12 @@ export default {
         standState: '',
         standNature: '',
         replaceStandNum: '',
+        replacePartStandNum: '',
         replaceStandNumId: '',
         // replaceStandNumCope: '',
         replaceStandNumList: [],
         replacedStandNum: '',
+        replacedPartStandNum: '',
         interStandNum: '',
         adoptExtent: '',
         emergyKind: '',
@@ -2161,6 +2168,8 @@ export default {
         synopsis: '',
         // replaceStandNumCope: '',
         replacedStandNum: '',
+          replacePartStandNum: '', // 代替标准号
+          replacedPartStandNum: '',  // 	被代替标准号
         orderBy:'',
         nowOrder: '',
         nowOrderBy: '',
@@ -2223,6 +2232,11 @@ export default {
           this.url="sarModelTree/list"
           this.urlChild="sarModelTree/childByList"
       },
+      popoverHideQuery(ids,attrField){
+          console.log(ids)
+          console.log("-----------------------------")
+          console.log(attrField)
+      },
       popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
           if(checkedData) {
               if(checkedData.length > 0){
@@ -2742,6 +2756,8 @@ export default {
         this.sarStandardsSearch.applyArctic = ''
         this.sarStandardsSearch.replaceStandNum = ''
         this.sarStandardsSearch.replacedStandNum = ''
+        this.sarStandardsSearch.replacePartStandNum = ''
+        this.sarStandardsSearch.replacedPartStandNum = ''
         this.sarStandardsSearch.synopsis = ''
         this.sarStandardsSearch.category = ''
         this.pageChange(1)
@@ -4035,6 +4051,8 @@ export default {
               this.sarConfigStandSearch.applyArctic = ''
               this.sarConfigStandSearch.replaceStandNum = ''
               this.sarConfigStandSearch.replacedStandNum = ''
+              this.sarStandardsSearch.replacePartStandNum = ''
+              this.sarStandardsSearch.replacedPartStandNum = ''
               this.selectConfiguraStand()
             }
           }

From d49bfb873218c8010c5a08620069ce5d74702ffa Mon Sep 17 00:00:00 2001
From: liuhuaizhi <liuhuaizhi@91isoft.com>
Date: Fri, 30 Jul 2021 09:52:50 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/details.vue                         | 56 +++++++++++++++----
 1 file changed, 45 insertions(+), 11 deletions(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 937ad9e75..2e94c804e 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -94,7 +94,7 @@
               width="190px"
               label="新车型实施日期">
             <template slot-scope="scope">
-              <span style="margin-left: 10px">{{scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '-' }}</span>
+              <span style="margin-left: 10px">{{scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format('YYYY-MM-DD') : '-' }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -103,7 +103,7 @@
               width="190px"
               label="在产车实施日期">
             <template slot-scope="scope">
-              <span style="margin-left: 10px">{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '-' }}</span>
+              <span style="margin-left: 10px">{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format('YYYY-MM-DD') : '-' }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -111,6 +111,11 @@
               label="责任部门"
               width="180px"
           >
+            <template slot-scope="scope">
+              <span style="margin-left: 10px">
+                {{zrbmMap[scope.row.zrbm]}}
+              </span>
+            </template>
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
@@ -231,16 +236,31 @@
               <el-table-column
                   prop="xcxssrq"
                   label="新车型实施日期">
+                <template slot-scope="scope">
+                  <span style="margin-left: 10px">
+                    {{scope.row.attrInfoCaseMap.xcxssrq ? $moment(scope.row.attrInfoCaseMap.xcxssrq).format('YYYY-MM-DD') : '-'}}
+                  </span>
+                </template>
               </el-table-column>
               <el-table-column
                   show-overflow-tooltip
                   prop="zccssrq"
                   label="在产车实施日期">
+                <template slot-scope="scope">
+                  <span style="margin-left: 10px">
+                    {{scope.row.attrInfoCaseMap.zccssrq ? $moment(scope.row.attrInfoCaseMap.zccssrq).format('YYYY-MM-DD') : '-'}}
+                  </span>
+                </template>
               </el-table-column>
               <el-table-column
                   show-overflow-tooltip
                   prop="textStatus"
                   label="文本状态">
+                <template slot-scope="scope">
+                  <span style="margin-left: 10px">
+                    {{textStatusMap[scope.row.textStatus]}}
+                  </span>
+                </template>
               </el-table-column>
             </el-table>
           </div>
@@ -312,6 +332,8 @@ export default {
       standList1:[],//调取添加的数据
       id:'',//批量删除.
       saveExportType: '',// 导出文件模态框控制，和文件名称
+      zrbmMap: {},
+      textStatusMap: {} // 文本状态id与name对应
     }
   },
   methods: {
@@ -596,17 +618,21 @@ export default {
       } else if (this.saveExportType === 'all') {
         console.log(this.selectList);
         let ids = ''
-        if (this.selectList.length === 0) {
-          ids='\''+this.dataList[0].standId+'\''
-          for(let i=1;i<this.dataList.length;i++){
-            ids+=',\''+this.dataList[i].standId+'\''
+        if (this.dataList.length === 0) {
+          this.$message.error('暂无导出数据')
+        }else{
+          if (this.selectList.length === 0) {
+            ids='\''+this.dataList[0].standId+'\''
+            for(let i=1;i<this.dataList.length;i++){
+              ids+=',\''+this.dataList[i].standId+'\''
+            }
           }
-        }
-        const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
+          const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
             'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
-        console.log(exportURL)
-        window.open(exportURL)
-        this.$message.success('导出信息成功')
+          console.log(exportURL)
+          window.open(exportURL)
+          this.$message.success('导出信息成功')
+        }
       }
       this.exportModelFlag = false
     },
@@ -625,6 +651,12 @@ export default {
     standSelectChange(val) {
       this.selectList = val;
     },//选项值发生改变
+    // 将文本状态的id与name对应
+    setMap(key,data){
+      data.forEach(item => {
+        this.$set(key, item.value, item.label)
+      })
+    }
   },
   computed: {
     ...mapGetters(['getLocalPro'])
@@ -645,6 +677,8 @@ export default {
         loading: 'loading'
       }, res => {
         this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+        this.setMap(this.zrbmMap,res.data.ZRBMCLASS)
+        this.setMap(this.textStatusMap,res.data.WBZTCLASS)
         this.showLocalProductData(this.getLocalPro)
       }, e => {
       })