From 745b9d30d264cd8e24175b3054f61a967e75969f 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, 2 Dec 2021 09:26:28 +0800
Subject: [PATCH 01/33] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E7=AC=A6=E5=90=88?=
 =?UTF-8?q?=E6=80=A7=E8=AF=A6=E6=83=85=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/complianceDetails/index.vue | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/pages/details/complianceDetails/index.vue b/src/pages/details/complianceDetails/index.vue
index 9a33fbf29..5ae648fb6 100644
--- a/src/pages/details/complianceDetails/index.vue
+++ b/src/pages/details/complianceDetails/index.vue
@@ -4,15 +4,13 @@
     <el-divider content-position="left" v-if="unfit.length < 1 && fit.length < 1"  >暂无评估结果</el-divider>
     <!-- 不满足-->
     <el-divider content-position="left" v-if="unfit.length"  >不满足</el-divider>
-    <div class="content">
       <el-table
-        height="100%"
         ref="selection"
         v-if="unfit.length"
         :data="unfit"
         tooltip-effect="dark"
         border
-        style="width: 100%; min-height: 300px; margin-bottom: 30px;"
+        style="width: 100%; min-height: 400px; margin-bottom: 30px;"
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
         fontWeight: 'bold', height: '48px'}">
         <el-table-column
@@ -60,19 +58,16 @@
       </el-table>
 <!--      <pagination :page="page" :total="total" @pageChange="pageChange"-->
 <!--                  @pageSizeChange="pageSizeChange"></pagination>-->
-    </div>
 
     <!--满足-->
     <el-divider content-position="left" v-if="fit.length">满足</el-divider>
-     <div class="content">
        <el-table
-         height="100%"
          ref="selection"
          v-if="fit.length"
          :data="fit"
          tooltip-effect="dark"
          border
-         style="width: 100%; min-height: 300px; margin-bottom: 30px;"
+         style="width: 100%; min-height: 400px; margin-bottom: 30px;"
          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
         fontWeight: 'bold', height: '48px'}">
          <el-table-column
@@ -103,7 +98,6 @@
            </template>
          </el-table-column>
        </el-table>
-     </div>
 <!--    <pagination :page="page" :total="total" @pageChange="pageChange"-->
 <!--                @pageSizeChange="pageSizeChange"></pagination>-->
     <loading :loading="loading">加载中...</loading>
@@ -170,12 +164,5 @@ export default {
   //width: 1200px;
   //margin: 0 auto;
   height: 100%;
-  .content{
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    height: calc(~'50% - 30px');
-    overflow: auto;
-  }
 }
 </style>

From e15803f0991d200c2bf1b9897f05d6988dac8d24 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Thu, 2 Dec 2021 10:17:40 +0800
Subject: [PATCH 02/33] =?UTF-8?q?=E9=93=BE=E6=8E=A5=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/linkApi.js                            |  10 +
 src/pages/config/pages/linkManage/index.vue   | 439 ++------------
 .../pages/linkManage/linkType/firstLink.vue   | 556 ++++++++++++++++++
 .../pages/linkManage/linkType/secondLink.vue  | 555 +++++++++++++++++
 .../home2/components/empennage/index.vue      | 412 +++++++------
 5 files changed, 1400 insertions(+), 572 deletions(-)
 create mode 100644 src/api/linkApi.js
 create mode 100644 src/pages/config/pages/linkManage/linkType/firstLink.vue
 create mode 100644 src/pages/config/pages/linkManage/linkType/secondLink.vue

diff --git a/src/api/linkApi.js b/src/api/linkApi.js
new file mode 100644
index 000000000..9ee01f0ba
--- /dev/null
+++ b/src/api/linkApi.js
@@ -0,0 +1,10 @@
+import axios from "@/common/axiosV2";
+
+export function getImg (data) {
+  return axios({
+    url: 'api/sarUrl/tsUrl/getIconImg',
+    method: 'get',
+    params: data,
+    responseType: 'arraybuffer'
+  })
+}
diff --git a/src/pages/config/pages/linkManage/index.vue b/src/pages/config/pages/linkManage/index.vue
index 71ea7a573..49ecb9778 100644
--- a/src/pages/config/pages/linkManage/index.vue
+++ b/src/pages/config/pages/linkManage/index.vue
@@ -1,393 +1,68 @@
 <!-- 配置管理 - 链接管理 -->
 <template>
-    <div id="post-manage">
-        <!--    头部操作按钮-->
-        <div class="action-bar">
-            <el-button type="primary"
-                       class="common-button-primary add-button"
-                       @click="addLink"
-                       v-btn-permission="'980cb239683de9e29ee5335cec98e5b4'"
-                       size="mini">新增</el-button>
-            <!--      <el-button type="primary"-->
-            <!--                 class="common-button-primary add-button"-->
-            <!--                 @click="linkOrder"-->
-            <!--                 v-btn-permission="'779665b2e4bb20fc480cf9372a100f69'"-->
-            <!--                 size="mini">顺序调整</el-button>-->
-            <el-button type="primary"
-                       class="common-button-primary add-button"
-                       @click="deleteAllLink"
-                       v-btn-permission="'779665b2e4bb20fc480cf9372a100f69'"
-                       size="mini">删除</el-button>
-        </div>
-        <!--    表格-->
-        <div class="content">
-            <el-table
-                    :data="linkList"
-                    tooltip-effect="dark"
-                    border
-                    style="width: 100%; flex: auto;"
-                    class="drag-table"
-                    height="100%"
-                    :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
-         fontWeight: 'bold', height: '48px'}"
-                    @selection-change="handleSelectionChange">
-                <el-table-column
-                        type="selection"
-                        width="55"
-                        align="center">
-                </el-table-column>
-                <el-table-column
-                        prop="orderBy"
-                        label="序号"
-                        align="center"
-                        width="50px">
-                </el-table-column>
-                <el-table-column
-                        prop="name"
-                        label="链接名称">
-                </el-table-column>
-                <el-table-column
-                        label="链接">
-                  <template slot-scope="scope" >
-                    <span v-if="scope.row.url.slice(0,7) === 'http://'" @click="linkto(scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline">
-                      {{ scope.row.url }}
-                    </span>
-                    <span v-else @click="linkto('http://' + scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline">{{ scope.row.url }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                        label="操作"
-                        width="50px">
-                    <template slot-scope="scope">
-                        <div @click.stop style="display: inline-block">
-                            <el-dropdown trigger="click" @command="handleCommand">
-                                <i class="iconfont">&#xe61e;</i>
-                                <el-dropdown-menu slot="dropdown">
-                                    <el-dropdown-item v-btn-permission="'0fbb849e244e07433a90180fb314ad10'" :command="[scope.row, '删除']">删除</el-dropdown-item>
-                                    <el-dropdown-item v-btn-permission="'fa0846d977aeef07e9cb7faf648f8f7f'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
-                                </el-dropdown-menu>
-                            </el-dropdown>
-                        </div>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </div>
-        <loading :loading="Loading">加载中...</loading>
-        <!--    新增链接弹窗-->
-        <el-dialog
-                :close-on-click-modal="false"
-                :title="dialogTitle"
-                :visible.sync="modalshowflag"
-                :wrapperClosable="false"
-                size="800px"
-                @close="resetForm"
-        >
-            <el-form
-                    ref="sarStandardsInfoForm"
-                    :model="sarStandardsInfoEO"
-                    :rules="sarStandardsInfoRules"
-                    class="label-input-form"
-            >
-                <el-form-item label="链接名称" prop="name" label-width="150px" class="add-form-item">
-                    <el-input v-model="sarStandardsInfoEO.name"
-                              placeholder="请输入链接名称"
-                              maxlength="30"
-                              show-word-limit
-                              clearable></el-input>
-                </el-form-item>
-                <el-form-item label="链接" prop="url" label-width="150px" class="add-form-item">
-                    <el-input v-model="sarStandardsInfoEO.url"
-                              maxlength="100"
-                              show-word-limit
-                              placeholder="请输入链接">
-                    </el-input>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="demo-drawer-footer">
-                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="resetForm">取消</el-button>
-                <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="submit">确定</el-button>
-            </span>
-        </el-dialog>
-    </div>
+  <div class="data-link">
+    <el-tabs v-model="activeName">
+      <el-tab-pane label="第一行链接" name="firstLink">
+        <first-link v-if="activeName === 'firstLink'"></first-link>
+      </el-tab-pane>
+      <el-tab-pane label="第二行链接" name="secondLink">
+        <second-link v-if="activeName === 'secondLink'"></second-link>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
 </template>
 
 <script>
- import Sortable from 'sortablejs'
-    export default {
-        name: "linkManage",
-        data () {
-            return {
-                editId: '',
-                type: '', // 1为新增 2为编辑
-                dialogTitle: '',
-                submitLoading: false,
-                // 向后台传参使用
-                data: [],
-                Loading: false,
-                modalshowflag: false,
-                // 排序
-                order:[],
-                // 表格选取的
-                selectList:[],
-                selectId:[],
-                ids:'',
-                // 向后台传参使用
-                sarStandardsInfoEO: {
-                    name: '',
-                    url: '',
-                    // sortId: ''
-                },
-                //新增链接未输入时提示
-                sarStandardsInfoRules: {
-                    name: [
-                        { required: true, message: '请输入链接名称', trigger: 'blur' }
-                    ],
-                    url: [
-                        { required: true, message: '请输入链接', trigger: 'blur' }
-                    ]
-                },
-
-                modalRole: false,
-                props: {
-                    label: 'name',
-                    children: 'children'
-                },
-
-                linkList: [],
-                sortData: [],
-            }
-        },
-        methods: {
-          //链接点击跳转,链接形式为http://xxxxxx
-          linkto(link_href){
-            window.open(link_href)
-          },
-            //头部新增按钮
-            addLink () {
-                this.type = 1
-                this.dialogTitle = '新增链接'
-                this.modalshowflag = true
-            },
-            //表格中操作列删除操作弹窗
-            deleteLink (row) {
-              this.$confirm('此操作将删除该链接, 是否继续?', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-              }).then(() => {
-
-                this.$http.delete('sarUrl/tsUrl/delete', {
-                  id: row.id
-                }, {
-                  _this: this,
-                  loading: 'Loading'
-                }, res => {
-                  if (res.ok) {
-                    this.$message.success('删除成功')
-                    let arr = []
-                    for (let a = 0; a < this.linkList.length; a++) {
-                      if (this.linkList[a].id === row.id) {
-                        this.linkList.splice(a, 1)
-                      }
-                    }
-                    this.linkList.forEach((item, index) => {
-                      let json = {}
-                      json.id = item.id
-                      json.orderBy = index + 1
-                      arr.push(json)
-                    })
-                    this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => {
-                      this.getLink()
-                    })
-                  }else {
-                    this.$message.warning(res.message)
-                  }
-                })
-              }).catch(() => {
-                this.$message({
-                  type: 'info',
-                  message: '已取消删除'
-                });
-              });
-
-            },
-            //头部删除按钮
-            deleteAllLink() {
-                this.selectId=[]
-                for (var i=0;i<this.selectList.length;i++){
-                    this.selectId.push(this.selectList[i].id)
-                }
-                this.ids = this.selectId.join(",")
-                if (this.selectList.length === 0) {
-                    this.$message.warning('请选择要删除的链接')
-                } else {
-                    this.modalRole = true
-                  this.$confirm('此操作将删除链接, 是否继续?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                  }).then(() => {
-                    this.$http.delete('sarUrl/tsUrl/deleteBatch', {
-                      ids: this.ids
-                    }, {}, res => {
-                      if (res.ok) {
-                        this.$message.success('删除成功')
-                        let arr = this.linkList.filter(items => {
-                          if (!this.ids.includes(items.id)) return items;
-                        })
-                        let newArr = []
-                        arr.forEach((item, index) => {
-                          let json = {}
-                          json.id = item.id
-                          json.orderBy = index + 1
-                          newArr.push(json)
-                        })
-                        this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(newArr), {}, res => {
-                          this.getLink()
-                        })
-                      }else {
-                        this.$message.warning(res.message)
-                      }
-                    })
-                  }).catch(() => {
-                    this.$message({
-                      type: 'info',
-                      message: '已取消删除'
-                    });
-                  });
-                }
-            },
-            //弹窗关闭操作
-            resetForm () {
-                this.$refs['sarStandardsInfoForm'].resetFields();
-                this.modalshowflag = false
-            },
-            //弹窗确认操作
-            submit () {
-                this.$refs['sarStandardsInfoForm'].validate((valid) => {
-                    if (valid) {
-                        if (this.type === 1) {
-                            this.$http.postData('sarUrl/tsUrl/add', {
-                                ...this.sarStandardsInfoEO,
-                            }, {
-                                _this: this,
-                                loading: 'Loading'
-                            }, res=> {
-                                if (res.ok) {
-                                    this.$message.success('新增成功')
-                                    this.modalshowflag = false
-                                    this.getLink()
-                                } else {
-                                    this.$message.warning(res.message)
-                                }
-                            })
-                        } else {
-                            // 编辑
-                            this.$http.putData('/sarUrl/tsUrl/edit', {
-                                id: this.editId,
-                                name: this.sarStandardsInfoEO.name,
-                                url: this.sarStandardsInfoEO.url,
-                            }, {
-                                _this: this,
-                                loading: 'Loading'
-                            }, res=> {
-                                if (res.ok) {
-                                    this.$message.success('修改成功')
-                                    this.modalshowflag = false
-                                    this.getLink()
-                                } else {
-                                    this.$message.warning(res.message)
-                                }
-                            })
-                        }
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            //表格中操作列
-            handleCommand (command) {
-                switch (command[1]) {
-                    case '删除':
-                        this.deleteLink(command[0])
-                        break
-                    case '编辑':
-                        this.editLink(command[0])
-                        break
-                }
-            },
-            //表格中操作列编辑操作弹窗
-            editLink (row) {
-                this.type = 2
-                this.editId = row.id
-                this.sarStandardsInfoEO.name = row.name
-                this.sarStandardsInfoEO.url = row.url
-                this.sarStandardsInfoEO.sortId = row.sortId
-                this.dialogTitle = '修改链接'
-                this.modalshowflag = true
-            },
-            //多选框选择
-            handleSelectionChange (val) {
-                this.selectList = val
-            },
-            // 获取链接数据
-            getLink () {
-                this.$http.get('sarUrl/tsUrl', {
-                }, {
-                    _this: this,
-                    loading: 'Loading'
-                }, res=> {
-                    this.linkList = res.data
-                    this.initSortable()
-                })
-            },
-            initSortable () {
-                this.sortData = [...this.linkList]
-                const el = document.querySelector('.el-table__body-wrapper tbody')
-                //创建拖拽对象
-                this.sortable = Sortable.create(el, {
-                    sort: true, //是否可进行拖拽排序
-                    animation: 150,
-                    onEnd: ({newIndex, oldIndex}) => {
-                        const val = this.sortData[oldIndex]
-                        this.sortData.splice(oldIndex, 1)
-                        this.sortData.splice(newIndex, 0, val)
-                        this.sortData.forEach((item, index) => {
-                            item.orderBy = index + 1
-                        })
-                        let arr = []
-                        this.sortData.forEach(item => {
-                            let json = {}
-                            json.id = item.id
-                            json.orderBy = item.orderBy
-                            arr.push(json)
-                        })
-                        this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => {
-                            if (res.ok) {
-                                this.$message.success('保存成功')
-                            } else {
-                                this.$message.warning('保存失败!')
-                            }
-                        })
-                    }
-                })
-            },
-        },
-        mounted() {
-            this.getLink();
-        }
+import firstLink from "./linkType/firstLink";
+import secondLink from "./linkType/secondLink";
+export default {
+  name: "linkManage",
+  components: {
+    firstLink,
+    secondLink
+  },
+  data() {
+    return {
+      activeName: 'firstLink',
     }
+  },
+  methods: {
+  },
+}
 </script>
 
 <style lang="less" scoped>
-    @import '~@/assets/styles/mixins';
-    #post-manage {
-        height: 100%;
-        .content {
-            height: calc(~'100% - 53px')
-        }
-        .filter-tree {
-            height: calc(~'100% - 50px')
-        }
+@import '~@/assets/styles/mixins';
+.data-link{
+  height: 100%;
+  padding: 0 10px;
+  background: #fff;
+  display: flex;
+  flex-direction: column;
+
+  /deep/ .el-tabs {
+    flex: auto;
+    display: flex;
+    flex-direction: column;
+
+    /deep/ .el-tabs__header {
+      margin: 0 !important;
     }
+
+    .el-tabs__content {
+      height: 100% !important;
+      flex: auto;
+      position: relative;
+      display: flex;
+      flex-direction: column;
+
+      .el-tab-pane {
+        height: 100%;
+        flex: auto;
+        display: flex;
+        flex-direction: column;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/pages/config/pages/linkManage/linkType/firstLink.vue b/src/pages/config/pages/linkManage/linkType/firstLink.vue
new file mode 100644
index 000000000..33888fac8
--- /dev/null
+++ b/src/pages/config/pages/linkManage/linkType/firstLink.vue
@@ -0,0 +1,556 @@
+<!-- 配置管理 - 链接管理 -->
+<template>
+  <div id="post-manage">
+    <!--    头部操作按钮-->
+    <div class="action-bar">
+      <el-button
+        type="primary"
+        class="common-button-primary add-button"
+        @click="addLink"
+        v-btn-permission="'980cb239683de9e29ee5335cec98e5b4'"
+        size="mini">新增
+      </el-button>
+      <!--      <el-button
+              type="primary"
+              class="common-button-primary add-button"
+              @click="linkOrder"
+              v-btn-permission="'779665b2e4bb20fc480cf9372a100f69'"
+              size="mini">顺序调整
+            </el-button>-->
+      <el-button
+        type="danger"
+        class="common-button-primary add-button"
+        @click="deleteAllLink"
+        v-btn-permission="'779665b2e4bb20fc480cf9372a100f69'"
+        size="mini">删除
+      </el-button>
+    </div>
+    <!--    表格-->
+    <div class="content">
+      <el-table
+        :data="linkListFirst"
+        tooltip-effect="dark"
+        border
+        style="width: 100%; flex: auto;"
+        class="drag-table"
+        height="100%"
+        :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+        @selection-change="handleSelectionChange">
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="orderBy"
+          label="序号"
+          align="center"
+          width="50px">
+        </el-table-column>
+        <el-table-column
+          prop="name"
+          label="链接名称">
+        </el-table-column>
+        <el-table-column
+          prop="icon"
+          label="链接图标">
+          <template slot-scope="scope">
+            <img v-if="scope.row.icon !== ''" style="height: 50px;width: 50px" :src="scope.row.icon">
+            <span v-else>{{'-'}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="url"
+          show-overflow-tooltip
+          label="链接">
+          <template slot-scope="scope">
+            <span v-if="scope.row.url.slice(0,7) === 'http://' || scope.row.url.slice(0,8) === 'https://'" @click="linkto(scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline">
+              {{ scope.row.url }}
+            </span>
+            <span v-else @click="linkto('http://' + scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline">
+              {{ 'http://' + scope.row.url }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="操作"
+          width="50px">
+          <template slot-scope="scope">
+            <div @click.stop style="display: inline-block">
+              <el-dropdown trigger="click" @command="handleCommand">
+                <i class="iconfont">&#xe61e;</i>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item v-btn-permission="'0fbb849e244e07433a90180fb314ad10'" :command="[scope.row, '删除']">
+                    删除
+                  </el-dropdown-item>
+                  <el-dropdown-item v-btn-permission="'fa0846d977aeef07e9cb7faf648f8f7f'" :command="[scope.row, '编辑']">
+                    编辑
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <loading :loading="Loading">加载中...</loading>
+    <!--    新增链接弹窗-->
+    <el-dialog
+      :close-on-click-modal="false"
+      :title="dialogTitle"
+      :visible.sync="modalshowflag"
+      :wrapperClosable="false"
+      size="800px"
+      @close="resetForm"
+    >
+      <el-form
+        ref="sarStandardsInfoForm"
+        :model="sarStandardsInfoEO"
+        :rules="sarStandardsInfoRules"
+        class="label-input-form"
+      >
+        <el-form-item label="链接类型" prop="type" label-width="150px" class="add-form-item">
+          <el-input :disabled="true" v-if="sarStandardsInfoEO.type === 1" value="第一行链接"/>
+        </el-form-item>
+        <el-form-item label="链接名称" prop="name" label-width="150px" class="add-form-item">
+          <el-input
+            v-model="sarStandardsInfoEO.name"
+            placeholder="请输入链接名称"
+            maxlength="20"
+            show-word-limit
+            clearable></el-input>
+        </el-form-item>
+        <el-form-item label="链接图标" prop="icon" label-width="150px" class="add-form-item">
+          <el-upload
+            v-model="sarStandardsInfoEO.icon"
+            class="upload-demo"
+            :action="uploadUrl"
+            :show-file-list="false"
+            :limit="1"
+            :on-success="handleAvatarSuccess"
+            :before-upload="beforeAvatarUpload"
+          >
+            <img width="100%" v-if="imageUrl" :src="imageUrl" class="avatar">
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="链接" prop="url" label-width="150px" class="add-form-item">
+          <el-input
+            v-model="sarStandardsInfoEO.url"
+            maxlength="100"
+            show-word-limit
+            placeholder="请输入链接">
+          </el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="demo-drawer-footer">
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="resetForm">取消</el-button>
+                <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="submit">确定</el-button>
+            </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Sortable from 'sortablejs'
+import { getImg } from '@/api/linkApi.js'
+
+export default {
+  name: "firstLink",
+  data() {
+    return {
+      editId: '',
+      type: '', // 1为新增 2为编辑
+      dialogTitle: '',
+      submitLoading: false,
+      // 向后台传参使用
+      data: [],
+      Loading: false,
+      modalshowflag: false,
+      // 排序
+      order: [],
+      // 表格选取的
+      selectList: [],
+      selectId: [],
+      ids: '',
+      // 向后台传参使用
+      sarStandardsInfoEO: {
+        name: '',
+        url: '',
+        icon: '',
+        type: 1,
+        // sortId: ''
+      },
+      //新增链接未输入时提示
+      sarStandardsInfoRules: {
+        name: [
+          {required: true, message: '请输入链接名称', trigger: 'blur'}
+        ],
+        url: [
+          {required: true, message: '请输入链接', trigger: 'blur'}
+        ]
+      },
+
+      modalRole: false,
+      props: {
+        label: 'name',
+        children: 'children'
+      },
+
+      linkListFirst: [],
+      linkList: [],
+      sortData: [],
+
+      imageUrl: '',
+      uploadUrl: 'api/att/attFile/upload',
+    }
+  },
+  methods: {
+    //链接点击跳转,链接形式为http://xxxxxx
+    linkto(link_href) {
+      window.open(link_href)
+    },
+    //头部新增按钮
+    addLink() {
+      this.type = 1
+      this.dialogTitle = '新增链接'
+      this.modalshowflag = true
+    },
+    //表格中操作列删除操作弹窗
+    deleteLink(row) {
+      this.$confirm('此操作将删除该链接, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$http.delete('sarUrl/tsUrl/delete', {
+          id: row.id
+        }, {
+          _this: this,
+          loading: 'Loading'
+        }, res => {
+          if (res.ok) {
+            this.$message.success('删除成功')
+            let arr = []
+            for (let a = 0; a < this.linkList.length; a++) {
+              if (this.linkList[a].id === row.id) {
+                this.linkList.splice(a, 1)
+              }
+            }
+            this.linkList.forEach((item, index) => {
+              let json = {}
+              json.id = item.id
+              json.orderBy = index + 1
+              arr.push(json)
+            })
+            this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => {
+              if (res.ok) {
+                this.linkListFirst = []
+                this.getLink()
+              }
+
+            })
+          } else {
+            this.$message.warning(res.message)
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
+
+    },
+    //头部删除按钮
+    deleteAllLink() {
+      this.selectId = []
+      for (var i = 0; i < this.selectList.length; i++) {
+        this.selectId.push(this.selectList[i].id)
+      }
+      this.ids = this.selectId.join(",")
+      if (this.selectList.length === 0) {
+        this.$message.warning('请选择要删除的链接')
+      } else {
+        this.modalRole = true
+        this.$confirm('此操作将删除链接, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$http.delete('sarUrl/tsUrl/deleteBatch', {
+            ids: this.ids
+          }, {}, res => {
+            if (res.ok) {
+              this.$message.success('删除成功')
+              let arr = this.linkList.filter(items => {
+                if (!this.ids.includes(items.id)) return items;
+              })
+              let newArr = []
+              arr.forEach((item, index) => {
+                let json = {}
+                json.id = item.id
+                json.orderBy = index + 1
+                newArr.push(json)
+              })
+              this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(newArr), {}, res => {
+                if (res.ok) {
+                  this.linkListFirst = []
+                  this.getLink()
+                }
+              })
+            } else {
+              this.$message.warning(res.message)
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          });
+        });
+      }
+    },
+
+    /** 链接图片上传 */
+    //
+    handleAvatarSuccess(res, file, fileList) {
+      if (res.ok) {
+        this.imageUrl = URL.createObjectURL(file.raw)
+        this.sarStandardsInfoEO.icon = res.data.attId
+        this.$message({
+          showClose: true,
+          message: res.message,
+          type: 'success'
+        })
+      }
+    },
+    // 链接图片上传格式限制
+    beforeAvatarUpload(file) {
+      const index = file.name.lastIndexOf('.')
+      const ext = file.name.substr(index + 1)
+      const isJPG = (file.type === 'image/jpeg' || file.type === 'image/png');
+      const isType = (ext === 'jpeg' || ext === 'jpg' || ext === 'png')
+      const isLt2M = file.size / 1024 / 1024 < 2;
+
+      if (!isJPG || !isType) {
+        this.$message.error('上传头像图片只能是 .jpg、.jpeg、.png 格式!');
+      }
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!');
+      }
+      return isJPG && isLt2M && isType;
+    },
+    //弹窗关闭操作
+    resetForm() {
+      this.$refs['sarStandardsInfoForm'].resetFields();
+      this.imageUrl = ''
+      this.modalshowflag = false
+    },
+    //弹窗确认操作
+    submit() {
+      this.$refs['sarStandardsInfoForm'].validate((valid) => {
+        if (valid) {
+          if (this.type === 1) {
+            this.$http.postData('sarUrl/tsUrl/add', {
+              ...this.sarStandardsInfoEO,
+            }, {
+              _this: this,
+              loading: 'Loading'
+            }, res => {
+              if (res.ok) {
+                this.$message.success('新增成功')
+                this.modalshowflag = false
+                this.imageUrl = ''
+                this.linkListFirst = []
+                this.getLink()
+              } else {
+                this.$message.warning(res.message)
+              }
+            })
+          } else {
+            // 编辑
+            this.$http.putData('/sarUrl/tsUrl/edit', {
+              id: this.editId,
+              name: this.sarStandardsInfoEO.name,
+              type: this.sarStandardsInfoEO.type,
+              url: this.sarStandardsInfoEO.url,
+              icon: this.sarStandardsInfoEO.icon
+            }, {
+              _this: this,
+              loading: 'Loading'
+            }, res => {
+              if (res.ok) {
+                this.$message.success('修改成功')
+                this.modalshowflag = false
+                this.linkListFirst = []
+                this.getLink()
+              } else {
+                this.$message.warning(res.message)
+              }
+            })
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+    //表格中操作列
+    handleCommand(command) {
+      switch (command[1]) {
+        case '删除':
+          this.deleteLink(command[0])
+          break
+        case '编辑':
+          this.editLink(command[0])
+          break
+      }
+    },
+    //表格中操作列编辑操作弹窗
+    editLink(row) {
+      this.type = 2
+      this.editId = row.id
+      this.sarStandardsInfoEO.name = row.name
+      this.sarStandardsInfoEO.url = row.url
+      this.sarStandardsInfoEO.sortId = row.sortId
+      this.sarStandardsInfoEO.icon = row.icon
+      if (row.id !== '') {
+        let imgId = {
+          id: row.id
+        }
+        getImg(imgId).then(res=>{
+          if (res.ok) {
+            const src =
+              "data:image/png;base64," +
+              btoa(
+                new Uint8Array(res).reduce(
+                  (data, byte) => data + String.fromCharCode(byte), "")
+              )
+            this.imageUrl = src
+          }
+        })
+      }
+      this.dialogTitle = '修改链接'
+      this.modalshowflag = true
+    },
+    //多选框选择
+    handleSelectionChange(val) {
+      this.selectList = val
+    },
+    // 获取链接数据
+    getLink() {
+      this.$http.get('sarUrl/tsUrl', {}, {
+        _this: this,
+        loading: 'Loading'
+      }, res => {
+        this.linkList = res.data
+        res.data.forEach(item=>{
+          if (item.type === 1) {
+            this.linkListFirst.push(item)
+          }
+        })
+        this.linkListFirst.forEach(item=>{
+          if (item.id !== '') {
+            let imgId = {
+              id: item.id
+            }
+            getImg(imgId).then(res=>{
+              if (res.ok) {
+                const src =
+                  "data:image/png;base64," +
+                  btoa(
+                    new Uint8Array(res).reduce(
+                      (data, byte) => data + String.fromCharCode(byte), "")
+                  )
+                item.icon = src
+              }
+            })
+          }
+        })
+        this.initSortable()
+      })
+    },
+    initSortable() {
+      this.sortData = [...this.linkListFirst]
+      const el = document.querySelector('.el-table__body-wrapper tbody')
+      //创建拖拽对象
+      this.sortable = Sortable.create(el, {
+        sort: true, //是否可进行拖拽排序
+        animation: 150,
+        onEnd: ({newIndex, oldIndex}) => {
+          const val = this.sortData[oldIndex]
+          this.sortData.splice(oldIndex, 1)
+          this.sortData.splice(newIndex, 0, val)
+          this.sortData.forEach((item, index) => {
+            item.orderBy = index + 1
+          })
+          let arr = []
+          this.sortData.forEach(item => {
+            let json = {}
+            json.id = item.id
+            json.orderBy = item.orderBy
+            arr.push(json)
+          })
+          this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => {
+            if (res.ok) {
+              this.$message.success('保存成功')
+            } else {
+              this.$message.warning('保存失败!')
+            }
+          })
+        }
+      })
+    },
+  },
+  mounted() {
+    this.getLink();
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/mixins';
+
+#post-manage {
+  height: 100%;
+
+  .content {
+    height: calc(~'100% - 53px')
+  }
+
+  .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    margin-top: 10px;
+    border-color: #409EFF;
+  }
+  .avatar-uploader {
+    margin-top: 10px;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 100px;
+    height: 100px;
+    line-height: 100px;
+    text-align: center;
+  }
+  .avatar {
+    width: 100px;
+    height: 100px;
+    display: block;
+  }
+  .filter-tree {
+    height: calc(~'100% - 50px')
+  }
+  /deep/.el-input.is-disabled .el-input__inner {
+    background-color: #fff;
+  }
+}
+</style>
diff --git a/src/pages/config/pages/linkManage/linkType/secondLink.vue b/src/pages/config/pages/linkManage/linkType/secondLink.vue
new file mode 100644
index 000000000..3d6f40b46
--- /dev/null
+++ b/src/pages/config/pages/linkManage/linkType/secondLink.vue
@@ -0,0 +1,555 @@
+<!-- 配置管理 - 链接管理 -->
+<template>
+  <div id="post-manage">
+    <!--    头部操作按钮-->
+    <div class="action-bar">
+      <el-button
+        type="primary"
+        class="common-button-primary add-button"
+        @click="addLink"
+        v-btn-permission="'980cb239683de9e29ee5335cec98e5b4'"
+        size="mini">新增
+      </el-button>
+      <!--      <el-button
+              type="primary"
+              class="common-button-primary add-button"
+              @click="linkOrder"
+              v-btn-permission="'779665b2e4bb20fc480cf9372a100f69'"
+              size="mini">顺序调整
+            </el-button>-->
+      <el-button
+        type="danger"
+        class="common-button-primary add-button"
+        @click="deleteAllLink"
+        v-btn-permission="'779665b2e4bb20fc480cf9372a100f69'"
+        size="mini">删除
+      </el-button>
+    </div>
+    <!--    表格-->
+    <div class="content">
+      <el-table
+        :data="linkListSecond"
+        tooltip-effect="dark"
+        border
+        style="width: 100%; flex: auto;"
+        class="drag-table"
+        height="100%"
+        :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+        @selection-change="handleSelectionChange">
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="orderBy"
+          label="序号"
+          align="center"
+          width="50px">
+        </el-table-column>
+        <el-table-column
+          prop="name"
+          label="链接名称">
+        </el-table-column>
+        <el-table-column
+          prop="icon"
+          label="链接图标">
+          <template slot-scope="scope">
+            <img style="height: 50px;width: 50px" :src="scope.row.icon">
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="url"
+          show-overflow-tooltip
+          label="链接">
+          <template slot-scope="scope">
+            <span v-if="scope.row.url.slice(0,7) === 'http://' || scope.row.url.slice(0,8) === 'https://'" @click="linkto(scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline">
+              {{ scope.row.url }}
+            </span>
+            <span v-else @click="linkto('http://' + scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline">
+              {{ 'http://' + scope.row.url }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="操作"
+          width="50px">
+          <template slot-scope="scope">
+            <div @click.stop style="display: inline-block">
+              <el-dropdown trigger="click" @command="handleCommand">
+                <i class="iconfont">&#xe61e;</i>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item v-btn-permission="'0fbb849e244e07433a90180fb314ad10'" :command="[scope.row, '删除']">
+                    删除
+                  </el-dropdown-item>
+                  <el-dropdown-item v-btn-permission="'fa0846d977aeef07e9cb7faf648f8f7f'" :command="[scope.row, '编辑']">
+                    编辑
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <loading :loading="Loading">加载中...</loading>
+    <!--    新增链接弹窗-->
+    <el-dialog
+      :close-on-click-modal="false"
+      :title="dialogTitle"
+      :visible.sync="modalshowflag"
+      :wrapperClosable="false"
+      size="800px"
+      @close="resetForm"
+    >
+      <el-form
+        ref="sarStandardsInfoForm"
+        :model="sarStandardsInfoEO"
+        :rules="sarStandardsInfoRules"
+        class="label-input-form"
+      >
+        <el-form-item label="链接类型" prop="type" label-width="150px" class="add-form-item">
+          <el-input :disabled="true" v-if="sarStandardsInfoEO.type === 2" value="第二行链接"/>
+        </el-form-item>
+        <el-form-item label="链接名称" prop="name" label-width="150px" class="add-form-item">
+          <el-input
+            v-model="sarStandardsInfoEO.name"
+            placeholder="请输入链接名称"
+            maxlength="30"
+            show-word-limit
+            clearable></el-input>
+        </el-form-item>
+        <el-form-item label="链接图标" prop="icon" label-width="150px" class="add-form-item">
+          <el-upload
+            v-model="sarStandardsInfoEO.icon"
+            class="avatar-uploader"
+            :action="uploadUrl"
+            :show-file-list="false"
+            :limit="1"
+            :on-success="handleAvatarSuccess"
+            :before-upload="beforeAvatarUpload">
+            <img v-if="imageUrl" :src="imageUrl" class="avatar">
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="链接" prop="url" label-width="150px" class="add-form-item">
+          <el-input
+            v-model="sarStandardsInfoEO.url"
+            maxlength="100"
+            show-word-limit
+            placeholder="请输入链接">
+          </el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="demo-drawer-footer">
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="resetForm">取消</el-button>
+                <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="submit">确定</el-button>
+            </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Sortable from 'sortablejs'
+import { getImg } from '@/api/linkApi.js'
+import listOfCost from "../../../../regulatoryRepository/dataStatis/page/listOfCost";
+export default {
+  name: "secondLink",
+  data() {
+    return {
+      editId: '',
+      type: '', // 1为新增 2为编辑
+      dialogTitle: '',
+      submitLoading: false,
+      // 向后台传参使用
+      data: [],
+      Loading: false,
+      modalshowflag: false,
+      // 排序
+      order: [],
+      // 表格选取的
+      selectList: [],
+      selectId: [],
+      ids: '',
+      // 向后台传参使用
+      sarStandardsInfoEO: {
+        name: '',
+        url: '',
+        icon: '',
+        type: 2,
+        // sortId: ''
+      },
+      //新增链接未输入时提示
+      sarStandardsInfoRules: {
+        name: [
+          {required: true, message: '请输入链接名称', trigger: 'blur'}
+        ],
+        url: [
+          {required: true, message: '请输入链接', trigger: 'blur'}
+        ]
+      },
+
+      modalRole: false,
+      props: {
+        label: 'name',
+        children: 'children'
+      },
+
+      linkList: [],
+      linkListSecond: [],
+      sortData: [],
+
+      imageUrl: '',
+      uploadUrl: 'api/att/attFile/upload',
+      verifyImg: ''
+    }
+  },
+  methods: {
+    //链接点击跳转,链接形式为http://xxxxxx
+    linkto(link_href) {
+      window.open(link_href)
+    },
+    //头部新增按钮
+    addLink() {
+      this.type = 1
+      this.dialogTitle = '新增链接'
+      this.modalshowflag = true
+    },
+    //表格中操作列删除操作弹窗
+    deleteLink(row) {
+      this.$confirm('此操作将删除该链接, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+
+        this.$http.delete('sarUrl/tsUrl/delete', {
+          id: row.id
+        }, {
+          _this: this,
+          loading: 'Loading'
+        }, res => {
+          if (res.ok) {
+            this.$message.success('删除成功')
+            let arr = []
+            for (let a = 0; a < this.linkList.length; a++) {
+              if (this.linkList[a].id === row.id) {
+                this.linkList.splice(a, 1)
+              }
+            }
+            this.linkList.forEach((item, index) => {
+              let json = {}
+              json.id = item.id
+              json.orderBy = index + 1
+              arr.push(json)
+            })
+            this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => {
+              if (res.ok) {
+                this.linkListSecond = []
+                this.getLink()
+              }
+            })
+          } else {
+            this.$message.warning(res.message)
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
+
+    },
+    //头部删除按钮
+    deleteAllLink() {
+      this.selectId = []
+      for (var i = 0; i < this.selectList.length; i++) {
+        this.selectId.push(this.selectList[i].id)
+      }
+      this.ids = this.selectId.join(",")
+      if (this.selectList.length === 0) {
+        this.$message.warning('请选择要删除的链接')
+      } else {
+        this.modalRole = true
+        this.$confirm('此操作将删除链接, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$http.delete('sarUrl/tsUrl/deleteBatch', {
+            ids: this.ids
+          }, {}, res => {
+            if (res.ok) {
+              this.$message.success('删除成功')
+              let arr = this.linkList.filter(items => {
+                if (!this.ids.includes(items.id)) return items;
+              })
+              let newArr = []
+              arr.forEach((item, index) => {
+                let json = {}
+                json.id = item.id
+                json.orderBy = index + 1
+                newArr.push(json)
+              })
+              this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(newArr), {}, res => {
+                if (res.ok) {
+                  this.linkListSecond = []
+                  this.getLink()
+                }
+              })
+            } else {
+              this.$message.warning(res.message)
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          });
+        });
+      }
+    },
+
+    /** 链接图片上传 */
+    //
+    handleAvatarSuccess(res, file, fileList) {
+      if (res.ok) {
+        this.imageUrl = URL.createObjectURL(file.raw)
+        this.sarStandardsInfoEO.icon = res.data.attId
+        this.$message({
+          showClose: true,
+          message: res.message,
+          type: 'success'
+        })
+      }
+    },
+    // 链接图片上传格式限制
+    beforeAvatarUpload(file) {
+      const index = file.name.lastIndexOf('.')
+      const ext = file.name.substr(index + 1)
+      const isJPG = (file.type === 'image/jpeg' || file.type === 'image/png');
+      const isType = (ext === 'jpeg' || ext === 'jpg' || ext === 'png')
+      const isLt2M = file.size / 1024 / 1024 < 2;
+
+      if (!isJPG || !isType) {
+        this.$message.error('上传头像图片只能是 .jpg、.jpeg、.png 格式!');
+      }
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!');
+      }
+      return isJPG && isLt2M && isType;
+    },
+
+    //弹窗关闭操作
+    resetForm() {
+      this.$refs['sarStandardsInfoForm'].resetFields();
+      this.imageUrl = ''
+      this.modalshowflag = false
+    },
+    //弹窗确认操作
+    submit() {
+      this.$refs['sarStandardsInfoForm'].validate((valid) => {
+        if (valid) {
+          if (this.type === 1) {
+            this.$http.postData('sarUrl/tsUrl/add', {
+              ...this.sarStandardsInfoEO,
+            }, {
+              _this: this,
+              loading: 'Loading'
+            }, res => {
+              if (res.ok) {
+                this.$message.success('新增成功')
+                this.modalshowflag = false
+                this.linkListSecond = []
+                this.getLink()
+              } else {
+                this.$message.warning(res.message)
+              }
+            })
+          } else {
+            // 编辑
+            this.$http.putData('/sarUrl/tsUrl/edit', {
+              id: this.editId,
+              type: this.sarStandardsInfoEO.type,
+              url: this.sarStandardsInfoEO.url,
+              icon: this.sarStandardsInfoEO.icon
+            }, {
+              _this: this,
+              loading: 'Loading'
+            }, res => {
+              if (res.ok) {
+                this.$message.success('修改成功')
+                this.modalshowflag = false
+                this.linkListSecond = []
+                this.getLink()
+              } else {
+                this.$message.warning(res.message)
+              }
+            })
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+    //表格中操作列
+    handleCommand(command) {
+      switch (command[1]) {
+        case '删除':
+          this.deleteLink(command[0])
+          break
+        case '编辑':
+          this.editLink(command[0])
+          break
+      }
+    },
+    //表格中操作列编辑操作弹窗
+    editLink(row) {
+      this.type = 2
+      this.editId = row.id
+      this.sarStandardsInfoEO.name = row.name
+      this.sarStandardsInfoEO.url = row.url
+      this.sarStandardsInfoEO.sortId = row.sortId
+      this.sarStandardsInfoEO.icon = row.icon
+      if (row.id !== '') {
+        let imgId = {
+          id: row.id
+        }
+        getImg(imgId).then(res=>{
+          if (res.ok) {
+            const src =
+              "data:image/png;base64," +
+              btoa(
+                new Uint8Array(res).reduce(
+                  (data, byte) => data + String.fromCharCode(byte), "")
+              )
+            item.icon = src
+          }
+        })
+      }
+      this.dialogTitle = '修改链接'
+      this.modalshowflag = true
+    },
+    //多选框选择
+    handleSelectionChange(val) {
+      this.selectList = val
+    },
+    // 获取链接数据
+    getLink() {
+      this.$http.get('sarUrl/tsUrl', {}, {
+        _this: this,
+        loading: 'Loading'
+      }, res => {
+        this.linkList = res.data
+        res.data.forEach(item=>{
+          if (item.type === 2) {
+            this.linkListSecond.push(item)
+          }
+        })
+        this.linkListSecond.forEach(item=>{
+          if (item.id !== '') {
+            let imgId = {
+              id: item.id
+            }
+            getImg(imgId).then(res=>{
+              if (res.ok) {
+                const src =
+                  "data:image/png;base64," +
+                  btoa(
+                    new Uint8Array(res).reduce(
+                      (data, byte) => data + String.fromCharCode(byte), "")
+                  )
+                item.icon = src
+              }
+            })
+          }
+        })
+        this.initSortable()
+      })
+    },
+    initSortable() {
+      this.sortData = [...this.linkListSecond]
+      const el = document.querySelector('.el-table__body-wrapper tbody')
+      //创建拖拽对象
+      this.sortable = Sortable.create(el, {
+        sort: true, //是否可进行拖拽排序
+        animation: 150,
+        onEnd: ({newIndex, oldIndex}) => {
+          const val = this.sortData[oldIndex]
+          this.sortData.splice(oldIndex, 1)
+          this.sortData.splice(newIndex, 0, val)
+          this.sortData.forEach((item, index) => {
+            item.orderBy = index + 1
+          })
+          let arr = []
+          this.sortData.forEach(item => {
+            let json = {}
+            json.id = item.id
+            json.orderBy = item.orderBy
+            arr.push(json)
+          })
+          this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => {
+            if (res.ok) {
+              this.$message.success('保存成功')
+            } else {
+              this.$message.warning('保存失败!')
+            }
+          })
+        }
+      })
+    },
+  },
+  mounted() {
+    this.getLink();
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/mixins';
+
+#post-manage {
+  height: 100%;
+
+  .content {
+    height: calc(~'100% - 53px')
+  }
+
+  .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    margin-top: 10px;
+    border-color: #409EFF;
+  }
+  .avatar-uploader {
+    margin-top: 10px;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 100px;
+    height: 100px;
+    line-height: 100px;
+    text-align: center;
+  }
+  .avatar {
+    width: 100px;
+    height: 100px;
+    display: block;
+  }
+  .filter-tree {
+    height: calc(~'100% - 50px')
+  }
+  /deep/.el-input.is-disabled .el-input__inner {
+    background-color: #fff;
+  }
+}
+</style>
diff --git a/src/pages/home2/components/empennage/index.vue b/src/pages/home2/components/empennage/index.vue
index 93343ec41..23244528b 100644
--- a/src/pages/home2/components/empennage/index.vue
+++ b/src/pages/home2/components/empennage/index.vue
@@ -1,202 +1,234 @@
 <!-- 尾部链接 -->
 <template>
-    <div class="link" id="link">
-      <!--  此部分暂时这样写，到后面做修改    -->
-      <div style="display: inline-block;width: 15%;">
-        <span class="title borderRight">友情链接</span>
-      </div>
-      <div style="display: inline-block;width: 80%;text-align: center">
-        <div>
-          <el-row>
-            <el-col :span="4">
-              <a style="color: #0068B7;" href="http://www.sac.gov.cn/" target="_blank">国标委</a>
-            </el-col>
-            <el-col :span="1">
-              <span class="borderMiddle"></span>
-            </el-col>
-            <el-col :span="4">
-              <a style="color: #0068B7;" href="http://www.catarc.org.cn/" target="_blank">汽标委</a>
-            </el-col>
-            <el-col :span="1">
-              <span class="borderMiddle"></span>
-            </el-col>
-            <el-col :span="4">
-              <a style="color: #0068B7;" href="http://openstd.samr.gov.cn/bzgk/gb/index" target="_blank">国标全文公开</a>
-            </el-col>
-            <el-col :span="1">
-              <span class="borderMiddle"></span>
-            </el-col>
-            <el-col :span="4">
-              <a style="color: #0068B7;" href="http://std.samr.gov.cn/" target="_blank">全国标准信息公共服务</a>
-            </el-col>
-            <el-col :span="1">
-              <span class="borderMiddle"></span>
-            </el-col>
-            <el-col :span="4">
-              <a style="color: #0068B7;" href="http://jtst.mot.gov.cn/" target="_blank">交通部标准信息</a>
-            </el-col>
-          </el-row>
-        </div>
-        <div>
-          <el-row>
-            <el-col :span="4">
-              <a style="color: #0068B7;" href="https://www.un.org/zh/aboutun/structure/unece/" target="_blank">欧洲经济委员会</a>
-            </el-col>
-            <el-col :span="1">
-              <span class="borderMiddle"></span>
-            </el-col>
-            <el-col :span="4">
-              <a style="color: #0068B7;" href="https://eur-lex.europa.eu" target="_blank">欧盟</a>
-            </el-col>
-            <el-col :span="1">
-              <span class="borderMiddle"></span>
-            </el-col>
-            <el-col :span="4">
-              <a style="color: #0068B7;" href="https://www.interregs.com/" target="_blank">InterRegs </a>
-            </el-col>
-            <el-col :span="1">
-              <span class="borderMiddle"></span>
-            </el-col>
-            <el-col :span="4">
-              <a style="color: #0068B7;" href="https://tbt.sist.org.cn/cslm/wtotbttb/" target="_blank">WTO/TBT通报</a>
-            </el-col>
-            <el-col :span="1">
-              <span class="borderMiddle"></span>
-            </el-col>
-            <el-col :span="4">
-              <a style="color: #0068B7;" href="https://www.iso.org/home.html" target="_blank">ISO</a>
-            </el-col>
-          </el-row>
-        </div>
-      </div>
-      <div style="display: inline-block;width: 15%;">
-        <span class="borderLeft"></span>
-        <span class="myLi1" @click="$router.push('linkManage')">更多链接 ⋙</span></div>
-
-
-      <!--          <div>
-            <span class="myLi1 borderRight" v-for="(link, index) in linkList" :key="index" @click="openLinkUrl(link.url)" :title="link.name" >
-                {{ link.name }}
-            </span>
-            <span class="myLi1" @click="$router.push('linkManage')">更多链接 ⋙</span>
-          </div>
-          <div v-show="false">
-            <span class="myLi1 borderRight" v-for="(link, index) in linkList" :key="index" @click="openLinkUrl(link.url)" :title="link.name" >
-                {{ link.name }}
-            </span>
-            <span class="myLi1" @click="$router.push('linkManage')">更多链接 ⋙</span>
-          </div>-->
+  <div class="link" id="link">
+    <!--  此部分暂时这样写，到后面做修改    -->
+    <div style="display: inline-block;width: 15%;">
+      <span class="title borderRight">友情链接</span>
     </div>
+    <div style="display: inline-block;width: 80%;text-align: center">
+      <div>
+        <el-row>
+            <span v-for="(item, index) in linkListFirst" :key="index">
+              <el-col :span="4">
+                <img
+                  style="height: 10px;width: 10px;margin-bottom: 3px"
+                  :src="item.icon"
+                  v-if="index < 5">
+                <a v-if="index < 5" style="color: #0068B7;" @click="openLinkUrl(item.url)" target="_blank">
+                  {{ item.name }}
+                </a>
+              </el-col>
+               <el-col :span="1" v-if="index < 4" v-show="true">
+                <span class="borderMiddle"></span>
+              </el-col>
+               <el-col :span="1" v-else v-show="false">
+                <span class="borderMiddle"></span>
+              </el-col>
+            </span>
+        </el-row>
+      </div>
+      <div>
+        <el-row>
+          <span v-for="(item, index) in linkListSecond" :key="index">
+              <el-col :span="4">
+                <img
+                  style="height: 10px;width: 10px;margin-bottom: 3px"
+                  :src="item.icon"
+                  v-if="index < 5">
+                <a v-if="index < 5" style="color: #0068B7;" @click="openLinkUrl(item.url)" target="_blank">
+                  {{ item.name }}
+                </a>
+              </el-col>
+               <el-col :span="1" v-if="index < 4" v-show="true">
+                <span class="borderMiddle"></span>
+              </el-col>
+               <el-col :span="1" v-else v-show="false">
+                <span class="borderMiddle"></span>
+              </el-col>
+            </span>
+        </el-row>
+      </div>
+    </div>
+    <div style="display: inline-block;width: 15%;">
+      <span class="borderLeft"></span>
+      <span class="myLi1" @click="$router.push('linkManage')">更多链接 ⋙</span>
+    </div>
+  </div>
 </template>
 
 <script>
-    export default {
-        name: 'Empennage',
-        components: {},
-        mixins: [],
-        data() {
-            return {
-                linkList: [],
-                width: ''
-            }
-        },
-        computed: {},
-        watch: {
-            width(val) {
-                console.log(val);
-            }
-        },
-        mounted() {
-            this.getLink();
-            this.width = document.getElementById("link").offsetWidth
-            let self = this
-            this.screenWidth = document.body.clientWidth
-            window.onresize = () => {
-                return (() => {
-                    console.log(document.body.clientWidth);
-                })
-            }
-        },
-        methods: {
-            // 跳转链接
-            openLinkUrl (linkUri) {
-                let getHttp = linkUri.substring(0, 7)
-                let getHttps = linkUri.substring(0, 8)
-                if (getHttp === 'http://' || getHttps === 'https://') {
-                    window.open(linkUri)
-                } else {
-                    window.open('https://' + linkUri)
-                }
-            },
-            // 获取链接数据
-            getLink () {
-                var width = document.getElementById("link").offsetWidth
-                this.$http.get('sarUrl/tsUrl', {
-                }, {
-                    _this: this,
-                    loading: 'Loading'
-                }, res=> {
-                    let b = 0
-                    let c = 0
-                    for (let a = 0; a < res.data.length; a++) {
-                        b += res.data[a].name.length * 14 + 100
-                        if (b > width) {
-                            c = a - 1
-                        } else {
-                            c = a
-                        }
-                    }
-                    let list
-                    list = res.data.slice(0, c)
-                    this.linkList = list
-                })
-            }
-        },
-
+import { getImg } from '@/api/linkApi.js'
+export default {
+  name: 'Empennage',
+  components: {},
+  mixins: [],
+  data() {
+    return {
+      linkListFirst: [],
+      linkListSecond: [],
+      width: '',
+      verifyImg: '',
     }
+  },
+  computed: {},
+  watch: {
+    width(val) {
+      console.log(val);
+    }
+  },
+  mounted() {
+    this.getLink();
+    /*this.width = document.getElementById("link").offsetWidth
+    let self = this
+    this.screenWidth = document.body.clientWidth
+    window.onresize = () => {
+      return (() => {
+        console.log(document.body.clientWidth);
+      })
+    }*/
+  },
+  methods: {
+    // 跳转链接
+    openLinkUrl(linkUri) {
+      let getHttp = linkUri.substring(0, 7)
+      let getHttps = linkUri.substring(0, 8)
+      if (getHttp === 'http://' || getHttps === 'https://') {
+        window.open(linkUri)
+      } else {
+        window.open('https://' + linkUri)
+      }
+    },
+    // 获取链接数据
+    getLink() {
+      // var width = document.getElementById("link").offsetWidth
+      this.$http.get('sarUrl/tsUrl', {}, {
+        _this: this,
+        loading: 'Loading'
+      }, res => {
+      /*  let b = 0
+        let c = 0
+        for (let a = 0; a < res.data.length; a++) {
+          b += res.data[a].name.length * 14 + 100
+          if (b > width) {
+            c = a - 1
+          } else {
+            c = a
+          }
+        }*/
+        /*let list
+        list = res.data*/
+        res.data.forEach(item=>{
+          if (item.type === 1) {
+            this.linkListFirst.push(item)
+          } else if(item.type === 2) {
+            this.linkListSecond.push(item)
+          }
+        })
+        this.linkListFirst.forEach(item=>{
+          if (item.id !== '') {
+            let imgId = {
+              id: item.id
+            }
+            getImg(imgId).then(res=>{
+              if (res.ok) {
+                const src =
+                  "data:image/png;base64," +
+                  btoa(
+                    new Uint8Array(res).reduce(
+                      (data, byte) => data + String.fromCharCode(byte), "")
+                  )
+                item.icon = src
+              }
+            })
+          }
+        })
+        this.linkListSecond.forEach(item=>{
+          if (item.id !== '') {
+            let imgId = {
+              id: item.id
+            }
+            getImg(imgId).then(res=>{
+              if (res.ok) {
+                const src =
+                  "data:image/png;base64," +
+                  btoa(
+                    new Uint8Array(res).reduce(
+                      (data, byte) => data + String.fromCharCode(byte), "")
+                  )
+                item.icon = src
+              }
+            })
+          }
+        })
+      })
+    },
+
+    getImgLink(row) {
+      let imgId = {
+        id: row.icon
+      }
+      getImg(imgId).then(res=>{
+        const src =
+          "data:image/png;base64," +
+          btoa(
+            new Uint8Array(res).reduce(
+              (data, byte) => data + String.fromCharCode(byte), "")
+          )
+        this.verifyImg = src;
+      })
+    }
+  },
+
+}
 </script>
 
 <style lang="less" scoped>
-    .link {
-        margin-right: 10px;
-        display: flex;
-        border-radius: 3px;
-        height: 100%;
-        align-items: center;
-        box-shadow: 1px 1px 10px rgba(0,0,0,0.1);
-        .borderRight {
-            //padding-right: 50px;
-            //margin-right: 50px;
-            border-right: 2px dotted #aaa;
-        }
-      .borderLeft {
-        margin-right: 50px;
-        //padding-left: 50px;
-        //margin-left: 50px;
-        border-left: 2px dotted #aaa;
-      }
-      .borderMiddle {
-        border-left: 2px dotted #aaa;
-      }
-        .title {
-          padding-right: 40px;
-            font-weight: bold;
-            padding-left: 40px;
-            width: 80px;
-        }
-        .myLi1 {
-            cursor: pointer;
-            color: #0068B7;
-        }
-      .el-col-4 {
-        white-space: nowrap;
-        text-overflow: ellipsis;
-        overflow: hidden;
-        word-break: break-all;
-        line-height: normal;
-        margin-top: 10px;
-        font-size: 5px;
-      }
-    }
+.link {
+  margin-right: 10px;
+  display: flex;
+  border-radius: 3px;
+  height: 100%;
+  align-items: center;
+  box-shadow: 1px 1px 10px rgba(0, 0, 0, 0.1);
+
+  .borderRight {
+    //padding-right: 50px;
+    //margin-right: 50px;
+    border-right: 2px dotted #aaa;
+  }
+
+  .borderLeft {
+    margin-right: 50px;
+    //padding-left: 50px;
+    //margin-left: 50px;
+    border-left: 2px dotted #aaa;
+  }
+
+  .borderMiddle {
+    border-left: 2px dotted #aaa;
+  }
+
+  .title {
+    padding-right: 40px;
+    font-weight: bold;
+    padding-left: 40px;
+    width: 80px;
+  }
+
+  .myLi1 {
+    cursor: pointer;
+    color: #0068B7;
+  }
+
+  .el-col-4 {
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    word-break: break-all;
+    line-height: normal;
+    margin-top: 10px;
+    font-size: 5px;
+  }
+}
 </style>
 

From 9dd767c50db09faab3ab3b046ce9c4f1f16d33c9 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, 2 Dec 2021 10:18:43 +0800
Subject: [PATCH 03/33] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/standInvolveProjectDetail.vue                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
index b68b90b2a..4e6e3b464 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
@@ -190,7 +190,7 @@
               <template slot-scope="scope">
 <!--                <el-button @click="changeState(scope.row)">符合性状态</el-button>-->
                 <div class="table-jump" @click="changeState(scope.row)">
-                  <div v-if="scope.row.sarState === 0">符合</div>
+                  <div v-if="scope.row.unCount === '0'">符合</div>
                   <div v-else >不符合</div>
                 </div>
               </template>

From ec2091875f7c472617e45851bcf22fa583ad4037 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Thu, 2 Dec 2021 10:36:01 +0800
Subject: [PATCH 04/33] =?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/linkManage/linkType/firstLink.vue   | 42 +++++----
 .../pages/linkManage/linkType/secondLink.vue  | 45 ++++++----
 .../home2/components/empennage/index.vue      | 88 ++++++++-----------
 3 files changed, 86 insertions(+), 89 deletions(-)

diff --git a/src/pages/config/pages/linkManage/linkType/firstLink.vue b/src/pages/config/pages/linkManage/linkType/firstLink.vue
index 33888fac8..025c33e0d 100644
--- a/src/pages/config/pages/linkManage/linkType/firstLink.vue
+++ b/src/pages/config/pages/linkManage/linkType/firstLink.vue
@@ -57,7 +57,7 @@
           label="链接图标">
           <template slot-scope="scope">
             <img v-if="scope.row.icon !== ''" style="height: 50px;width: 50px" :src="scope.row.icon">
-            <span v-else>{{'-'}}</span>
+            <span v-else>{{ '-' }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -154,7 +154,7 @@
 
 <script>
 import Sortable from 'sortablejs'
-import { getImg } from '@/api/linkApi.js'
+import {getImg} from '@/api/linkApi.js'
 
 export default {
   name: "firstLink",
@@ -415,11 +415,12 @@ export default {
       this.sarStandardsInfoEO.url = row.url
       this.sarStandardsInfoEO.sortId = row.sortId
       this.sarStandardsInfoEO.icon = row.icon
-      if (row.id !== '') {
+      if (row.icon !== '') {
         let imgId = {
           id: row.id
         }
-        getImg(imgId).then(res=>{
+        // 图片转base64
+        getImg(imgId).then(res => {
           if (res.ok) {
             const src =
               "data:image/png;base64," +
@@ -445,26 +446,25 @@ export default {
         loading: 'Loading'
       }, res => {
         this.linkList = res.data
-        res.data.forEach(item=>{
+        res.data.forEach(item => {
           if (item.type === 1) {
             this.linkListFirst.push(item)
           }
         })
-        this.linkListFirst.forEach(item=>{
-          if (item.id !== '') {
+        this.linkListFirst.forEach(item => {
+          if (item.icon !== '') {
             let imgId = {
               id: item.id
             }
-            getImg(imgId).then(res=>{
-              if (res.ok) {
-                const src =
-                  "data:image/png;base64," +
-                  btoa(
-                    new Uint8Array(res).reduce(
-                      (data, byte) => data + String.fromCharCode(byte), "")
-                  )
-                item.icon = src
-              }
+            // 图片转base64
+            getImg(imgId).then(res => {
+              const src =
+                "data:image/png;base64," +
+                btoa(
+                  new Uint8Array(res).reduce(
+                    (data, byte) => data + String.fromCharCode(byte), "")
+                )
+              item.icon = src
             })
           }
         })
@@ -526,13 +526,16 @@ export default {
     position: relative;
     overflow: hidden;
   }
+
   .avatar-uploader .el-upload:hover {
     margin-top: 10px;
     border-color: #409EFF;
   }
+
   .avatar-uploader {
     margin-top: 10px;
   }
+
   .avatar-uploader-icon {
     font-size: 28px;
     color: #8c939d;
@@ -541,15 +544,18 @@ export default {
     line-height: 100px;
     text-align: center;
   }
+
   .avatar {
     width: 100px;
     height: 100px;
     display: block;
   }
+
   .filter-tree {
     height: calc(~'100% - 50px')
   }
-  /deep/.el-input.is-disabled .el-input__inner {
+
+  /deep/ .el-input.is-disabled .el-input__inner {
     background-color: #fff;
   }
 }
diff --git a/src/pages/config/pages/linkManage/linkType/secondLink.vue b/src/pages/config/pages/linkManage/linkType/secondLink.vue
index 3d6f40b46..b785a6b94 100644
--- a/src/pages/config/pages/linkManage/linkType/secondLink.vue
+++ b/src/pages/config/pages/linkManage/linkType/secondLink.vue
@@ -56,7 +56,8 @@
           prop="icon"
           label="链接图标">
           <template slot-scope="scope">
-            <img style="height: 50px;width: 50px" :src="scope.row.icon">
+            <img v-if="scope.row.icon !== ''" style="height: 50px;width: 50px" :src="scope.row.icon">
+            <span v-else>{{ '-' }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -131,7 +132,6 @@
             :before-upload="beforeAvatarUpload">
             <img v-if="imageUrl" :src="imageUrl" class="avatar">
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-
           </el-upload>
         </el-form-item>
         <el-form-item label="链接" prop="url" label-width="150px" class="add-form-item">
@@ -153,8 +153,9 @@
 
 <script>
 import Sortable from 'sortablejs'
-import { getImg } from '@/api/linkApi.js'
+import {getImg} from '@/api/linkApi.js'
 import listOfCost from "../../../../regulatoryRepository/dataStatis/page/listOfCost";
+
 export default {
   name: "secondLink",
   data() {
@@ -414,20 +415,19 @@ export default {
       this.sarStandardsInfoEO.url = row.url
       this.sarStandardsInfoEO.sortId = row.sortId
       this.sarStandardsInfoEO.icon = row.icon
-      if (row.id !== '') {
+      if (row.icon !== '') {
         let imgId = {
           id: row.id
         }
-        getImg(imgId).then(res=>{
-          if (res.ok) {
-            const src =
-              "data:image/png;base64," +
-              btoa(
-                new Uint8Array(res).reduce(
-                  (data, byte) => data + String.fromCharCode(byte), "")
-              )
-            item.icon = src
-          }
+        // 图片转base64
+        getImg(imgId).then(res => {
+          const src =
+            "data:image/png;base64," +
+            btoa(
+              new Uint8Array(res).reduce(
+                (data, byte) => data + String.fromCharCode(byte), "")
+            )
+          this.imageUrl = src
         })
       }
       this.dialogTitle = '修改链接'
@@ -444,17 +444,18 @@ export default {
         loading: 'Loading'
       }, res => {
         this.linkList = res.data
-        res.data.forEach(item=>{
+        res.data.forEach(item => {
           if (item.type === 2) {
             this.linkListSecond.push(item)
           }
         })
-        this.linkListSecond.forEach(item=>{
-          if (item.id !== '') {
+        this.linkListSecond.forEach(item => {
+          if (item.icon !== '') {
             let imgId = {
               id: item.id
             }
-            getImg(imgId).then(res=>{
+            // 图片转base64
+            getImg(imgId).then(res => {
               if (res.ok) {
                 const src =
                   "data:image/png;base64," +
@@ -525,13 +526,16 @@ export default {
     position: relative;
     overflow: hidden;
   }
+
   .avatar-uploader .el-upload:hover {
     margin-top: 10px;
     border-color: #409EFF;
   }
+
   .avatar-uploader {
     margin-top: 10px;
   }
+
   .avatar-uploader-icon {
     font-size: 28px;
     color: #8c939d;
@@ -540,15 +544,18 @@ export default {
     line-height: 100px;
     text-align: center;
   }
+
   .avatar {
     width: 100px;
     height: 100px;
     display: block;
   }
+
   .filter-tree {
     height: calc(~'100% - 50px')
   }
-  /deep/.el-input.is-disabled .el-input__inner {
+
+  /deep/ .el-input.is-disabled .el-input__inner {
     background-color: #fff;
   }
 }
diff --git a/src/pages/home2/components/empennage/index.vue b/src/pages/home2/components/empennage/index.vue
index 23244528b..f030f13e2 100644
--- a/src/pages/home2/components/empennage/index.vue
+++ b/src/pages/home2/components/empennage/index.vue
@@ -57,7 +57,8 @@
 </template>
 
 <script>
-import { getImg } from '@/api/linkApi.js'
+import {getImg} from '@/api/linkApi.js'
+
 export default {
   name: 'Empennage',
   components: {},
@@ -105,78 +106,61 @@ export default {
         _this: this,
         loading: 'Loading'
       }, res => {
-      /*  let b = 0
-        let c = 0
-        for (let a = 0; a < res.data.length; a++) {
-          b += res.data[a].name.length * 14 + 100
-          if (b > width) {
-            c = a - 1
-          } else {
-            c = a
-          }
-        }*/
+        /*  let b = 0
+          let c = 0
+          for (let a = 0; a < res.data.length; a++) {
+            b += res.data[a].name.length * 14 + 100
+            if (b > width) {
+              c = a - 1
+            } else {
+              c = a
+            }
+          }*/
         /*let list
         list = res.data*/
-        res.data.forEach(item=>{
+        res.data.forEach(item => {
           if (item.type === 1) {
             this.linkListFirst.push(item)
-          } else if(item.type === 2) {
+          } else if (item.type === 2) {
             this.linkListSecond.push(item)
           }
         })
-        this.linkListFirst.forEach(item=>{
-          if (item.id !== '') {
+        this.linkListFirst.forEach(item => {
+          if (item.icon !== '') {
             let imgId = {
               id: item.id
             }
-            getImg(imgId).then(res=>{
-              if (res.ok) {
-                const src =
-                  "data:image/png;base64," +
-                  btoa(
-                    new Uint8Array(res).reduce(
-                      (data, byte) => data + String.fromCharCode(byte), "")
-                  )
-                item.icon = src
-              }
+            // 图片转base64
+            getImg(imgId).then(res => {
+              const src =
+                "data:image/png;base64," +
+                btoa(
+                  new Uint8Array(res).reduce(
+                    (data, byte) => data + String.fromCharCode(byte), "")
+                )
+              item.icon = src
             })
           }
         })
-        this.linkListSecond.forEach(item=>{
-          if (item.id !== '') {
+        this.linkListSecond.forEach(item => {
+          if (item.icon !== '') {
             let imgId = {
               id: item.id
             }
-            getImg(imgId).then(res=>{
-              if (res.ok) {
-                const src =
-                  "data:image/png;base64," +
-                  btoa(
-                    new Uint8Array(res).reduce(
-                      (data, byte) => data + String.fromCharCode(byte), "")
-                  )
-                item.icon = src
-              }
+            // 图片转base64
+            getImg(imgId).then(res => {
+              const src =
+                "data:image/png;base64," +
+                btoa(
+                  new Uint8Array(res).reduce(
+                    (data, byte) => data + String.fromCharCode(byte), "")
+                )
+              item.icon = src
             })
           }
         })
       })
     },
-
-    getImgLink(row) {
-      let imgId = {
-        id: row.icon
-      }
-      getImg(imgId).then(res=>{
-        const src =
-          "data:image/png;base64," +
-          btoa(
-            new Uint8Array(res).reduce(
-              (data, byte) => data + String.fromCharCode(byte), "")
-          )
-        this.verifyImg = src;
-      })
-    }
   },
 
 }

From acbb06db1289c74cbfc8534149a3cd0298278c63 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 2 Dec 2021 13:40:37 +0800
Subject: [PATCH 05/33] commit

---
 .../domesticStandardsAndRegulations/index.vue                | 3 +--
 .../components/EnterpriseStandardDatabase.vue                | 5 +----
 .../foreignRegulationsDatabase/index.vue                     | 3 +--
 .../foreignStandardsAndRegulations/index.vue                 | 4 +---
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 9c9355a48..ee0b07c15 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -20,8 +20,7 @@
                 default-expanded-keys="['64df1d5522bb49c09af2']"
                 highlight-current
                 @node-click="treeClick"
-                :filter-node-method="filterNode"
-                :expand-on-click-node="false">
+                :filter-node-method="filterNode">
                   <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)"
                         @mouseleave="mouseleave(data)">
                         <span
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index d17405e5b..6c44ab0da 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -10,8 +10,6 @@
           </el-input>
         <div class="tree">
           <el-card style="height: 100%;padding-right: 120px;overflow-y:auto">
-
-
           <el-tree
                   ref="tree"
                   node-key="id"
@@ -23,8 +21,7 @@
                   default-expanded-keys="['22179d54d4e640098e30']"
                   highlight-current
                   @node-click="treeClick"
-                  :filter-node-method="filterNode"
-                  :expand-on-click-node="false">
+                  :filter-node-method="filterNode">
                 <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
                         <span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
                         <span style="font-size:12px"> {{ node.label }} </span>
diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
index 3eb4b26f4..6a155f2ee 100644
--- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
@@ -21,8 +21,7 @@
                     default-expanded-keys="['64df1d5522bb49c09af6']"
                     highlight-current
                     @node-click="treeClick"
-                    :filter-node-method="filterNode"
-                    :expand-on-click-node="false">
+                    :filter-node-method="filterNode">
                 <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
                         <span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
                         <span style="font-size:12px"> {{ node.label }} </span>
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 4f10273ac..bafd59de8 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -9,7 +9,6 @@
         </el-input>
         <div class="tree">
           <el-card style="height: 100%;padding-right: 120px;overflow-y:auto">
-
             <el-tree
               ref="tree"
               node-key="id"
@@ -21,8 +20,7 @@
               default-expanded-keys="['22179d54d4e640098e29']"
               highlight-current
               @node-click="treeClick"
-              :filter-node-method="filterNode"
-              :expand-on-click-node="false">
+              :filter-node-method="filterNode">
                 <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
                         <span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
                         <span style="font-size:12px"> {{ node.label }} </span>

From c14d265793a5037e287d75b3a730e04ba089fc3e Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 2 Dec 2021 14:02:08 +0800
Subject: [PATCH 06/33] commit

---
 src/components/CustomFormComponents/File.vue          |  1 -
 .../domesticStandardsAndRegulations/index.vue         | 11 ++++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue
index 371d7977e..1f76cfce2 100644
--- a/src/components/CustomFormComponents/File.vue
+++ b/src/components/CustomFormComponents/File.vue
@@ -38,7 +38,6 @@
             class="form-upload-btn"
         >
 <!--          {{ (value === 'null' || value === '' || value == null) && (!processModel || (processModel && !disabled)) ? '点击上传' : '查看已上传的文件' }}-->
-          上传
         </el-button>
       </template>
       <el-dialog
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index ee0b07c15..2cc363571 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -771,7 +771,7 @@
                     >
                       <template slot="label">起草单位</template>
                       <div style="display: flex;justify-content: space-between;align-items: center;">
-                        <el-tooltip class="item" effect="dark" :content="sarStandardsInfoEO['QCDW']" placement="top-start">
+                        <el-tooltip v-if="sarStandardsInfoEO['QCDW']" class="item" effect="dark" :content="sarStandardsInfoEO['QCDW']" placement="top-start">
                           <el-input
                                   :key="field.attrField"
                                   :config="field"
@@ -780,6 +780,15 @@
                                   :disabled="formdisableflag" placeholder="选择或输入起草单位">
                           </el-input>
                         </el-tooltip>
+                        <div v-else>
+                          <el-input
+                                  :key="field.attrField"
+                                  :config="field"
+                                  clearable
+                                  v-model="sarStandardsInfoEO['QCDW']"
+                                  :disabled="formdisableflag" placeholder="选择或输入起草单位">
+                          </el-input>
+                        </div>
                         <div>
                           <el-button
                                   size="mini"

From 95f5eba0258f3c932211d28b563c9de45fcfaed2 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Thu, 2 Dec 2021 14:42:16 +0800
Subject: [PATCH 07/33] =?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/linkManage/linkType/firstLink.vue   | 10 ++++++---
 .../pages/linkManage/linkType/secondLink.vue  | 22 ++++++++++---------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/pages/config/pages/linkManage/linkType/firstLink.vue b/src/pages/config/pages/linkManage/linkType/firstLink.vue
index 025c33e0d..04cf53df1 100644
--- a/src/pages/config/pages/linkManage/linkType/firstLink.vue
+++ b/src/pages/config/pages/linkManage/linkType/firstLink.vue
@@ -127,7 +127,6 @@
             class="upload-demo"
             :action="uploadUrl"
             :show-file-list="false"
-            :limit="1"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
           >
@@ -331,11 +330,11 @@ export default {
       const index = file.name.lastIndexOf('.')
       const ext = file.name.substr(index + 1)
       const isJPG = (file.type === 'image/jpeg' || file.type === 'image/png');
-      const isType = (ext === 'jpeg' || ext === 'jpg' || ext === 'png')
+      const isType = (ext === 'jpg' || ext === 'png')
       const isLt2M = file.size / 1024 / 1024 < 2;
 
       if (!isJPG || !isType) {
-        this.$message.error('上传头像图片只能是 .jpg、.jpeg、.png 格式!');
+        this.$message.error('上传头像图片只能是 .jpg、.png 格式!');
       }
       if (!isLt2M) {
         this.$message.error('上传头像图片大小不能超过 2MB!');
@@ -445,12 +444,16 @@ export default {
         _this: this,
         loading: 'Loading'
       }, res => {
+        this.Loading = true
         this.linkList = res.data
         res.data.forEach(item => {
           if (item.type === 1) {
             this.linkListFirst.push(item)
           }
         })
+        if (this.linkListFirst.length === 0) {
+          this.Loading = false
+        }
         this.linkListFirst.forEach(item => {
           if (item.icon !== '') {
             let imgId = {
@@ -466,6 +469,7 @@ export default {
                 )
               item.icon = src
             })
+            this.Loading = false
           }
         })
         this.initSortable()
diff --git a/src/pages/config/pages/linkManage/linkType/secondLink.vue b/src/pages/config/pages/linkManage/linkType/secondLink.vue
index b785a6b94..f5c67b7fb 100644
--- a/src/pages/config/pages/linkManage/linkType/secondLink.vue
+++ b/src/pages/config/pages/linkManage/linkType/secondLink.vue
@@ -127,7 +127,6 @@
             class="avatar-uploader"
             :action="uploadUrl"
             :show-file-list="false"
-            :limit="1"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload">
             <img v-if="imageUrl" :src="imageUrl" class="avatar">
@@ -443,12 +442,16 @@ export default {
         _this: this,
         loading: 'Loading'
       }, res => {
+        this.Loading = true
         this.linkList = res.data
         res.data.forEach(item => {
           if (item.type === 2) {
             this.linkListSecond.push(item)
           }
         })
+        if (this.linkListSecond.length === 0) {
+          this.Loading = false
+        }
         this.linkListSecond.forEach(item => {
           if (item.icon !== '') {
             let imgId = {
@@ -456,16 +459,15 @@ export default {
             }
             // 图片转base64
             getImg(imgId).then(res => {
-              if (res.ok) {
-                const src =
-                  "data:image/png;base64," +
-                  btoa(
-                    new Uint8Array(res).reduce(
-                      (data, byte) => data + String.fromCharCode(byte), "")
-                  )
-                item.icon = src
-              }
+              const src =
+                "data:image/png;base64," +
+                btoa(
+                  new Uint8Array(res).reduce(
+                    (data, byte) => data + String.fromCharCode(byte), "")
+                )
+              item.icon = src
             })
+            this.Loading = false
           }
         })
         this.initSortable()

From b6c5716a74613d5847756081f6191b5cf48c27cf Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Thu, 2 Dec 2021 15:29:02 +0800
Subject: [PATCH 08/33] =?UTF-8?q?=E4=B8=89=E5=A4=A7=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accessStandardsAndRegulations/pages/addEdit.vue             | 2 ++
 .../accessStandardsAndRegulations/pages/otherAddEit.vue         | 2 ++
 .../accessStandardsAndRegulations/pages/projectAddEit.vue       | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 8297e2464..d676a1cca 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -1641,6 +1641,7 @@ export default {
         }, res => {
           console.log('1640',res)
           this.sarAccessInfoSearchList = res.data.list
+          this.drawerTotal = res.data.count
         }, e => {
         })
       }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS'){
@@ -1649,6 +1650,7 @@ export default {
         }, res => {
           console.log('1648',res)
           this.sarAccessInfoSearchList = res.data.list
+          this.drawerTotal = res.data.count
         }, e => {
         })
       }
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 70ec69b73..cc186c817 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -1538,6 +1538,7 @@ export default {
         }, res => {
           console.log('1640',res)
           this.sarAccessInfoSearchList = res.data.list
+          this.drawerTotal = res.data.count
         }, e => {
         })
       }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS'){
@@ -1546,6 +1547,7 @@ export default {
         }, res => {
           console.log('1648',res)
           this.sarAccessInfoSearchList = res.data.list
+          this.drawerTotal = res.data.count
         }, e => {
         })
       }
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 360907b0e..25941adfd 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -1636,6 +1636,7 @@ export default {
         }, res => {
           console.log('1640',res)
           this.sarAccessInfoSearchList = res.data.list
+          this.drawerTotal = res.data.count
         }, e => {
         })
       }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS'){
@@ -1644,6 +1645,7 @@ export default {
         }, res => {
           console.log('1648',res)
           this.sarAccessInfoSearchList = res.data.list
+          this.drawerTotal = res.data.count
         }, e => {
         })
       }

From 0c397101b6a0ef456725e22b7506883bc42aad64 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, 2 Dec 2021 15:33:43 +0800
Subject: [PATCH 09/33] commit

---
 src/pages/processCenter/pages/creatProcess/xmpg/step5.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
index cf1d2f00a..ee33c608a 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
@@ -310,7 +310,7 @@
                 :rows="3"
                 resize="none"
                 placeholder="请输入意见"
-                v-model="commentText">
+                v-model.trim="commentText">
               </el-input>
             </div>
           </el-collapse-item>

From 568f7dd46382bdd61217259b27268e3a74a1d90c Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 2 Dec 2021 15:52:19 +0800
Subject: [PATCH 10/33] commit

---
 .../pages/creatProcess/bzzqyj/step1-1.vue     |  2 +-
 .../pages/creatProcess/bzzqyj/step1-9.vue     |  2 +-
 .../pages/creatProcess/bzzqyj/step1.vue       |  2 +-
 .../pages/creatProcess/bzzqyj/step2.vue       |  2 +-
 .../pages/creatProcess/bzzqyj/step3.vue       |  2 +-
 .../pages/creatProcess/bzzqyj/step4.vue       |  2 +-
 .../pages/creatProcess/bzzqyj/step5.vue       |  2 +-
 .../pages/creatProcess/bzzqyj/step6.vue       |  2 +-
 .../pages/creatProcess/bzzqyj/step7.vue       |  2 +-
 .../pages/creatProcess/bzzqyj/step8.vue       |  2 +-
 .../pages/creatProcess/bzzqyj/step9.vue       |  2 +-
 .../processCenter/pages/phone/bzjd/step4.vue  | 50 +++++++++++++++++++
 src/router/index.js                           | 12 ++++-
 13 files changed, 72 insertions(+), 12 deletions(-)
 create mode 100644 src/pages/processCenter/pages/phone/bzjd/step4.vue

diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
index edd83a846..7cb9d901e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
@@ -423,7 +423,7 @@ export default {
       } else {
         id = item.oriAttId
       }
-      window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+      window.open('/static/pdf/phone/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     addfjList() {
       this.$http.get('lawss/sarStandFile/queryFileInfo', {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
index b089d34bd..b8f5b7b80 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
@@ -275,7 +275,7 @@ export default {
       } else {
         id = item.oriAttId
       }
-      window.open('/static/pdf/web/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+      window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     getHistoryData () {
       this.$http.get('lawss/activiti/get_list_by_instance', {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
index 35901c24e..d78716bf4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
@@ -422,7 +422,7 @@ export default {
       } else {
         id = item.oriAttId
       }
-      window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+      window.open('/static/pdf/phone/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     addfjList() {
       this.$http.get('lawss/sarStandFile/queryFileInfo', {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
index d1bf953cc..a6c61d6db 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
@@ -249,7 +249,7 @@ export default {
       } else {
         id = item.oriAttId
       }
-      window.open('/static/pdf/web/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+      window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     getHistoryData() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index 1c447a791..4cfba66a0 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -340,7 +340,7 @@ export default {
       } else {
         id = item.oriAttId
       }
-      window.open('/static/pdf/web/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+      window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     getHistoryData() {
       this.$http.get('lawss/activiti/get_list_by_instance', {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
index d5933345e..56a4700cd 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
@@ -313,7 +313,7 @@ export default {
       } else {
         id = item.oriAttId
       }
-      window.open('/static/pdf/web/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+      window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     getHistoryData() {
       this.$http.get('lawss/activiti/get_list_by_instance', {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
index 6beb38976..d6a4098b4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
@@ -353,7 +353,7 @@ export default {
       } else {
         id = item.oriAttId
       }
-      window.open('/static/pdf/web/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+      window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     getHistoryData() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
index d68e7e09b..e1c15431d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
@@ -337,7 +337,7 @@ export default {
       } else {
         id = item.oriAttId
       }
-      window.open('/static/pdf/web/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+      window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     getHistoryData() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
index 66919dec5..95f444881 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
@@ -334,7 +334,7 @@ export default {
       } else {
         id = item.oriAttId
       }
-      window.open('/static/pdf/web/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+      window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     getHistoryData() {
       this.$http.get('lawss/activiti/get_list_by_instance', {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
index 8bd0319ec..c9f4c8eeb 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
@@ -334,7 +334,7 @@ export default {
       } else {
         id = item.oriAttId
       }
-      window.open('/static/pdf/web/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+      window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     getHistoryData() {
       this.$http.get('lawss/activiti/get_list_by_instance', {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
index 2a9039e77..6a7f2b77f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
@@ -334,7 +334,7 @@ export default {
       } else {
         id = item.oriAttId
       }
-      window.open('/static/pdf/web/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+      window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     getHistoryData() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
diff --git a/src/pages/processCenter/pages/phone/bzjd/step4.vue b/src/pages/processCenter/pages/phone/bzjd/step4.vue
new file mode 100644
index 000000000..42eb6cfc2
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/bzjd/step4.vue
@@ -0,0 +1,50 @@
+<template>
+    <div class="phoneBzjdStep4 phoneBox">
+      123
+    </div>
+</template>
+
+<script>
+    import ProcessHeader from '../../components/ProcessHeader'
+    import ProcessFooter from '../../components/ProcessFooter'
+    import ProcessTitle from '../../components/ProcessTitle'
+    import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
+    import axios from "axios";
+
+    export default {
+        name: "phoneBzjdStep4",
+        data() {
+            return {
+                isSubmit: false,
+                saveLoading: false,
+
+            }
+        },
+        components: {
+            ProcessHeader,
+            ProcessFooter,
+            ProcessTitle
+        },
+        methods: {
+            handleSave () {},
+            handleSubmit () {},
+            handleSubmitNo () {},
+            handleTransfer () {},
+        },
+        mounted () {
+        },
+        computed: {
+
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+    @import '~@/assets/styles/phone';
+    body {
+        width: 375px;
+    }
+    .phoneBzjdStep4 {
+        width: 375px;
+    }
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index 950677be7..c0c05e84d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1687,7 +1687,18 @@ const routes = [
           title: '外部标准化会后管理流程（审批）'
         }
       },
+      {
+        path: '/phoneBzjdStep4',
+        name: 'phoneBzjdStep4',
+        component: () => import('@/pages/processCenter/pages/phone/bzjd/step4.vue'),
+        meta: {
+          isBoolean: true,
+          requireAuth: true,
+          title: '标准解读流程'
+        }
+      },
     ]
+
   },
   // 本地工具
   {
@@ -1993,7 +2004,6 @@ const routes = [
           menuId: 'PCZKM8TQJAH5UP5EAXTJ'
         }
       },
-
       // 工作组
       {
         path: '/workingGroup',

From bdf353da9449f36b68a987ece6175e79b48177e3 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, 2 Dec 2021 16:49:27 +0800
Subject: [PATCH 11/33] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/home2/components/todoList/index.vue |   2 +-
 .../pages/creatProcess/xmqdqr/step1-1.vue     |  12 +-
 .../pages/creatProcess/xmqdqr/step1.vue       |  12 +-
 .../pages/creatProcess/xmqdqr/step2.vue       | 844 ++++++++++++----
 .../pages/creatProcess/xmqdqr/step3.vue       | 853 ++++++++++++++---
 .../pages/creatProcess/xmqdqr/step4.vue       | 899 ++++++++++++++++++
 .../pages/creatProcess/xmqdqr/step5.vue       | 671 +++++++++++++
 .../processCenter/pages/newProcess/index.vue  |   2 +-
 .../tabComponents/processCenter/index.vue     |   2 +-
 src/router/index.js                           |  36 +-
 10 files changed, 2985 insertions(+), 348 deletions(-)
 create mode 100644 src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
 create mode 100644 src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue

diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue
index 965aa38b1..13c91226f 100644
--- a/src/pages/home2/components/todoList/index.vue
+++ b/src/pages/home2/components/todoList/index.vue
@@ -614,7 +614,7 @@ export default {
           break
           //项目清单确认流程
         case '10' :
-          if(row.taskInfo === '确认人确认'){
+          if(row.taskInfo === '产品工程经理分发清单'){
             this.$router.push({
               name: 'xmqdqrStep2',
               query: {
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue
index c0a97afc7..940d01219 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue
@@ -96,15 +96,15 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="选择确认人" placement="top"
+            <el-timeline-item timestamp="选择产品经理" placement="top"
                               :color="roleForm.confirmId ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="confirmName" style="margin-bottom: 0">
-                  <h4>确认人</h4>
+                  <h4>产品经理</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.confirmId" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.confirmName" placeholder="选择确认人"
-                              @click.native="choiceZRR('confirmId', '选择确认人', roleForm.confirmId)"></el-input>
+                    <el-input v-model="roleForm.confirmName" placeholder="选择产品经理"
+                              @click.native="choiceZRR('confirmId', '选择产品经理', roleForm.confirmId)"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -449,7 +449,7 @@ export default {
       // 角色验证
       roleFormRules: {
         confirmName: [
-          { required: true, message: "请选择确认人", trigger: "change" }
+          { required: true, message: "请选择产品经理", trigger: "change" }
         ]
       }
     };
@@ -691,7 +691,7 @@ export default {
       _formData.append("createUserName", this.$store.getters.userInfo.userName);
       _formData.append("prcType", "10");
       _formData.append("json", JSON.stringify({
-        taskInfo: "确认人确认",
+        taskInfo: "产品经理分发",
         form: this.qdform,
         roleForm: this.roleForm,
         commentText: this.commentText
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
index ff1ebb8a0..559165663 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
@@ -103,15 +103,15 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="选择确认人" placement="top"
+            <el-timeline-item timestamp="选择产品经理" placement="top"
                               :color="roleForm.confirmId ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="confirmName" style="margin-bottom: 0">
-                  <h4>确认人</h4>
+                  <h4>产品经理</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.confirmId" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.confirmName" placeholder="选择确认人"
-                              @click.native="choiceZRR('confirmId', '选择确认人', roleForm.confirmId)"></el-input>
+                    <el-input v-model="roleForm.confirmName" placeholder="选择产品经理"
+                              @click.native="choiceZRR('confirmId', '选择产品经理', roleForm.confirmId)"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -461,7 +461,7 @@ export default {
       // 角色验证
       roleFormRules: {
         confirmName: [
-          { required: true, message: "请选择确认人", trigger: "change" }
+          { required: true, message: "请选择产品经理", trigger: "change" }
         ],
         approveName: [
           { required: true, message: "请选择审批人", trigger: "change" }
@@ -695,7 +695,7 @@ export default {
       _formData.append("createUserName", this.$store.getters.userInfo.userName);
       _formData.append("prcType", "10");
       _formData.append("json", JSON.stringify({
-        taskInfo: "确认人确认",
+        taskInfo: "产品经理分发",
         form: this.qdform,
         roleForm: this.roleForm,
         commentText: this.commentText
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
index 90c62c85f..21c7f9d79 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
@@ -2,7 +2,7 @@
   <div class="xmqdqr-step2">
     <ProcessHeader toggle>
       <template slot="proName">项目清单确认流程</template>
-      <template slot="proNode">确认人确认</template>
+      <template slot="proNode">产品经理分发任务</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -44,6 +44,14 @@
                   clearable
                 ></el-input>
               </el-form-item>
+              <el-form-item label="确认人" prop="detailPeopleName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="qdform.detailPeopleName"
+                  placeholder="请选择确认人"
+                  clearable
+                  @click.native="choiceZRRS"
+                ></el-input>
+              </el-form-item>
             </el-col>
           </el-row>
         </el-form>
@@ -252,163 +260,439 @@
     <!--    添加标准抽屉-->
     <el-drawer
       title="添加标准"
+      :wrapperClosable="false"
       :visible.sync="standModel"
       size="900px"
       custom-class="demo-drawer"
-    >
+     >
       <div class="demo-drawer-content">
-        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
-          <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
-            <div class="left">
-              <el-form :model="standCommonlySearch" inline class="label-input-form">
-                <el-formItem label="标准号/名称" prop="standNumber" class="search-item">
-                  <el-input v-model="standCommonlySearch.standNumber" placeholder="根据标准号/名称查找" clearable />
-                </el-formItem>
-<!--                <el-formItem label="标准类别" prop="standSort" class="search-item">-->
-<!--                  <el-select v-model="standCommonlySearch.standSort" placeholder="根据标准类别查找" clearable>-->
-<!--                    <el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value"-->
-<!--                               :key="opt.value" :label="opt.label">{{ opt.label }}-->
-<!--                    </el-option>-->
-<!--                  </el-select>-->
-<!--                </el-formItem>-->
-                <el-formItem label="标准来源" prop="standType" class="search-item">
-                  <el-select v-model="standCommonlySearch.standType" placeholder="根据标准来源查找" clearable>
-                    <el-option value="INLAND" key="1" label="国内标准"></el-option>
-                    <el-option value="FOREIGN" key="2" label="海外标准"></el-option>
-                  </el-select>
-                </el-formItem>
-                <el-formItem class="search-item btn-box">
-                  <el-button
-                    type="primary"
-                    size="mini"
-                    class="common-button-primary"
-                    @click="search">查询
-                  </el-button>
-                  <el-button
-                    class="common-button-default"
-                    size="mini"
-                    @click="clearSearch">清空
-                  </el-button>
-                </el-formItem>
-              </el-form>
-            </div>
-            <el-table
-              :data="standardData"
-              tooltip-effect="dark"
-              style="width: 100%"
-              border
-              ref="table"
-              height="100%"
-              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
-         fontWeight: 'bold', height: '48px'}"
-              @selection-change="selectStand"
+        <el-form
+          class="label-input-form"
+          style="margin-top: 15px;"
+          label-width="130px"
+          :modal="handleSelectForm"
+          :inline="true"
+        >
+          <el-form-item label="标准/政策来源" class="search-item">
+            <el-select
+              v-model="handleSelectForm.dataSource"
+              @change="dataSourceChange"
+              :popper-append-to-body="false"
+              placeholder="请选择标准来源">
+              <el-option value="INLAND" label="国内标准库"></el-option>
+              <el-option value="FOREIGN" label="海外标准库"></el-option>
+<!--              <el-option value="FOREIGN_LAWS" label="国内外政策库"></el-option>-->
+              <el-option value="BUSINESS_STAND" label="企业标准库"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="标准编号" class="search-item">
+            <el-input
+              v-model="handleSelectForm.lawNumber"
+              @change="lawNumberSearch"
+              placeholder="根据标准编号查找"
+              clearable
+              :maxlength="100"></el-input>
+          </el-form-item>
+<!--          <el-form-item label="标准名称/政策名称" class="search-item">-->
+<!--            <el-input-->
+<!--              v-model="handleSelectForm.lawName"-->
+<!--              @change="lawNameSearch"-->
+<!--              placeholder="根据标准名称/政策名称查找"-->
+<!--              clearable-->
+<!--              :maxlength="100"></el-input>-->
+<!--          </el-form-item>-->
+          <el-form-item class="search-item btn-box">
+            <el-button
+              size="small"
+              type="primary"
+              class="common-button-primary"
+              @click="searchLawBtn">
+              查询
+            </el-button>
+          </el-form-item>
+          <el-form-item class="search-item btn-box">
+            <el-button
+              class="common-button-default"
+              size="small"
+              type="default"
+              @click="clearLawBtn">
+              清空
+            </el-button>
+          </el-form-item>
+        </el-form>
+        <loading :loading="lawInfoTableLoading">数据获取中</loading>
+        <el-table
+          ref="selections"
+          tooltip-effect="dark"
+          style="width: 100%;overflow-y: auto;overflow-x: hidden;"
+          border
+          :loading="lawInfoTableLoading"
+          :data="lawInfoTable"
+          :height="300"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          fontWeight: 'bold', height: '48px'}"
+          @selection-change="handleSelectTableChange"
+        >
+
+          <el-table-column
+            fixed="left"
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+
+          <div v-if="handleSelectForm.dataSource === 'INLAND'">
+            <el-table-column
+              label="标准号"
+              width="150"
             >
-              <el-table-column
-                type="selection"
-                width="55"
-                align="center">
-              </el-table-column>
-              <el-table-column
-                prop="code"
-                align="center"
-                label="标准号">
-                <template slot-scope="scope">
-                  <a v-if="scope.row.standYear" class="table-jump"
-                     @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
-                      scope.row.standNumber
-                    }}-{{ scope.row.standYear }}</a>
-                  <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
-                      scope.row.standSortShow }}
-                    {{ scope.row.standNumber }}</a>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="standName"
-                align="center"
-                label="标准名称"
-              >
-                <template slot-scope="scope">
-                  <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="issueTime"
-                align="center"
-                label="发布日期">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="xcxssrqgj"
-                align="center"
-                label="新车型实施日期">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                show-overflow-tooltip
-                prop="zccssrqgj"
-                align="center"
-                label="在产车实施日期">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                show-overflow-tooltip
-                prop="textStatus"
-                align="center"
-                label="文本状态">
-                <template slot-scope="scope">
-                  <span>{{ textStatusMap[scope.row.textStatus] }}</span>
-                </template>
-              </el-table-column>
-            </el-table>
+              <template slot-scope="scope">
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
+                   @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                    scope.row.standNumber
+                  }}-{{ scope.row.standYear }}</a>
+                <a v-else-if="scope.row.standYear" class="table-jump" style="color: #333333"
+                   @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                    scope.row.standNumber
+                  }}-{{ scope.row.standYear }}</a>
+                <a v-else @click="handlePreview(scope.row)" class="table-jump" style="color: #333333">
+                  {{ scope.row.standSortShow }}
+                  {{ scope.row.standNumber }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              show-overflow-tooltip
+              prop="standName"
+              label="标准名称"
+              min-width="300"
+            >
+              <template slot-scope="scope">
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
+                <a v-else @click="handlePreview(scope.row)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="issueTime"
+              sortable="custom"
+              width="120"
+              label="发布日期">
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
+                <span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="SSRQ"
+              sortable="custom"
+              width="120"
+              label="实施日期">
+              <template slot-scope="scope">
+                <!--                {{ formatIssueDate(scope.row.putTime) }}-->
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+
+              </template>
+            </el-table-column>
+
+            <el-table-column
+              prop="XCXSSRQ"
+              sortable="custom"
+              width="150"
+              label="新车型实施日期">
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="ZCCSSRQ"
+              sortable="custom"
+              width="150"
+              label="在产车实施日期">
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="textStatus"
+              sortable="custom"
+              width="110"
+              label="文本状态">
+              <!--              <template slot="header" slot-scope="scope">-->
+              <!--                <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
+              <!--                  <span>文本状态<i class="el-icon-warning-outline"></i></span>-->
+              <!--                </el-tooltip>-->
+              <!--              </template>-->
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    textStatusMap[scope.row.textStatus]
+                  }}</span>
+                <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
+              </template>
+            </el-table-column>
           </div>
-          <pagination
-            :page="page"
-            :pageSize="pageSize"
-            :total="total"
-            @pageChange="pageChange"
-            @pageSizeChange="pageSizeChange"
-          />
+          <div v-if="handleSelectForm.dataSource === 'FOREIGN'">
+            <el-table-column
+              label="标准号"
+              width="150"
+            >
+              <template slot-scope="scope">
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
+                    scope.row.standSortShow
+                  }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                <a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">{{
+                    scope.row.standSortShow
+                  }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                <a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">{{
+                    scope.row.standSortShow
+                  }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standSortShow
+                  }}
+                  {{ scope.row.standNumber }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              show-overflow-tooltip
+              prop="standName"
+              label="标准名称"
+              min-width="300"
+            >
+              <template slot-scope="scope">
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standName
+                  }}</a>
+                <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standName
+                  }}</a>
+                <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standName
+                  }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="issueTime"
+              sortable="custom"
+              width="120"
+              label="发布日期">
+              <template slot-scope="scope">
+                <div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
+                  {{ formatIssueDate(scope.row.issueTime) }}
+                </div>
+                <div v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">
+                  {{ formatIssueDate(scope.row.issueTime) }}
+                </div>
+                <div v-else style="color: #333333">
+                  {{ formatIssueDate(scope.row.issueTime) }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="SSRQ"
+              sortable="custom"
+              width="120"
+              label="实施日期">
+              <template slot-scope="scope">
+                <!--                {{ formatIssueDate(scope.row.putTime) }}-->
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else style="color: #333333">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="XCXSSRQ"
+              sortable="custom"
+              width="150"
+              label="新车型实施日期">
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else style="color: #333333">{{
+                    scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+                  }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="ZCCSSRQ"
+              sortable="custom"
+              width="150"
+              label="在产车实施日期">
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else style="color: #333333">{{
+                    scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+                  }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="textStatus"
+              sortable="custom"
+              width="110"
+              label="文本状态">
+              <!--              <template slot="header" slot-scope="scope">-->
+              <!--                <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
+              <!--                  <span>文本状态 <i class="el-icon-warning-outline"></i></span>-->
+              <!--                </el-tooltip>-->
+              <!--              </template>-->
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    textStatusMap[scope.row.textStatus]
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    textStatusMap[scope.row.textStatus]
+                  }}</span>
+                <span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
+              </template>
+            </el-table-column>
+          </div>
+          <div v-if="handleSelectForm.dataSource === 'BUSINESS_STAND'">
+            <el-table-column
+              show-overflow-tooltip
+              label="企标编号"
+              width="150"
+            >
+              <template slot-scope="scope">
+                <!--                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>-->
+                <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+                <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+                <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              show-overflow-tooltip
+              prop="standName"
+              label="中文名称"
+              min-width="300"
+            >
+              <template slot-scope="scope">
+                <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                <a v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              show-overflow-tooltip
+              prop="standEnName"
+              label="英文名称"
+              min-width="300"
+            >
+              <template slot-scope="scope">
+                <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+                <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+                <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="issueTime"
+              label="发布日期"
+              sortable
+              width="120"
+            >
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="putTime"
+              label="实施日期"
+              sortable
+              width="120"
+            >
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              show-overflow-tooltip
+              sortable
+              prop="standStatusShow"
+              label="文本状态"
+              width="110"
+            >
+
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">
+                  {{scope.row.standStatusShow}}
+                </span>
+                <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">
+                  {{scope.row.standStatusShow}}
+                </span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">
+                  {{scope.row.standStatusShow}}
+                </span>
+              </template>
+            </el-table-column>
+          </div>
+
+        </el-table>
+        <!--分页-->
+        <pagination
+          v-show="this.lawInfoTableLoading === false"
+          style="position: relative;"
+          :page="handleSelectForm.page"
+          :total="handleSelectForm.total"
+          @pageChange="handleSelectPageChange"
+          @pageSizeChange="handleSelectPageSizeChange"></pagination>
+        <div slot="footer" class="demo-drawer-footer">
+          <el-button class="common-button-default" round icon="el-icon-close" @click="standModel = false">取消</el-button>
+          <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="handleSelectConfirm" v-show="lawInfoTableLoading === false">确定</el-button>
         </div>
       </div>
-      <div class="demo-drawer-footer">
-        <el-button size="mini" @click="cancelStand">取消</el-button>
-        <el-button type="primary" size="mini" @click="okStand">添加</el-button>
-      </div>
     </el-drawer>
+        <ProcessFooter
+          show-save
+          show-transfer
+          show-affirm
+          :submitLoading="isSubmit"
+          :transfer-loading="isTransfer"
+          :saveLoading="saveLoading"
+          @submit="handleSubmit"
+          @transfer="handleTransfer"
+          @save="handleSave"
+          :approval="true"
+        >
+        </ProcessFooter>
 <!--    <ProcessFooter-->
-<!--      show-save-->
-<!--      show-transfer-->
-<!--      show-affirm-->
+<!--      :show-save="submitShow"-->
+<!--      :show-transfer="submitShow"-->
+<!--      :show-affirm="submitShow"-->
+<!--      show-confirm-->
 <!--      :submitLoading="isSubmit"-->
 <!--      :transfer-loading="isTransfer"-->
 <!--      :saveLoading="saveLoading"-->
 <!--      @submit="handleSubmit"-->
 <!--      @transfer="handleTransfer"-->
 <!--      @save="handleSave"-->
+<!--      @accept="handleAccept"-->
 <!--      :approval="true"-->
 <!--    >-->
 <!--    </ProcessFooter>-->
-    <ProcessFooter
-      :show-save="submitShow"
-      :show-transfer="submitShow"
-      :show-affirm="submitShow"
-      show-confirm
-      :submitLoading="isSubmit"
-      :transfer-loading="isTransfer"
-      :saveLoading="saveLoading"
-      @submit="handleSubmit"
-      @transfer="handleTransfer"
-      @save="handleSave"
-      @accept="handleAccept"
-      :approval="true"
-    >
-    </ProcessFooter>
+    <!--    多选确认人-->
+    <Role-tree
+      is-title="选择责任部门对接人"
+      :is-visible.sync="modalshowflag"
+      @checkedRole="checkedRole2"
+      :nodeList="nodeList2"
+    ></Role-tree>
     <!-- 福田全公司选人解决方案 -->
     <Role-tree
         check-box
@@ -435,13 +719,34 @@ export default {
   },
   data() {
     return {
+      lawInfoTableLoading: true,
+      lawInfoTable:[],
+      handleSelectForm: {
+        standName: '', //标准名称
+        numberName: '', //政策名称
+        lawsNumber: '', //政策编号
+        standNumber: '', //标准编号
+        standCode: '', //企标编号
+        dataSource: 'INLAND',
+        lawNumber: '', // 标准编号/政策编号
+        lawName: '', // 标准名称/政策名称
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        total: 0,
+        standType: '',
+        quoteIdList: '',
+        validFlag: '0',
+        menuId: 'nomenu'
+      },
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,
       drawerTitle:'',
       active: "1",
       nodeList: [],
+      nodeList2: [],
       loading: false,
+      modalshowflag: false,
       // 当前流程类型(1待办/2已办)
       processType: 1,
       isSubmit: false,
@@ -456,6 +761,7 @@ export default {
       standList: [],
       projectStand:[],
       standardData: [],
+      handleSelectTableList: [], //标准数据
       page: 1,
       pageSize: this.$store.getters.userInfo.configContent,
       total: 0,
@@ -469,6 +775,7 @@ export default {
       },
       //表单的数据
       qdform: {
+        detailPeople: "", //确认人
         BZFlag: " ", //1审批通过 其他为驳回
         projectNumber: "",  //项目编号
         projectName: "",  //项目名称
@@ -502,6 +809,14 @@ export default {
     });
   },
   methods: {
+    formatIssueDate(str) {
+      const momentDate = this.$moment(str)
+      if (momentDate.isValid()) {
+        return this.$moment(str).format('YYYY-MM-DD')
+      } else {
+        return str
+      }
+    },
     //确认转办
     checkedTransferRole (data) {
       this.assigneeNewLoading = true
@@ -609,41 +924,44 @@ export default {
           this.qdform.prcNum = this.prcNum;
           this.qdform.prcName = this.prcName;
           this.qdform["id"] = item.id;
-          // this.projectId = item.projectId;
+          this.projectId = item.projectId;
           //获取清单id 查询对应清单下的标准
           this.detailedId = item.detailedListId;
-          // this.getStandData();
-          this.getStand();
+          this.getStandData();
         }else{
           this.qdform = item.form
           this.dataList =item.form.dataList
           this.detailedId = item.form.detailedListId;
-          this.getStand();
         }
       });
     },
     //查询清单下的标准
-    // getStandData() {
-    //   this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId, cars: '1', }, {
-    //     _this: this
-    //   }, res => {
-    //     this.dataList = res.data.records;
-    //     this.dataList.forEach(item => {
-    //       // 责任部门转换
-    //       if (item.zrbm !== null || item.zrbm !== "") {
-    //         let k = (item.zrbm || "").split(",");
-    //         for (let i in this.zrbmOptions) {
-    //           for (let m = 0; m < k.length; m++) {
-    //             if (this.zrbmOptions[i].value === k[m]) {
-    //               k[m] = this.zrbmOptions[i].label;
-    //             }
-    //             item.zrbm = k.join(",");
-    //           }
-    //         }
-    //       }
-    //     });
-    //   });
-    // },
+    getStandData() {
+      this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId, cars: '1', }, {
+        _this: this
+      }, res => {
+        this.dataList = res.data.records;
+        this.dataList.forEach(item => {
+          // 责任部门转换
+          if (item.zrbm !== null || item.zrbm !== "" ) {
+            let k = (item.zrbm || "").split(",");
+            for (let i in this.zrbmOptions) {
+              for (let m = 0; m < k.length; m++) {
+                if (this.zrbmOptions[i].value === k[m]) {
+                  k[m] = this.zrbmOptions[i].label;
+                }
+                item.zrbm = k.join(",");
+              }
+            }
+          }
+        });
+        this.dataList.map(item => {
+          if(item.zrbm === '[]'){
+            item.zrbm = ''
+          }
+        })
+      });
+    },
     // 接受按钮
     handleAccept(){
       this.isSubmit = true
@@ -699,6 +1017,7 @@ export default {
       });
     },
     addList() {
+      this.searchLawBtn()
       this.standModel = true;
     },
     //批量删除
@@ -726,12 +1045,34 @@ export default {
       }
     },
     //添加标准勾选框数据
-    selectStand(data) {
-      this.standList = data;
+    handleSelectTableChange (data) {
+      this.handleSelectTableList = data
+      console.log(this.handleSelectTableList);
     },
     selectStandChange(data){
       this.projectStand = data
     },
+    choiceZRRS() {
+      this.nodeList2 = [];
+      if (this.qdform.detailPeople) {
+        this.nodeList2 = this.qdform.detailPeople.split(",");
+      }
+      this.modalshowflag = true;
+    },
+    checkedRole2(data) {
+      var idList = "";
+      var nameList = "";
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ",";
+          idList += ",";
+        }
+        idList += item.id;
+        nameList += item.name;
+      });
+      this.qdform.detailPeople = idList;
+      this.qdform.detailPeopleName = nameList;
+    },
     cancelStand() {
       this.standModel = false;
     },
@@ -764,52 +1105,137 @@ export default {
       }
 
     },
+    //手动查找的清空按钮
+    clearLawBtn(){
+      this.lawInfoTableLoading = true
+      this.handleSelectForm.lawNumber = ''
+      this.handleSelectForm.standNumber = ''
+      this.handleSelectForm.lawsNumber = ''
+      this.handleSelectForm.standCode = ''
+      //清空标准名称/政策名称的查询
+      this.handleSelectForm.lawName = ''
+      this.handleSelectForm.standName = ''
+      this.handleSelectForm.numberName = ''
+      this.searchLawBtn()
+    },
     //添加标准的查询按钮
-    search() {
-      this.page = 1;
-      this.getStand();
-    },
-    clearSearch() {
-      this.standCommonlySearch = {
-        standSort: "",
-        standNumber: "",
-        standType: ""
-      };
-      this.getStand();
-    },
-    pageChange(page) {
-      this.page = page;
-      this.getStand();
-    },
-    pageSizeChange(pageSize) {
-      this.pageSize = pageSize;
-      this.getStand();
-    },
-    //查询清单下的标准
-    getStand() {
-      this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
-        id: this.detailedId,
-        page: this.page,
-        Size: this.pageSize,
-        ...this.standCommonlySearch
-      }, {
-        _this: this
-      }, res => {
-        if (res.data === null) {
-          this.standardData = "";
-          this.totalDo = "";
-        }
-        this.standardData = res.data.records;
-        this.standardData.forEach(item => {
-          if (item.zccssrqgj === "-" || item.zccssrqgj === 'null' || item.zccssrqgj === 'undefined') {
-            item.zccssrqgj = "";
+    searchLawBtn(){
+      this.lawInfoTableLoading = true
+      if (this.handleSelectForm.dataSource === 'INLAND'){
+        this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{
+          _this: this
+        },res=>{
+          console.log('国内标准库数据',res)
+          if (res.ok){
+            this.lawInfoTable = res.data.list
+            this.handleSelectForm.total = res.data.count
+            if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+              this.lawInfoTableLoading = true
+              this.handleSelectPageChange(1)
+            }else {
+              this.lawInfoTableLoading = false
+              this.lawInfoTableLoading = false
+            }
+          }else {
+            this.$message.error(res.message)
           }
-          if (item.xcxssrqgj === "-" || item.xcxssrqgj === 'null' || item.xcxssrqgj === 'undefined' ) {
-            item.xcxssrqgj = "";
+        },e=>{
+          this.lawInfoTable = []
+          this.handleSelectForm.total = 0
+        })
+      }else if(this.handleSelectForm.dataSource === 'FOREIGN'){
+        this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{
+          _this: this
+        },res=>{
+          if (res.ok){
+            this.lawInfoTable = res.data.list
+            this.handleSelectForm.total = res.data.count
+            if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+              this.lawInfoTableLoading = true
+              this.handleSelectPageChange(1)
+            }else {
+              this.lawInfoTableLoading = false
+            }
+          }else {
+            this.$message.error(res.message)
+            this.lawInfoTableLoading = false
           }
-        });
-        this.total = res.data.total;
-      });
+        },e=>{
+          this.lawInfoTable = []
+          this.handleSelectForm.total = 0
+        })
+      }else if(this.handleSelectForm.dataSource === 'BUSINESS_STAND'){
+        this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',this.handleSelectForm,{
+          _this: this
+        },res=>{
+          if (res.ok){
+            this.lawInfoTable = res.data.list
+            this.handleSelectForm.total = res.data.count
+            if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+              this.lawInfoTableLoading = true
+              this.handleSelectPageChange(1)
+            }else {
+              this.lawInfoTableLoading = false
+            }
+          }else {
+            this.$message.error(res.message)
+            this.lawInfoTableLoading = false
+          }
+        },e=>{
+          this.lawInfoTable = []
+          this.handleSelectForm.total = 0
+        })
+      }else {
+        this.$message.warning('请先选择标准/政策来源')
+      }
+    },
+    handleSelectConfirm(){
+      if(this.handleSelectTableList.length < 1){
+        this.$message.warning('请至少选择一条数据进行添加')
+      }else{
+        this.standList.forEach(item =>{
+          if(item.ssrq === "-"){
+            item.ssrq = ''
+          }
+          if(item.zrbm === '[]'){
+            item.zrbm =''
+          }
+        })
+        this.handleSelectTableList.map(item => {
+          let addIndex
+          addIndex = this.dataList.findIndex(items =>{
+            return items.id === item.id
+          })
+          if(addIndex > -1){
+            this.$message.warning('请勿重复添加数据')
+          }else{
+            this.dataList.push(item)
+          }
+        })
+        this.standModel = false
+      }
+    },
+    dataSourceChange() {
+      this.handleSelectForm.page = 1
+      this.lawInfoTableLoading = true
+      this.handleSelectForm.standType = this.handleSelectForm.dataSource
+      this.searchLawBtn()
+    },
+    //根据标准编号的查询
+    lawNumberSearch() {
+      this.handleSelectForm.standNumber = this.handleSelectForm.lawNumber
+      this.handleSelectForm.lawsNumber = this.handleSelectForm.lawNumber
+      this.handleSelectForm.standCode = this.handleSelectForm.lawNumber
+    },
+    handleSelectPageChange(page){
+      this.lawInfoTableLoading = true
+      this.handleSelectForm.page = page
+      this.searchLawBtn()
+    },
+    handleSelectPageSizeChange(pageSize){
+      this.lawInfoTableLoading = true
+      this.handleSelectForm.pageSize = pageSize
+      this.searchLawBtn()
     },
   },
   computed: {
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
index 50bfeb2b3..d9a30164e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
@@ -2,7 +2,7 @@
   <div class="xmqdqr-step2">
     <ProcessHeader toggle>
       <template slot="proName">项目清单确认流程</template>
-      <template slot="proNode">法规部经理审批</template>
+      <template slot="proNode">产品经理分发任务</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -50,6 +50,12 @@
         <process-title style="margin-top:5px; margin-bottom: 5px">
           <template slot="title">填写信息</template>
         </process-title>
+        <div class="tableTitle">
+          <div class="tableButton">
+            <el-button :disabled="acceptShow" plain class="common-button-primary" size="mini" @click="addList">添加</el-button>
+            <el-button :disabled="acceptShow" plain class="common-button-primary" size="mini" @click="delectList">批量删除</el-button>
+          </div>
+        </div>
         <el-table
           :data="dataList"
           border
@@ -107,22 +113,22 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="xcxssrq"
+            prop="xcxssrqgj"
             width="190px"
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zccssrq"
+            prop="zccssrqgj"
             align="center"
             sortable
             width="190px"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -162,7 +168,7 @@
       </div>
       <div>
         <el-collapse accordion>
-          <el-collapse-item title="审批意见">
+          <el-collapse-item title="回执说明">
             <div style="margin: 10px 0;">
               <el-input
                 type="textarea"
@@ -243,19 +249,442 @@
         <loading :loading="loading">流程列表加载中</loading>
       </div>
     </div>
+    <!--    添加标准抽屉-->
+    <el-drawer
+      title="添加标准"
+      :wrapperClosable="false"
+      :visible.sync="standModel"
+      size="900px"
+      custom-class="demo-drawer"
+    >
+      <div class="demo-drawer-content">
+        <el-form
+          class="label-input-form"
+          style="margin-top: 15px;"
+          label-width="130px"
+          :modal="handleSelectForm"
+          :inline="true"
+        >
+          <el-form-item label="标准/政策来源" class="search-item">
+            <el-select
+              v-model="handleSelectForm.dataSource"
+              @change="dataSourceChange"
+              :popper-append-to-body="false"
+              placeholder="请选择标准来源">
+              <el-option value="INLAND" label="国内标准库"></el-option>
+              <el-option value="FOREIGN" label="海外标准库"></el-option>
+              <!--              <el-option value="FOREIGN_LAWS" label="国内外政策库"></el-option>-->
+              <el-option value="BUSINESS_STAND" label="企业标准库"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="标准编号" class="search-item">
+            <el-input
+              v-model="handleSelectForm.lawNumber"
+              @change="lawNumberSearch"
+              placeholder="根据标准编号查找"
+              clearable
+              :maxlength="100"></el-input>
+          </el-form-item>
+          <!--          <el-form-item label="标准名称/政策名称" class="search-item">-->
+          <!--            <el-input-->
+          <!--              v-model="handleSelectForm.lawName"-->
+          <!--              @change="lawNameSearch"-->
+          <!--              placeholder="根据标准名称/政策名称查找"-->
+          <!--              clearable-->
+          <!--              :maxlength="100"></el-input>-->
+          <!--          </el-form-item>-->
+          <el-form-item class="search-item btn-box">
+            <el-button
+              size="small"
+              type="primary"
+              class="common-button-primary"
+              @click="searchLawBtn">
+              查询
+            </el-button>
+          </el-form-item>
+          <el-form-item class="search-item btn-box">
+            <el-button
+              class="common-button-default"
+              size="small"
+              type="default"
+              @click="clearLawBtn">
+              清空
+            </el-button>
+          </el-form-item>
+        </el-form>
+        <loading :loading="lawInfoTableLoading">数据获取中</loading>
+        <el-table
+          ref="selections"
+          tooltip-effect="dark"
+          style="width: 100%;overflow-y: auto;overflow-x: hidden;"
+          border
+          :loading="lawInfoTableLoading"
+          :data="lawInfoTable"
+          :height="300"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          fontWeight: 'bold', height: '48px'}"
+          @selection-change="handleSelectTableChange"
+        >
+
+          <el-table-column
+            fixed="left"
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+
+          <div v-if="handleSelectForm.dataSource === 'INLAND'">
+            <el-table-column
+              label="标准号"
+              width="150"
+            >
+              <template slot-scope="scope">
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
+                   @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                    scope.row.standNumber
+                  }}-{{ scope.row.standYear }}</a>
+                <a v-else-if="scope.row.standYear" class="table-jump" style="color: #333333"
+                   @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                    scope.row.standNumber
+                  }}-{{ scope.row.standYear }}</a>
+                <a v-else @click="handlePreview(scope.row)" class="table-jump" style="color: #333333">
+                  {{ scope.row.standSortShow }}
+                  {{ scope.row.standNumber }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              show-overflow-tooltip
+              prop="standName"
+              label="标准名称"
+              min-width="300"
+            >
+              <template slot-scope="scope">
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
+                <a v-else @click="handlePreview(scope.row)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="issueTime"
+              sortable="custom"
+              width="120"
+              label="发布日期">
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
+                <span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="SSRQ"
+              sortable="custom"
+              width="120"
+              label="实施日期">
+              <template slot-scope="scope">
+                <!--                {{ formatIssueDate(scope.row.putTime) }}-->
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+
+              </template>
+            </el-table-column>
+
+            <el-table-column
+              prop="XCXSSRQ"
+              sortable="custom"
+              width="150"
+              label="新车型实施日期">
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="ZCCSSRQ"
+              sortable="custom"
+              width="150"
+              label="在产车实施日期">
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="textStatus"
+              sortable="custom"
+              width="110"
+              label="文本状态">
+              <!--              <template slot="header" slot-scope="scope">-->
+              <!--                <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
+              <!--                  <span>文本状态<i class="el-icon-warning-outline"></i></span>-->
+              <!--                </el-tooltip>-->
+              <!--              </template>-->
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    textStatusMap[scope.row.textStatus]
+                  }}</span>
+                <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
+              </template>
+            </el-table-column>
+          </div>
+          <div v-if="handleSelectForm.dataSource === 'FOREIGN'">
+            <el-table-column
+              label="标准号"
+              width="150"
+            >
+              <template slot-scope="scope">
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
+                    scope.row.standSortShow
+                  }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                <a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">{{
+                    scope.row.standSortShow
+                  }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                <a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">{{
+                    scope.row.standSortShow
+                  }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standSortShow
+                  }}
+                  {{ scope.row.standNumber }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              show-overflow-tooltip
+              prop="standName"
+              label="标准名称"
+              min-width="300"
+            >
+              <template slot-scope="scope">
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standName
+                  }}</a>
+                <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standName
+                  }}</a>
+                <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standName
+                  }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="issueTime"
+              sortable="custom"
+              width="120"
+              label="发布日期">
+              <template slot-scope="scope">
+                <div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
+                  {{ formatIssueDate(scope.row.issueTime) }}
+                </div>
+                <div v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">
+                  {{ formatIssueDate(scope.row.issueTime) }}
+                </div>
+                <div v-else style="color: #333333">
+                  {{ formatIssueDate(scope.row.issueTime) }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="SSRQ"
+              sortable="custom"
+              width="120"
+              label="实施日期">
+              <template slot-scope="scope">
+                <!--                {{ formatIssueDate(scope.row.putTime) }}-->
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else style="color: #333333">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="XCXSSRQ"
+              sortable="custom"
+              width="150"
+              label="新车型实施日期">
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else style="color: #333333">{{
+                    scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+                  }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="ZCCSSRQ"
+              sortable="custom"
+              width="150"
+              label="在产车实施日期">
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else style="color: #333333">{{
+                    scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+                  }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="textStatus"
+              sortable="custom"
+              width="110"
+              label="文本状态">
+              <!--              <template slot="header" slot-scope="scope">-->
+              <!--                <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
+              <!--                  <span>文本状态 <i class="el-icon-warning-outline"></i></span>-->
+              <!--                </el-tooltip>-->
+              <!--              </template>-->
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    textStatusMap[scope.row.textStatus]
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    textStatusMap[scope.row.textStatus]
+                  }}</span>
+                <span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
+              </template>
+            </el-table-column>
+          </div>
+          <div v-if="handleSelectForm.dataSource === 'BUSINESS_STAND'">
+            <el-table-column
+              show-overflow-tooltip
+              label="企标编号"
+              width="150"
+            >
+              <template slot-scope="scope">
+                <!--                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>-->
+                <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+                <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+                <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              show-overflow-tooltip
+              prop="standName"
+              label="中文名称"
+              min-width="300"
+            >
+              <template slot-scope="scope">
+                <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                <a v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              show-overflow-tooltip
+              prop="standEnName"
+              label="英文名称"
+              min-width="300"
+            >
+              <template slot-scope="scope">
+                <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+                <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+                <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="issueTime"
+              label="发布日期"
+              sortable
+              width="120"
+            >
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="putTime"
+              label="实施日期"
+              sortable
+              width="120"
+            >
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              show-overflow-tooltip
+              sortable
+              prop="standStatusShow"
+              label="文本状态"
+              width="110"
+            >
+
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">
+                  {{scope.row.standStatusShow}}
+                </span>
+                <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">
+                  {{scope.row.standStatusShow}}
+                </span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">
+                  {{scope.row.standStatusShow}}
+                </span>
+              </template>
+            </el-table-column>
+          </div>
+
+        </el-table>
+        <!--分页-->
+        <pagination
+          v-show="this.lawInfoTableLoading === false"
+          style="position: relative;"
+          :page="handleSelectForm.page"
+          :total="handleSelectForm.total"
+          @pageChange="handleSelectPageChange"
+          @pageSizeChange="handleSelectPageSizeChange"></pagination>
+        <div slot="footer" class="demo-drawer-footer">
+          <el-button class="common-button-default" round icon="el-icon-close" @click="standModel = false">取消</el-button>
+          <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="handleSelectConfirm" v-show="lawInfoTableLoading === false">确定</el-button>
+        </div>
+      </div>
+    </el-drawer>
     <ProcessFooter
-      show-back
+      show-save
       show-transfer
-      show-submit
+      show-affirm
       :submitLoading="isSubmit"
       :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
-      :approval="true"
-      @back="beforeBack"
-      @transfer="handleTransfer"
       @submit="handleSubmit"
+      @transfer="handleTransfer"
+      @save="handleSave"
+      :approval="true"
     >
     </ProcessFooter>
+    <!--    <ProcessFooter-->
+    <!--      :show-save="submitShow"-->
+    <!--      :show-transfer="submitShow"-->
+    <!--      :show-affirm="submitShow"-->
+    <!--      show-confirm-->
+    <!--      :submitLoading="isSubmit"-->
+    <!--      :transfer-loading="isTransfer"-->
+    <!--      :saveLoading="saveLoading"-->
+    <!--      @submit="handleSubmit"-->
+    <!--      @transfer="handleTransfer"-->
+    <!--      @save="handleSave"-->
+    <!--      @accept="handleAccept"-->
+    <!--      :approval="true"-->
+    <!--    >-->
+    <!--    </ProcessFooter>-->
+    <!--    多选确认人-->
+    <Role-tree
+      is-title="选择责任部门对接人"
+      :is-visible.sync="modalshowflag"
+      @checkedRole="checkedRole2"
+      :nodeList="nodeList2"
+    ></Role-tree>
     <!-- 福田全公司选人解决方案 -->
     <Role-tree
       check-box
@@ -271,7 +700,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { changeAssigneeNew, inboundLiaisonDetail, queryDetail } from "api/process";
+import { inboundLiaisonDetail, queryDetail, saveTaskForPub ,changeAssigneeNew, execTask} from "api/process";
 
 export default {
   name: "xmqdqrStep3",
@@ -282,23 +711,48 @@ export default {
   },
   data() {
     return {
+      lawInfoTableLoading: true,
+      lawInfoTable:[],
+      handleSelectForm: {
+        standName: '', //标准名称
+        numberName: '', //政策名称
+        lawsNumber: '', //政策编号
+        standNumber: '', //标准编号
+        standCode: '', //企标编号
+        dataSource: 'INLAND',
+        lawNumber: '', // 标准编号/政策编号
+        lawName: '', // 标准名称/政策名称
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        total: 0,
+        standType: '',
+        quoteIdList: '',
+        validFlag: '0',
+        menuId: 'nomenu'
+      },
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
+      drawerTitle:'',
       active: "1",
+      nodeList: [],
+      nodeList2: [],
       loading: false,
       // 当前流程类型(1待办/2已办)
       processType: 1,
-      nodeList: [],
-      drawerTitle: '',
-      // 调整处理人抽屉状态
-      drawerModal: false,
       isSubmit: false,
-      isTransfer: false,
       saveLoading: false,
+      submitShow: false,
+      acceptShow: false,
+      todoId: '',
       projectId: "",
       detailedId: "",
+      standModel: false,
       standSortOptions: [],
       standList: [],
       projectStand:[],
       standardData: [],
+      handleSelectTableList: [], //标准数据
       page: 1,
       pageSize: this.$store.getters.userInfo.configContent,
       total: 0,
@@ -325,10 +779,34 @@ export default {
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
       standMap: new Map(),
-      textStatusMap: {}// 文本状态id与name对应
+      textStatusMap: {},// 文本状态id与name对应
     };
   },
+  mounted() {
+    this.processTable();
+    this.getData();
+    // 查询各下拉框数据
+    this.$http.get("sys/dictype/getDicTypeListCode", {}, {
+      _this: this,
+      loading: "loading"
+    }, res => {
+      this.energyKindOptions = res.data.ENERGYTYPES; //适用车型
+      this.standSortOptions = res.data.STANDCLASSIFY; // 标准类别
+      this.setMap(res.data.WBZTCLASS);// 文本状态
+      this.setMap(this.zrbmMap, res.data.ZRBMCLASS);
+      this.showLocalProductData(this.getLocalPro);
+    }, e => {
+    });
+  },
   methods: {
+    formatIssueDate(str) {
+      const momentDate = this.$moment(str)
+      if (momentDate.isValid()) {
+        return this.$moment(str).format('YYYY-MM-DD')
+      } else {
+        return str
+      }
+    },
     //确认转办
     checkedTransferRole (data) {
       this.assigneeNewLoading = true
@@ -350,7 +828,7 @@ export default {
       })
     },
     // 请求转换流程图
-    processNum () {
+    processNum (row) {
       axios.request({
         url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
         responseType: 'blob',
@@ -364,6 +842,18 @@ export default {
         this.processStep = window.URL.createObjectURL(res.data)
       })
     },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
+    // 将文本状态的id与name对应
+    setMap(data) {
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label)
+      })
+    },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,
@@ -401,6 +891,15 @@ export default {
         }).then(res => {
           if (res) {
             const processForm = JSON.parse(res.mesg);
+            let commitStatus = res.commitStatus
+            if(commitStatus && commitStatus > 0){
+              this.acceptShow = true
+              this.submitShow = false
+            }else {
+              this.acceptShow = false
+              this.submitShow = true
+            }
+            this.todoId = res.id
             this.getFormFieldList(processForm);
           }
         }).catch(e => {
@@ -414,22 +913,81 @@ export default {
           this.qdform = JSON.parse(JSON.stringify(item));
           this.qdform.prcNum = this.prcNum;
           this.qdform.prcName = this.prcName;
-          this.dataList = item.dataList
           this.qdform["id"] = item.id;
-          this.projectId = item.projectId
-          // this.getStandData();
+          this.projectId = item.projectId;
+          //获取清单id 查询对应清单下的标准
+          this.detailedId = item.detailedListId;
+          this.getStandData();
         }else{
           this.qdform = item.form
           this.dataList =item.form.dataList
-          this.projectId = item.form.projectId
-          // this.getStandData();
+          this.detailedId = item.form.detailedListId;
         }
       });
     },
+    //查询清单下的标准
+    getStandData() {
+      this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId, cars: '1', }, {
+        _this: this
+      }, res => {
+        this.dataList = res.data.records;
+        this.dataList.forEach(item => {
+          // 责任部门转换
+          if (item.zrbm !== null || item.zrbm !== "" ) {
+            let k = (item.zrbm || "").split(",");
+            for (let i in this.zrbmOptions) {
+              for (let m = 0; m < k.length; m++) {
+                if (this.zrbmOptions[i].value === k[m]) {
+                  k[m] = this.zrbmOptions[i].label;
+                }
+                item.zrbm = k.join(",");
+              }
+            }
+          }
+        });
+        this.dataList.map(item => {
+          if(item.zrbm === '[]'){
+            item.zrbm = ''
+          }
+        })
+      });
+    },
+    // 接受按钮
+    handleAccept(){
+      this.isSubmit = true
+      execTask({
+        todoId: this.todoId // 当前节点ID
+      }).then(res => {
+        if (res.sign && res.sign === '0') {
+          this.$message.success('接收成功')
+          this.$router.push('/processCenter')
+        }
+        this.isSubmit = false
+      })
+    },
+    //保存事件
+    handleSave() {
+      this.saveLoading = true;
+      let _formData = new FormData();
+      this.qdform.dataList = this.dataList
+      _formData.append("id", this.bpnId || "");
+      _formData.append("prcType", "10");
+      _formData.append('taskIds', this.taskIds)
+      _formData.append("json", JSON.stringify({
+        form: this.qdform,
+        commentText: this.commentText
+      }));
+      saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false;
+        this.$message.success("保存成功");
+        this.bpnId = res.result;
+      }).catch(e => {
+        this.saveLoading = false;
+      });
+    },
     //提交事件
     handleSubmit() {
       this.isSubmit = true;
-      this.qdform.passFlag = "0";
       this.qdform.commentText = this.commentText;
       this.qdform.dataList = this.dataList
       const json = JSON.stringify(this.qdform);
@@ -448,38 +1006,38 @@ export default {
       }, e => {
       });
     },
-    //转办事件
-    handleTransfer(){
-      this.drawerModal = true
-      this.drawerTitle = '转办处理人'
-      this.selectPeople = row
+    addList() {
+      this.searchLawBtn()
+      this.standModel = true;
     },
-    //驳回事件
-    beforeBack() {
-      if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
-        this.$message.warning("请填写审批意见");
+    //批量删除
+    delectList(){
+      if (this.projectStand.length < 1) {
+        this.$message.warning("请选择一条数据进行删除");
       } else {
-        this.qdform.passFlag = "1";
-        this.qdform.commentText = this.commentText;
-        const json = JSON.stringify(this.qdform);
-        this.$http.post("lawss/activiti/completeTask", {
-          taskIds: this.taskIds,
-          userId: this.userId,
-          json: json
-        }, {
-          _this: this
-        }, res => {
-          if (res.success) {
-            this.$message.success(res.message);
-            this.$router.push("/processCenter");
-          }
-        }, e => {
+        this.$confirm("您确认删除这些数据?", "提示", {
+          confirmButtonText: "确认",
+          confirmButtonClass: "common-button-primary",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.projectStand.map(item => {
+            let index;
+            index = this.dataList.findIndex(items => {
+              return items.standId === item.standId;
+            });
+            if (index > -1) {
+              this.dataList.splice(index, 1);
+            }
+          });
+        }).catch(() => {
         });
       }
     },
     //添加标准勾选框数据
-    selectStand(data) {
-      this.standList = data;
+    handleSelectTableChange (data) {
+      this.handleSelectTableList = data
+      console.log(this.handleSelectTableList);
     },
     selectStandChange(data){
       this.projectStand = data
@@ -503,7 +1061,7 @@ export default {
         this.standList.map(item => {
           let addIndex
           addIndex = this.dataList.findIndex(items =>{
-            return items.standId === item.id
+            return items.id === item.id
           })
           if(addIndex > -1){
             this.$message.warning('请勿重复添加数据')
@@ -516,56 +1074,137 @@ export default {
       }
 
     },
+    //手动查找的清空按钮
+    clearLawBtn(){
+      this.lawInfoTableLoading = true
+      this.handleSelectForm.lawNumber = ''
+      this.handleSelectForm.standNumber = ''
+      this.handleSelectForm.lawsNumber = ''
+      this.handleSelectForm.standCode = ''
+      //清空标准名称/政策名称的查询
+      this.handleSelectForm.lawName = ''
+      this.handleSelectForm.standName = ''
+      this.handleSelectForm.numberName = ''
+      this.searchLawBtn()
+    },
     //添加标准的查询按钮
-    search() {
-      this.getStand();
-    },
-    clearSearch() {
-      this.standCommonlySearch = {
-        standSort: "",
-        standNumber: "",
-        standType: ""
-      };
-      this.getStand();
-    },
-    pageChange(page) {
-      this.page = page;
-      this.getStand();
-    },
-    pageSizeChange(pageSize) {
-      this.pageSize = pageSize;
-      this.getStand();
-    },
-    getStand(data) {
-      this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
-        id: this.detailedId,
-        page: this.page,
-        Size: this.pageSize,
-        ...this.standCommonlySearch
-      }, {
-        _this: this
-      }, res => {
-        if (res.data === null) {
-          this.standardData = "";
-          this.totalDo = "";
-        }
-        this.standardData = res.data.records;
-        this.standardData.forEach(item => {
-          if (item.zccssrqgj === "-") {
-            item.zccssrqgj = "";
+    searchLawBtn(){
+      this.lawInfoTableLoading = true
+      if (this.handleSelectForm.dataSource === 'INLAND'){
+        this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{
+          _this: this
+        },res=>{
+          console.log('国内标准库数据',res)
+          if (res.ok){
+            this.lawInfoTable = res.data.list
+            this.handleSelectForm.total = res.data.count
+            if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+              this.lawInfoTableLoading = true
+              this.handleSelectPageChange(1)
+            }else {
+              this.lawInfoTableLoading = false
+              this.lawInfoTableLoading = false
+            }
+          }else {
+            this.$message.error(res.message)
           }
-          if (item.xcxssrqgj === "-") {
-            item.xcxssrq = "";
+        },e=>{
+          this.lawInfoTable = []
+          this.handleSelectForm.total = 0
+        })
+      }else if(this.handleSelectForm.dataSource === 'FOREIGN'){
+        this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{
+          _this: this
+        },res=>{
+          if (res.ok){
+            this.lawInfoTable = res.data.list
+            this.handleSelectForm.total = res.data.count
+            if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+              this.lawInfoTableLoading = true
+              this.handleSelectPageChange(1)
+            }else {
+              this.lawInfoTableLoading = false
+            }
+          }else {
+            this.$message.error(res.message)
+            this.lawInfoTableLoading = false
           }
-        });
-        this.total = res.data.total;
-      });
+        },e=>{
+          this.lawInfoTable = []
+          this.handleSelectForm.total = 0
+        })
+      }else if(this.handleSelectForm.dataSource === 'BUSINESS_STAND'){
+        this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',this.handleSelectForm,{
+          _this: this
+        },res=>{
+          if (res.ok){
+            this.lawInfoTable = res.data.list
+            this.handleSelectForm.total = res.data.count
+            if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+              this.lawInfoTableLoading = true
+              this.handleSelectPageChange(1)
+            }else {
+              this.lawInfoTableLoading = false
+            }
+          }else {
+            this.$message.error(res.message)
+            this.lawInfoTableLoading = false
+          }
+        },e=>{
+          this.lawInfoTable = []
+          this.handleSelectForm.total = 0
+        })
+      }else {
+        this.$message.warning('请先选择标准/政策来源')
+      }
     },
-    // 将文本状态的id与name对应
-    setMap(data) {
-      data.forEach(item => {
-        this.$set(this.textStatusMap, item.value, item.label);
-      });
+    handleSelectConfirm(){
+      if(this.handleSelectTableList.length < 1){
+        this.$message.warning('请至少选择一条数据进行添加')
+      }else{
+        this.standList.forEach(item =>{
+          if(item.ssrq === "-"){
+            item.ssrq = ''
+          }
+          if(item.zrbm === '[]'){
+            item.zrbm =''
+          }
+        })
+        this.handleSelectTableList.map(item => {
+          let addIndex
+          addIndex = this.dataList.findIndex(items =>{
+            return items.id === item.id
+          })
+          if(addIndex > -1){
+            this.$message.warning('请勿重复添加数据')
+          }else{
+            this.dataList.push(item)
+          }
+        })
+        this.standModel = false
+      }
+    },
+    dataSourceChange() {
+      this.handleSelectForm.page = 1
+      this.lawInfoTableLoading = true
+      this.handleSelectForm.standType = this.handleSelectForm.dataSource
+      this.searchLawBtn()
+    },
+    //根据标准编号的查询
+    lawNumberSearch() {
+      this.handleSelectForm.standNumber = this.handleSelectForm.lawNumber
+      this.handleSelectForm.lawsNumber = this.handleSelectForm.lawNumber
+      this.handleSelectForm.standCode = this.handleSelectForm.lawNumber
+    },
+    handleSelectPageChange(page){
+      this.lawInfoTableLoading = true
+      this.handleSelectForm.page = page
+      this.searchLawBtn()
+    },
+    handleSelectPageSizeChange(pageSize){
+      this.lawInfoTableLoading = true
+      this.handleSelectForm.pageSize = pageSize
+      this.searchLawBtn()
     },
   },
   computed: {
@@ -573,23 +1212,7 @@ export default {
       return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
     }
   },
-  mounted() {
-    this.processTable();
-    this.getData();
-    // 查询各下拉框数据
-    this.$http.get("sys/dictype/getDicTypeListCode", "", {
-      _this: this,
-      loading: "loading"
-    }, res => {
-      this.energyKindOptions = res.data.ENERGYTYPES; //适用车型
-      this.standSortOptions = res.data.STANDCLASSIFY; // 标准类别
-      this.standStateOptions = res.data.WBZTCLASS; // 文本状态
-      this.setMap(this.zrbmMap, res.data.ZRBMCLASS);
-      this.setMap(this.standStateOptions);
-      this.showLocalProductData(this.getLocalPro);
-    }, e => {
-    });
-  }
+
 };
 </script>
 
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
new file mode 100644
index 000000000..7c4768cf9
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
@@ -0,0 +1,899 @@
+<template>
+  <div class="xmqdqr-step2">
+    <ProcessHeader toggle>
+      <template slot="proName">项目清单确认流程</template>
+      <template slot="proNode">确认人确认</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          :model="qdform"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="qdform.projectNumber"
+                  placeholder="请输入项目编号"
+                  disabled
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="qdform.projectName"
+                  placeholder="请输入项目名称"
+                  disabled
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="清单名称" prop="detailedListName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="qdform.detailedListName"
+                  placeholder="请输入清单名称"
+                  disabled
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title style="margin-top:5px; margin-bottom: 5px">
+          <template slot="title">填写信息</template>
+        </process-title>
+        <div class="tableTitle">
+          <div class="tableButton">
+            <el-button :disabled="acceptShow" plain class="common-button-primary" size="mini" @click="addList">添加</el-button>
+            <el-button :disabled="acceptShow" plain class="common-button-primary" size="mini" @click="delectList">批量删除</el-button>
+          </div>
+        </div>
+        <el-table
+          :data="dataList"
+          border
+          ref="selection"
+          height="65%"
+          @selection-change="selectStandChange"
+          style="width: 100%; border:1px solid #ccc"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            align="center"
+            width="200px"
+            label="标准号"
+          >
+            <template slot-scope="scope">
+              <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort
+                }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
+                {{ scope.row.standNumber }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="standName"
+            align="center"
+            label="中文名称"
+            width="180px"
+          >
+            <template slot-scope="scope">
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="standEnName"
+            label="英文名称"
+            align="center"
+            width="180px"
+          >
+            <template slot-scope="scope">
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="190px"
+            align="center"
+            sortable
+            label="标准实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="xcxssrqgj"
+            width="190px"
+            align="center"
+            label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="zccssrqgj"
+            align="center"
+            sortable
+            width="190px"
+            label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="zrbm"
+            label="责任部门"
+            align="center"
+            width="180px"
+          >
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="kccvppsbm"
+            width="180px"
+            align="center"
+            label="卡车VPPS编码">
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="kccvppscn"
+            width="180px"
+            align="center"
+            label="卡车vpps中文名称">
+          </el-table-column>
+          <el-table-column
+            prop="cycvppsbm"
+            width="180px"
+            align="center"
+            label="乘用车VPPS编码">
+          </el-table-column>
+          <el-table-column
+            prop="cycvppscn"
+            width="180px"
+            align="center"
+            label="乘用车vpps中文名称">
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="回执说明">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list" style="height: 100%">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="流程信息"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+    <!--    添加标准抽屉-->
+    <el-drawer
+      title="添加标准"
+      :visible.sync="standModel"
+      size="900px"
+      custom-class="demo-drawer"
+    >
+      <div class="demo-drawer-content">
+        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
+          <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+            <div class="left">
+              <el-form :model="standCommonlySearch" inline class="label-input-form">
+                <el-formItem label="标准号/名称" prop="standNumber" class="search-item">
+                  <el-input v-model="standCommonlySearch.standNumber" placeholder="根据标准号/名称查找" clearable />
+                </el-formItem>
+                <!--                <el-formItem label="标准类别" prop="standSort" class="search-item">-->
+                <!--                  <el-select v-model="standCommonlySearch.standSort" placeholder="根据标准类别查找" clearable>-->
+                <!--                    <el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value"-->
+                <!--                               :key="opt.value" :label="opt.label">{{ opt.label }}-->
+                <!--                    </el-option>-->
+                <!--                  </el-select>-->
+                <!--                </el-formItem>-->
+                <el-formItem label="标准来源" prop="standType" class="search-item">
+                  <el-select v-model="standCommonlySearch.standType" placeholder="根据标准来源查找" clearable>
+                    <el-option value="INLAND" key="1" label="国内标准"></el-option>
+                    <el-option value="FOREIGN" key="2" label="海外标准"></el-option>
+                  </el-select>
+                </el-formItem>
+                <el-formItem class="search-item btn-box">
+                  <el-button
+                    type="primary"
+                    size="mini"
+                    class="common-button-primary"
+                    @click="search">查询
+                  </el-button>
+                  <el-button
+                    class="common-button-default"
+                    size="mini"
+                    @click="clearSearch">清空
+                  </el-button>
+                </el-formItem>
+              </el-form>
+            </div>
+            <el-table
+              :data="standardData"
+              tooltip-effect="dark"
+              style="width: 100%"
+              border
+              ref="table"
+              height="100%"
+              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+              @selection-change="selectStand"
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="code"
+                align="center"
+                label="标准号">
+                <template slot-scope="scope">
+                  <a v-if="scope.row.standYear" class="table-jump"
+                     @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                      scope.row.standNumber
+                    }}-{{ scope.row.standYear }}</a>
+                  <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
+                      scope.row.standSortShow }}
+                    {{ scope.row.standNumber }}</a>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="standName"
+                align="center"
+                label="标准名称"
+              >
+                <template slot-scope="scope">
+                  <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="issueTime"
+                align="center"
+                label="发布日期">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="xcxssrqgj"
+                align="center"
+                label="新车型实施日期">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                show-overflow-tooltip
+                prop="zccssrqgj"
+                align="center"
+                label="在产车实施日期">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                show-overflow-tooltip
+                prop="textStatus"
+                align="center"
+                label="文本状态">
+                <template slot-scope="scope">
+                  <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <pagination
+            :page="page"
+            :pageSize="pageSize"
+            :total="total"
+            @pageChange="pageChange"
+            @pageSizeChange="pageSizeChange"
+          />
+        </div>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="cancelStand">取消</el-button>
+        <el-button type="primary" size="mini" @click="okStand">添加</el-button>
+      </div>
+    </el-drawer>
+    <!--    <ProcessFooter-->
+    <!--      show-save-->
+    <!--      show-transfer-->
+    <!--      show-affirm-->
+    <!--      :submitLoading="isSubmit"-->
+    <!--      :transfer-loading="isTransfer"-->
+    <!--      :saveLoading="saveLoading"-->
+    <!--      @submit="handleSubmit"-->
+    <!--      @transfer="handleTransfer"-->
+    <!--      @save="handleSave"-->
+    <!--      :approval="true"-->
+    <!--    >-->
+    <!--    </ProcessFooter>-->
+    <ProcessFooter
+      :show-save="submitShow"
+      :show-transfer="submitShow"
+      :show-affirm="submitShow"
+      show-confirm
+      :submitLoading="isSubmit"
+      :transfer-loading="isTransfer"
+      :saveLoading="saveLoading"
+      @submit="handleSubmit"
+      @transfer="handleTransfer"
+      @save="handleSave"
+      @accept="handleAccept"
+      :approval="true"
+    >
+    </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedTransferRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { inboundLiaisonDetail, queryDetail, saveTaskForPub ,changeAssigneeNew, execTask} from "api/process";
+// name: "xmqdqrStep2",
+export default {
+  name: "xmqdqrStep4",
+  components: {
+    ProcessTitle,
+    ProcessHeader,
+    ProcessFooter
+  },
+  data() {
+    return {
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
+      drawerTitle:'',
+      active: "1",
+      nodeList: [],
+      loading: false,
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      isSubmit: false,
+      saveLoading: false,
+      submitShow: false,
+      acceptShow: false,
+      todoId: '',
+      projectId: "",
+      detailedId: "",
+      standModel: false,
+      standSortOptions: [],
+      standList: [],
+      projectStand:[],
+      standardData: [],
+      page: 1,
+      pageSize: this.$store.getters.userInfo.configContent,
+      total: 0,
+      //查询清单下标准数据
+      standCommonlySearch: {
+        standSort: "",
+        standNumber: "",
+        standType: "",
+        page: 1,
+        Size: this.$store.getters.userInfo.configContent
+      },
+      //表单的数据
+      qdform: {
+        BZFlag: " ", //1审批通过 其他为驳回
+        projectNumber: "",  //项目编号
+        projectName: "",  //项目名称
+        dataList: [], //项目下的标准数据
+        breakdownList: [] //标准下的分解单数据
+      },
+      dataList: [], //展示的标准数据
+      commentText: "", //审批意见
+      detailData: [],//流程历史数据
+      userId: this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      standMap: new Map(),
+      textStatusMap: {},// 文本状态id与name对应
+    };
+  },
+  mounted() {
+    this.processTable();
+    this.getData();
+    // 查询各下拉框数据
+    this.$http.get("sys/dictype/getDicTypeListCode", {}, {
+      _this: this,
+      loading: "loading"
+    }, res => {
+      this.energyKindOptions = res.data.ENERGYTYPES; //适用车型
+      this.standSortOptions = res.data.STANDCLASSIFY; // 标准类别
+      this.setMap(res.data.WBZTCLASS);// 文本状态
+      this.setMap(this.zrbmMap, res.data.ZRBMCLASS);
+      this.showLocalProductData(this.getLocalPro);
+    }, e => {
+    });
+  },
+  methods: {
+    //确认转办
+    checkedTransferRole (data) {
+      this.assigneeNewLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
+    // 将文本状态的id与name对应
+    setMap(data) {
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label)
+      })
+    },
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : "",
+        shunxu: this.shunxu
+      }, {
+        loading: "loading",
+        _this: this
+      }, res => {
+        this.detailData = res;
+      }, e => {
+      });
+    },
+    //tab改变
+    handleTabs(type) {
+      this.active = type;
+    },
+    // 点击查看
+    handlePreview(item) {
+      let routeUrl = this.$router.resolve({
+        name: "OtherStandardDetails",
+        params: {
+          id: item.id,
+          pageType: "INLAND_STAND"
+        }
+      });
+      window.open(routeUrl.href, "_blank");
+    },
+    //获取数据
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            let commitStatus = res.commitStatus
+            if(commitStatus && commitStatus > 0){
+              this.acceptShow = true
+              this.submitShow = false
+            }else {
+              this.acceptShow = false
+              this.submitShow = true
+            }
+            this.todoId = res.id
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    //动态表单读取
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        if(item.form === undefined){
+          this.qdform = JSON.parse(JSON.stringify(item));
+          this.qdform.prcNum = this.prcNum;
+          this.qdform.prcName = this.prcName;
+          this.qdform["id"] = item.id;
+          // this.projectId = item.projectId;
+          //获取清单id 查询对应清单下的标准
+          this.detailedId = item.detailedListId;
+          // this.getStandData();
+          this.getStand();
+        }else{
+          this.qdform = item.form
+          this.dataList =item.form.dataList
+          this.detailedId = item.form.detailedListId;
+          this.getStand();
+        }
+      });
+    },
+    //查询清单下的标准
+    // getStandData() {
+    //   this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId, cars: '1', }, {
+    //     _this: this
+    //   }, res => {
+    //     this.dataList = res.data.records;
+    //     this.dataList.forEach(item => {
+    //       // 责任部门转换
+    //       if (item.zrbm !== null || item.zrbm !== "") {
+    //         let k = (item.zrbm || "").split(",");
+    //         for (let i in this.zrbmOptions) {
+    //           for (let m = 0; m < k.length; m++) {
+    //             if (this.zrbmOptions[i].value === k[m]) {
+    //               k[m] = this.zrbmOptions[i].label;
+    //             }
+    //             item.zrbm = k.join(",");
+    //           }
+    //         }
+    //       }
+    //     });
+    //   });
+    // },
+    // 接受按钮
+    handleAccept(){
+      this.isSubmit = true
+      execTask({
+        todoId: this.todoId // 当前节点ID
+      }).then(res => {
+        if (res.sign && res.sign === '0') {
+          this.$message.success('接收成功')
+          this.$router.push('/processCenter')
+        }
+        this.isSubmit = false
+      })
+    },
+    //保存事件
+    handleSave() {
+      this.saveLoading = true;
+      let _formData = new FormData();
+      this.qdform.dataList = this.dataList
+      _formData.append("id", this.bpnId || "");
+      _formData.append("prcType", "10");
+      _formData.append('taskIds', this.taskIds)
+      _formData.append("json", JSON.stringify({
+        form: this.qdform,
+        commentText: this.commentText
+      }));
+      saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false;
+        this.$message.success("保存成功");
+        this.bpnId = res.result;
+      }).catch(e => {
+        this.saveLoading = false;
+      });
+    },
+    //提交事件
+    handleSubmit() {
+      this.isSubmit = true;
+      this.qdform.commentText = this.commentText;
+      this.qdform.dataList = this.dataList
+      const json = JSON.stringify(this.qdform);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+        this.isSubmit = false;
+      }, e => {
+      });
+    },
+    addList() {
+      this.standModel = true;
+    },
+    //批量删除
+    delectList(){
+      if (this.projectStand.length < 1) {
+        this.$message.warning("请选择一条数据进行删除");
+      } else {
+        this.$confirm("您确认删除这些数据?", "提示", {
+          confirmButtonText: "确认",
+          confirmButtonClass: "common-button-primary",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.projectStand.map(item => {
+            let index;
+            index = this.dataList.findIndex(items => {
+              return items.standId === item.standId;
+            });
+            if (index > -1) {
+              this.dataList.splice(index, 1);
+            }
+          });
+        }).catch(() => {
+        });
+      }
+    },
+    //添加标准勾选框数据
+    selectStand(data) {
+      this.standList = data;
+    },
+    selectStandChange(data){
+      this.projectStand = data
+    },
+    cancelStand() {
+      this.standModel = false;
+    },
+    //添加标准带入事件
+    okStand() {
+      if(this.standList.length < 1){
+        this.$message.warning('请至少选择一条数据进行添加')
+      }else{
+        this.standList.forEach(item =>{
+          if(item.ssrq === "-"){
+            item.ssrq = ''
+          }
+          if(item.zrbm === '[]'){
+            item.zrbm =''
+          }
+        })
+        this.standList.map(item => {
+          let addIndex
+          addIndex = this.dataList.findIndex(items =>{
+            return items.id === item.id
+          })
+          if(addIndex > -1){
+            this.$message.warning('请勿重复添加数据')
+          }else{
+            this.dataList.push(item)
+          }
+        })
+
+        this.standModel = false
+      }
+
+    },
+    //添加标准的查询按钮
+    search() {
+      this.page = 1;
+      this.getStand();
+    },
+    clearSearch() {
+      this.standCommonlySearch = {
+        standSort: "",
+        standNumber: "",
+        standType: ""
+      };
+      this.getStand();
+    },
+    pageChange(page) {
+      this.page = page;
+      this.getStand();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+      this.getStand();
+    },
+    //查询清单下的标准
+    getStand() {
+      this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
+        id: this.detailedId,
+        page: this.page,
+        Size: this.pageSize,
+        ...this.standCommonlySearch
+      }, {
+        _this: this
+      }, res => {
+        if (res.data === null) {
+          this.standardData = "";
+          this.totalDo = "";
+        }
+        this.standardData = res.data.records;
+        this.standardData.forEach(item => {
+          if (item.zccssrqgj === "-" || item.zccssrqgj === 'null' || item.zccssrqgj === 'undefined') {
+            item.zccssrqgj = "";
+          }
+          if (item.xcxssrqgj === "-" || item.xcxssrqgj === 'null' || item.xcxssrqgj === 'undefined' ) {
+            item.xcxssrqgj = "";
+          }
+        });
+        this.total = res.data.total;
+      });
+    },
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.xmqdqr-step2 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue
new file mode 100644
index 000000000..85f9184d6
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue
@@ -0,0 +1,671 @@
+<template>
+  <div class="xmqdqr-step2">
+    <ProcessHeader toggle>
+      <template slot="proName">项目清单确认流程</template>
+      <template slot="proNode">法规部经理审批</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          :model="qdform"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="qdform.projectNumber"
+                  placeholder="请输入项目编号"
+                  disabled
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="qdform.projectName"
+                  placeholder="请输入项目名称"
+                  disabled
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="清单名称" prop="detailedListName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="qdform.detailedListName"
+                  placeholder="请输入清单名称"
+                  disabled
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title style="margin-top:5px; margin-bottom: 5px">
+          <template slot="title">填写信息</template>
+        </process-title>
+        <el-table
+          :data="dataList"
+          border
+          ref="selection"
+          height="65%"
+          @selection-change="selectStandChange"
+          style="width: 100%; border:1px solid #ccc"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            align="center"
+            width="200px"
+            label="标准号"
+          >
+            <template slot-scope="scope">
+              <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort
+                }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
+                {{ scope.row.standNumber }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="standName"
+            align="center"
+            label="中文名称"
+            width="180px"
+          >
+            <template slot-scope="scope">
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="standEnName"
+            label="英文名称"
+            align="center"
+            width="180px"
+          >
+            <template slot-scope="scope">
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="190px"
+            align="center"
+            sortable
+            label="标准实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="xcxssrq"
+            width="190px"
+            align="center"
+            label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="zccssrq"
+            align="center"
+            sortable
+            width="190px"
+            label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="zrbm"
+            label="责任部门"
+            align="center"
+            width="180px"
+          >
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="kccvppsbm"
+            width="180px"
+            align="center"
+            label="卡车VPPS编码">
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="kccvppscn"
+            width="180px"
+            align="center"
+            label="卡车vpps中文名称">
+          </el-table-column>
+          <el-table-column
+            prop="cycvppsbm"
+            width="180px"
+            align="center"
+            label="乘用车VPPS编码">
+          </el-table-column>
+          <el-table-column
+            prop="cycvppscn"
+            width="180px"
+            align="center"
+            label="乘用车vpps中文名称">
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="审批意见">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list" style="height: 100%">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="流程信息"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+    <ProcessFooter
+      show-back
+      show-transfer
+      show-submit
+      :submitLoading="isSubmit"
+      :transfer-loading="isTransfer"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @back="beforeBack"
+      @transfer="handleTransfer"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedTransferRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { changeAssigneeNew, inboundLiaisonDetail, queryDetail } from "api/process";
+
+export default {
+  name: "xmqdqrStep5",
+  components: {
+    ProcessTitle,
+    ProcessHeader,
+    ProcessFooter
+  },
+  data() {
+    return {
+      active: "1",
+      loading: false,
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      nodeList: [],
+      drawerTitle: '',
+      // 调整处理人抽屉状态
+      drawerModal: false,
+      isSubmit: false,
+      isTransfer: false,
+      saveLoading: false,
+      projectId: "",
+      detailedId: "",
+      standSortOptions: [],
+      standList: [],
+      projectStand:[],
+      standardData: [],
+      page: 1,
+      pageSize: this.$store.getters.userInfo.configContent,
+      total: 0,
+      //查询清单下标准数据
+      standCommonlySearch: {
+        standSort: "",
+        standNumber: "",
+        standType: "",
+        page: 1,
+        Size: this.$store.getters.userInfo.configContent
+      },
+      //表单的数据
+      qdform: {
+        BZFlag: " ", //1审批通过 其他为驳回
+        projectNumber: "",  //项目编号
+        projectName: "",  //项目名称
+        dataList: [], //项目下的标准数据
+        breakdownList: [] //标准下的分解单数据
+      },
+      dataList: [], //展示的标准数据
+      commentText: "", //审批意见
+      detailData: [],//流程历史数据
+      userId: this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      standMap: new Map(),
+      textStatusMap: {}// 文本状态id与name对应
+    };
+  },
+  methods: {
+    //确认转办
+    checkedTransferRole (data) {
+      this.assigneeNewLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum () {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : "",
+        shunxu: this.shunxu
+      }, {
+        loading: "loading",
+        _this: this
+      }, res => {
+        this.detailData = res;
+      }, e => {
+      });
+    },
+    //tab改变
+    handleTabs(type) {
+      this.active = type;
+    },
+    // 点击查看
+    handlePreview(item) {
+      let routeUrl = this.$router.resolve({
+        name: "OtherStandardDetails",
+        params: {
+          id: item.id,
+          pageType: "INLAND_STAND"
+        }
+      });
+      window.open(routeUrl.href, "_blank");
+    },
+    //获取数据
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    //动态表单读取
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        if(item.form === undefined){
+          this.qdform = JSON.parse(JSON.stringify(item));
+          this.qdform.prcNum = this.prcNum;
+          this.qdform.prcName = this.prcName;
+          this.dataList = item.dataList
+          this.qdform["id"] = item.id;
+          this.projectId = item.projectId
+          // this.getStandData();
+        }else{
+          this.qdform = item.form
+          this.dataList =item.form.dataList
+          this.projectId = item.form.projectId
+          // this.getStandData();
+        }
+      });
+    },
+    //提交事件
+    handleSubmit() {
+      this.isSubmit = true;
+      this.qdform.passFlag = "0";
+      this.qdform.commentText = this.commentText;
+      this.qdform.dataList = this.dataList
+      const json = JSON.stringify(this.qdform);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+        this.isSubmit = false;
+      }, e => {
+      });
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
+    //驳回事件
+    beforeBack() {
+      if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
+        this.$message.warning("请填写审批意见");
+      } else {
+        this.qdform.passFlag = "1";
+        this.qdform.commentText = this.commentText;
+        const json = JSON.stringify(this.qdform);
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+        }, e => {
+        });
+      }
+    },
+    //添加标准勾选框数据
+    selectStand(data) {
+      this.standList = data;
+    },
+    selectStandChange(data){
+      this.projectStand = data
+    },
+    cancelStand() {
+      this.standModel = false;
+    },
+    //添加标准带入事件
+    okStand() {
+      if(this.standList.length < 1){
+        this.$message.warning('请至少选择一条数据进行添加')
+      }else{
+        this.standList.forEach(item =>{
+          if(item.ssrq === "-"){
+            item.ssrq = ''
+          }
+          if(item.zrbm === '[]'){
+            item.zrbm =''
+          }
+        })
+        this.standList.map(item => {
+          let addIndex
+          addIndex = this.dataList.findIndex(items =>{
+            return items.standId === item.id
+          })
+          if(addIndex > -1){
+            this.$message.warning('请勿重复添加数据')
+          }else{
+            this.dataList.push(item)
+          }
+        })
+
+        this.standModel = false
+      }
+
+    },
+    //添加标准的查询按钮
+    search() {
+      this.getStand();
+    },
+    clearSearch() {
+      this.standCommonlySearch = {
+        standSort: "",
+        standNumber: "",
+        standType: ""
+      };
+      this.getStand();
+    },
+    pageChange(page) {
+      this.page = page;
+      this.getStand();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+      this.getStand();
+    },
+    getStand(data) {
+      this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
+        id: this.detailedId,
+        page: this.page,
+        Size: this.pageSize,
+        ...this.standCommonlySearch
+      }, {
+        _this: this
+      }, res => {
+        if (res.data === null) {
+          this.standardData = "";
+          this.totalDo = "";
+        }
+        this.standardData = res.data.records;
+        this.standardData.forEach(item => {
+          if (item.zccssrqgj === "-") {
+            item.zccssrqgj = "";
+          }
+          if (item.xcxssrqgj === "-") {
+            item.xcxssrq = "";
+          }
+        });
+        this.total = res.data.total;
+      });
+    },
+    // 将文本状态的id与name对应
+    setMap(data) {
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label);
+      });
+    },
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  mounted() {
+    this.processTable();
+    this.getData();
+    // 查询各下拉框数据
+    this.$http.get("sys/dictype/getDicTypeListCode", "", {
+      _this: this,
+      loading: "loading"
+    }, res => {
+      this.energyKindOptions = res.data.ENERGYTYPES; //适用车型
+      this.standSortOptions = res.data.STANDCLASSIFY; // 标准类别
+      this.standStateOptions = res.data.WBZTCLASS; // 文本状态
+      this.setMap(this.zrbmMap, res.data.ZRBMCLASS);
+      this.setMap(this.standStateOptions);
+      this.showLocalProductData(this.getLocalPro);
+    }, e => {
+    });
+  }
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.xmqdqr-step2 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>
+
diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue
index efdfb9cb1..d45ee8087 100644
--- a/src/pages/processCenter/pages/newProcess/index.vue
+++ b/src/pages/processCenter/pages/newProcess/index.vue
@@ -127,7 +127,7 @@
           </div>
           </el-card>
         </el-col>
-        <el-col :span="size ? 6 : 8" v-btn-permission="'14f54ef4475d9210b1ee7872ab69eca8'">
+        <el-col :span="size ? 6 : 8" v-btn-permission="''">
           <el-card shadow="hover">
             <div class="card-box" @click="handleCreateProcess('11')">
               <div class="card-top">
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index f31618145..ae048f454 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -868,7 +868,7 @@ export default {
           }
           break
         case '10':
-          if (row.taskInfo === '确认人确认') {
+          if (row.taskInfo === '产品工程经理分发清单') {
             this.$router.push({
               name: 'xmqdqrStep2',
               query: {
diff --git a/src/router/index.js b/src/router/index.js
index 950677be7..69fa9ae24 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -736,6 +736,33 @@ const routes = [
           title: '项目清单确认流程'
         }
       },
+      {
+        path: '/xmqdqrStep3',
+        name: 'xmqdqrStep3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue'),
+        meta: {
+          requireAuth: true,
+          title: '项目清单确认流程'
+        }
+      },
+      {
+        path: '/xmqdqrStep4',
+        name: 'xmqdqrStep4',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue'),
+        meta: {
+          requireAuth: true,
+          title: '项目清单确认流程'
+        }
+      },
+      {
+        path: '/xmqdqrStep5',
+        name: 'xmqdqrStep5',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue'),
+        meta: {
+          requireAuth: true,
+          title: '项目清单确认流程'
+        }
+      },
       {
         path: '/xmqdqrStep1-1',
         name: 'xmqdqrStep1-1',
@@ -763,15 +790,6 @@ const routes = [
           title: '项目清单确认流程'
         }
       },
-      {
-        path: '/xmqdqrStep3',
-        name: 'xmqdqrStep3',
-        component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue'),
-        meta: {
-          requireAuth: true,
-          title: '项目清单确认流程'
-        }
-      },
       {
         path: '/wfhxzgStep1',
         name: 'wfhxzgStep1',

From 9bfb13deee1e745fd547a2f2d134ed6cdc4be88e Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Thu, 2 Dec 2021 17:11:53 +0800
Subject: [PATCH 12/33] =?UTF-8?q?=E9=A6=96=E9=A1=B5UI=E5=AD=97=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/home/components/EnterCard.vue              | 12 ++++++------
 src/pages/home2/components/empennage/index.vue       |  2 ++
 src/pages/home2/components/navMenu/index.vue         |  6 +++---
 src/pages/home2/components/release/index.vue         |  8 +++++++-
 src/pages/home2/components/searchGroup/index.vue     |  6 +++---
 src/pages/home2/components/solicitopinions/index.vue |  8 +++++++-
 src/pages/home2/components/todoList/index.vue        |  5 +++--
 src/pages/home2/index.vue                            |  2 +-
 8 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/src/pages/home/components/EnterCard.vue b/src/pages/home/components/EnterCard.vue
index fe2ef511c..4f533f55d 100644
--- a/src/pages/home/components/EnterCard.vue
+++ b/src/pages/home/components/EnterCard.vue
@@ -3,7 +3,7 @@
     <div>
       <div v-if="label" class="icon-style">
         <span v-for="item in icons" v-if="item.label === label" :class="item.icon" style="font-size: 20px;">
-          <span style="padding-left: 10px; font-size: 16px">
+          <span style="font-size: 15px;">
             {{ label }}
           </span>
         </span>
@@ -67,7 +67,7 @@
 
 <style lang="less" scoped>
   .wx-card {
-    line-height: 70px;
+    line-height: 50px;
     text-align: center;
     background: #fff;
     display: flex;
@@ -79,7 +79,7 @@
     & > div {
       border-radius: 5px;
       width: 100%;
-      height: 70px;
+      height: 50px;
       color: #fff;
       background-color: #4788c0;
     }
@@ -91,7 +91,7 @@
     }
   }
   .wx-card1 {
-    line-height: 70px;
+    line-height: 50px;
     text-align: center;
     background: #fff;
     display: flex;
@@ -102,7 +102,7 @@
     padding-left: 10px;
     & > div {
       width: 100%;
-      height: 70px;
+      height: 50px;
       background: #fff;
       border: 2px dashed #E4E4E4;
       border-radius: 5px;
@@ -119,7 +119,7 @@
     display: flex;
     align-items: center;
     .el-icon-circle-plus-outline {
-      font-size: 50px;
+      font-size: 40px;
       color: #E4E4E4;
     }
   }
diff --git a/src/pages/home2/components/empennage/index.vue b/src/pages/home2/components/empennage/index.vue
index f030f13e2..490412f1a 100644
--- a/src/pages/home2/components/empennage/index.vue
+++ b/src/pages/home2/components/empennage/index.vue
@@ -193,6 +193,7 @@ export default {
   }
 
   .title {
+    font-size: 15px;
     padding-right: 40px;
     font-weight: bold;
     padding-left: 40px;
@@ -200,6 +201,7 @@ export default {
   }
 
   .myLi1 {
+    font-size: 15px;
     cursor: pointer;
     color: #0068B7;
   }
diff --git a/src/pages/home2/components/navMenu/index.vue b/src/pages/home2/components/navMenu/index.vue
index de912b2bc..cfe0c4c93 100644
--- a/src/pages/home2/components/navMenu/index.vue
+++ b/src/pages/home2/components/navMenu/index.vue
@@ -77,7 +77,7 @@
                 height: 40px;
                 line-height: 40px;
                 background: #fff;
-                font-size: 14px;
+                font-size: 15px;
               border-radius: 10px;
             }
             .menu-wrap {
@@ -92,11 +92,11 @@
                     margin-bottom: 0;
                 }
                 .wx-card {
-                    height: 70px;
+                    height: 50px;
                     width: 33.333333%;
                 }
                 .wx-card1 {
-                    height: 70px;
+                    height: 50px;
                     width: 33.333333%;
                 }
                 .menu-item {
diff --git a/src/pages/home2/components/release/index.vue b/src/pages/home2/components/release/index.vue
index 0fe974c71..b78c54f8b 100644
--- a/src/pages/home2/components/release/index.vue
+++ b/src/pages/home2/components/release/index.vue
@@ -21,7 +21,7 @@
                   label="序号"
                   type="index"
                   align="center"
-                  width="50">
+                  width="55">
           </el-table-column>
           <el-table-column
                   prop="standName"
@@ -98,6 +98,12 @@ export default {
 
 <style lang="less" scoped>
 .release {
+  /deep/.el-table th > .cell {
+    font-size: 15px;
+  }
+  /deep/.el-table td > .cell{
+    font-size: 13px;
+  }
     width: 100%;
   .time-title {
     margin: 15px;
diff --git a/src/pages/home2/components/searchGroup/index.vue b/src/pages/home2/components/searchGroup/index.vue
index f3af3f4f8..e978d8af3 100644
--- a/src/pages/home2/components/searchGroup/index.vue
+++ b/src/pages/home2/components/searchGroup/index.vue
@@ -22,8 +22,8 @@
         placeholder="请输入关键词"
         clearable
       ></el-input>
-      <el-button style="box-shadow:1px 1px 10px rgba(0,0,0,0.2);margin-left: 5px;" type="primary" @click="search">一般检索</el-button>
-      <el-button style="box-shadow:1px 1px 10px rgba(0,0,0,0.2);margin-left: 5px;" type="primary" @click="seniorSearch">高级检索</el-button>
+      <el-button style="box-shadow:1px 1px 10px rgba(0,0,0,0.2);margin-left: 5px;font-size: 15px;" type="primary" @click="search">一般检索</el-button>
+      <el-button style="box-shadow:1px 1px 10px rgba(0,0,0,0.2);margin-left: 5px;font-size: 15px;" type="primary" @click="seniorSearch">高级检索</el-button>
     </div>
   </div>
 </template>
@@ -106,7 +106,7 @@ export default {
         width: 18vm;
         height: 40px;
         color: #333333;
-        font-size: 14px;
+        font-size: 15px;
         border: 0;
         border-radius: 3px;
        background-color: #FFFFFF;
diff --git a/src/pages/home2/components/solicitopinions/index.vue b/src/pages/home2/components/solicitopinions/index.vue
index 01d59e84a..1b36284bd 100644
--- a/src/pages/home2/components/solicitopinions/index.vue
+++ b/src/pages/home2/components/solicitopinions/index.vue
@@ -21,7 +21,7 @@
               label="序号"
               type="index"
               align="center"
-              width="50">
+              width="55">
       </el-table-column>
       <el-table-column
               prop="cid"
@@ -91,6 +91,12 @@ export default {
 
 <style lang="less" scoped>
 .solicitopinions {
+  /deep/.el-table th > .cell {
+    font-size: 15px;
+  }
+  /deep/.el-table td > .cell{
+    font-size: 13px;
+  }
   height: 100%;
   width: 100%;
   .time-title {
diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue
index 13c91226f..a5db7bae9 100644
--- a/src/pages/home2/components/todoList/index.vue
+++ b/src/pages/home2/components/todoList/index.vue
@@ -10,7 +10,7 @@
     <ul>
       <li v-for="item in toDoTaskList" :key="item.id" class="time-title">
          <div style="height: 30px">
-           <span @click="dealWith(item)" style="line-height: 30px; font-size: 12px;">{{ item.prcName }}</span>
+           <span @click="dealWith(item)" style="line-height: 30px; font-size: 13px;">{{ item.prcName }}</span>
          </div>
       </li>
     </ul>
@@ -1284,9 +1284,10 @@ export default {
     display: inline-block;
     margin: 15px;
     color: #333333;
-    font-size: 14px;
+    font-size: 15px;
   }
   .more {
+    font-size: 15px;
     float: right;
     color: #4788c0;
     margin: 15px 15px;
diff --git a/src/pages/home2/index.vue b/src/pages/home2/index.vue
index ee56d41a2..c56aee185 100644
--- a/src/pages/home2/index.vue
+++ b/src/pages/home2/index.vue
@@ -172,7 +172,7 @@ export default {
     .right_wrapper {
       display: flex;
       flex-direction: column;
-      width: 37vw;
+      width: 30vw;
       height: 100%;
     }
     .search-condition {

From d17d05f0a9fc74d97bd34643023501aa04b572fb Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Thu, 2 Dec 2021 17:15:37 +0800
Subject: [PATCH 13/33] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AF=84=E4=BB=B7?=
 =?UTF-8?q?=E8=8D=89=E7=A8=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otherBussStandardDetails/index.vue        | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index d215e83d8..cf109226c 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -22,6 +22,56 @@
                style="border-top:none;position: absolute;right: 36px;">
             <div class="modular-header" style="height: 50px;">
               <div class="modular-header-btn">
+                <el-button type="warning" icon="el-icon-edit" @click="businessCommentDialog = true">企标评价</el-button>
+                <el-dialog title="企业标准动态评价表" :visible.sync="businessCommentDialog" width="80%">
+                  <el-table ref="businessCommentTable" :data="businessCommentTable" border style="width: 100%; flex: auto;margin-bottom: 2%"
+                            class="drag-table"
+                            :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
+                                   fontWeight: 'bold', height: '48px'}">
+                    <el-table-column
+                        type="index"
+                        label="序号"
+                        width="55"
+                        align="center"
+                    />
+                    <el-table-column property="commentTarget" label="评价指标" width="300">
+                    </el-table-column>
+                    <el-table-column prop="targetScore" label="指标分值" width="160">
+                      <template slot-scope="scope">
+                      <el-rate
+                          v-model="scope.row.targetScore"
+                          @change="targetScoreChange"
+                          allow-half>
+                      </el-rate>
+                      </template>
+                    </el-table-column>
+                    <el-table-column property="averageScore" label="动态评价分值">
+                      <template slot-scope="scope">
+                        <el-rate
+                            v-model="value"
+                            disabled
+                            show-score
+                            text-color="#ff9900"
+                            score-template="{value}">
+                        </el-rate>
+                        <el-input v-model="scope.row.averageScore" style="margin: 10px 0;" />
+                      </template>
+                    </el-table-column>
+                    <el-table-column property="address" label="简述理由"></el-table-column>
+                  </el-table>
+                  <el-form :model="businessCommentForm">
+                    <el-form-item label="对标准的意见和建议，是否需要修订">
+                      <template>
+                        <el-radio v-model="revise" label="1">是</el-radio>
+                        <el-radio v-model="revise" label="0">否</el-radio>
+                        <el-input v-show="revise === '1'"
+                                  placeholder="请填写修订理由"
+                                  type="textarea"
+                                  :rows="2"></el-input>
+                      </template>
+                    </el-form-item>
+                  </el-form>
+                </el-dialog>
                 <el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="el-icon-star-on" :loading="isSubmit"></el-button>
                 <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
                 <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
@@ -987,6 +1037,19 @@ export default {
   },
   data () {
     return {
+      targetScore: '',
+      businessCommentDialog: false,
+      businessCommentForm: {},
+      revise: '',
+      businessCommentTable: [{
+        commentTarget: '企业标准内容完整、要求合理（指标、流程等。）',
+      }, {
+        commentTarget: '企业标准便于实施应用',
+      }, {
+        commentTarget: '标准编写规范，内容清晰易理解',
+      }, {
+        commentTarget: '标准对我的实际工作很有帮助',
+      }],
       activeNames: ['基础信息','过程稿件','实施日期'],
       activeState: true,
       visiblePlanCheck: false,
@@ -1194,6 +1257,9 @@ export default {
   watch: {
   },
   methods: {
+    targetScoreChange(row){
+      console.log('1234',row)
+    },
     child1Func(child1){
       const list = []
       if(child1 && child1.length > 1){

From d0aa3ec4621541bcd899e2d94febb0c33887a2b8 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 2 Dec 2021 17:20:31 +0800
Subject: [PATCH 14/33] commit

---
 .../ueditor/ADT/attachment/attachment.css     |   4 -
 src/assets/styles/common.less                 |   2 +
 src/assets/styles/phone.less                  |   4 +
 src/assets/styles/reset.css                   |   7 +-
 .../pages/components/ProcessHeaderPhone.vue   |  83 +++
 .../pages/creatProcess/bzjd/step4.vue         |   9 +-
 .../processCenter/pages/phone/bzjd/step4.vue  | 518 +++++++++++++++++-
 .../tabComponents/processCenter/index.vue     |   2 +-
 8 files changed, 602 insertions(+), 27 deletions(-)
 create mode 100644 src/assets/styles/phone.less
 create mode 100644 src/pages/processCenter/pages/components/ProcessHeaderPhone.vue

diff --git a/public/static/ueditor/ADT/attachment/attachment.css b/public/static/ueditor/ADT/attachment/attachment.css
index e1ff867cc..9d0ec4b5f 100644
--- a/public/static/ueditor/ADT/attachment/attachment.css
+++ b/public/static/ueditor/ADT/attachment/attachment.css
@@ -96,7 +96,6 @@
 #upload .placeholder .webuploader-pick {
     font-size: 18px;
     background: #00b7ee;
-    3px;
     line-height: 44px;
     padding: 0 30px;
     *width: 120px;
@@ -198,7 +197,6 @@
     overflow: hidden;
     z-index: 50;
     margin: 0;
-    0;
     background: none;
     -webkit-box-shadow: 0 0 0;
 }
@@ -317,7 +315,6 @@
     height: 113px;
     background: url(./images/image.png) no-repeat center 12px;
     border: 1px solid #eeeeee;
-    0;
 }
 #upload .filelist li.filePickerBlock div.webuploader-pick  {
     width: 100%;
@@ -447,7 +444,6 @@
     color: #565656;
     padding: 0 18px;
     display: inline-block;
-    3px;
     margin-left: 10px;
     cursor: pointer;
     font-size: 14px;
diff --git a/src/assets/styles/common.less b/src/assets/styles/common.less
index 111d1293c..fd4c13f29 100644
--- a/src/assets/styles/common.less
+++ b/src/assets/styles/common.less
@@ -1,6 +1,8 @@
 /*liuyan  全局公共样式*/
 @import './style';
 @import './mixins';
+// 移动端公共样式
+@import './phone';
 // 左侧菜单样式
 @import './navMenu';
 // tree组件父组件内样式
diff --git a/src/assets/styles/phone.less b/src/assets/styles/phone.less
new file mode 100644
index 000000000..7ab7d7a88
--- /dev/null
+++ b/src/assets/styles/phone.less
@@ -0,0 +1,4 @@
+.phoneBox {
+  width: 100%;
+  height: 100%;
+}
diff --git a/src/assets/styles/reset.css b/src/assets/styles/reset.css
index 1599c94dc..bebcef1bc 100644
--- a/src/assets/styles/reset.css
+++ b/src/assets/styles/reset.css
@@ -18,7 +18,12 @@ mark{background-color:transparent}
 a,ins,s,u,del{text-decoration:none}
 sup,sub{vertical-align:baseline}
 html {width:100%;height: 100%;font-size: 50px;-webkit-tap-highlight-color: transparent;}
-body {font-family: 'PingFang SC', 'Microsoft Yahei', '微软雅黑', Arial, sans-serif !important;color: #333;font-size: 14px;line-height: 1;-webkit-text-size-adjust: none;width:100%;height:100%;min-width:1280px;overflow-x:auto;}
+@media screen and (min-width: 1366px) {
+    body {
+        min-width:1280px;
+    }
+}
+body {font-family: 'PingFang SC', 'Microsoft Yahei', '微软雅黑', Arial, sans-serif !important;color: #333;font-size: 14px;line-height: 1;-webkit-text-size-adjust: none;width:100%;height:100%;overflow-x:auto;}
 hr {height: .02rem;margin: .1rem 0;border: medium none;border-top: .02rem solid #cacaca;}
 a {text-decoration: none;}
 /*意见反馈页面富文本表格宽度*/
diff --git a/src/pages/processCenter/pages/components/ProcessHeaderPhone.vue b/src/pages/processCenter/pages/components/ProcessHeaderPhone.vue
new file mode 100644
index 000000000..f419a885f
--- /dev/null
+++ b/src/pages/processCenter/pages/components/ProcessHeaderPhone.vue
@@ -0,0 +1,83 @@
+<!-- 流程信息公共头部 -->
+<template>
+    <div class="prc-header-wrap">
+        <div class="process-header">
+            <span class="process-title">
+                <slot name="proName"></slot>
+                <a>(<slot name="proNode"></slot>)</a>
+            </span>
+        </div>
+        <el-divider></el-divider>
+    </div>
+</template>
+
+<script>
+    import { mapGetters } from 'vuex'
+    export default {
+        name: 'ProcessHeaderPhone',
+        mixins: [],
+        props: {
+            toggle: {
+                type: Boolean,
+                default: false
+            }
+        },
+        components: {},
+        data () {
+            return {
+                activeName: '',
+                opacityStyle: {},
+                headerFixed: false
+            }
+        },
+        methods: {
+            handleBack() {
+                if (this.$store.state.detailMap !== '') {
+                    this.$router.push({
+                        path: this.$store.state.detailMap,
+                        query: {
+                            prcNum: this.$store.getters.getHandleInfo.prcNum,
+                            tabsName: this.$store.getters.getHandleInfo.tabsName
+                        }
+                    })
+                    this.$store.commit('setDetailMap', '')
+                } else {
+                    this.$router.push({
+                        name: 'ProcessCenter'
+                    })
+                }
+            }
+        },
+        computed: {
+            ...mapGetters(['isCollapse'])
+        },
+        watch: {},
+        mounted () {
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+    @import '~@/assets/styles/style';
+    .el-divider {
+        margin: 10px 0 0;
+    }
+    .process-header {
+        position: relative;
+        padding-top: 10px;
+    }
+    .process-title {
+        margin-left: 10px;
+        font-size: 18px;
+        font-weight: bold;
+        display: inline-block;
+        height: 30px;
+        line-height: 30px;
+        a {
+            font-size: 14px;
+            margin-left: 5px;
+            cursor: default;
+            color: #888;
+        }
+    }
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index ecf021766..fca2bdbc0 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -325,12 +325,6 @@
                 submitBTNText="同意"
         >
         </ProcessFooter>
-        <Role-tree
-                check-box
-                is-title="转办处理人"
-                :is-visible.sync="drawerModal"
-                @checkedRole="checkedRole"
-        ></Role-tree>
         <el-dialog
                 title="查看条款内容"
                 :visible.sync="itermsConditionsFlag"
@@ -385,6 +379,9 @@
             ProcessTitle
         },
         methods: {
+            phoneClick () {
+                this.$router.push('/phoneBzjdStep4')
+            },
             handleTransfer() {
                 this.drawerModal = true
             },
diff --git a/src/pages/processCenter/pages/phone/bzjd/step4.vue b/src/pages/processCenter/pages/phone/bzjd/step4.vue
index 42eb6cfc2..a501aee13 100644
--- a/src/pages/processCenter/pages/phone/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/phone/bzjd/step4.vue
@@ -1,11 +1,329 @@
 <template>
     <div class="phoneBzjdStep4 phoneBox">
-      123
+        <ProcessHeaderPhone toggle>
+            <template slot="proName">标准解读流程</template>
+            <template slot="proNode">责任人审核</template>
+        </ProcessHeaderPhone>
+        <div class="headerTabs">
+            <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+            <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
+        </div>
+        <div class="content" v-show="active === '1'">
+            <div style="overflow: auto;">
+                <el-form
+                        ref="bzzqyjForm"
+                        :model="form"
+                        class="label-input-form"
+                        label-width="210px"
+                >
+                    <ProcessTitle>
+                        <template slot="title">基础信息</template>
+                    </ProcessTitle>
+                    <el-collapse-transition>
+                        <div class="prc-content-border" v-if="foldFormFlag === false">
+                            <el-row :gutter="24">
+                                <el-col :span="24">
+                                    <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                                        <el-input
+                                                disabled
+                                                v-model="form.itemsNum"
+                                                placeholder="请输入标准编号"
+                                                clearable
+                                        ></el-input>
+                                    </el-form-item>
+                                    <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
+                                        <el-input
+                                                disabled
+                                                v-model="form.itemsName"
+                                                placeholder="请输入标准名称"
+                                                clearable
+                                        ></el-input>
+                                    </el-form-item>
+                                    <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                        <el-input
+                                                disabled
+                                                v-model="form.itemsNum1"
+                                                clearable
+                                        ></el-input>
+                                    </el-form-item>
+                                    <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                        <el-input
+                                                disabled
+                                                v-model="form.itemsNum1"
+                                                clearable
+                                        ></el-input>
+                                    </el-form-item>
+                                    <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                        <el-input
+                                                disabled
+                                                v-model="form.itemsName1"
+                                                clearable
+                                        ></el-input>
+                                    </el-form-item>
+                                    <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                        <el-input
+                                                disabled
+                                                v-model="form.itemsName1"
+                                                clearable
+                                        ></el-input>
+                                    </el-form-item>
+                                </el-col>
+                            </el-row>
+                        </div>
+                    </el-collapse-transition>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
+                    <div class="prc-content-border" v-if="foldFormFlag === true" style="display: none">
+                        <el-row :gutter="24">
+                            <el-col :span="24">
+                                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.itemsNum"
+                                            placeholder="请输入标准编号"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.itemsName"
+                                            placeholder="请输入标准名称"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.itemsNum1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.itemsNum1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.itemsName1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.itemsName1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                </el-form>
+            </div>
+            <ProcessTitle>
+                <template slot="title">拆分信息</template>
+            </ProcessTitle>
+            <el-table border
+                      ref="selection"
+                      :data="itemList"
+                      tooltip-effect="dark"
+                      style="width: 100%;"
+                      height="100%"
+                      :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+                      row-key="id"
+            >
+                <el-table-column
+                        prop="itemsNum"
+                        label="条款号"
+                        width="70"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itemsName"
+                        label="条款名称"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itermsConditions"
+                        label="条款内容"
+                        width="200"
+                        show-overflow-tooltip
+                        align="center">
+                    <template slot-scope="scope">
+                        <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        show-overflow-tooltip
+                        prop="technicalRequir"
+                        width="200"
+                        label="核心技术要求"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        show-overflow-tooltip
+                        v-if="sarType === 'INLAND'"
+                        prop="changePoint"
+                        width="150"
+                        label="基于上一版本差异"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        show-overflow-tooltip
+                        v-if="sarType === 'FOREIGN'"
+                        prop="changePoint"
+                        width="150"
+                        label="相对于国行标差异点"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="complianceRequir"
+                        width="150"
+                        label="符合项状态"
+                        align="center">
+                    <template slot-scope="scope">
+                        <div v-if="scope.row.complianceRequir === '1'">符合</div>
+                        <div v-else>不符合</div>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        show-overflow-tooltip
+                        prop="complianceState"
+                        width="200"
+                        label="合规性分析"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="newData"
+                        width="150"
+                        label="新车型实施日期"
+                        align="center">
+                    <template slot-scope="scope">
+                        <div>{{ scope.row.newData ? $moment(scope.row.newData).format('YYYY-MM-DD')  : scope.row.newData }}</div>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        prop="onlineData"
+                        width="150"
+                        label="在产车型实施日期"
+                        align="center">
+                    <template slot-scope="scope">
+                        <div>{{ scope.row.onlineData ? $moment(scope.row.onlineData).format('YYYY-MM-DD')  : scope.row.onlineData }}</div>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        prop="applyArctic"
+                        width="150"
+                        label="适用车型"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="unitDeptName"
+                        label="责任部门"
+                        width="170"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        label="责任人"
+                        width="170"
+                        prop="zrUserIdName"
+                        align="center">
+                </el-table-column>
+            </el-table>
+            <el-collapse accordion>
+                <el-collapse-item title="审批意见">
+                    <div style="margin: 10px 0;">
+                        <el-input
+                                type="textarea"
+                                :rows="3"
+                                resize="none"
+                                placeholder="请输入意见"
+                                v-model="commentText">
+                        </el-input>
+                    </div>
+                </el-collapse-item>
+            </el-collapse>
+        </div>
+        <div class="content" v-show="active === '2'">
+            <el-table
+                    height="100%"
+                    ref="selection"
+                    :data="histortData"
+                    tooltip-effect="dark"
+                    style="width: 100%"
+                    border
+                    row-key="id"
+                    :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+                <el-table-column
+                        prop="name"
+                        label="任务步骤"
+                        align="center"
+                        width="120"
+                >
+                </el-table-column>
+                <el-table-column
+                        prop="assignee"
+                        label="任务受理人"
+                        align="center"
+                >
+                </el-table-column>
+                <el-table-column
+                        prop="createTime"
+                        label="创建时间"
+                        align="center">
+                    <template slot-scope="scope">
+                        <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        prop="endTime"
+                        label="完成时间"
+                        align="center">
+                    <template slot-scope="scope">
+                        <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        prop="comment"
+                        label="流程信息"
+                        align="center">
+                    <template slot-scope="scope">
+                        <span>{{ scope.row.commentText }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        prop="completeFlag"
+                        label="状态"
+                        align="center">
+                    <template slot-scope="scope">
+                        <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </div>
+        <ProcessFooter
+                show-submit
+                :submitLoading="isSubmit"
+                :saveLoading="saveLoading"
+                @save="handleSave"
+                @submit="handleSubmit"
+                show-back
+                @back="handleSubmitNo"
+                submitBTNText="同意"
+        >
+        </ProcessFooter>
     </div>
 </template>
 
 <script>
-    import ProcessHeader from '../../components/ProcessHeader'
+    import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
     import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
@@ -15,36 +333,206 @@
         name: "phoneBzjdStep4",
         data() {
             return {
+                drawerModal: false,
+                //折叠的标志，true为折叠，false为不折叠
+                foldFormFlag: false,
+                itermsConditionsFlag: false,
+                itermsConditionsTitle: '',
+                histortData: [],
+                sarType: '',
+                itemList: [],
+                loading: true,
+                commentText: '',
+                taskIds: this.$route.query.taskIds,
+                pId: this.$route.query.prcId,
+                textarea: '', // 意见
+                active: '1', // 默认显示
                 isSubmit: false,
                 saveLoading: false,
-
+                form: {
+                    itemsNum: '',
+                    itemsName: '',
+                    itemsNum1: '',
+                    itemsName1: '',
+                },
+                json: {},
             }
         },
         components: {
-            ProcessHeader,
+            ProcessHeaderPhone,
             ProcessFooter,
             ProcessTitle
         },
         methods: {
-            handleSave () {},
-            handleSubmit () {},
-            handleSubmitNo () {},
-            handleTransfer () {},
+            handleTransfer() {
+                this.drawerModal = true
+            },
+            checkedRole (data) {
+                changeAssigneeNew({
+                    taskId: this.$route.query.taskIds, // 任务id
+                    userId:this.$store.getters.userInfo.userId, // 委托人
+                    assignee: data[0].id, // 被委托人
+                    pId: this.$route.query.prcId, // 流程实例
+                }).then(res => {
+                    if (res.success) {
+                        this.drawerModal = false
+                        this.$message.success('调整成功')
+                        this.processNum()
+                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                })
+            },
+            // 请求转换流程图
+            processNum (row) {
+                axios.request({
+                    url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+                    responseType: 'blob',
+                    method: 'get',
+                    params: {
+                        prcNum: this.$route.query.prcNum
+                    }
+                }).then(res => {
+                    this.processStep = window.URL.createObjectURL(res.data)
+                })
+            },
+            //折叠/展开基础信息方法
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
+            itermsConditionsClose () {
+                this.itermsConditionsFlag = false
+            },
+            itermsConditionsOpen (row) {
+                this.itermsConditionsFlag = true
+                this.itermsConditionsTitle = row
+            },
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
+            handleTabs(name) {
+                this.active = name
+            },
+            handleSave() {},
+            handleSubmit() {
+                this.isSubmit = true
+                var json = this.json
+                json.resolveFlag = 1
+                json.commentText = this.commentText
+                this.$http.post('lawss/activiti/completeTask', {
+                    json: JSON.stringify(json),
+                    taskId: this.taskIds,
+                    userId: this.$store.getters.userInfo.userId
+                }, {}, res => {
+                    if (res.success) {
+                        this.$message.success('提交成功')
+                        this.$router.push('/processCenter')
+                    }
+                    this.isSubmit = false
+                })
+            },
+            handleSubmitNo () {
+                if (this.commentText) {
+                    this.isSubmit = true
+                    var json = this.json
+                    json.resolveFlag = 2
+                    json.commentText = this.commentText
+                    this.$http.post('lawss/activiti/completeTask', {
+                        json: JSON.stringify(json),
+                        taskId: this.taskIds,
+                        userId: this.$store.getters.userInfo.userId
+                    }, {}, res => {
+                        if (res.success) {
+                            this.$message.success('驳回成功')
+                            this.$router.push('/processCenter')
+                        }
+                        this.isSubmit = false
+                    })
+                } else {
+                    this.$message.warning('请输入反馈意见')
+                }
+            },
+            getData() {
+                return new Promise((resolve, reject) => {
+                    inboundLiaisonDetail({
+                        taskIds: this.taskIds,
+                        pId: this.pId
+                    }).then(res => {
+                        let data = JSON.parse(res.mesg)
+                        this.form.itemsNum = data.itemsNum || data.form.itemsNum
+                        this.form.itemsName = data.itemsName || data.form.itemsName
+                        if (data.form) {
+                            this.form.itemsName1 = data.form.itemsName1 || ''
+                            this.form.itemsNum1 = data.form.itemsNum1 || ''
+                        } else {
+                            this.form.itemsName1 = data.itemsName1 || ''
+                            this.form.itemsNum1 = data.itemsNum1 || ''
+                        }
+                        this.sarType = data.standInData || data.sarType
+                        this.json = data
+                        this.itemList = data.itemList
+                        this.loading = false
+                    }).catch(e => {
+                    })
+                })
+            },
         },
         mounted () {
+            this.getHistoryData()
+            this.getData()
         },
-        computed: {
-
-        }
     }
 </script>
 
 <style lang="less" scoped>
     @import '~@/assets/styles/phone';
-    body {
-        width: 375px;
-    }
     .phoneBzjdStep4 {
-        width: 375px;
+        .headerTabs {
+            height: 52px;
+            display: flex;
+            align-items: center;
+            position: absolute;
+            top: 52px;
+            right: 10px;
+            .headerTabsItem {
+                border: 1px solid #c1c1c1;
+                padding: 0 5px;
+                height: 30px;
+                line-height: 30px;
+                cursor: pointer;
+            }
+            .active {
+                border: 1px solid #E6A23C;
+                color: #fff;
+                background: #E6A23C;
+            }
+        }
+        .content {
+            border-top: 1px solid #DCDFE6;
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+            margin-top: 52px;
+            height: calc(~'100% - 155px');
+            overflow: auto;
+            .tableTitle {
+                margin-bottom: 10px;
+                height: 30px;
+                line-height: 30px;
+                position: relative;
+                font-size: 13px;
+                font-weight: bold;
+                .tableButton {
+                    position: absolute;
+                    right: 0;
+                    top: 0;
+                }
+            }
+        }
     }
 </style>
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index f31618145..2840cdbb3 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -834,7 +834,7 @@ export default {
             })
           } else if (row.taskInfo === '责任人审核') {
             this.$router.push({
-              name: 'bzjdStep4',
+              name: 'phoneBzjdStep4',
               query: {
                 taskIds: row.taskIds,
                 prcId: row.prcId,

From 92108b8b97e60ec11cb5d37dee35007f9eb92e01 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 2 Dec 2021 17:36:59 +0800
Subject: [PATCH 15/33] =?UTF-8?q?=E6=B0=B4=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/static/pdf/web/viewer.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/static/pdf/web/viewer.js b/public/static/pdf/web/viewer.js
index 31be3f39b..90bee7839 100644
--- a/public/static/pdf/web/viewer.js
+++ b/public/static/pdf/web/viewer.js
@@ -6649,13 +6649,13 @@ var PDFPageView = function () {
           watermark_txt: msg,
           watermark_x: 50,//水印起始位置x轴坐标
           watermark_y: 0,//水印起始位置Y轴坐标
-          watermark_rows: 7,//水印行数
-          watermark_cols: 5,//水印列数
-          watermark_x_space: 80,//水印x轴间隔
-          watermark_y_space: 120,//水印y轴间隔
+          watermark_rows: 15,//水印行数
+          watermark_cols: 7,//水印列数
+          watermark_x_space: 18,//水印x轴间隔
+          watermark_y_space: 20,//水印y轴间隔
           watermark_color: 'rgba(192, 192, 192)',//水印字体颜色
           watermark_alpha: 0.3,//水印透明度
-          watermark_fontsize: '30px',//水印字体大小
+          watermark_fontsize: '40px',//水印字体大小
           watermark_font: '微软雅黑',//水印字体
           watermark_width: 120,//水印宽度
           watermark_height: 80,//水印长度

From 6fe296c813b333176690cb75ad2f79bbaef4a5d5 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Thu, 2 Dec 2021 17:51:08 +0800
Subject: [PATCH 16/33] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E7=B1=BB=E5=88=AB=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 6fb9806c1..048bce049 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -29,7 +29,7 @@
                                         <el-radio label="1">海外标准入库</el-radio>
                                     </el-radio-group>
                                 </el-form-item>
-                              <el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled" v-show="form.standInData === '0'">
+                              <el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
                                 <el-select :popper-append-to-body="false" filterable v-model="form.standSort" placeholder="请选择标准类别">
                                   <el-option
                                       v-for="item in standSortOptions"

From 3d12b97463838bc77f2e737e5c8440e0d90ddbf6 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 2 Dec 2021 17:56:51 +0800
Subject: [PATCH 17/33] commit

---
 src/assets/styles/phone.less                       |  5 +++++
 src/pages/processCenter/pages/phone/bzjd/step4.vue | 12 +++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/assets/styles/phone.less b/src/assets/styles/phone.less
index 7ab7d7a88..d73daf347 100644
--- a/src/assets/styles/phone.less
+++ b/src/assets/styles/phone.less
@@ -2,3 +2,8 @@
   width: 100%;
   height: 100%;
 }
+@media screen and (max-width: 1366px) {
+  .el-message {
+    min-width: 200px !important;
+  }
+}
diff --git a/src/pages/processCenter/pages/phone/bzjd/step4.vue b/src/pages/processCenter/pages/phone/bzjd/step4.vue
index a501aee13..002c2edbe 100644
--- a/src/pages/processCenter/pages/phone/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/phone/bzjd/step4.vue
@@ -265,18 +265,20 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        width="120"
+                        width="130"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
+                        width="130"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
+                        width="130"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
@@ -285,6 +287,7 @@
                 <el-table-column
                         prop="endTime"
                         label="完成时间"
+                        width="130"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
@@ -293,6 +296,7 @@
                 <el-table-column
                         prop="comment"
                         label="流程信息"
+                        width="130"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.commentText }}</span>
@@ -492,6 +496,12 @@
 <style lang="less" scoped>
     @import '~@/assets/styles/phone';
     .phoneBzjdStep4 {
+        .prc-content-border {
+            overflow: auto;
+        }
+        /deep/.prc-content-border .el-form-item__content {
+            width: 270px;
+        }
         .headerTabs {
             height: 52px;
             display: flex;

From f12b2450670c31f36b9911984166f27ae9e8d79d Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Thu, 2 Dec 2021 18:00:11 +0800
Subject: [PATCH 18/33] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue         | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 048bce049..0232bc6a2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -1732,6 +1732,26 @@
               this.getFormFieldList(mes.form)
             })
           },
+          /**
+           * @description: 动态表单读取
+           */
+          getFormFieldList (item) {
+            this.$nextTick(() => {
+              this.form = JSON.parse(JSON.stringify(item))
+              this.defaultCheckedKeys = [this.form.standSystem]
+              this.defaultCheckedKeys1 = [this.form.cycvppsbm]
+              this.defaultCheckedKeys2 = [this.form.kccvppsbm]
+              this.defaultCheckedKeys3 = [this.form.dybxh]
+              this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
+              this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
+              if( this.form.country !== undefined &&   this.form.country !== null &&   this.form.country !== ''){
+                this.form.country=this.form.country.split(",");
+              }
+              this.form.prcNum = this.prcNum
+              this.form.prcName = this.prcName
+              this.form['id'] = item.id
+            })
+          },
           // 将文本状态的id与name对应
           setMap(data){
             data.forEach(item => {

From 414b4f09d70910448dcb5b2dadc22e11c1f8d79c Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Thu, 2 Dec 2021 18:04:43 +0800
Subject: [PATCH 19/33] =?UTF-8?q?=E5=85=88=E4=B8=8D=E7=AE=A1=E8=8B=B1?=
 =?UTF-8?q?=E6=96=87=E5=90=8D=E7=A7=B0=EF=BC=8C=E6=8A=8A=E7=BA=BF=E7=B2=97?=
 =?UTF-8?q?=E4=B8=80=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherStandardDetails/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index ebfc39406..51d8dc21e 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -3599,7 +3599,8 @@ export default {
         }
 
         & > div:not(.modular-item-more) {
-          /*border-bottom: 1px solid #E5E5E5;*/
+          //英文名称变粗
+          border-bottom: 1px solid #E5E5E5;
           min-height: 43px;
           line-height: 43px;
 

From 150aa7e56ed3a736c87dd87a0afa8d77b3ddc861 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Thu, 2 Dec 2021 18:17:02 +0800
Subject: [PATCH 20/33] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=EF=BC=8C=E5=B8=A6=E5=85=A5=E7=9A=84=E6=A0=87=E5=87=86=E7=9A=84?=
 =?UTF-8?q?=E5=AE=9E=E6=96=BD=E6=97=A5=E5=A4=9A=E4=BA=86=E6=97=B6=E5=88=86?=
 =?UTF-8?q?=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 0232bc6a2..f0847398f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -1842,7 +1842,7 @@
                         this.verifySarStandard = true
                         this.clearFormData(this.form)
                         break
-                    // 带入
+                    // 带入（确认）
                     case 2:
                         if (this.standardCheckedList.length === 1) {
                           this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoUpdateById', {id: this.standardCheckedList[0].id}, {
@@ -1873,7 +1873,10 @@
                               this.key3++
                               this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
                               this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : ''
+                              console.log(this.form)
                               this.form.ssrq =  this.$moment(this.form.ssrq).format("YYYY-MM-DD")
+                              this.form.zccssrq =  this.$moment(this.form.zccssrq).format("YYYY-MM-DD")
+                              this.form.xcxssrq =  this.$moment(this.form.xcxssrq).format("YYYY-MM-DD")
                               this.form.prcNum = this.prcNum
                               this.form.prcName = this.prcName
                               this.form['id'] = bringData.id

From 6b39a40e20bf45ab13d69104cb60b37ce7651654 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, 2 Dec 2021 19:22:34 +0800
Subject: [PATCH 21/33] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/home2/components/todoList/index.vue |  13 +-
 .../pages/creatProcess/xmqdqr/step2.vue       |  30 +-
 .../pages/creatProcess/xmqdqr/step3.vue       | 127 ++-
 .../pages/creatProcess/xmqdqr/step4.vue       | 912 +++++++++++++-----
 .../tabComponents/processCenter/index.vue     |  13 +-
 5 files changed, 766 insertions(+), 329 deletions(-)

diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue
index a5db7bae9..644525388 100644
--- a/src/pages/home2/components/todoList/index.vue
+++ b/src/pages/home2/components/todoList/index.vue
@@ -625,7 +625,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '标准法规部经理审批') {
+          } else if (row.taskInfo === '确认人确认') {
             this.$router.push({
               name: 'xmqdqrStep3',
               query: {
@@ -636,6 +636,17 @@ export default {
                 prcType: row.prcType
               }
             })
+          }else if(row.taskInfo === '产品工程经理汇总清单'){
+            this.$router.push({
+              name: 'xmqdqrStep4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }
           break
         case '14':
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
index 21c7f9d79..b4d4fd058 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
@@ -146,32 +146,6 @@
             width="180px"
           >
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="kccvppsbm"
-            width="180px"
-            align="center"
-            label="卡车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="kccvppscn"
-            width="180px"
-            align="center"
-            label="卡车vpps中文名称">
-          </el-table-column>
-          <el-table-column
-            prop="cycvppsbm"
-            width="180px"
-            align="center"
-            label="乘用车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            prop="cycvppscn"
-            width="180px"
-            align="center"
-            label="乘用车vpps中文名称">
-          </el-table-column>
         </el-table>
       </div>
       <div>
@@ -653,8 +627,8 @@
           @pageChange="handleSelectPageChange"
           @pageSizeChange="handleSelectPageSizeChange"></pagination>
         <div slot="footer" class="demo-drawer-footer">
-          <el-button class="common-button-default" round icon="el-icon-close" @click="standModel = false">取消</el-button>
-          <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="handleSelectConfirm" v-show="lawInfoTableLoading === false">确定</el-button>
+          <el-button class="common-button-default" size="mini"  @click="standModel = false">取消</el-button>
+          <el-button type="primary" size="mini" class="common-button-primary"  @click="handleSelectConfirm" v-show="lawInfoTableLoading === false">确定</el-button>
         </div>
       </div>
     </el-drawer>
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
index d9a30164e..2180eccc0 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
@@ -2,7 +2,7 @@
   <div class="xmqdqr-step2">
     <ProcessHeader toggle>
       <template slot="proName">项目清单确认流程</template>
-      <template slot="proNode">产品经理分发任务</template>
+      <template slot="proNode">确认人确认</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -60,7 +60,7 @@
           :data="dataList"
           border
           ref="selection"
-          height="65%"
+          height="59%"
           @selection-change="selectStandChange"
           style="width: 100%; border:1px solid #ccc"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -139,31 +139,34 @@
           >
           </el-table-column>
           <el-table-column
-            show-overflow-tooltip
-            prop="kccvppsbm"
-            width="180px"
+            prop="involve"
+            width="160px"
             align="center"
-            label="卡车VPPS编码">
+            label="标准是否涉及">
+             <template slot-scope="scope">
+               <el-select v-model="scope.row.involve"
+                          placeholder="请选择涉不涉及"
+                          max-length="30"
+                          clearable>
+                 <el-option value="involve" label="涉及"></el-option>
+                 <el-option value="noInvolve" label="不涉及"></el-option>
+               </el-select>
+             </template>
           </el-table-column>
           <el-table-column
-            show-overflow-tooltip
-            prop="kccvppscn"
-            width="180px"
+            prop="remarks"
             align="center"
-            label="卡车vpps中文名称">
-          </el-table-column>
-          <el-table-column
-            prop="cycvppsbm"
-            width="180px"
-            align="center"
-            label="乘用车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            prop="cycvppscn"
-            width="180px"
-            align="center"
-            label="乘用车vpps中文名称">
+            width="180"
+            label="备注">
+            <template slot-scope="scope">
+              <el-input
+                v-model.trim="dataList[scope.$index].remarks"
+                placeholder="请输入备注"
+              >
+              </el-input>
+            </template>
           </el-table-column>
+
         </el-table>
       </div>
       <div>
@@ -645,8 +648,8 @@
           @pageChange="handleSelectPageChange"
           @pageSizeChange="handleSelectPageSizeChange"></pagination>
         <div slot="footer" class="demo-drawer-footer">
-          <el-button class="common-button-default" round icon="el-icon-close" @click="standModel = false">取消</el-button>
-          <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="handleSelectConfirm" v-show="lawInfoTableLoading === false">确定</el-button>
+          <el-button class="common-button-default" size="mini" @click="standModel = false">取消</el-button>
+          <el-button type="primary" size="mini" class="common-button-primary"  @click="handleSelectConfirm" v-show="lawInfoTableLoading === false">确定</el-button>
         </div>
       </div>
     </el-drawer>
@@ -678,13 +681,6 @@
     <!--      :approval="true"-->
     <!--    >-->
     <!--    </ProcessFooter>-->
-    <!--    多选确认人-->
-    <Role-tree
-      is-title="选择责任部门对接人"
-      :is-visible.sync="modalshowflag"
-      @checkedRole="checkedRole2"
-      :nodeList="nodeList2"
-    ></Role-tree>
     <!-- 福田全公司选人解决方案 -->
     <Role-tree
       check-box
@@ -908,16 +904,22 @@ export default {
     },
     //动态表单读取
     getFormFieldList(item) {
+      console.log(item);
       this.$nextTick(() => {
         if(item.form === undefined){
           this.qdform = JSON.parse(JSON.stringify(item));
           this.qdform.prcNum = this.prcNum;
           this.qdform.prcName = this.prcName;
           this.qdform["id"] = item.id;
-          this.projectId = item.projectId;
-          //获取清单id 查询对应清单下的标准
-          this.detailedId = item.detailedListId;
-          this.getStandData();
+          this.dataList = item.dataList
+          this.dataList.forEach(item => {
+            this.$set(item, 'involve', 'involve')
+            this.$set(item, 'remarks', '')
+          })
+          // this.projectId = item.projectId;
+          // //获取清单id 查询对应清单下的标准
+          // this.detailedId = item.detailedListId;
+          // this.getStandData();
         }else{
           this.qdform = item.form
           this.dataList =item.form.dataList
@@ -985,26 +987,43 @@ export default {
         this.saveLoading = false;
       });
     },
+    handleRemark(){
+      this.dataList.map(item => {
+        if(item.involve === 'noInvolve'){
+          comFlag
+        }
+      })
+    },
     //提交事件
     handleSubmit() {
-      this.isSubmit = true;
-      this.qdform.commentText = this.commentText;
-      this.qdform.dataList = this.dataList
-      const json = JSON.stringify(this.qdform);
-      this.$http.post("lawss/activiti/completeTask", {
-        taskIds: this.taskIds,
-        userId: this.userId,
-        json: json
-      }, {
-        _this: this
-      }, res => {
-        if (res.success) {
-          this.$message.success(res.message);
-          this.$router.push("/processCenter");
+      let comFlag = 0
+      this.dataList.map(item => {
+        if(item.involve === 'noInvolve' && item.remarks === ''){
+          comFlag++
         }
-        this.isSubmit = false;
-      }, e => {
-      });
+      })
+      if(comFlag > 0){
+        this.$message.warning('请填写不涉及的备注信息')
+      }else{
+        this.isSubmit = true;
+        this.qdform.commentText = this.commentText;
+        this.qdform.dataList = this.dataList
+        const json = JSON.stringify(this.qdform);
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+          this.isSubmit = false;
+        }, e => {
+        });
+      }
     },
     addList() {
       this.searchLawBtn()
@@ -1181,6 +1200,10 @@ export default {
             this.dataList.push(item)
           }
         })
+        this.dataList.forEach(item => {
+          this.$set(item, 'involve', 'involve')
+          this.$set(item, 'remarks', '')
+        })
         this.standModel = false
       }
     },
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
index 7c4768cf9..59f3abd9b 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
@@ -2,7 +2,7 @@
   <div class="xmqdqr-step2">
     <ProcessHeader toggle>
       <template slot="proName">项目清单确认流程</template>
-      <template slot="proNode">确认人确认</template>
+      <template slot="proNode">产品经理汇总</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -60,7 +60,7 @@
           :data="dataList"
           border
           ref="selection"
-          height="65%"
+          height="59%"
           @selection-change="selectStandChange"
           style="width: 100%; border:1px solid #ccc"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -139,31 +139,34 @@
           >
           </el-table-column>
           <el-table-column
-            show-overflow-tooltip
-            prop="kccvppsbm"
-            width="180px"
+            prop="involve"
+            width="160px"
             align="center"
-            label="卡车VPPS编码">
+            label="标准是否涉及">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.involve"
+                         placeholder="请选择涉不涉及"
+                         max-length="30"
+                         clearable>
+                <el-option value="involve" label="涉及"></el-option>
+                <el-option value="noInvolve" label="不涉及"></el-option>
+              </el-select>
+            </template>
           </el-table-column>
           <el-table-column
-            show-overflow-tooltip
-            prop="kccvppscn"
-            width="180px"
+            prop="remarks"
             align="center"
-            label="卡车vpps中文名称">
-          </el-table-column>
-          <el-table-column
-            prop="cycvppsbm"
-            width="180px"
-            align="center"
-            label="乘用车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            prop="cycvppscn"
-            width="180px"
-            align="center"
-            label="乘用车vpps中文名称">
+            width="180"
+            label="备注">
+            <template slot-scope="scope">
+              <el-input
+                v-model.trim="dataList[scope.$index].remarks"
+                placeholder="请输入备注"
+              >
+              </el-input>
+            </template>
           </el-table-column>
+
         </el-table>
       </div>
       <div>
@@ -252,163 +255,432 @@
     <!--    添加标准抽屉-->
     <el-drawer
       title="添加标准"
+      :wrapperClosable="false"
       :visible.sync="standModel"
       size="900px"
       custom-class="demo-drawer"
     >
       <div class="demo-drawer-content">
-        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
-          <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
-            <div class="left">
-              <el-form :model="standCommonlySearch" inline class="label-input-form">
-                <el-formItem label="标准号/名称" prop="standNumber" class="search-item">
-                  <el-input v-model="standCommonlySearch.standNumber" placeholder="根据标准号/名称查找" clearable />
-                </el-formItem>
-                <!--                <el-formItem label="标准类别" prop="standSort" class="search-item">-->
-                <!--                  <el-select v-model="standCommonlySearch.standSort" placeholder="根据标准类别查找" clearable>-->
-                <!--                    <el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value"-->
-                <!--                               :key="opt.value" :label="opt.label">{{ opt.label }}-->
-                <!--                    </el-option>-->
-                <!--                  </el-select>-->
-                <!--                </el-formItem>-->
-                <el-formItem label="标准来源" prop="standType" class="search-item">
-                  <el-select v-model="standCommonlySearch.standType" placeholder="根据标准来源查找" clearable>
-                    <el-option value="INLAND" key="1" label="国内标准"></el-option>
-                    <el-option value="FOREIGN" key="2" label="海外标准"></el-option>
-                  </el-select>
-                </el-formItem>
-                <el-formItem class="search-item btn-box">
-                  <el-button
-                    type="primary"
-                    size="mini"
-                    class="common-button-primary"
-                    @click="search">查询
-                  </el-button>
-                  <el-button
-                    class="common-button-default"
-                    size="mini"
-                    @click="clearSearch">清空
-                  </el-button>
-                </el-formItem>
-              </el-form>
-            </div>
-            <el-table
-              :data="standardData"
-              tooltip-effect="dark"
-              style="width: 100%"
-              border
-              ref="table"
-              height="100%"
-              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
-         fontWeight: 'bold', height: '48px'}"
-              @selection-change="selectStand"
+        <el-form
+          class="label-input-form"
+          style="margin-top: 15px;"
+          label-width="130px"
+          :modal="handleSelectForm"
+          :inline="true"
+        >
+          <el-form-item label="标准/政策来源" class="search-item">
+            <el-select
+              v-model="handleSelectForm.dataSource"
+              @change="dataSourceChange"
+              :popper-append-to-body="false"
+              placeholder="请选择标准来源">
+              <el-option value="INLAND" label="国内标准库"></el-option>
+              <el-option value="FOREIGN" label="海外标准库"></el-option>
+              <!--              <el-option value="FOREIGN_LAWS" label="国内外政策库"></el-option>-->
+              <el-option value="BUSINESS_STAND" label="企业标准库"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="标准编号" class="search-item">
+            <el-input
+              v-model="handleSelectForm.lawNumber"
+              @change="lawNumberSearch"
+              placeholder="根据标准编号查找"
+              clearable
+              :maxlength="100"></el-input>
+          </el-form-item>
+          <!--          <el-form-item label="标准名称/政策名称" class="search-item">-->
+          <!--            <el-input-->
+          <!--              v-model="handleSelectForm.lawName"-->
+          <!--              @change="lawNameSearch"-->
+          <!--              placeholder="根据标准名称/政策名称查找"-->
+          <!--              clearable-->
+          <!--              :maxlength="100"></el-input>-->
+          <!--          </el-form-item>-->
+          <el-form-item class="search-item btn-box">
+            <el-button
+              size="small"
+              type="primary"
+              class="common-button-primary"
+              @click="searchLawBtn">
+              查询
+            </el-button>
+          </el-form-item>
+          <el-form-item class="search-item btn-box">
+            <el-button
+              class="common-button-default"
+              size="small"
+              type="default"
+              @click="clearLawBtn">
+              清空
+            </el-button>
+          </el-form-item>
+        </el-form>
+        <loading :loading="lawInfoTableLoading">数据获取中</loading>
+        <el-table
+          ref="selections"
+          tooltip-effect="dark"
+          style="width: 100%;overflow-y: auto;overflow-x: hidden;"
+          border
+          :loading="lawInfoTableLoading"
+          :data="lawInfoTable"
+          :height="300"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          fontWeight: 'bold', height: '48px'}"
+          @selection-change="handleSelectTableChange"
+        >
+
+          <el-table-column
+            fixed="left"
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+
+          <div v-if="handleSelectForm.dataSource === 'INLAND'">
+            <el-table-column
+              label="标准号"
+              width="150"
             >
-              <el-table-column
-                type="selection"
-                width="55"
-                align="center">
-              </el-table-column>
-              <el-table-column
-                prop="code"
-                align="center"
-                label="标准号">
-                <template slot-scope="scope">
-                  <a v-if="scope.row.standYear" class="table-jump"
-                     @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
-                      scope.row.standNumber
-                    }}-{{ scope.row.standYear }}</a>
-                  <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
-                      scope.row.standSortShow }}
-                    {{ scope.row.standNumber }}</a>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="standName"
-                align="center"
-                label="标准名称"
-              >
-                <template slot-scope="scope">
-                  <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="issueTime"
-                align="center"
-                label="发布日期">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="xcxssrqgj"
-                align="center"
-                label="新车型实施日期">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                show-overflow-tooltip
-                prop="zccssrqgj"
-                align="center"
-                label="在产车实施日期">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                show-overflow-tooltip
-                prop="textStatus"
-                align="center"
-                label="文本状态">
-                <template slot-scope="scope">
-                  <span>{{ textStatusMap[scope.row.textStatus] }}</span>
-                </template>
-              </el-table-column>
-            </el-table>
+              <template slot-scope="scope">
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
+                   @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                    scope.row.standNumber
+                  }}-{{ scope.row.standYear }}</a>
+                <a v-else-if="scope.row.standYear" class="table-jump" style="color: #333333"
+                   @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                    scope.row.standNumber
+                  }}-{{ scope.row.standYear }}</a>
+                <a v-else @click="handlePreview(scope.row)" class="table-jump" style="color: #333333">
+                  {{ scope.row.standSortShow }}
+                  {{ scope.row.standNumber }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              show-overflow-tooltip
+              prop="standName"
+              label="标准名称"
+              min-width="300"
+            >
+              <template slot-scope="scope">
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
+                <a v-else @click="handlePreview(scope.row)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="issueTime"
+              sortable="custom"
+              width="120"
+              label="发布日期">
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
+                <span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="SSRQ"
+              sortable="custom"
+              width="120"
+              label="实施日期">
+              <template slot-scope="scope">
+                <!--                {{ formatIssueDate(scope.row.putTime) }}-->
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+
+              </template>
+            </el-table-column>
+
+            <el-table-column
+              prop="XCXSSRQ"
+              sortable="custom"
+              width="150"
+              label="新车型实施日期">
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="ZCCSSRQ"
+              sortable="custom"
+              width="150"
+              label="在产车实施日期">
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="textStatus"
+              sortable="custom"
+              width="110"
+              label="文本状态">
+              <!--              <template slot="header" slot-scope="scope">-->
+              <!--                <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
+              <!--                  <span>文本状态<i class="el-icon-warning-outline"></i></span>-->
+              <!--                </el-tooltip>-->
+              <!--              </template>-->
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    textStatusMap[scope.row.textStatus]
+                  }}</span>
+                <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
+              </template>
+            </el-table-column>
           </div>
-          <pagination
-            :page="page"
-            :pageSize="pageSize"
-            :total="total"
-            @pageChange="pageChange"
-            @pageSizeChange="pageSizeChange"
-          />
+          <div v-if="handleSelectForm.dataSource === 'FOREIGN'">
+            <el-table-column
+              label="标准号"
+              width="150"
+            >
+              <template slot-scope="scope">
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
+                    scope.row.standSortShow
+                  }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                <a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">{{
+                    scope.row.standSortShow
+                  }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                <a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">{{
+                    scope.row.standSortShow
+                  }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standSortShow
+                  }}
+                  {{ scope.row.standNumber }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              show-overflow-tooltip
+              prop="standName"
+              label="标准名称"
+              min-width="300"
+            >
+              <template slot-scope="scope">
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standName
+                  }}</a>
+                <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standName
+                  }}</a>
+                <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
+                    scope.row.standName
+                  }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="issueTime"
+              sortable="custom"
+              width="120"
+              label="发布日期">
+              <template slot-scope="scope">
+                <div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
+                  {{ formatIssueDate(scope.row.issueTime) }}
+                </div>
+                <div v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">
+                  {{ formatIssueDate(scope.row.issueTime) }}
+                </div>
+                <div v-else style="color: #333333">
+                  {{ formatIssueDate(scope.row.issueTime) }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="SSRQ"
+              sortable="custom"
+              width="120"
+              label="实施日期">
+              <template slot-scope="scope">
+                <!--                {{ formatIssueDate(scope.row.putTime) }}-->
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else style="color: #333333">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="XCXSSRQ"
+              sortable="custom"
+              width="150"
+              label="新车型实施日期">
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else style="color: #333333">{{
+                    scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
+                  }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="ZCCSSRQ"
+              sortable="custom"
+              width="150"
+              label="在产车实施日期">
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+                  }}</span>
+                <span v-else style="color: #333333">{{
+                    scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
+                  }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="textStatus"
+              sortable="custom"
+              width="110"
+              label="文本状态">
+              <!--              <template slot="header" slot-scope="scope">-->
+              <!--                <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
+              <!--                  <span>文本状态 <i class="el-icon-warning-outline"></i></span>-->
+              <!--                </el-tooltip>-->
+              <!--              </template>-->
+              <template slot-scope="scope">
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                    textStatusMap[scope.row.textStatus]
+                  }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                    textStatusMap[scope.row.textStatus]
+                  }}</span>
+                <span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
+              </template>
+            </el-table-column>
+          </div>
+          <div v-if="handleSelectForm.dataSource === 'BUSINESS_STAND'">
+            <el-table-column
+              show-overflow-tooltip
+              label="企标编号"
+              width="150"
+            >
+              <template slot-scope="scope">
+                <!--                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>-->
+                <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+                <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+                <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              show-overflow-tooltip
+              prop="standName"
+              label="中文名称"
+              min-width="300"
+            >
+              <template slot-scope="scope">
+                <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                <a v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              show-overflow-tooltip
+              prop="standEnName"
+              label="英文名称"
+              min-width="300"
+            >
+              <template slot-scope="scope">
+                <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+                <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+                <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="issueTime"
+              label="发布日期"
+              sortable
+              width="120"
+            >
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="putTime"
+              label="实施日期"
+              sortable
+              width="120"
+            >
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              show-overflow-tooltip
+              sortable
+              prop="standStatusShow"
+              label="文本状态"
+              width="110"
+            >
+
+              <template slot-scope="scope">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">
+                  {{scope.row.standStatusShow}}
+                </span>
+                <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">
+                  {{scope.row.standStatusShow}}
+                </span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">
+                  {{scope.row.standStatusShow}}
+                </span>
+              </template>
+            </el-table-column>
+          </div>
+
+        </el-table>
+        <!--分页-->
+        <pagination
+          v-show="this.lawInfoTableLoading === false"
+          style="position: relative;"
+          :page="handleSelectForm.page"
+          :total="handleSelectForm.total"
+          @pageChange="handleSelectPageChange"
+          @pageSizeChange="handleSelectPageSizeChange"></pagination>
+        <div slot="footer" class="demo-drawer-footer">
+          <el-button class="common-button-default" size="mini" @click="standModel = false">取消</el-button>
+          <el-button type="primary" size="mini" class="common-button-primary"  @click="handleSelectConfirm" v-show="lawInfoTableLoading === false">确定</el-button>
         </div>
       </div>
-      <div class="demo-drawer-footer">
-        <el-button size="mini" @click="cancelStand">取消</el-button>
-        <el-button type="primary" size="mini" @click="okStand">添加</el-button>
-      </div>
     </el-drawer>
-    <!--    <ProcessFooter-->
-    <!--      show-save-->
-    <!--      show-transfer-->
-    <!--      show-affirm-->
-    <!--      :submitLoading="isSubmit"-->
-    <!--      :transfer-loading="isTransfer"-->
-    <!--      :saveLoading="saveLoading"-->
-    <!--      @submit="handleSubmit"-->
-    <!--      @transfer="handleTransfer"-->
-    <!--      @save="handleSave"-->
-    <!--      :approval="true"-->
-    <!--    >-->
-    <!--    </ProcessFooter>-->
     <ProcessFooter
-      :show-save="submitShow"
-      :show-transfer="submitShow"
-      :show-affirm="submitShow"
-      show-confirm
+      show-save
+      show-transfer
+      show-affirm
       :submitLoading="isSubmit"
       :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
       @submit="handleSubmit"
       @transfer="handleTransfer"
       @save="handleSave"
-      @accept="handleAccept"
       :approval="true"
     >
     </ProcessFooter>
+    <!--    <ProcessFooter-->
+    <!--      :show-save="submitShow"-->
+    <!--      :show-transfer="submitShow"-->
+    <!--      :show-affirm="submitShow"-->
+    <!--      show-confirm-->
+    <!--      :submitLoading="isSubmit"-->
+    <!--      :transfer-loading="isTransfer"-->
+    <!--      :saveLoading="saveLoading"-->
+    <!--      @submit="handleSubmit"-->
+    <!--      @transfer="handleTransfer"-->
+    <!--      @save="handleSave"-->
+    <!--      @accept="handleAccept"-->
+    <!--      :approval="true"-->
+    <!--    >-->
+    <!--    </ProcessFooter>-->
     <!-- 福田全公司选人解决方案 -->
     <Role-tree
       check-box
@@ -425,7 +697,7 @@ import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
 import { inboundLiaisonDetail, queryDetail, saveTaskForPub ,changeAssigneeNew, execTask} from "api/process";
-// name: "xmqdqrStep2",
+
 export default {
   name: "xmqdqrStep4",
   components: {
@@ -435,12 +707,32 @@ export default {
   },
   data() {
     return {
+      lawInfoTableLoading: true,
+      lawInfoTable:[],
+      handleSelectForm: {
+        standName: '', //标准名称
+        numberName: '', //政策名称
+        lawsNumber: '', //政策编号
+        standNumber: '', //标准编号
+        standCode: '', //企标编号
+        dataSource: 'INLAND',
+        lawNumber: '', // 标准编号/政策编号
+        lawName: '', // 标准名称/政策名称
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        total: 0,
+        standType: '',
+        quoteIdList: '',
+        validFlag: '0',
+        menuId: 'nomenu'
+      },
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,
       drawerTitle:'',
       active: "1",
       nodeList: [],
+      nodeList2: [],
       loading: false,
       // 当前流程类型(1待办/2已办)
       processType: 1,
@@ -456,6 +748,7 @@ export default {
       standList: [],
       projectStand:[],
       standardData: [],
+      handleSelectTableList: [], //标准数据
       page: 1,
       pageSize: this.$store.getters.userInfo.configContent,
       total: 0,
@@ -502,6 +795,14 @@ export default {
     });
   },
   methods: {
+    formatIssueDate(str) {
+      const momentDate = this.$moment(str)
+      if (momentDate.isValid()) {
+        return this.$moment(str).format('YYYY-MM-DD')
+      } else {
+        return str
+      }
+    },
     //确认转办
     checkedTransferRole (data) {
       this.assigneeNewLoading = true
@@ -603,47 +904,56 @@ export default {
     },
     //动态表单读取
     getFormFieldList(item) {
+      console.log(item);
       this.$nextTick(() => {
         if(item.form === undefined){
           this.qdform = JSON.parse(JSON.stringify(item));
           this.qdform.prcNum = this.prcNum;
           this.qdform.prcName = this.prcName;
           this.qdform["id"] = item.id;
+          this.dataList = item.dataList
+          this.dataList.forEach(item => {
+            this.$set(item, 'involve', 'involve')
+            this.$set(item, 'remarks', '')
+          })
           // this.projectId = item.projectId;
-          //获取清单id 查询对应清单下的标准
-          this.detailedId = item.detailedListId;
+          // //获取清单id 查询对应清单下的标准
+          // this.detailedId = item.detailedListId;
           // this.getStandData();
-          this.getStand();
         }else{
           this.qdform = item.form
           this.dataList =item.form.dataList
           this.detailedId = item.form.detailedListId;
-          this.getStand();
         }
       });
     },
     //查询清单下的标准
-    // getStandData() {
-    //   this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId, cars: '1', }, {
-    //     _this: this
-    //   }, res => {
-    //     this.dataList = res.data.records;
-    //     this.dataList.forEach(item => {
-    //       // 责任部门转换
-    //       if (item.zrbm !== null || item.zrbm !== "") {
-    //         let k = (item.zrbm || "").split(",");
-    //         for (let i in this.zrbmOptions) {
-    //           for (let m = 0; m < k.length; m++) {
-    //             if (this.zrbmOptions[i].value === k[m]) {
-    //               k[m] = this.zrbmOptions[i].label;
-    //             }
-    //             item.zrbm = k.join(",");
-    //           }
-    //         }
-    //       }
-    //     });
-    //   });
-    // },
+    getStandData() {
+      this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId, cars: '1', }, {
+        _this: this
+      }, res => {
+        this.dataList = res.data.records;
+        this.dataList.forEach(item => {
+          // 责任部门转换
+          if (item.zrbm !== null || item.zrbm !== "" ) {
+            let k = (item.zrbm || "").split(",");
+            for (let i in this.zrbmOptions) {
+              for (let m = 0; m < k.length; m++) {
+                if (this.zrbmOptions[i].value === k[m]) {
+                  k[m] = this.zrbmOptions[i].label;
+                }
+                item.zrbm = k.join(",");
+              }
+            }
+          }
+        });
+        this.dataList.map(item => {
+          if(item.zrbm === '[]'){
+            item.zrbm = ''
+          }
+        })
+      });
+    },
     // 接受按钮
     handleAccept(){
       this.isSubmit = true
@@ -677,28 +987,46 @@ export default {
         this.saveLoading = false;
       });
     },
+    handleRemark(){
+      this.dataList.map(item => {
+        if(item.involve === 'noInvolve'){
+          comFlag
+        }
+      })
+    },
     //提交事件
     handleSubmit() {
-      this.isSubmit = true;
-      this.qdform.commentText = this.commentText;
-      this.qdform.dataList = this.dataList
-      const json = JSON.stringify(this.qdform);
-      this.$http.post("lawss/activiti/completeTask", {
-        taskIds: this.taskIds,
-        userId: this.userId,
-        json: json
-      }, {
-        _this: this
-      }, res => {
-        if (res.success) {
-          this.$message.success(res.message);
-          this.$router.push("/processCenter");
+      let comFlag = 0
+      this.dataList.map(item => {
+        if(item.involve === 'noInvolve' && item.remarks === ''){
+          comFlag++
         }
-        this.isSubmit = false;
-      }, e => {
-      });
+      })
+      if(comFlag > 0){
+        this.$message.warning('请填写不涉及的备注信息')
+      }else{
+        this.isSubmit = true;
+        this.qdform.commentText = this.commentText;
+        this.qdform.dataList = this.dataList
+        const json = JSON.stringify(this.qdform);
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+          this.isSubmit = false;
+        }, e => {
+        });
+      }
     },
     addList() {
+      this.searchLawBtn()
       this.standModel = true;
     },
     //批量删除
@@ -726,8 +1054,9 @@ export default {
       }
     },
     //添加标准勾选框数据
-    selectStand(data) {
-      this.standList = data;
+    handleSelectTableChange (data) {
+      this.handleSelectTableList = data
+      console.log(this.handleSelectTableList);
     },
     selectStandChange(data){
       this.projectStand = data
@@ -764,52 +1093,141 @@ export default {
       }
 
     },
+    //手动查找的清空按钮
+    clearLawBtn(){
+      this.lawInfoTableLoading = true
+      this.handleSelectForm.lawNumber = ''
+      this.handleSelectForm.standNumber = ''
+      this.handleSelectForm.lawsNumber = ''
+      this.handleSelectForm.standCode = ''
+      //清空标准名称/政策名称的查询
+      this.handleSelectForm.lawName = ''
+      this.handleSelectForm.standName = ''
+      this.handleSelectForm.numberName = ''
+      this.searchLawBtn()
+    },
     //添加标准的查询按钮
-    search() {
-      this.page = 1;
-      this.getStand();
-    },
-    clearSearch() {
-      this.standCommonlySearch = {
-        standSort: "",
-        standNumber: "",
-        standType: ""
-      };
-      this.getStand();
-    },
-    pageChange(page) {
-      this.page = page;
-      this.getStand();
-    },
-    pageSizeChange(pageSize) {
-      this.pageSize = pageSize;
-      this.getStand();
-    },
-    //查询清单下的标准
-    getStand() {
-      this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
-        id: this.detailedId,
-        page: this.page,
-        Size: this.pageSize,
-        ...this.standCommonlySearch
-      }, {
-        _this: this
-      }, res => {
-        if (res.data === null) {
-          this.standardData = "";
-          this.totalDo = "";
-        }
-        this.standardData = res.data.records;
-        this.standardData.forEach(item => {
-          if (item.zccssrqgj === "-" || item.zccssrqgj === 'null' || item.zccssrqgj === 'undefined') {
-            item.zccssrqgj = "";
+    searchLawBtn(){
+      this.lawInfoTableLoading = true
+      if (this.handleSelectForm.dataSource === 'INLAND'){
+        this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{
+          _this: this
+        },res=>{
+          console.log('国内标准库数据',res)
+          if (res.ok){
+            this.lawInfoTable = res.data.list
+            this.handleSelectForm.total = res.data.count
+            if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+              this.lawInfoTableLoading = true
+              this.handleSelectPageChange(1)
+            }else {
+              this.lawInfoTableLoading = false
+              this.lawInfoTableLoading = false
+            }
+          }else {
+            this.$message.error(res.message)
           }
-          if (item.xcxssrqgj === "-" || item.xcxssrqgj === 'null' || item.xcxssrqgj === 'undefined' ) {
-            item.xcxssrqgj = "";
+        },e=>{
+          this.lawInfoTable = []
+          this.handleSelectForm.total = 0
+        })
+      }else if(this.handleSelectForm.dataSource === 'FOREIGN'){
+        this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{
+          _this: this
+        },res=>{
+          if (res.ok){
+            this.lawInfoTable = res.data.list
+            this.handleSelectForm.total = res.data.count
+            if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+              this.lawInfoTableLoading = true
+              this.handleSelectPageChange(1)
+            }else {
+              this.lawInfoTableLoading = false
+            }
+          }else {
+            this.$message.error(res.message)
+            this.lawInfoTableLoading = false
           }
-        });
-        this.total = res.data.total;
-      });
+        },e=>{
+          this.lawInfoTable = []
+          this.handleSelectForm.total = 0
+        })
+      }else if(this.handleSelectForm.dataSource === 'BUSINESS_STAND'){
+        this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',this.handleSelectForm,{
+          _this: this
+        },res=>{
+          if (res.ok){
+            this.lawInfoTable = res.data.list
+            this.handleSelectForm.total = res.data.count
+            if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) {
+              this.lawInfoTableLoading = true
+              this.handleSelectPageChange(1)
+            }else {
+              this.lawInfoTableLoading = false
+            }
+          }else {
+            this.$message.error(res.message)
+            this.lawInfoTableLoading = false
+          }
+        },e=>{
+          this.lawInfoTable = []
+          this.handleSelectForm.total = 0
+        })
+      }else {
+        this.$message.warning('请先选择标准/政策来源')
+      }
+    },
+    handleSelectConfirm(){
+      if(this.handleSelectTableList.length < 1){
+        this.$message.warning('请至少选择一条数据进行添加')
+      }else{
+        this.standList.forEach(item =>{
+          if(item.ssrq === "-"){
+            item.ssrq = ''
+          }
+          if(item.zrbm === '[]'){
+            item.zrbm =''
+          }
+        })
+        this.handleSelectTableList.map(item => {
+          let addIndex
+          addIndex = this.dataList.findIndex(items =>{
+            return items.id === item.id
+          })
+          if(addIndex > -1){
+            this.$message.warning('请勿重复添加数据')
+          }else{
+            this.dataList.push(item)
+          }
+        })
+        this.dataList.forEach(item => {
+          this.$set(item, 'involve', 'involve')
+          this.$set(item, 'remarks', '')
+        })
+        this.standModel = false
+      }
+    },
+    dataSourceChange() {
+      this.handleSelectForm.page = 1
+      this.lawInfoTableLoading = true
+      this.handleSelectForm.standType = this.handleSelectForm.dataSource
+      this.searchLawBtn()
+    },
+    //根据标准编号的查询
+    lawNumberSearch() {
+      this.handleSelectForm.standNumber = this.handleSelectForm.lawNumber
+      this.handleSelectForm.lawsNumber = this.handleSelectForm.lawNumber
+      this.handleSelectForm.standCode = this.handleSelectForm.lawNumber
+    },
+    handleSelectPageChange(page){
+      this.lawInfoTableLoading = true
+      this.handleSelectForm.page = page
+      this.searchLawBtn()
+    },
+    handleSelectPageSizeChange(pageSize){
+      this.lawInfoTableLoading = true
+      this.handleSelectForm.pageSize = pageSize
+      this.searchLawBtn()
     },
   },
   computed: {
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 9ff4aa477..a5e03bd72 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -879,7 +879,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if(row.taskInfo === '标准法规部经理审批'){
+          } else if(row.taskInfo === '确认人确认'){
             this.$router.push({
               name: 'xmqdqrStep3',
               query: {
@@ -890,6 +890,17 @@ export default {
                 prcType: row.prcType
               }
             })
+          }else if(row.taskInfo === '产品工程经理汇总清单'){
+            this.$router.push({
+              name: 'xmqdqrStep4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }
           break
         case 'laws2':

From b114d8a43a97e2fea7ab6bcfd8f31ac797f09619 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, 2 Dec 2021 19:27:48 +0800
Subject: [PATCH 22/33] =?UTF-8?q?=E6=94=B9=E5=8F=98=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 2cc363571..30298c95b 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -150,7 +150,7 @@
                    :loading="delLoading"
                    size="mini"
                    @click="deleteStand(2)"
-                   v-btn-permission="'c09dc12531085e30e39bbdc6cb6116ba'"><i class="iconfont">&#xe61b;</i>批量删除
+                   v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'"><i class="iconfont">&#xe61b;</i>批量删除
         </el-button>
         <el-button class="common-button-default"
                    size="mini"

From fe34efc326dc96d65c6bb8397f58829985ff1908 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Thu, 2 Dec 2021 19:46:57 +0800
Subject: [PATCH 23/33] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BB=A3=E5=8A=9E?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AD=97=E6=95=B0=E8=B6=85=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/home2/components/todoList/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue
index 644525388..7626d2b83 100644
--- a/src/pages/home2/components/todoList/index.vue
+++ b/src/pages/home2/components/todoList/index.vue
@@ -10,7 +10,8 @@
     <ul>
       <li v-for="item in toDoTaskList" :key="item.id" class="time-title">
          <div style="height: 30px">
-           <span @click="dealWith(item)" style="line-height: 30px; font-size: 13px;">{{ item.prcName }}</span>
+           <span @click="dealWith(item)" v-if="item.prcName.length<25" style="line-height: 30px; font-size: 13px;">{{ item.prcName }}</span>
+           <span @click="dealWith(item)" v-else style="line-height: 30px; font-size: 13px;">{{ item.prcName.substring(0,25)+'...' }}</span>
          </div>
       </li>
     </ul>

From 76e635e1f21957a462f0f566d8d25e4a24e7e37a Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Thu, 2 Dec 2021 20:00:58 +0800
Subject: [PATCH 24/33] =?UTF-8?q?=E6=8A=A5=E6=89=B9=E7=A8=BF=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=B9=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherStandardDetails/index.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 51d8dc21e..a9277a744 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -3637,9 +3637,10 @@ export default {
 
             & > .files-title {
               width: calc(~'100% - 120px');
-              min-height: 50px;
-              line-height: 50px;
-              font-size: 16px;
+              //报批稿撑开
+              //min-height: 50px;
+              //line-height: 50px;
+              //font-size: 16px;
               color: #409EFF;
 
               & > a {
@@ -3669,7 +3670,8 @@ export default {
 
             .decomposition-btn {
               position: absolute;
-              top: 10px;
+              //报批稿撑开
+              //top: 10px;
               right: 0;
               padding: 0 10px;
               height: 30px;

From d473f34df89f82251d652220d28779d1492e804e Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Thu, 2 Dec 2021 20:12:33 +0800
Subject: [PATCH 25/33] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7=E3=80=81=E6=96=87=E6=9C=AC=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=9A=84=E9=A2=9C=E8=89=B2=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherStandardDetails/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index a9277a744..913ed518e 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -46,7 +46,7 @@
                 <div class="details-content-modular basic-information" style="border-top:none">
                   <div class="basic-information-content">
                     <!--                <p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>-->
-                    <p style="color: #C42626;" class="">
+                    <p class="">
                       <label style=" margin-right: 164px;">标准号</label>
                       <span v-if="sarStandardsInfoEO.standYear">{{
                           sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear
@@ -106,7 +106,7 @@
                       <label style=" margin-right: 150px;"
                              title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
                       >文本状态</label>
-                      <span style="color: #409EFF;">{{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}</span>
+                      <span>{{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}</span>
                     </p>
                     <p class="half"><label style=" margin-right: 150px;">发布日期</label><span>{{
                         sarStandardsInfoEO.issueTime || '-'

From e0a8bc57b253ef01d9c264571028ac7b384563b0 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, 2 Dec 2021 20:17:07 +0800
Subject: [PATCH 26/33] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/xmqdqr/step3.vue       |  1 +
 .../pages/creatProcess/xmqdqr/step4.vue       | 24 ++++-------------
 .../pages/creatProcess/xmqdqr/step5.vue       | 26 -------------------
 3 files changed, 6 insertions(+), 45 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
index 2180eccc0..764893fb9 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
@@ -1006,6 +1006,7 @@ export default {
         this.$message.warning('请填写不涉及的备注信息')
       }else{
         this.isSubmit = true;
+        this.qdform.currentPerson = this.$store.getters.userInfo.userName;
         this.qdform.commentText = this.commentText;
         this.qdform.dataList = this.dataList
         const json = JSON.stringify(this.qdform);
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
index 59f3abd9b..4f15bd8ec 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
@@ -143,28 +143,12 @@
             width="160px"
             align="center"
             label="标准是否涉及">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.involve"
-                         placeholder="请选择涉不涉及"
-                         max-length="30"
-                         clearable>
-                <el-option value="involve" label="涉及"></el-option>
-                <el-option value="noInvolve" label="不涉及"></el-option>
-              </el-select>
-            </template>
           </el-table-column>
           <el-table-column
             prop="remarks"
             align="center"
             width="180"
             label="备注">
-            <template slot-scope="scope">
-              <el-input
-                v-model.trim="dataList[scope.$index].remarks"
-                placeholder="请输入备注"
-              >
-              </el-input>
-            </template>
           </el-table-column>
 
         </el-table>
@@ -904,7 +888,6 @@ export default {
     },
     //动态表单读取
     getFormFieldList(item) {
-      console.log(item);
       this.$nextTick(() => {
         if(item.form === undefined){
           this.qdform = JSON.parse(JSON.stringify(item));
@@ -913,8 +896,11 @@ export default {
           this.qdform["id"] = item.id;
           this.dataList = item.dataList
           this.dataList.forEach(item => {
-            this.$set(item, 'involve', 'involve')
-            this.$set(item, 'remarks', '')
+             if(item.involve === 'involve'){
+               item.involve = '涉及'
+             }else if(item.involve === 'noInvolve'){
+               item.involve = '不涉及'
+             }
           })
           // this.projectId = item.projectId;
           // //获取清单id 查询对应清单下的标准
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue
index 85f9184d6..ca2543c73 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue
@@ -132,32 +132,6 @@
             width="180px"
           >
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="kccvppsbm"
-            width="180px"
-            align="center"
-            label="卡车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="kccvppscn"
-            width="180px"
-            align="center"
-            label="卡车vpps中文名称">
-          </el-table-column>
-          <el-table-column
-            prop="cycvppsbm"
-            width="180px"
-            align="center"
-            label="乘用车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            prop="cycvppscn"
-            width="180px"
-            align="center"
-            label="乘用车vpps中文名称">
-          </el-table-column>
         </el-table>
       </div>
       <div>

From 09b2e9572fdbe8145bb62b6dd9d67e64535c3f82 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Thu, 2 Dec 2021 20:32:18 +0800
Subject: [PATCH 27/33] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E7=9A=84=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherStandardDetails/index.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 913ed518e..9e7527983 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -3606,7 +3606,7 @@ export default {
 
           .modular-content-p-name {
             display: inline-block;
-            width: 220px;
+            width: 213px;
             height: 43px;
             line-height: 43px;
             font-size: 16px;
@@ -3620,10 +3620,10 @@ export default {
           .modular-content-p-val {
             display: inline-block;
             width: calc(~'100% - 225px');
-            min-height: 50px;
-            line-height: 50px;
-            font-size: 16px;
-            color: #999999;
+            //min-height: 50px;
+            //line-height: 50px;
+            //font-size: 16px;
+            //color: #999999;
             word-break: break-all;
             //overflow: hidden;
             //white-space: nowrap;

From db5ccdca741414cc3afb67b04a662b5f3563fcb5 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Thu, 2 Dec 2021 20:38:28 +0800
Subject: [PATCH 28/33] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=BD=93=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=B8=A6=E5=85=A5=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index f0847398f..b54c9cb35 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -1874,9 +1874,9 @@
                               this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
                               this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : ''
                               console.log(this.form)
-                              this.form.ssrq =  this.$moment(this.form.ssrq).format("YYYY-MM-DD")
-                              this.form.zccssrq =  this.$moment(this.form.zccssrq).format("YYYY-MM-DD")
-                              this.form.xcxssrq =  this.$moment(this.form.xcxssrq).format("YYYY-MM-DD")
+                              this.form.ssrq =  this.form.ssrq?this.$moment(this.form.ssrq).format("YYYY-MM-DD"):null
+                              this.form.zccssrq = this.form.zccssrq?this.$moment(this.form.zccssrq).format("YYYY-MM-DD"):null
+                              this.form.xcxssrq =  this.form.xcxssrq?this.$moment(this.form.xcxssrq).format("YYYY-MM-DD"):null
                               this.form.prcNum = this.prcNum
                               this.form.prcName = this.prcName
                               this.form['id'] = bringData.id

From 5da6e3c9a222ae9edba1d9ae475fe5a64b43dbb6 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, 2 Dec 2021 20:49:05 +0800
Subject: [PATCH 29/33] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/home2/components/todoList/index.vue |   4 +-
 .../pages/creatProcess/xmqdqr/step1-3.vue     |  39 +--
 .../pages/creatProcess/xmqdqr/step2.vue       |   4 +-
 .../pages/creatProcess/xmqdqr/step3.vue       |   4 +-
 .../pages/creatProcess/xmqdqr/step4.vue       |   4 +-
 .../pages/creatProcess/xmqdqr/step5.vue       | 298 +++++++++++-------
 .../tabComponents/processCenter/index.vue     |  11 +
 7 files changed, 217 insertions(+), 147 deletions(-)

diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue
index 7626d2b83..b7faa2136 100644
--- a/src/pages/home2/components/todoList/index.vue
+++ b/src/pages/home2/components/todoList/index.vue
@@ -637,9 +637,9 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if(row.taskInfo === '产品工程经理汇总清单'){
+          }else if(row.taskInfo === '标准法规部经理审批'){
             this.$router.push({
-              name: 'xmqdqrStep4',
+              name: 'xmqdqrStep5',
               query: {
                 taskIds: row.taskIds,
                 prcId: row.prcId,
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-3.vue
index 159c2ad30..08e1752ee 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-3.vue
@@ -80,7 +80,7 @@
             prop="standName"
             align="center"
             label="中文名称"
-            width="180px"
+            min-width="300"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -90,7 +90,7 @@
             prop="standEnName"
             label="英文名称"
             align="center"
-            width="180px"
+            min-width="300"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
@@ -133,30 +133,16 @@
           >
           </el-table-column>
           <el-table-column
-            show-overflow-tooltip
-            prop="kccvppsbm"
-            width="180px"
+            prop="involve"
+            width="160px"
             align="center"
-            label="卡车VPPS编码">
+            label="标准是否涉及">
           </el-table-column>
           <el-table-column
-            show-overflow-tooltip
-            prop="kccvppscn"
-            width="180px"
+            prop="remarks"
             align="center"
-            label="卡车vpps中文名称">
-          </el-table-column>
-          <el-table-column
-            prop="cycvppsbm"
-            width="180px"
-            align="center"
-            label="乘用车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            prop="cycvppscn"
-            width="180px"
-            align="center"
-            label="乘用车vpps中文名称">
+            width="180"
+            label="备注">
           </el-table-column>
         </el-table>
       </div>
@@ -356,8 +342,13 @@ export default {
           this.qdform.prcName = this.prcName;
           this.qdform["id"] = item.id;
           this.dataList = item.dataList
-          this.projectId = item.projectId
-          // this.getStandData();
+          this.dataList.forEach(item => {
+            if(item.involve === 'involve'){
+              item.involve = '涉及'
+            }else if(item.involve === 'noInvolve'){
+              item.involve = '不涉及'
+            }
+          })
         }else{
           this.qdform = item.form
           this.dataList =item.form.dataList
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
index b4d4fd058..ef1f9f7ae 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
@@ -93,8 +93,8 @@
           <el-table-column
             prop="standName"
             align="center"
+            min-width="300"
             label="中文名称"
-            width="180px"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -103,8 +103,8 @@
           <el-table-column
             prop="standEnName"
             label="英文名称"
+            min-width="300"
             align="center"
-            width="180px"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
index 764893fb9..0072b8b4c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
@@ -86,7 +86,7 @@
             prop="standName"
             align="center"
             label="中文名称"
-            width="180px"
+            min-width="300"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -96,7 +96,7 @@
             prop="standEnName"
             label="英文名称"
             align="center"
-            width="180px"
+            min-width="300"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
index 4f15bd8ec..376574cb6 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
@@ -86,7 +86,7 @@
             prop="standName"
             align="center"
             label="中文名称"
-            width="180px"
+            min-width="300"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -96,7 +96,7 @@
             prop="standEnName"
             label="英文名称"
             align="center"
-            width="180px"
+            min-width="300"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue
index ca2543c73..7691ed962 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue
@@ -2,7 +2,7 @@
   <div class="xmqdqr-step2">
     <ProcessHeader toggle>
       <template slot="proName">项目清单确认流程</template>
-      <template slot="proNode">法规部经理审批</template>
+      <template slot="proNode">产品经理汇总</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -54,7 +54,7 @@
           :data="dataList"
           border
           ref="selection"
-          height="65%"
+          height="63%"
           @selection-change="selectStandChange"
           style="width: 100%; border:1px solid #ccc"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -80,7 +80,7 @@
             prop="standName"
             align="center"
             label="中文名称"
-            width="180px"
+            min-width="300"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -90,7 +90,7 @@
             prop="standEnName"
             label="英文名称"
             align="center"
-            width="180px"
+            min-width="300"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
@@ -107,22 +107,22 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="xcxssrq"
+            prop="xcxssrqgj"
             width="190px"
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zccssrq"
+            prop="zccssrqgj"
             align="center"
             sortable
             width="190px"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -132,11 +132,24 @@
             width="180px"
           >
           </el-table-column>
+          <el-table-column
+            prop="involve"
+            width="160px"
+            align="center"
+            label="标准是否涉及">
+          </el-table-column>
+          <el-table-column
+            prop="remarks"
+            align="center"
+            width="180"
+            label="备注">
+          </el-table-column>
+
         </el-table>
       </div>
       <div>
         <el-collapse accordion>
-          <el-collapse-item title="审批意见">
+          <el-collapse-item title="回执说明">
             <div style="margin: 10px 0;">
               <el-input
                 type="textarea"
@@ -245,7 +258,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { changeAssigneeNew, inboundLiaisonDetail, queryDetail } from "api/process";
+import { inboundLiaisonDetail, queryDetail, saveTaskForPub ,changeAssigneeNew, execTask} from "api/process";
 
 export default {
   name: "xmqdqrStep5",
@@ -256,23 +269,30 @@ export default {
   },
   data() {
     return {
+      lawInfoTableLoading: true,
+      lawInfoTable:[],
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
+      drawerTitle:'',
       active: "1",
+      nodeList: [],
+      nodeList2: [],
       loading: false,
       // 当前流程类型(1待办/2已办)
       processType: 1,
-      nodeList: [],
-      drawerTitle: '',
-      // 调整处理人抽屉状态
-      drawerModal: false,
       isSubmit: false,
-      isTransfer: false,
       saveLoading: false,
+      submitShow: false,
+      acceptShow: false,
+      todoId: '',
       projectId: "",
       detailedId: "",
       standSortOptions: [],
       standList: [],
       projectStand:[],
       standardData: [],
+      handleSelectTableList: [], //标准数据
       page: 1,
       pageSize: this.$store.getters.userInfo.configContent,
       total: 0,
@@ -299,10 +319,34 @@ export default {
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
       standMap: new Map(),
-      textStatusMap: {}// 文本状态id与name对应
+      textStatusMap: {},// 文本状态id与name对应
     };
   },
+  mounted() {
+    this.processTable();
+    this.getData();
+    // 查询各下拉框数据
+    this.$http.get("sys/dictype/getDicTypeListCode", {}, {
+      _this: this,
+      loading: "loading"
+    }, res => {
+      this.energyKindOptions = res.data.ENERGYTYPES; //适用车型
+      this.standSortOptions = res.data.STANDCLASSIFY; // 标准类别
+      this.setMap(res.data.WBZTCLASS);// 文本状态
+      this.setMap(this.zrbmMap, res.data.ZRBMCLASS);
+      this.showLocalProductData(this.getLocalPro);
+    }, e => {
+    });
+  },
   methods: {
+    formatIssueDate(str) {
+      const momentDate = this.$moment(str)
+      if (momentDate.isValid()) {
+        return this.$moment(str).format('YYYY-MM-DD')
+      } else {
+        return str
+      }
+    },
     //确认转办
     checkedTransferRole (data) {
       this.assigneeNewLoading = true
@@ -324,7 +368,7 @@ export default {
       })
     },
     // 请求转换流程图
-    processNum () {
+    processNum (row) {
       axios.request({
         url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
         responseType: 'blob',
@@ -338,6 +382,18 @@ export default {
         this.processStep = window.URL.createObjectURL(res.data)
       })
     },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
+    // 将文本状态的id与name对应
+    setMap(data) {
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label)
+      })
+    },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,
@@ -375,6 +431,15 @@ export default {
         }).then(res => {
           if (res) {
             const processForm = JSON.parse(res.mesg);
+            let commitStatus = res.commitStatus
+            if(commitStatus && commitStatus > 0){
+              this.acceptShow = true
+              this.submitShow = false
+            }else {
+              this.acceptShow = false
+              this.submitShow = true
+            }
+            this.todoId = res.id
             this.getFormFieldList(processForm);
           }
         }).catch(e => {
@@ -388,45 +453,92 @@ export default {
           this.qdform = JSON.parse(JSON.stringify(item));
           this.qdform.prcNum = this.prcNum;
           this.qdform.prcName = this.prcName;
-          this.dataList = item.dataList
           this.qdform["id"] = item.id;
-          this.projectId = item.projectId
+          this.dataList = item.dataList
+          this.dataList.forEach(item => {
+            if(item.involve === 'involve'){
+              item.involve = '涉及'
+            }else if(item.involve === 'noInvolve'){
+              item.involve = '不涉及'
+            }
+          })
+          // this.projectId = item.projectId;
+          // //获取清单id 查询对应清单下的标准
+          // this.detailedId = item.detailedListId;
           // this.getStandData();
         }else{
           this.qdform = item.form
           this.dataList =item.form.dataList
-          this.projectId = item.form.projectId
-          // this.getStandData();
+          this.detailedId = item.form.detailedListId;
         }
       });
     },
-    //提交事件
-    handleSubmit() {
-      this.isSubmit = true;
-      this.qdform.passFlag = "0";
-      this.qdform.commentText = this.commentText;
-      this.qdform.dataList = this.dataList
-      const json = JSON.stringify(this.qdform);
-      this.$http.post("lawss/activiti/completeTask", {
-        taskIds: this.taskIds,
-        userId: this.userId,
-        json: json
-      }, {
+    //查询清单下的标准
+    getStandData() {
+      this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId, cars: '1', }, {
         _this: this
       }, res => {
-        if (res.success) {
-          this.$message.success(res.message);
-          this.$router.push("/processCenter");
-        }
-        this.isSubmit = false;
-      }, e => {
+        this.dataList = res.data.records;
+        this.dataList.forEach(item => {
+          // 责任部门转换
+          if (item.zrbm !== null || item.zrbm !== "" ) {
+            let k = (item.zrbm || "").split(",");
+            for (let i in this.zrbmOptions) {
+              for (let m = 0; m < k.length; m++) {
+                if (this.zrbmOptions[i].value === k[m]) {
+                  k[m] = this.zrbmOptions[i].label;
+                }
+                item.zrbm = k.join(",");
+              }
+            }
+          }
+        });
+        this.dataList.map(item => {
+          if(item.zrbm === '[]'){
+            item.zrbm = ''
+          }
+        })
       });
     },
-    //转办事件
-    handleTransfer(){
-      this.drawerModal = true
-      this.drawerTitle = '转办处理人'
-      this.selectPeople = row
+    // 接受按钮
+    handleAccept(){
+      this.isSubmit = true
+      execTask({
+        todoId: this.todoId // 当前节点ID
+      }).then(res => {
+        if (res.sign && res.sign === '0') {
+          this.$message.success('接收成功')
+          this.$router.push('/processCenter')
+        }
+        this.isSubmit = false
+      })
+    },
+    //保存事件
+    handleSave() {
+      this.saveLoading = true;
+      let _formData = new FormData();
+      this.qdform.dataList = this.dataList
+      _formData.append("id", this.bpnId || "");
+      _formData.append("prcType", "10");
+      _formData.append('taskIds', this.taskIds)
+      _formData.append("json", JSON.stringify({
+        form: this.qdform,
+        commentText: this.commentText
+      }));
+      saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false;
+        this.$message.success("保存成功");
+        this.bpnId = res.result;
+      }).catch(e => {
+        this.saveLoading = false;
+      });
+    },
+    handleRemark(){
+      this.dataList.map(item => {
+        if(item.involve === 'noInvolve'){
+          comFlag
+        }
+      })
     },
     //驳回事件
     beforeBack() {
@@ -451,9 +563,32 @@ export default {
         });
       }
     },
+    //提交事件
+    handleSubmit() {
+      this.isSubmit = true;
+      this.qdform.passFlag = "0";
+      this.qdform.commentText = this.commentText;
+      this.qdform.dataList = this.dataList
+      const json = JSON.stringify(this.qdform);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+        this.isSubmit = false;
+      }, e => {
+      });
+    },
     //添加标准勾选框数据
-    selectStand(data) {
-      this.standList = data;
+    handleSelectTableChange (data) {
+      this.handleSelectTableList = data
+      console.log(this.handleSelectTableList);
     },
     selectStandChange(data){
       this.projectStand = data
@@ -477,7 +612,7 @@ export default {
         this.standList.map(item => {
           let addIndex
           addIndex = this.dataList.findIndex(items =>{
-            return items.standId === item.id
+            return items.id === item.id
           })
           if(addIndex > -1){
             this.$message.warning('请勿重复添加数据')
@@ -490,80 +625,13 @@ export default {
       }
 
     },
-    //添加标准的查询按钮
-    search() {
-      this.getStand();
-    },
-    clearSearch() {
-      this.standCommonlySearch = {
-        standSort: "",
-        standNumber: "",
-        standType: ""
-      };
-      this.getStand();
-    },
-    pageChange(page) {
-      this.page = page;
-      this.getStand();
-    },
-    pageSizeChange(pageSize) {
-      this.pageSize = pageSize;
-      this.getStand();
-    },
-    getStand(data) {
-      this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
-        id: this.detailedId,
-        page: this.page,
-        Size: this.pageSize,
-        ...this.standCommonlySearch
-      }, {
-        _this: this
-      }, res => {
-        if (res.data === null) {
-          this.standardData = "";
-          this.totalDo = "";
-        }
-        this.standardData = res.data.records;
-        this.standardData.forEach(item => {
-          if (item.zccssrqgj === "-") {
-            item.zccssrqgj = "";
-          }
-          if (item.xcxssrqgj === "-") {
-            item.xcxssrq = "";
-          }
-        });
-        this.total = res.data.total;
-      });
-    },
-    // 将文本状态的id与name对应
-    setMap(data) {
-      data.forEach(item => {
-        this.$set(this.textStatusMap, item.value, item.label);
-      });
-    },
   },
   computed: {
     listNoDataText() {
       return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
     }
   },
-  mounted() {
-    this.processTable();
-    this.getData();
-    // 查询各下拉框数据
-    this.$http.get("sys/dictype/getDicTypeListCode", "", {
-      _this: this,
-      loading: "loading"
-    }, res => {
-      this.energyKindOptions = res.data.ENERGYTYPES; //适用车型
-      this.standSortOptions = res.data.STANDCLASSIFY; // 标准类别
-      this.standStateOptions = res.data.WBZTCLASS; // 文本状态
-      this.setMap(this.zrbmMap, res.data.ZRBMCLASS);
-      this.setMap(this.standStateOptions);
-      this.showLocalProductData(this.getLocalPro);
-    }, e => {
-    });
-  }
+
 };
 </script>
 
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index a5e03bd72..84c472269 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -901,6 +901,17 @@ export default {
                 prcType: row.prcType
               }
             })
+          }else if(row.taskInfo === '标准法规部经理审批'){
+            this.$router.push({
+              name: 'xmqdqrStep5',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }
           break
         case 'laws2':

From 2e844f38ea73131f59f6b7ef5deaac1e884f5aa5 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, 2 Dec 2021 20:51:45 +0800
Subject: [PATCH 30/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../localProductsOrProjectLibrary/pages/details.vue             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 3c9121860..5f0242084 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -100,12 +100,14 @@
           <el-table-column
             prop="standName"
             label="中文名称"
+            min-width="300"
             show-overflow-tooltip
           >
           </el-table-column>
           <el-table-column
             prop="standEnName"
             label="英文名称"
+            min-width="300"
             show-overflow-tooltip
           >
           </el-table-column>

From 6fbf2934548e631bba32d40290ed54d1f0b289d5 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Thu, 2 Dec 2021 21:08:30 +0800
Subject: [PATCH 31/33] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=B8=A6=E5=85=A5=E7=9A=84=E5=BC=B9=E5=87=BA=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=EF=BC=8C=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F=E8=B0=83=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue         | 43 +++++++++++--------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index b54c9cb35..9f531a6f4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -1047,7 +1047,7 @@
         <el-drawer
                 ref="standard"
                 title="查询结果"
-                size="1300px"
+                size="800px"
                 :visible.sync="standardDrawer"
                 direction="rtl"
                 :before-close="handleReviseDrawerClose">
@@ -1055,7 +1055,8 @@
                 <div class="content">
                     <div class="standard-table-search">
                         <el-form :model="standardSearchForm" inline class="label-input-form search-area">
-                            <el-formItem label="标准来源" style="margin-right:-20px" prop="standType" class="search-item" >
+                          <el-row>
+                            <el-formItem label="标准来源" prop="standType" class="search-item" >
                                 <el-select
                                     :popper-append-to-body="false"
                                         v-model="standardSearchForm.standType"
@@ -1064,7 +1065,7 @@
                                     <el-option value="FOREIGN" label="海外标准库"></el-option>
                                 </el-select>
                             </el-formItem>
-                            <el-form-item label="标准类别" style="margin-right:-20px" prop="standSort" class="search-item" >
+                            <el-form-item label="标准类别" prop="standSort" class="search-item" >
                                 <el-select :popper-append-to-body="false" v-model="standardSearchForm.standSort" placeholder="请选择标准类别" filterable clearable>
                                     <el-option
                                             v-for="item in standSortOptions"
@@ -1074,20 +1075,21 @@
                                     ></el-option>
                                 </el-select>
                             </el-form-item>
-                            <el-form-item label="标准编号" style="margin-right:-20px" prop="standNumber" class="search-item" >
+                            <el-form-item label="标准编号" prop="standNumber" class="search-item" >
                                 <el-input
                                         v-model="standardSearchForm.standNumber"
                                         placeholder="请输入标准编号"
                                         clearable
                                         :maxlength="100"></el-input>
                             </el-form-item>
-                            <el-form-item label="中文名称" style="margin-right:-20px" prop="standName" class="search-item" >
+                          </el-row>
+                            <el-form-item label="中文名称" prop="standName" class="search-item" >
                                 <el-input v-model="standardSearchForm.standName"
                                           placeholder="请输入标准名称"
                                           clearable
                                           :maxlength="500"></el-input>
                             </el-form-item>
-                            <el-form-item label="英文名称" style="margin-right:-20px" prop="standEnName" class="search-item">
+                            <el-form-item label="英文名称" prop="standEnName" class="search-item">
                                 <el-input
                                         v-model="standardSearchForm.standEnName"
                                         maxlength="1000"
@@ -1137,6 +1139,7 @@
                             <el-table-column
                                     label="标准号"
                                     align="center"
+                                    min-width="40"
                             >
                                 <template slot-scope="scope">
                                     <a v-if="scope.row.standYear" @click="handlePreview(scope.row)">
@@ -1152,21 +1155,22 @@
                             <el-table-column
                                     prop="textStatus"
                                     label="文本状态"
-                                    align="center">
+                                    align="center"
+                                    min-width="30">
                               <template slot-scope="scope">
                                 <span>{{ textStatusMap[scope.row.textStatus] }}</span>
                               </template>
                             </el-table-column>
-                            <el-table-column label="操作" align="center" width="80">
-                                <template slot-scope="scope">
-                                    <el-button
-                                            class="opera-btn"
-                                            size="mini"
-                                            type="primary"
-                                            @click="handlePreview(scope.row)">查看
-                                    </el-button>
-                                </template>
-                            </el-table-column>
+<!--                            <el-table-column label="操作" align="center" width="80">-->
+<!--                                <template slot-scope="scope">-->
+<!--                                    <el-button-->
+<!--                                            class="opera-btn"-->
+<!--                                            size="mini"-->
+<!--                                            type="primary"-->
+<!--                                            @click="handlePreview(scope.row)">查看-->
+<!--                                    </el-button>-->
+<!--                                </template>-->
+<!--                            </el-table-column>-->
                         </el-table>
                     </div>
                     <pagination
@@ -2810,6 +2814,11 @@
 <style lang="less" scoped>
     @import '~@/assets/styles/style';
     .bzrkStep1 {
+      /deep/ .search-area {
+        display: contents;
+        flex-wrap: wrap;
+        justify-content: space-around;
+      }
       /deep/ .el-upload-dragger {
         background-color: #fff;
         border: 1px dashed #d9d9d9;

From 37e593b82d8abf8543f13b7d9d870374c274216e Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Thu, 2 Dec 2021 21:13:16 +0800
Subject: [PATCH 32/33] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=A0=87=E9=A2=98=E5=90=8E=E5=A4=9A=E6=8B=BC?=
 =?UTF-8?q?=E4=BA=86=E4=B8=80=E4=B8=AA-?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherStandardDetails/index.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 9e7527983..dd9c0b8d1 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -3,7 +3,10 @@
   <div class="other-standard-details v-class" :class="{'hidden': !isMoreAwayBtn}">
     <!--title 标题-->
     <div class="details-header">
-      <span>{{ sarStandardsInfoEO.standSortShow || '' }} {{
+      <span v-if="sarStandardsInfoEO.standYear === null">{{ sarStandardsInfoEO.standSortShow || '' }} {{
+          sarStandardsInfoEO.standNumber
+        }} 《{{ sarStandardsInfoEO.standName }}》</span>
+      <span v-else>{{ sarStandardsInfoEO.standSortShow || '' }} {{
           sarStandardsInfoEO.standNumber
         }}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName }}》</span>
     </div>

From 5855f25abdafc529dfa976a67e9da22fa075fbf7 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Thu, 2 Dec 2021 21:49:06 +0800
Subject: [PATCH 33/33] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E9=80=82=E7=94=A8?=
 =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/localTool/standardWarning.vue | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue
index 5203e4016..308c3e146 100644
--- a/src/pages/localTool/standardWarning.vue
+++ b/src/pages/localTool/standardWarning.vue
@@ -641,7 +641,20 @@ export default {
       }, {
         _this: this
       }, res => {
-        console.log('805',res)
+        // 适用车型转换
+        for (let a = 0; a < res.data.records.length; a++) {
+          if (res.data.records[a].applyType !== null) {
+            let k = (res.data.records[a].applyType || "").split(",");
+            for (let i in this.energyKindOptions) {
+              for (let m = 0; m < k.length; m++) {
+                if (this.energyKindOptions[i].value === k[m]) {
+                  k[m] = this.energyKindOptions[i].label;
+                }
+                res.data.records[a].applyType = k.join(",");
+              }
+            }
+          }
+        }
         this.warningTableDatas = res.data.records
         this.pageConfig.page = res.data.current
         this.pageConfig.pageSize = res.data.size
@@ -650,9 +663,8 @@ export default {
         this.warningTableLoading = false
       }, e => {
       });
-
     });
-
+    this.searchBtnClick()
 
   }
 };