diff --git a/package-lock.json b/package-lock.json
index 3d1e87236..0b1644602 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9208,7 +9208,7 @@
     },
     "image-size": {
       "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
+      "resolved": "https://registry.nlark.com/image-size/download/image-size-0.5.5.tgz",
       "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
       "dev": true,
       "optional": true
@@ -11040,6 +11040,12 @@
         "polyline-miter-util": "^1.0.1"
       }
     },
+    "popper.js": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npm.taobao.org/popper.js/download/popper.js-1.16.1.tgz",
+      "integrity": "sha1-KiI8s9x7YhPXQOQDcr5A3kPmWxs=",
+      "dev": true
+    },
     "portfinder": {
       "version": "1.0.28",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
@@ -12300,6 +12306,11 @@
         "is-plain-obj": "^1.0.0"
       }
     },
+    "sortablejs": {
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz",
+      "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w=="
+    },
     "source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -13519,8 +13530,8 @@
     },
     "vue-loader-v16": {
       "version": "npm:vue-loader@16.3.3",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.3.3.tgz",
-      "integrity": "sha512-/1GzCuQ6MRORbC+leKTKoTGtpQt60bYe0gDGEextSteA2OM+v201FPha5jzmjQzVhRcwieZeUvezAtG5a/e5cw==",
+      "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.3.3.tgz",
+      "integrity": "sha1-5EDk6xJ4bhYTi12YthIgjynd9TI=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -13531,8 +13542,8 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995651629&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
+          "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -13541,8 +13552,8 @@
         },
         "chalk": {
           "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.1.tgz",
+          "integrity": "sha1-yAs/qyi/Y3HmhjMl7uZ+YYt35q0=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -13552,8 +13563,8 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
+          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -13562,29 +13573,29 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
+          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
           "dev": true,
           "optional": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626716578584&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz",
+          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
           "dev": true,
           "optional": true
         },
         "hash-sum": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
-          "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
+          "resolved": "https://registry.npm.taobao.org/hash-sum/download/hash-sum-2.0.0.tgz",
+          "integrity": "sha1-gdAbtd6OpKIUrV1urRtSNGCwtFo=",
           "dev": true,
           "optional": true
         },
         "loader-utils": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
+          "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
           "dev": true,
           "optional": true,
           "requires": {
@@ -13595,8 +13606,8 @@
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1626703455199&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
+          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
           "dev": true,
           "optional": true,
           "requires": {
diff --git a/package.json b/package.json
index bdd1937f8..ab87a247b 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "jquery": "^3.5.1",
     "js-base64": "^2.6.2",
     "moment": "^2.29.1",
+    "sortablejs": "^1.14.0",
     "v-charts": "^1.19.0",
     "vue": "^2.6.11",
     "vue-clipboard2": "^0.3.1",
@@ -34,6 +35,7 @@
     "@vue/cli-service": "~4.5.0",
     "less": "^3.13.1",
     "less-loader": "^5.0.0",
+    "popper.js": "^1.16.1",
     "vue-template-compiler": "^2.6.11",
     "webpack": "^4.27.1"
   }
diff --git a/src/common/verify/index.js b/src/common/verify/index.js
index acb0272ba..2f030082a 100644
--- a/src/common/verify/index.js
+++ b/src/common/verify/index.js
@@ -457,6 +457,15 @@ export default {
       callback()
     }
   },
+  // 验证输入数字和英文
+  testNumberCode (rule, value, callback) {
+    let reg = /[0-9\-]/
+    if (value !== '' && !value.match(reg)) {
+      return callback(new Error('只能输入数字'))
+    } else {
+      callback()
+    }
+  },
   validUrl (rule, value, callback) {
     let reg = /(^((https|ftp|http|file):\/\/)|www\.)*([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/gm
     if (!value.match(reg)) {
diff --git a/src/components/CustomFormComponents/DatePicker.vue b/src/components/CustomFormComponents/DatePicker.vue
index 19fbd067e..c5ea683dc 100644
--- a/src/components/CustomFormComponents/DatePicker.vue
+++ b/src/components/CustomFormComponents/DatePicker.vue
@@ -11,6 +11,8 @@
       :class="{'form-item-disabled': disabled}"
     >
       <el-date-picker
+        :value-format="valueFormat"
+        format="yyyy-MM-dd"
         :value="value"
         type="date"
         :editable="true"
@@ -38,6 +40,10 @@ export default {
       type: Boolean,
       default: false
     },
+    valueFormat: {
+      type: String,
+      default: 'yyyy-MM-dd'
+    },
     // 栅格比例
     span: {
       type: Number,
diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue
index 13cd59906..2ce3f679f 100644
--- a/src/components/CustomFormComponents/InputForStandards.vue
+++ b/src/components/CustomFormComponents/InputForStandards.vue
@@ -120,7 +120,7 @@
         @pageChange="pageChangeReplace"
         @pageSizeChange="pageSizeChangeReplace"></pagination>
       <div slot="footer" class="demo-drawer-footer">
-        <el-button class="common-button-default" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
+        <el-button class="common-button-default" round icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
         <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
       </div>
     </el-dialog>
@@ -336,7 +336,7 @@ export default {
         standNum = item.standSort + ' ' + item.standNumber
       }
       // 验证标准号在系统中是否存在
-      this.$http.post('lawss/sarTestItem/validateStandNumber', {
+      this.$http.post('sarStandardsInfo/sar-standards-info/validateStandNumber', {
                 standnumber: standNum
               }, {
                 _this: this
diff --git a/src/pages/config/pages/linkManage/index.vue b/src/pages/config/pages/linkManage/index.vue
index df2ef0f22..f23611502 100644
--- a/src/pages/config/pages/linkManage/index.vue
+++ b/src/pages/config/pages/linkManage/index.vue
@@ -1,322 +1,356 @@
 <!-- 配置管理 - 链接管理 -->
 <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',
+    <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="name"
-            label="链接名称"
-            width="220px">
-        </el-table-column>
-        <el-table-column
-            prop="url"
-            label="链接">
-        </el-table-column>
-<!--        <el-table-column-->
-<!--            prop="orderBy"-->
-<!--            label="序号"-->
-<!--            sortable-->
-<!--            width="170px">-->
-        </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
-        :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="请输入链接名称"
-                    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"
-                    placeholder="请输入链接"
-                    clearable></el-input>
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="demo-drawer-footer">
+                    @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="链接名称"
+                        width="220px">
+                </el-table-column>
+                <el-table-column
+                        prop="url"
+                        label="链接">
+                </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
+                :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="请输入链接名称"
+                              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"
+                              placeholder="请输入链接"
+                              clearable></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>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
-  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' }
-          ]
-        },
+ 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'
-        },
+                modalRole: false,
+                props: {
+                    label: 'name',
+                    children: 'children'
+                },
 
-        linkList: []
-      }
-    },
-    methods: {
-      //头部新增按钮
-      addLink () {
-        this.type = 1
-        this.dialogTitle = '新增链接'
-        this.modalshowflag = true
-      },
-
-      //头部顺序调整按钮
-      linkOrder () {
-        this.order=[]
-        for (var i=0;i<this.linkList.length;i++){
-          this.order.push({
-            urlId:this.linkList[i].id,
-            sortId:this.linkList[i].sortId
-          })
-        }
-        this.$http.postData('sarUrl/tsUrl/order',this.order, {}, res => {
-          if (res.ok) {
-          }else {
-            this.$message.warning(res.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.nodeList = this.selectList[0].idList
-          this.$http.delete('sarUrl/tsUrl/deleteBatch', {
-            ids: this.ids
-          }, {}, res => {
-            if (res.ok) {
-              this.$message.success('删除成功')
-              this.getLink()
-            }else {
-              this.$message.warning(res.message)
+                linkList: [],
+                sortData: [],
             }
-          })
-        }
-      },
-
-      //弹窗关闭操作
-      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)
+        },
+        methods: {
+            //头部新增按钮
+            addLink () {
+                this.type = 1
+                this.dialogTitle = '新增链接'
+                this.modalshowflag = true
+            },
+            //表格中操作列删除操作弹窗
+            deleteLink (row) {
+                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)
+                    }
+                })
+            },
+            //头部删除按钮
+            deleteAllLink() {
+                this.selectId=[]
+                for (var i=0;i<this.selectList.length;i++){
+                    this.selectId.push(this.selectList[i].id)
                 }
-              })
-            } 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()
+                this.ids = this.selectId.join(",")
+                if (this.selectList.length === 0) {
+                    this.$message.warning('请选择要删除的链接')
                 } else {
-                  this.$message.warning(res.message)
+                    this.modalRole = true
+                    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)
+                        }
+                    })
                 }
-              })
-            }
-          } else {
-            return false;
-          }
-        });
-      },
-
-      //表格中操作列
-      handleCommand (command) {
-        switch (command[1]) {
-          case '删除':
-            this.deleteLink(command[0])
-            break
-          case '编辑':
-            this.editLink(command[0])
-            break
+            },
+            //弹窗关闭操作
+            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();
         }
-      },
-
-      //表格中操作列删除操作弹窗
-      deleteLink (row) {
-        this.$http.delete('sarUrl/tsUrl/delete', {
-          id: row.id
-        }, {
-          _this: this,
-          loading: 'Loading'
-        }, res => {
-          if (res.ok) {
-            this.$message.success('删除成功')
-            this.getLink()
-          }else {
-            this.$message.warning(res.message)
-          }
-        })
-      },
-
-      //表格中操作列编辑操作弹窗
-      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
-        })
-      },
-    },
-    mounted() {
-      this.getLink();
     }
-  }
 </script>
 
 <style lang="less" scoped>
-  @import '~@/assets/styles/mixins';
-  #post-manage {
-    height: 100%;
-    .content {
-      height: calc(~'100% - 53px')
+    @import '~@/assets/styles/mixins';
+    #post-manage {
+        height: 100%;
+        .content {
+            height: calc(~'100% - 53px')
+        }
+        .filter-tree {
+            height: calc(~'100% - 50px')
+        }
     }
-    .filter-tree {
-      height: calc(~'100% - 50px')
-    }
-  }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 0d47b1ac6..179e7af34 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -47,7 +47,7 @@
                 <p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>
                 <p><label style=" margin-right: 150px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
                 <p><label style=" margin-right: 150px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
-                <p><label style=" margin-right: 150px;">标准性质</label><span>{{ sarStandardsInfoEO.standNature || '-' }}</span></p>
+                <p><label style=" margin-right: 150px;">标准性质</label><span>{{ standMap[sarStandardsInfoEO.standNature] || '-' }}</span></p>
                 <p>
                   <label style=" margin-right: 132px;"
                           title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
@@ -246,7 +246,7 @@
                   v-for="(file, fileIndex) in child.value"
                   :key="fileIndex"
                 >
-                  <span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span>
+<!--                  <span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span>-->
                   <!--发布稿、增补件单独设置下载权限-->
                   <template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG'
                   || child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
@@ -1250,6 +1250,7 @@ export default {
       itemsText: '',
       itemsTextDialogs: false,
       textStatusMap: {},
+      standMap: {}
     }
   },
   props: {
@@ -1260,8 +1261,10 @@ export default {
     setMap(data){
       data.forEach(item => {
         this.$set(this.textStatusMap, item.value, item.label)
+        this.$set(this.standMap, item.value, item.label)
       })
       console.log(this.textStatusMap, '文本状态的值')
+      console.log(this.standMap, '标准性质')
     },
     statusClick () {
       let routeUrl = this.$router.resolve({
@@ -2630,6 +2633,7 @@ export default {
       this.requestOptions = res.data.REQUESTTYPE
       this.BZFGGXOUIUJ = res.data.BZFGGXOUIUJ // 企标覆盖关系
       this.setMap(res.data.WBZTCLASS) // 文本状态
+      this.setMap(res.data.SARPROPERTY) // 标准性质
     }, e => {
     })
     Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then((values) => {
diff --git a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue
index 9251b1c8f..2c38af157 100644
--- a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue
+++ b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue
@@ -53,10 +53,10 @@
                 </el-col>
                 <el-col :span="6">
                   <el-tooltip class="item" effect="dark" :content="item.collectTitle" placement="top" v-if="item.collectTitle">
-                    <div class="left-contents">标题：{{ item.collectTitle }}</div>
+                    <div class="left-contents" @click="getDetail(item)">标题：{{ item.collectTitle }}</div>
                   </el-tooltip>
                   <div v-else>
-                    <div class="left-contents">标题：{{ item.collectTitle }}</div>
+                    <div class="left-contents" @click="getDetail(item)">标题：{{ item.collectTitle }}</div>
                   </div>
                 </el-col>
                 <el-col :span="4" :offset="3">创建时间：{{getDate(item.creationTime)}}</el-col>
@@ -103,6 +103,16 @@ export default {
     }
   },
   methods: {
+    getDetail(item) {
+      let routeUrl = this.$router.resolve({
+        name: 'OtherStandardDetails',
+        params: {
+          id: item.collectResId,
+          pageType: 'INLAND_STAND'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+    },
     // 重置
     resetSelect () {
       this.search.name = ''
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index 379ce8cf2..00b06a111 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -1,785 +1,709 @@
 <!--标准清单发布/更新流程-->
 <template>
-    <div class="bzqdfb-step1">
-        <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 === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</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
-                        ref="qdfbForm"
-                        :model="listForm"
-                        :rules="formRules"
-                        class="label-input-form prc-content-border"
-                        label-width="150px"
-                >
-                    <el-row :gutter="24">
-                        <el-col :span="24">
-                            <el-form-item label="选择清单" prop="orgName" class="add-form-item form-item-disabled">
-                                <el-radio-group v-model="listType" @change="selectionList">
-                                    <el-radio label="country">国家/地区清单</el-radio>
-                                    <el-radio label="project">项目清单</el-radio>
-                                    <el-radio label="other">其他清单</el-radio>
-                                </el-radio-group>
-                                <el-button size="mini" type="primary" style="margin-left: 40px;" @click="choiceShow">
-                                    选择清单
-                                </el-button>
-                            </el-form-item>
-                            <el-form-item label="清单名称" prop="listName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        disabled
-                                        v-model="listForm.listName"
-                                        placeholder="请输入清单名称"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <!--              <el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled add-form-el-select">-->
-                            <!--&lt;!&ndash;                <el-input&ndash;&gt;-->
-                            <!--&lt;!&ndash;                  v-model="listForm.applyRegion"&ndash;&gt;-->
-                            <!--&lt;!&ndash;                  placeholder="请输入适用区域"&ndash;&gt;-->
-                            <!--&lt;!&ndash;                  clearable&ndash;&gt;-->
-                            <!--&lt;!&ndash;                ></el-input>&ndash;&gt;-->
-                            <!--                <el-select-->
-                            <!--                  width="120"-->
-                            <!--                  v-model="listForm.applyRegion"-->
-                            <!--                  placeholder="请选择适用区域"-->
-                            <!--                  filterable-->
-                            <!--                >-->
-                            <!--                  <el-option-->
-                            <!--                    v-for="item in countryOptions"-->
-                            <!--                    :value="item.value"-->
-                            <!--                    :key="item.value"-->
-                            <!--                    :label="item.label"-->
-                            <!--                  >-->
-                            <!--                  </el-option>-->
-                            <!--                </el-select>-->
-                            <!--              </el-form-item>-->
-                            <el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="listForm.descriptionList"
-                                        placeholder="请输入清单说明"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <!--              <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">-->
-                            <!--                <el-input-->
-                            <!--                  disabled-->
-                            <!--                  style="display: none;"-->
-                            <!--                  v-model="listForm.modelName"-->
-                            <!--                  clearable-->
-                            <!--                ></el-input>-->
-                            <!--                <div v-if="listForm.modelName" @click="fileUpload" class="fileClass">-->
-                            <!--                  {{ listForm.modelName }}-->
-                            <!--                </div>-->
-                            <!--                <div v-else>-->
-                            <!--                  <el-button-->
-                            <!--                    type="primary"-->
-                            <!--                    class="common-button-primary"-->
-                            <!--                    @click="fileUpload"-->
-                            <!--                    size="mini">-->
-                            <!--                    点击上传-->
-                            <!--                  </el-button>-->
-                            <!--                </div>-->
-                            <!--              </el-form-item>-->
-                            <el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled">
-                                <el-upload
-                                        v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "
-                                        :action="uploadFileListPath"
-                                        show-file-list
-                                        :file-list="fileInfoList"
-                                        name="file"
-                                        accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
-                                        :on-remove="delFileInfo"
-                                        :on-success="uploadBackSuccess"
-                                        :before-upload="beforeUpload"
-                                >
-                                    <el-button class="common-button-default" size="mini">
-                                        点击上传
-                                    </el-button>
-                                </el-upload>
-                                <el-input
-                                        v-else
-                                        v-model="listForm.fileId"
-                                        placeholder=""
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled">
-                                <el-radio-group v-model="signFlag" @change="selectSign">
-                                    <el-radio label="1">是</el-radio>
-                                    <el-radio label="2">否</el-radio>
-                                </el-radio-group>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </el-form>
-                <process-title>
-                    <template slot="title">填写信息</template>
-                </process-title>
-                <div class="tableTitle">
-                    <div class="tableButton">
-                        <el-button plain class="common-button-primary" size="mini" @click="addList">添加</el-button>
-                        <el-button plain class="common-button-primary" size="mini" @click="deleteList">批量删除</el-button>
-                    </div>
-                </div>
-                <el-table
-                        :data="dataList"
-                        border
-                        ref="selection"
-                        height="49%"
-                        style="width: 100%;"
-                        @selection-change="selectStandChange"
-                        :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
-                            prop="code"
-                            fixed="left"
-                            width="180px"
-                            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"
-                            label="标准名称"
-                            align="center"
-                            width="260px"
-                    >
-                    </el-table-column>
-                    <el-table-column
-                            prop="issueTime"
-                            align="center"
-                            label="发布日期">
-                    </el-table-column>
-                    <el-table-column
-                            prop="xcxssrq"
-                            align="center"
-                            label="新车型实施日期">
-                    </el-table-column>
-                    <el-table-column
-                            show-overflow-tooltip
-                            prop="zccssrq"
-                            align="center"
-                            label="在产车实施日期">
-                    </el-table-column>
-                    <el-table-column
-                            show-overflow-tooltip
-                            prop="textStatus"
-                            align="center"
-                            width="120px"
-                            label="文本状态">
-                    </el-table-column>
-                </el-table>
-            </div>
-        </div>
-        <div class="content" v-show="active === '2'">
-            <div class="block" style="padding-top: 20px;">
-                <el-timeline>
-                    <el-form
-                            ref="Form"
-                            :model="roleForm"
-                            :rules="roleFormRules"
-                            class="label-input-form">
-                        <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
-                            <el-card>
-                                <el-form-item prop="startUserName" style="margin-bottom: 0">
-                                    <h4>标准/政策法规工程师</h4>
-                                    <div style="margin-top: 10px;width: 300px;">
-                                        <el-input v-model="roleForm.startUser" style="display: none;"></el-input>
-                                        <el-input v-model="roleForm.startUserName" placeholder="流程发起人"
-                                                  disabled></el-input>
-                                    </div>
-                                </el-form-item>
-                            </el-card>
-                        </el-timeline-item>
-                        <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top"
-                                          :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '1'">
-                            <el-card>
-                                <el-form-item prop="dockUserName" style="margin-bottom: 0">
-                                    <h4>会签人</h4>
-                                    <div style="margin-top: 10px;width: 300px;">
-                                        <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
-                                        <el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人"
-                                                  @click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">
-                                        </el-input>
-                                    </div>
-                                </el-form-item>
-                            </el-card>
-                        </el-timeline-item>
-                        <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top"
-                                          :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '2'">
-                            <el-card>
-                                <el-form-item prop="dockUserName2" style="margin-bottom: 0">
-                                    <h4>会签人</h4>
-                                    <div style="margin-top: 10px;width: 300px;">
-                                        <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
-                                        <el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人"
-                                                  @click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">
-                                        </el-input>
-                                    </div>
-                                </el-form-item>
-                            </el-card>
-                        </el-timeline-item>
-                        <el-timeline-item timestamp="根据会签意见修订" placement="top"
-                                          :color="roleForm.ministerUser ? '#66b1ff' : ''">
-                            <el-card>
-                                <el-form-item prop="ministerUserName" style="margin-bottom: 0">
-                                    <h4>标准/政策法规工程师</h4>
-                                    <div style="margin-top: 10px;width: 300px;">
-                                        <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
-                                        <el-input v-model="roleForm.ministerUserName" placeholder="选择标准/政策法规工程师"
-                                                  @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input>
-                                    </div>
-                                </el-form-item>
-                            </el-card>
-                        </el-timeline-item>
-                        <el-timeline-item timestamp="审批" placement="top"
-                                          :color="roleForm.directorUser ? '#66b1ff' : ''">
-                            <el-card>
-                                <el-form-item prop="directorUserName" style="margin-bottom: 0">
-                                    <h4>业务经理</h4>
-                                    <div style="margin-top: 10px;width: 300px;">
-                                        <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
-                                        <el-input v-model="roleForm.directorUserName" placeholder="选择业务经理"
-                                                  @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"></el-input>
-                                    </div>
-                                </el-form-item>
-                            </el-card>
-                        </el-timeline-item>
-                    </el-form>
-                </el-timeline>
-            </div>
-        </div>
-        <!-- 选择清单抽屉-->
-        <el-drawer
-                title="选择清单"
-                :visible.sync="ListModel"
-                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 :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form"
-                                     style="margin-left:10px">
-                                <!--                <el-form-item label="国家/地区" class="search-item search-item-last">-->
-                                <!--                  <el-select-->
-                                <!--                    v-model="sarSarAccessEOSearch.countryArea"-->
-                                <!--                    placeholder="请选择"-->
-                                <!--                    filterable-->
-                                <!--                  >-->
-                                <!--                    <el-option-->
-                                <!--                      v-for="item in countryOptions"-->
-                                <!--                      :value="item.value"-->
-                                <!--                      :key="item.value"-->
-                                <!--                      :label="item.label"-->
-                                <!--                    >-->
-                                <!--                    </el-option>-->
-                                <!--                  </el-select>-->
-                                <!--                </el-form-item>-->
-                                <el-form-item label="清单名称" class="search-item search-item-last">
-                                    <el-input
-                                            v-model="sarSarAccessEOSearch.detailedListName"
-                                            placeholder="请输入清单名称"
-                                    ></el-input>
-                                </el-form-item>
-                                <el-form-item class="search-item btn-box">
-                                    <el-button
-                                            :loading="searching"
-                                            type="primary"
-                                            class="common-button-primary"
-                                            size="small"
-                                            v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
-                                            @click="selectionList">
-                                        查询
-                                    </el-button>
-                                </el-form-item>
-                                <el-form-item class="search-item btn-box">
-                                    <el-button
-                                            class="common-button-default"
-                                            size="small"
-                                            v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
-                                            @click="clearSearch">清空
-                                    </el-button>
-                                </el-form-item>
-                            </el-form>
-                        </div>
-                        <el-table
-                                v-if="listType === 'country'"
-                                :data="sarAccessListDatas"
-                                tooltip-effect="dark"
-                                style="width: 100%"
-                                border
-                                height="100%"
-                                :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
-         fontWeight: 'bold', height: '48px'}"
-                                @selection-change="selectListChange"
-                                ref="selection"
-                        >
-                            <el-table-column
-                                    type="selection"
-                                    width="55"
-                                    align="center">
-                            </el-table-column>
-                            <el-table-column
-                                    prop="countryArea"
-                                    label="国家/地区"
-                                    align="center">
-                            </el-table-column>
-                            <el-table-column
-                                    prop="detailedListName"
-                                    label="清单名称"
-                                    align="center"
-                            >
-                                <template slot-scope="scope">
-                                    <a class="table-jump" @click.stop="showTable(scope.row)">{{
-                                        scope.row.detailedListName }}</a>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                    prop="detailedListState"
-                                    label="清单状态"
-                                    align="center">
-                                <template slot-scope="scope">
-                                    <span v-if="scope.row.detailedListState === '0'">未发布</span>
-                                    <span v-if="scope.row.detailedListState === '1'">已发布</span>
-                                    <span v-if="scope.row.detailedListState === '3'">审核中</span>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                    prop="detailedListVision"
-                                    label="清单版本"
-                                    align="center">
-                                <template slot-scope="scope">
-            <span
-                    v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
-              }}</span>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                    prop="applicationScope"
-                                    label="适用领域"
-                                    align="center">
-                                <template slot-scope="scope">
-            <span
-                    v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
-              }}</span>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                    prop="updateTime"
-                                    label="更新时间"
-                                    sortable
-                                    align="center">
-                                <template slot-scope="scope">
-                                    <div>
-                                        {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD
-                                        hh:mm:ss") : scope.row.updateTime
-                                        }}
-                                    </div>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                    prop="updatePeople"
-                                    label="更新人"
-                                    align="center">
-                            </el-table-column>
-                        </el-table>
-                        <el-table
-                                v-if="listType === 'project'"
-                                :data="sarAccessListDatas"
-                                tooltip-effect="dark"
-                                style="width: 100%"
-                                border
-                                height="100%"
-                                :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
-         fontWeight: 'bold', height: '48px'}"
-                                @selection-change="selectListChange"
-                                ref="selection"
-                        >
-                            <el-table-column
-                                    type="selection"
-                                    width="55"
-                                    align="center">
-                            </el-table-column>
-                            <el-table-column
-                                    prop="projectName"
-                                    label="项目名称"
-                                    align="center">
-                            </el-table-column>
-                            <el-table-column
-                                    prop="detailedListName"
-                                    label="清单名称"
-                                    align="center"
-                            >
-                                <template slot-scope="scope">
-                                    <a class="table-jump" @click.stop="showTable(scope.row)">{{
-                                        scope.row.detailedListName }}</a>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                    prop="detailedListState"
-                                    label="清单状态"
-                                    align="center">
-                                <template slot-scope="scope">
-                                    <span v-if="scope.row.detailedListState === '0'">未发布</span>
-                                    <span v-if="scope.row.detailedListState === '1'">已发布</span>
-                                    <span v-if="scope.row.detailedListState === '3'">审核中</span>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                    prop="detailedListVision"
-                                    label="清单版本"
-                                    align="center">
-                                <template slot-scope="scope">
-            <span
-                    v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
-              }}</span>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                    prop="applicationScope"
-                                    label="适用领域"
-                                    align="center">
-                                <template slot-scope="scope">
-            <span
-                    v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
-              }}</span>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                    prop="updateTime"
-                                    label="更新时间"
-                                    sortable
-                                    align="center">
-                                <template slot-scope="scope">
-                                    <div>
-                                        {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD
-                                        hh:mm:ss") : scope.row.updateTime
-                                        }}
-                                    </div>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                    prop="updatePeople"
-                                    label="更新人"
-                                    align="center">
-                            </el-table-column>
-                        </el-table>
-                        <el-table
-                                v-if="listType === 'other'"
-                                :data="sarAccessListDatas"
-                                tooltip-effect="dark"
-                                style="width: 100%"
-                                border
-                                height="100%"
-                                :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
-         fontWeight: 'bold', height: '48px'}"
-                                @selection-change="selectListChange"
-                                ref="selection"
-                        >
-                            <el-table-column
-                                    type="selection"
-                                    width="55"
-                                    align="center">
-                            </el-table-column>
-                            <el-table-column
-                                    prop="detailedList"
-                                    label="清单类别"
-                                    align="center">
-                            </el-table-column>
-                            <el-table-column
-                                    prop="detailedListName"
-                                    label="清单名称"
-                                    align="center"
-                            >
-                                <template slot-scope="scope">
-                                    <a class="table-jump" @click.stop="showTable(scope.row)">{{
-                                        scope.row.detailedListName }}</a>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                    prop="detailedListState"
-                                    label="清单状态"
-                                    align="center">
-                                <template slot-scope="scope">
-                                    <span v-if="scope.row.detailedListState === '0'">未发布</span>
-                                    <span v-if="scope.row.detailedListState === '1'">已发布</span>
-                                    <span v-if="scope.row.detailedListState === '3'">审核中</span>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                    prop="detailedListVision"
-                                    label="清单版本"
-                                    align="center">
-                                <template slot-scope="scope">
-            <span
-                    v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
-              }}</span>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                    prop="applicationScope"
-                                    label="适用领域"
-                                    align="center">
-                                <template slot-scope="scope">
-            <span
-                    v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
-              }}</span>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                    prop="updateTime"
-                                    label="更新时间"
-                                    sortable
-                                    align="center">
-                                <template slot-scope="scope">
-                                    <div>
-                                        {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD
-                                        hh:mm:ss") : scope.row.updateTime
-                                        }}
-                                    </div>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                    prop="updatePeople"
-                                    label="更新人"
-                                    align="center">
-                            </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="closeDrawer">取消</el-button>
-                <el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
-            </div>
-        </el-drawer>
-        <!--    添加标准抽屉-->
-        <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 :modal="standardSearch" :inline="true" class="label-input-form"
-                                     style="margin-left:10px">
-                                <el-form-item label="类型" class="search-item search-item-last">
-                                    <el-select
-                                            @change="typeChange"
-                                            v-model="standardSearch.standType"
-                                            placeholder="请选择"
-                                            filterable
-                                    >
-                                        <el-option
-                                                v-for="item in standardTypeOptions"
-                                                :value="item.value"
-                                                :key="item.value"
-                                                :label="item.label"
-                                        >
-                                        </el-option>
-                                    </el-select>
-                                </el-form-item>
-                                <el-form-item label="标准号/标准名称" class="search-item search-item-last">
-                                    <el-input
-                                            v-model="standardSearch.standNumber"
-                                            placeholder="请输入标准号或标准名称"
-                                    ></el-input>
-                                </el-form-item>
-                                <el-form-item class="search-item btn-box">
-                                    <el-button
-                                            :loading="searching"
-                                            type="primary"
-                                            class="common-button-primary"
-                                            size="small"
-                                            v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
-                                            @click="addList">
-                                        查询
-                                    </el-button>
-                                </el-form-item>
-                                <el-form-item class="search-item btn-box">
-                                    <el-button
-                                            class="common-button-default"
-                                            size="small"
-                                            v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
-                                            @click="clearSearch">清空
-                                    </el-button>
-                                </el-form-item>
-                            </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="selectThree"
-                        >
-                            <el-table-column
-                                    type="selection"
-                                    width="55"
-                                    align="center">
-                            </el-table-column>
-                            <el-table-column
-                                    prop="code"
-                                    fixed="left"
-                                    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="标准名称"
-                            >
-                            </el-table-column>
-                            <el-table-column
-                                    prop="issueTime"
-                                    align="center"
-                                    label="发布日期">
-                            </el-table-column>
-                            <el-table-column
-                                    prop="xcxssrq"
-                                    align="center"
-                                    label="新车型实施日期">
-                            </el-table-column>
-                            <el-table-column
-                                    show-overflow-tooltip
-                                    prop="zccssrq"
-                                    align="center"
-                                    label="在产车实施日期">
-                            </el-table-column>
-                            <el-table-column
-                                    show-overflow-tooltip
-                                    prop="textStatus"
-                                    align="center"
-                                    label="文本状态">
-                            </el-table-column>
-                        </el-table>
-                    </div>
-                    <pagination
-                            :page="pageNo"
-                            :pageSize="pageSizeNo"
-                            :total="totalNo"
-                            @pageChange="pageChangeNo"
-                            @pageSizeChange="pageSizeChangeNo"
-                    />
-                </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-submit
-                :submitLoading="isSubmit"
-                :saveLoading="saveLoading"
-                @save="handleSave"
-                @submit="handleSubmit"
-        >
-        </ProcessFooter>
-        <!--    选择责任人-->
-        <el-drawer
-                :title="drawerTitle"
-                :visible.sync="modalshowflag"
-                :wrapperClosable="false"
-                size="800px">
-            <el-tree
-                    v-if="modalshowflag"
-                    style="height: 100%; overflow: auto;"
-                    node-key="id"
-                    class="filter-tree"
-                    :data="treeData"
-                    :props="defaultProps"
-                    :default-checked-keys="nodeList"
-                    highlight-current
-                    check-strictly
-                    @check="drawerCheck"
-                    default-expand-all
-                    :expand-on-click-node="false"
-                    show-checkbox
-                    ref="tree">
-            </el-tree>
-            <div id="roleFormButton" class="demo-drawer-footer">
-                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary"
-                           @click="saveUserInfo">
-                    确定
-                </el-button>
-                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消
-                </el-button>
-            </div>
-        </el-drawer>
-        <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
-            <el-upload
-                    multiple
-                    drag
-                    :action="fileUrl"
-                    ref="importfile"
-                    name="file"
-                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
-                    :before-upload="beginImportFile"
-                    :on-success="importFileSuccess"
-                    :show-file-list="false"
-            >
-                <div style="padding: 20px 0">
-                    <i class="el-icon-upload" style="color: #3399ff"></i>
-                    <p>点击或拖拽上传文件</p>
-                </div>
-            </el-upload>
-        </el-dialog>
+  <div class="bzqdfb-step1">
+    <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 === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</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
+          ref="qdfbForm"
+          :model="listForm"
+          :rules="formRules"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="选择清单" prop="orgName" class="add-form-item form-item-disabled">
+                <el-radio-group v-model="listType" @change="selectionList">
+                  <el-radio label="country">国家/地区清单</el-radio>
+                  <el-radio label="project">项目清单</el-radio>
+                  <el-radio label="other">其他清单</el-radio>
+                </el-radio-group>
+                <el-button size="mini" type="primary" style="margin-left: 40px;" @click="choiceShow">
+                  选择清单
+                </el-button>
+              </el-form-item>
+              <el-form-item label="清单名称" prop="listName" class="add-form-item form-item-disabled">
+                <el-input
+                  disabled
+                  v-model="listForm.listName"
+                  placeholder="请输入清单名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.descriptionList"
+                  placeholder="请输入清单说明"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled">
+                <el-upload
+                  v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "
+                  :action="uploadFileListPath"
+                  show-file-list
+                  :file-list="fileInfoList"
+                  name="file"
+                  accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
+                  :on-remove="delFileInfo"
+                  :on-success="uploadBackSuccess"
+                  :before-upload="beforeUpload"
+                >
+                  <el-button class="common-button-default" size="mini">
+                    点击上传
+                  </el-button>
+                </el-upload>
+                <el-input
+                  v-else
+                  v-model="listForm.fileId"
+                  placeholder=""
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled">
+                <el-radio-group v-model="signFlag" @change="selectSign">
+                  <el-radio label="1">是</el-radio>
+                  <el-radio label="2">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title>
+          <template slot="title">填写信息</template>
+        </process-title>
+        <div class="tableTitle">
+          <div class="tableButton">
+            <el-button plain class="common-button-primary" size="mini" @click="addList">添加</el-button>
+            <el-button plain class="common-button-primary" size="mini" @click="deleteList">批量删除</el-button>
+          </div>
+        </div>
+        <el-table
+          :data="dataList"
+          border
+          ref="selection"
+          height="49%"
+          style="width: 100%;"
+          @selection-change="selectStandChange"
+          :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
+            prop="code"
+            fixed="left"
+            width="180px"
+            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"
+            label="标准名称"
+            align="center"
+            width="260px"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="issueTime"
+            align="center"
+            label="发布日期">
+          </el-table-column>
+          <el-table-column
+            prop="xcxssrq"
+            align="center"
+            label="新车型实施日期">
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="zccssrq"
+            align="center"
+            label="在产车实施日期">
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="textStatus"
+            align="center"
+            width="120px"
+            label="文本状态">
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <div class="content" v-show="active === '2'">
+      <div class="block" style="padding-top: 20px;">
+        <el-timeline>
+          <el-form
+            ref="Form"
+            :model="roleForm"
+            :rules="roleFormRules"
+            class="label-input-form">
+            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="startUserName" style="margin-bottom: 0">
+                  <h4>标准/政策法规工程师</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.startUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.startUserName" placeholder="流程发起人"
+                              disabled></el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top"
+                              :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '1'">
+              <el-card>
+                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                  <h4>会签人</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人"
+                              @click.native="choiceZRRS">
+                    </el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top"
+                              :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '2'">
+              <el-card>
+                <el-form-item prop="dockUserName2" style="margin-bottom: 0">
+                  <h4>会签人</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人"
+                              @click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">
+                    </el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="根据会签意见修订" placement="top"
+                              :color="roleForm.ministerUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="ministerUserName" style="margin-bottom: 0">
+                  <h4>标准/政策法规工程师</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.ministerUserName" placeholder="选择标准/政策法规工程师"
+                              @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="审批" placement="top"
+                              :color="roleForm.directorUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="directorUserName" style="margin-bottom: 0">
+                  <h4>业务经理</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.directorUserName" placeholder="选择业务经理"
+                              @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"></el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+          </el-form>
+        </el-timeline>
+      </div>
+    </div>
+    <!-- 选择清单抽屉-->
+    <el-drawer
+      title="选择清单"
+      :visible.sync="ListModel"
+      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 :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form"
+                       style="margin-left:10px">
+                <el-form-item label="清单名称" class="search-item search-item-last">
+                  <el-input
+                    v-model="sarSarAccessEOSearch.detailedListName"
+                    placeholder="请输入清单名称"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    :loading="searching"
+                    type="primary"
+                    class="common-button-primary"
+                    size="small"
+                    v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
+                    @click="queryDetailsData">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
+                    @click="clearSearch">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
+            <el-table
+              v-if="listType === 'country'"
+              :data="sarAccessListDatas"
+              tooltip-effect="dark"
+              style="width: 100%"
+              border
+              height="100%"
+              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+              @selection-change="selectListChange"
+              ref="selection"
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="countryArea"
+                label="国家/地区"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="detailedListName"
+                label="清单名称"
+                align="center"
+              >
+                <template slot-scope="scope">
+                  <a class="table-jump" @click.stop="showTable(scope.row)">{{
+                      scope.row.detailedListName }}</a>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="detailedListState"
+                label="清单状态"
+                align="center">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.detailedListState === '0'">未发布</span>
+                  <span v-if="scope.row.detailedListState === '1'">已发布</span>
+                  <span v-if="scope.row.detailedListState === '3'">审核中</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="detailedListVision"
+                label="清单版本"
+                align="center">
+                <template slot-scope="scope">
+            <span
+              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
+              }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="applicationScope"
+                label="适用领域"
+                align="center">
+                <template slot-scope="scope">
+            <span
+              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
+              }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="updateTime"
+                label="更新时间"
+                sortable
+                align="center">
+                <template slot-scope="scope">
+                  <div>
+                    {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
+                    }}
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="updatePeople"
+                label="更新人"
+                align="center">
+              </el-table-column>
+            </el-table>
+            <el-table
+              v-if="listType === 'project'"
+              :data="sarAccessListDatas"
+              tooltip-effect="dark"
+              style="width: 100%"
+              border
+              height="100%"
+              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+              @selection-change="selectListChange"
+              ref="selection"
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="projectName"
+                label="项目名称"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="detailedListName"
+                label="清单名称"
+                align="center"
+              >
+                <template slot-scope="scope">
+                  <a class="table-jump" @click.stop="showTable(scope.row)">{{
+                      scope.row.detailedListName }}</a>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="detailedListState"
+                label="清单状态"
+                align="center">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.detailedListState === '0'">未发布</span>
+                  <span v-if="scope.row.detailedListState === '1'">已发布</span>
+                  <span v-if="scope.row.detailedListState === '3'">审核中</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="detailedListVision"
+                label="清单版本"
+                align="center">
+                <template slot-scope="scope">
+            <span
+              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
+              }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="applicationScope"
+                label="适用领域"
+                align="center">
+                <template slot-scope="scope">
+            <span
+              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
+              }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="updateTime"
+                label="更新时间"
+                sortable
+                align="center">
+                <template slot-scope="scope">
+                  <div>
+                    {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-D hh:mm:ss") : scope.row.updateTime
+                    }}
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="updatePeople"
+                label="更新人"
+                align="center">
+              </el-table-column>
+            </el-table>
+            <el-table
+              v-if="listType === 'other'"
+              :data="sarAccessListDatas"
+              tooltip-effect="dark"
+              style="width: 100%"
+              border
+              height="100%"
+              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+              @selection-change="selectListChange"
+              ref="selection"
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="detailedList"
+                label="清单类别"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="detailedListName"
+                label="清单名称"
+                align="center"
+              >
+                <template slot-scope="scope">
+                  <a class="table-jump" @click.stop="showTable(scope.row)">{{
+                      scope.row.detailedListName }}</a>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="detailedListState"
+                label="清单状态"
+                align="center">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.detailedListState === '0'">未发布</span>
+                  <span v-if="scope.row.detailedListState === '1'">已发布</span>
+                  <span v-if="scope.row.detailedListState === '3'">审核中</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="detailedListVision"
+                label="清单版本"
+                align="center">
+                <template slot-scope="scope">
+            <span
+              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
+              }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="applicationScope"
+                label="适用领域"
+                align="center">
+                <template slot-scope="scope">
+            <span
+              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
+              }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="updateTime"
+                label="更新时间"
+                sortable
+                align="center">
+                <template slot-scope="scope">
+                  <div>
+                    {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
+                    }}
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="updatePeople"
+                label="更新人"
+                align="center">
+              </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="closeDrawer">取消</el-button>
+        <el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
+      </div>
+    </el-drawer>
+    <!--    添加标准抽屉-->
+    <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 :modal="standardSearch" :inline="true" class="label-input-form"
+                       style="margin-left:10px">
+                <el-form-item label="类型" class="search-item search-item-last">
+                  <el-select
+                    @change="typeChange"
+                    v-model="standardSearch.standType"
+                    placeholder="请选择"
+                    filterable
+                  >
+                    <el-option
+                      v-for="item in standardTypeOptions"
+                      :value="item.value"
+                      :key="item.value"
+                      :label="item.label"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="标准号/标准名称" class="search-item search-item-last">
+                  <el-input
+                    v-model="standardSearch.standNumber"
+                    placeholder="请输入标准号或标准名称"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    :loading="searching"
+                    type="primary"
+                    class="common-button-primary"
+                    size="small"
+                    v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
+                    @click="addList">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
+                    @click="clearStandSearch">清空
+                  </el-button>
+                </el-form-item>
+              </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="selectThree"
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="code"
+                fixed="left"
+                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="标准名称"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="issueTime"
+                align="center"
+                label="发布日期">
+              </el-table-column>
+              <el-table-column
+                prop="xcxssrq"
+                align="center"
+                label="新车型实施日期">
+              </el-table-column>
+              <el-table-column
+                show-overflow-tooltip
+                prop="zccssrq"
+                align="center"
+                label="在产车实施日期">
+              </el-table-column>
+              <el-table-column
+                show-overflow-tooltip
+                prop="textStatus"
+                align="center"
+                label="文本状态">
+              </el-table-column>
+            </el-table>
+          </div>
+          <pagination
+            :page="pageNo"
+            :pageSize="pageSizeNo"
+            :total="totalNo"
+            @pageChange="pageChangeNo"
+            @pageSizeChange="pageSizeChangeNo"
+          />
+        </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-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      @save="handleSave"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <!--    选择责任人-->
+    <Role-tree
+      is-title="选择责任部门对接人"
+      :is-visible.sync="modalshowflag2"
+      @checkedRole="checkedRole2"
+      :nodeList="nodeList2"
+    ></Role-tree>
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="modalshowflag"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+    <el-dialog width="400px" :visible.sync="fileMadel" title="上传文件">
+      <el-upload
+        multiple
+        drag
+        :action="fileUrl"
+        ref="importfile"
+        name="file"
+        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+        :before-upload="beginImportFile"
+        :on-success="importFileSuccess"
+        :show-file-list="false"
+      >
+        <div style="padding: 20px 0">
+          <i class="el-icon-upload" style="color: #3399ff"></i>
+          <p>点击或拖拽上传文件</p>
+        </div>
+      </el-upload>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-    import ProcessHeader from "../../components/ProcessHeader";
-    import ProcessFooter from "../../components/ProcessFooter";
-    import ProcessTitle from "../../components/ProcessTitle";
-    import {saveTaskFirst} from "api/process";
-    import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis";
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { saveTaskFirst } from "api/process";
+import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis";
 
 export default {
   name: "bzqdfbStep1",
@@ -790,25 +714,25 @@ export default {
   },
   data() {
     return {
-      fileUrl: 'api/att/attFile/upload',
+      fileUrl: "api/att/attFile/upload",
       fileMadel: false,
       searching: false,
       // 查询选择清单相关参数
       sarSarAccessEOSearch: {
         countryArea: "",
         detailedListName: "",
-        page: 1,
-        pageSize: this.$store.getters.userInfo.configContent
       },
       //查询添加标准相关数据
       standardSearch: {
-        standType: '',
-        standNumber:'',
+        standType: "",
+        standNumber: "",
         pageNo: 1,
         pageSizeNo: this.$store.getters.userInfo.configContent
-    },
+      },
       standList: [], //新添加的标准
       modalshowflag: false, // drawer开关
+      modalshowflag2: false,
+      nodeList2: [],
       drawerTitle: "", //drawer标题
       nodeList: [],
       defaultProps: {
@@ -878,9 +802,9 @@ export default {
         listName: "", //清单名称
         // applyRegion: "", //适用区域
         descriptionList: "", //清单说明
-        fileId:'',
-        model: '', // 上传模板
-        modelName: '',
+        fileId: "",
+        model: "", // 上传模板
+        modelName: "",
         standId: "", //选择的清单的id
         signFlag: "1",  //是否会签  1为会签 2为不会签
         inforlist: "", //用来存放标准列表的标准id
@@ -898,15 +822,15 @@ export default {
       // countryOptions: [], //适用区域下拉框数据
       standardTypeOptions: [
         {
-          value: 'INLAND',
-        label: '国内标准法规',
-        item:'INLAND',
-      },
-        {
-          value: 'FOREIGN',
-          label: '海外标准法规',
-          item:'FOREIGN',
+          value: "INLAND",
+          label: "国内标准法规",
+          item: "INLAND"
         },
+        {
+          value: "FOREIGN",
+          label: "海外标准法规",
+          item: "FOREIGN"
+        }
       ],
       user1: "",
       user2: "",
@@ -917,22 +841,36 @@ export default {
     };
   },
   methods: {
-    saveUserInfo() {
+    checkedRole(data) {
       if (this.type === "dockUser") {
         this.roleForm.dockUser = this.roleRow.id;
         this.roleForm.dockUserName = this.roleRow.name;
       } else if (this.type === "ministerUser") {
-        this.roleForm.ministerUser = this.roleRow.id;
-        this.roleForm.ministerUserName = this.roleRow.name;
+        this.roleForm.ministerUser = data[0].id;
+        this.roleForm.ministerUserName = data[0].name;
       } else if (this.type === "directorUser") {
-        this.roleForm.directorUser = this.roleRow.id;
-        this.roleForm.directorUserName = this.roleRow.name;
+        this.roleForm.directorUser = data[0].id;
+        this.roleForm.directorUserName = data[0].name;
       } else if (this.type === "presidentUser") {
-        this.roleForm.presidentUser = this.roleRow.id;
-        this.roleForm.presidentUserName = this.roleRow.name;
+        this.roleForm.presidentUser = data[0].id;
+        this.roleForm.presidentUserName = data[0].name;
       }
       this.modalshowflag = false;
     },
+    checkedRole2(data) {
+      var idList = "";
+      var nameList = "";
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ",";
+          idList += ",";
+        }
+        idList += item.id;
+        nameList += item.name;
+      });
+      this.roleForm.dockUser = idList;
+      this.roleForm.dockUserName = nameList;
+    },
     cancleUserInfo() {
       this.modalshowflag = false;
     },
@@ -960,9 +898,13 @@ export default {
         this.listForm.signFlag = 2;
       }
     },
+    queryDetailsData(){
+      this.page = 1
+      this.selectionList()
+    },
     // //判断当前选中的是哪个清单
     selectionList(type) {
-      type  = this.listType
+      type = this.listType;
       if (type === "project") {
         this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
           page: this.page,
@@ -989,7 +931,7 @@ export default {
           this.total = res.data.total;
         }, e => {
         });
-      } else if(type === 'country') {
+      } else if (type === "country") {
         this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
           page: this.page,
           pageSize: this.pageSize,
@@ -1009,12 +951,14 @@ export default {
         countryArea: "",
         detailedListName: ""
       };
-      this.standardSearch ={
-        standType:'',
-        standNumber: '',
-      }
       this.selectionList();
-      this.addList()
+    },
+    clearStandSearch(){
+      this.standardSearch = {
+        standType: "",
+        standNumber: ""
+      };
+      this.addList();
     },
     //点击添加事件
     addList() {
@@ -1027,7 +971,7 @@ export default {
         _this: this
       }, res => {
         this.standardData = res.data.list;
-        this.totalNo = res.data.count
+        this.totalNo = res.data.count;
       }, e => {
       });
       this.standModel = true;
@@ -1061,184 +1005,185 @@ export default {
     },
     //保存事件
     handleSave() {
-      this.saveLoading = true;
-      let _formData = new FormData();
-      _formData.append("createUser", this.$store.getters.userInfo.userId);
-      _formData.append("createUserName", this.$store.getters.userInfo.uName);
-      _formData.append("prcType", this.$route.query.type);
-      _formData.append("json", JSON.stringify({
-        prcForm: this.prcForm,
-        sarAccessInfoList: this.sarAccessInfoList,
-        sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
-        bzqdForm: this.bzqdForm,
-        listInfo: this.listInfo,
-        id: this.id
-      }));
+      this.saveLoading = true
+      let _formData = new FormData()
+      _formData.append('id', this.bpnId || '')
+      _formData.append('createUser', this.$store.getters.userInfo.userId)
+      _formData.append('createUserName', this.$store.getters.userInfo.userName)
+      _formData.append('prcType', '4')
+      _formData.append('json', JSON.stringify({
+        form: this.form,
+        roleForm: this.roleForm,
+        commentText: this.commentText
+      }))
       saveTaskFirst(_formData).then(res => {
-        this.saveLoading = false;
-        this.$message.success("保存成功");
+        this.saveLoading = false
+        this.$message.success('保存成功')
+        this.bpnId = res.result
       }).catch(e => {
-        this.saveLoading = false;
-      });
+        this.saveLoading = false
+      })
     },
     //提交事件
     handleSubmit() {
-      let json = this.listForm;
-      this.listForm.fileId = this.fileIds.join(',')
-      this.listForm.fileName =  this.fileListName.join(',')
-      this.listForm.model=this.listForm.fileId
-      this.listForm.modelName=this.listForm.fileName
-        // let json = Object.assign(this.listForm, this.roleForm)
-      json.zrUserId = this.roleForm.dockUser; //会签人
-      json.jlUserId = this.roleForm.directorUser;   //业务经理
-      // (如果是业务经理应该这样写 后续需要更改 例：json.jlUserId = this.roleForm.directorUser;)
-      json.applyUpdUserId = this.roleForm.ministerUser; // 修订人
-      json.approvalOpinion = "";
-      json.prcCreateUser = this.$store.getters.userInfo.userId;
-      json.prcCreateUserName = this.$store.getters.userInfo.account;
-      json.standName = this.listForm.listName;
-      json.standId = this.listForm.standId;
-      this.$refs["qdfbForm"].validate((valid) => {
-        if (valid) {
-          this.$refs["Form"].validate((valid) => {
-            if (valid) {
-              this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
-                _this: this
-              }, res => {
-                if (res.ok) {
-                  this.$http.post("lawss/activiti/completeTask", {
-                    taskIds: res.data,
-                    userId: this.$store.getters.userInfo.userId,
-                    json: JSON.stringify(json)
-                  }, {
-                    _this: this
-                  }, res => {
-                    if (res.success) {
-                      this.$message.success(res.message);
-                      this.$router.push("/processCenter");
-                    }
-                  });
-                }
-              });
-            } else {
-              return this.$message.warning("请完善人员信息");
-            }
-          });
-        } else {
-          return this.$message.warning("请完善基础信息");
-        }
-      });
+      if(this.dataList.length < 1){
+        this.$message.warning('标准不能为空')
+      }else{
+        let json = this.listForm;
+        this.listForm.fileId = this.fileIds.join(",");
+        this.listForm.fileName = this.fileListName.join(",");
+        this.listForm.model = this.listForm.fileId;
+        this.listForm.modelName = this.listForm.fileName;
+        json.zrUserId = this.roleForm.dockUser; //会签人
+        json.jlUserId = this.roleForm.directorUser;   //业务经理
+        json.applyUpdUserId = this.roleForm.ministerUser; // 修订人
+        json.approvalOpinion = "";
+        json.prcCreateUser = this.$store.getters.userInfo.userId;
+        json.prcCreateUserName = this.$store.getters.userInfo.uName;
+        json.standName = this.listForm.listName;
+        json.standId = this.listForm.standId;
+        this.$refs["qdfbForm"].validate((valid) => {
+          if (valid) {
+            this.$refs["Form"].validate((valid) => {
+              if (valid) {
+                this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
+                  _this: this
+                }, res => {
+                  if (res.ok) {
+                    this.$http.post("lawss/activiti/completeTask", {
+                      taskIds: res.data,
+                      userId: this.$store.getters.userInfo.userId,
+                      json: JSON.stringify(json)
+                    }, {
+                      _this: this
+                    }, res => {
+                      if (res.success) {
+                        this.$message.success(res.message);
+                        this.$router.push("/processCenter");
+                      }
+                    });
+                  }
+                });
+              } else {
+                return this.$message.warning("请完善人员信息");
+              }
+            });
+          } else {
+            return this.$message.warning("请完善基础信息");
+          }
+        });
+      }
     },
     // 删除上传的文件
     delFileInfo(file, fileList) {
-      let middle = []
-      let files=[]
+      let middle = [];
+      let files = [];
       fileList.forEach(item => {
-        middle.push(item.name)
-          files.push(item.response.data.id)
-      })
-      this.fileListName = middle
-        this.fileIds=files
+        middle.push(item.name);
+        files.push(item.response.data.id);
+      });
+      this.fileListName = middle;
+      this.fileIds = files;
     },
-    fileUpload () {
-      this.fileMadel = true
+    fileUpload() {
+      this.fileMadel = true;
     },
     // 上传文件成功回调
-    uploadBackSuccess (res, file, fileList) {
+    uploadBackSuccess(res, file, fileList) {
       if (res.ok) {
-        let middle = []
+        let middle = [];
         fileList.forEach(item => {
-          middle.push(item.name)
-        })
-        this.fileListName = middle
-        this.fileIds.push(file.response.data.id)
+          middle.push(item.name);
+        });
+        this.fileListName = middle;
+        this.fileIds.push(file.response.data.id);
         // this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
         // this.$message.success('上传成功')
       } else {
-        this.$message.error(res.message)
-        fileList.pop()
+        this.$message.error(res.message);
+        fileList.pop();
       }
     },
     // 相关附件 上传之前钩子
-    beforeUpload (file) {
-      var filename = file.name
-      var index1 = filename.lastIndexOf('.')
-      var index2 = filename.length
-      var fileSuffix = filename.substring(index1, index2)
+    beforeUpload(file) {
+      var filename = file.name;
+      var index1 = filename.lastIndexOf(".");
+      var index2 = filename.length;
+      var fileSuffix = filename.substring(index1, index2);
       // const fileSuffix = file.name.split('.')[1] // 后缀名
       //把后缀转大写
-      if(fileSuffix !== undefined && fileSuffix !== null){
-        fileSuffix = fileSuffix.toUpperCase()
+      if (fileSuffix !== undefined && fileSuffix !== null) {
+        fileSuffix = fileSuffix.toUpperCase();
       }
       // 判断上传文件格式
-      if (fileSuffix === '.PDF' || fileSuffix === '.DOC' || fileSuffix === '.DOCX' || fileSuffix === '.PPT'
-        || fileSuffix === '.PPTX'|| fileSuffix === '.XLS'|| fileSuffix === '.XLSX'
-        || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG') {
-        return true
+      if (fileSuffix === ".PDF" || fileSuffix === ".DOC" || fileSuffix === ".DOCX" || fileSuffix === ".PPT"
+        || fileSuffix === ".PPTX" || fileSuffix === ".XLS" || fileSuffix === ".XLSX"
+        || fileSuffix === ".PNG" || fileSuffix === ".JPG" || fileSuffix === ".JPEG") {
+        return true;
       } else {
-        this.$message.error('文件' + file.name + '格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件')
-        return false
+        this.$message.error("文件" + file.name + "格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件");
+        return false;
       }
       // 判断文件上传大小
       if (file.size / 1024 / 1024 > 300) {
-        this.$message.warning('文件' + file.name + '大小不能超过300M')
-        return false
+        this.$message.warning("文件" + file.name + "大小不能超过300M");
+        return false;
       }
-      return true
+      return true;
     },
     // 点击查看
-    handlePreview (item) {
+    handlePreview(item) {
       let routeUrl = this.$router.resolve({
-        name: 'OtherStandardDetails',
+        name: "OtherStandardDetails",
         params: {
           id: item.id,
-          pageType: 'INLAND_STAND'
+          pageType: "INLAND_STAND"
         }
-      })
-      window.open(routeUrl.href, '_blank')
+      });
+      window.open(routeUrl.href, "_blank");
     },
     // 导入标准数据成功后执行
-    importFileSuccess (response, file) {
+    importFileSuccess(response, file) {
       if (response.ok) {
-        this.fileMadel = false
-        this.listForm.model = response.data.id
-        this.listForm.modelName = response.data.name
+        this.fileMadel = false;
+        this.listForm.model = response.data.id;
+        this.listForm.modelName = response.data.name;
         this.$message({
           showClose: true,
           message: response.message,
-          type: 'success'
-        })
+          type: "success"
+        });
       }
     },
     // 导入按钮 上传之前的钩子
-    beginImportFile (file) {
-      var filename = file.name
-      var index1 = filename.lastIndexOf('.')
-      var index2 = filename.length
-      var fileSuffix = filename.substring(index1, index2)
+    beginImportFile(file) {
+      var filename = file.name;
+      var index1 = filename.lastIndexOf(".");
+      var index2 = filename.length;
+      var fileSuffix = filename.substring(index1, index2);
       // const fileSuffix = file.name.split('.')[1] // 后缀名
       // 判断上传文件格式
-      if (fileSuffix === '.PDF' || fileSuffix === '.DOC' || fileSuffix === '.DOCX' || fileSuffix === '.PPT'
-            || fileSuffix === '.PPTX'|| fileSuffix === '.XLS'|| fileSuffix === '.XLSX'
-            || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' ||
-        fileSuffix === '.pdf' || fileSuffix === '.doc' || fileSuffix === '.docx' || fileSuffix === '.ppt'
-        || fileSuffix === '.pptx'|| fileSuffix === '.xls'|| fileSuffix === '.xlsx'
-        || fileSuffix === '.png'|| fileSuffix === '.jpg'|| fileSuffix === '.jpeg') {
-        return true
+      if (fileSuffix === ".PDF" || fileSuffix === ".DOC" || fileSuffix === ".DOCX" || fileSuffix === ".PPT"
+        || fileSuffix === ".PPTX" || fileSuffix === ".XLS" || fileSuffix === ".XLSX"
+        || fileSuffix === ".PNG" || fileSuffix === ".JPG" || fileSuffix === ".JPEG" ||
+        fileSuffix === ".pdf" || fileSuffix === ".doc" || fileSuffix === ".docx" || fileSuffix === ".ppt"
+        || fileSuffix === ".pptx" || fileSuffix === ".xls" || fileSuffix === ".xlsx"
+        || fileSuffix === ".png" || fileSuffix === ".jpg" || fileSuffix === ".jpeg") {
+        return true;
       } else {
-        this.spinShow = false
-        this.$message.error('文件' + file.name + '格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件')
-        return false
+        this.spinShow = false;
+        this.$message.error("文件" + file.name + "格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件");
+        return false;
       }
       // 判断文件上传大小
       // eslint-disable-next-line no-unreachable
       if (file.size / 1024 / 1024 <= 200) {
-        return true
+        return true;
       } else {
-        this.$message.error('文件' + file.name + '大小不超过200M')
-        return false
+        this.$message.error("文件" + file.name + "大小不超过200M");
+        return false;
       }
-      return true
+      return true;
     },
     // beginImportFile (file) {
     //   var filename = file.name
@@ -1272,7 +1217,7 @@ export default {
       this.ListModel = false;
     },
     typeChange(type) {
-      this.standardSearch.standType = type
+      this.standardSearch.standType = type;
     },
     //添加标准取消事件
     cancelStand() {
@@ -1298,7 +1243,7 @@ export default {
             _this.dataList.push(item);
           }
         });
-        this.standardData = []
+        this.standardData = [];
         _this.standModel = false;
       }
     },
@@ -1322,16 +1267,16 @@ export default {
         this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { id: bringData[0].id }, {
           _this: this
         }, res => {
-          if(res.data==null){
-              res.data=[]
+          if (res.data == null) {
+            res.data = [];
           }
           this.dataList = res.data;
           this.listForm.dataList = res.data;
-          let formId = []
+          let formId = [];
           this.dataList.map(item => {
-              formId.push(item.id)
+            formId.push(item.id);
           });
-          this.listForm.inforlist = formId.join(',');
+          this.listForm.inforlist = formId.join(",");
         }, e => {
         });
       } else if (this.selectedList.length > 1) {
@@ -1365,12 +1310,20 @@ export default {
       this.drawerTitle = title;
       this.modalshowflag = true;
     },
+    choiceZRRS() {
+      this.nodeList2 = [];
+      if (this.roleForm.dockUser.length > 0) {
+        this.nodeList2 = this.roleForm.dockUser.split(",");
+      }
+      this.modalshowflag2 = true;
+    },
     getTree() {
       this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
         this.treeData = res.data;
       });
     },
     pageChange(page) {
+      console.log(page);
       this.page = page;
       this.selectionList();
     },
@@ -1378,113 +1331,113 @@ export default {
       this.pageSize = this.$store.getters.userInfo.configContent;
       this.selectionList();
     },
-    pageChangeNo(page){
-      this.pageNo = page
-      this.addList()
+    pageChangeNo(page) {
+      this.pageNo = page;
+      this.addList();
     },
-    pageSizeChangeNo(pageSize){
+    pageSizeChangeNo(pageSize) {
       this.pageSizeNo = this.$store.getters.userInfo.configContent;
-      this.addList()
+      this.addList();
 
-            },
-        },
-        computed: {},
-        mounted() {
-            //从数据库中查询下拉框数据
-            this.$http.get("sys/dictype/getDicTypeListCode", {}, {
-                _this: this
-            }, res => {
-                this.countryOptions = res.data.COUNTRY;
-            });
-            this.selectionList();
-            this.selectSign();
-            this.getTree();
-            for (let i = 0; i < this.dataList.length; i++) {
-                this.standMap.set(this.dataList[i].id, this.dataList[i]);
-            }
-        }
+    }
+  },
+  computed: {},
+  mounted() {
+    //从数据库中查询下拉框数据
+    this.$http.get("sys/dictype/getDicTypeListCode", {}, {
+      _this: this
+    }, res => {
+      this.countryOptions = res.data.COUNTRY;
+    });
+    this.selectionList();
+    this.selectSign();
+    this.getTree();
+    for (let i = 0; i < this.dataList.length; i++) {
+      this.standMap.set(this.dataList[i].id, this.dataList[i]);
+    }
+  }
 
-    };
+};
 </script>
 
 <style lang="less" scoped>
-    @import '~@/assets/styles/style';
+@import '~@/assets/styles/style';
 
-    .bzqdfb-step1 {
-        /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%;
-                }
-            }
-        }
-
-        .add-form-el-select {
-            /deep/ .el-select {
-                width: 210px;
-            }
-        }
-
-        .demo-drawer-content {
-            margin-top: 10px;
-        }
+.bzqdfb-step1 {
+  /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%;
+      }
+    }
+  }
+
+  .add-form-el-select {
+    /deep/ .el-select {
+      width: 210px;
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
 </style>
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
index 7ca0d53c2..6bb1abe0b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
@@ -21,14 +21,6 @@
         >
           <el-row :gutter="24">
             <el-col :span="24">
-              <!--              <el-form-item label="选择清单" prop="orgName" class="add-form-item form-item-disabled">-->
-              <!--                <el-radio-group v-model="listType" @change="selectionList">-->
-              <!--                  <el-radio label="country">国家/地区清单</el-radio>-->
-              <!--                  <el-radio label="project">项目清单</el-radio>-->
-              <!--                  <el-radio label="other">其他清单</el-radio>-->
-              <!--                </el-radio-group>-->
-              <!--                <el-button size="mini" type="primary" style="margin-left: 40px;" @click="choiceShow">选择清单</el-button>-->
-              <!--              </el-form-item>-->
               <el-form-item label="清单名称" prop="listName" class="add-form-item form-item-disabled">
                 <el-input
                   disabled
@@ -37,14 +29,6 @@
                   clearable
                 ></el-input>
               </el-form-item>
-<!--              <el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled">-->
-<!--                <el-input-->
-<!--                  disabled-->
-<!--                  v-model="listForm.applyRegion"-->
-<!--                  placeholder="请输入适用区域"-->
-<!--                  clearable-->
-<!--                ></el-input>-->
-<!--              </el-form-item>-->
               <el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
                 <el-input
                   disabled
@@ -54,11 +38,11 @@
                 ></el-input>
               </el-form-item>
               <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
-               <el-input
-                 v-if="listForm.modelName == null || this.listForm.modelName== 'undefined' || this.listForm.modelName == '' "
-                 placeholder="暂无数据"
-               >
-               </el-input>
+                <el-input
+                  v-if="listForm.modelName == null || this.listForm.modelName== 'undefined' || this.listForm.modelName == '' "
+                  placeholder="暂无数据"
+                >
+                </el-input>
                 <el-input
                   v-else
                   v-model="listForm.modelName"
@@ -73,20 +57,23 @@
         </process-title>
         <el-table
           :data="dataList"
+          style="width: 100%; border: 1px solid #ccc;"
+          row-key="standId"
+          height="70%"
           border
-          height="64.6%"
-          style="width: 100%"
           @selection-change="selectStandChange"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-              fontWeight: 'bold', height: '48px'}">
+          fontWeight: 'bold', height: '48px'}">
           <el-table-column
             prop="code"
-            fixed="left"
             width="180px"
             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>
+              <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
@@ -171,7 +158,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -179,7 +166,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -187,7 +174,7 @@
             label="审批意见"
             align="center">
             <template slot-scope="scope">
-              <span>{{scope.row.commentText}}</span>
+              <span>{{ scope.row.commentText }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -195,14 +182,13 @@
             label="状态"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
             </template>
           </el-table-column>
         </el-table>
         <loading :loading="loading">流程列表加载中</loading>
       </div>
     </div>
-
     <ProcessFooter
       show-submit
       :submitLoading="isSubmit"
@@ -217,6 +203,7 @@ import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
 import { inboundLiaisonDetail, queryDetail } from "api/process";
+import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis";
 
 export default {
   name: "bzqdfbStep2",
@@ -233,7 +220,7 @@ export default {
       loading: false,
       dataList: [],//清单里的标准数据
       active: "1",
-      userId:this.$store.getters.userInfo.userId,
+      userId: this.$store.getters.userInfo.userId,
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
       listType: "country",  //选择的清单类型
@@ -277,17 +264,18 @@ export default {
     };
   },
   methods: {
-    processTable () {
-      this.$http.get('lawss/activiti/get_list_by_instance', {
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,
-        sortWord: this.shunxu ? this.paixu : '',
+        sortWord: this.shunxu ? this.paixu : "",
         shunxu: this.shunxu
       }, {
-        loading: 'loading',
+        loading: "loading",
         _this: this
       }, res => {
-        this.detailData = res
-      }, e => {})
+        this.detailData = res;
+      }, e => {
+      });
     },
     //tab发生变化
     handleTabs(name) {
@@ -304,34 +292,48 @@ export default {
         }).then(res => {
           console.log(res.mesg);
           if (res) {
-            const processForm = JSON.parse(res.mesg)
-            this.getFormFieldList(processForm)
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
           }
         }).catch(e => {
-        })
-      })
+        });
+      });
     },
     /**
      * @description: 动态表单读取
      */
-    getFormFieldList (item) {
+    getFormFieldList(item) {
       this.$nextTick(() => {
-        this.listForm = JSON.parse(JSON.stringify(item))
-        this.listForm.prcNum = this.prcNum
-        this.listForm.prcName = this.prcName
-        this.listForm['id'] = item.id
-        this.listForm.dataList = item.dataList
-        this.dataList = item.dataList
-        this.listForm.applyUpdUserId = item.applyUpdUserId
-        this.listForm.jlUserId = item.jlUserId
-        this.listForm.zrUserId = item.zrUserId
-      })
+        this.listForm = JSON.parse(JSON.stringify(item));
+        this.listForm.prcNum = this.prcNum;
+        this.listForm.prcName = this.prcName;
+        this.listForm["id"] = item.id;
+        this.listForm.dataList = item.dataList;
+        this.dataList = item.dataList;
+        this.listForm.applyUpdUserId = item.applyUpdUserId;
+        this.listForm.jlUserId = item.jlUserId;
+        this.listForm.zrUserId = item.zrUserId;
+      });
     },
 
 
     //保存事件
     handleSave() {
 
+    },
+    handlePreview(item) {
+      if (item.id) {
+        let routeUrl = this.$router.resolve({
+          name: "OtherStandardDetails",
+          params: {
+            id: item.standId,
+            pageType: item.standType + "_STAND"
+          }
+        });
+        window.open(routeUrl.href, "_blank");
+      } else {
+        this.$message.warning("暂无关联的标准");
+      }
     },
     //提交事件
     handleSubmit() {
@@ -345,16 +347,16 @@ export default {
       this.listForm.standId = this.listForm.standId;
       this.listForm.signFlag = "";
       const json = JSON.stringify(this.listForm);
-      this.$http.post('lawss/activiti/completeTask', {
+      this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
         userId: this.userId,
-        json: json,
+        json: json
       }, {
         _this: this
       }, res => {
         if (res.success) {
-           this.$message.success(res.message)
-          this.$router.push('/processCenter')
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
         }
       }, e => {
 
@@ -406,14 +408,15 @@ export default {
     }
   },
   computed: {
-    listNoDataText () {
-      return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
-    },
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
   },
+  watch: {},
   mounted() {
-    this.processTable()
-    this.getData()
-    this.getFileInfo()
+    this.processTable();
+    this.getData();
+    this.getFileInfo();
     // console.log(this.$store.getters.getHandleInfo);
   }
 };
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 60d989f4a..3f8d70f52 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -58,7 +58,7 @@
                                     ></el-input>
                                 </el-form-item>
                                 <el-form-item v-show="verifySarStandard" label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.textStatus" placeholder="请选择文本状态">
+                                    <el-select :popper-append-to-body="false" v-model="form.textStatus" placeholder="请选择文本状态">
                                         <el-option
                                                 v-for="item in standStateOptions"
                                                 placeholder="请选择"
@@ -79,7 +79,7 @@
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.standSort" placeholder="请选择标准类别">
+                                    <el-select :popper-append-to-body="false" v-model="form.standSort" placeholder="请选择标准类别">
                                         <el-option
                                                 v-for="item in standSortOptions"
                                                 placeholder="请选择"
@@ -90,7 +90,7 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.standNature" placeholder="请选择标准性质">
+                                    <el-select :popper-append-to-body="false" v-model="form.standNature" placeholder="请选择标准性质">
                                         <el-option
                                                 v-for="item in standNatureOptions"
                                                 placeholder="请选择"
@@ -122,7 +122,7 @@
                                     </el-radio-group>
                                 </el-form-item>
                                 <el-form-item v-show="verifySarStandard" v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
-                                    <el-input v-model="form.standSystemName" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
+                                    <el-input v-model="form.standSystem" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
                                     <tree-select-new
                                             :key="key"
                                             :multiple=false
@@ -473,7 +473,7 @@
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple>
+                                    <el-select :popper-append-to-body="false" v-model="form.zrbm" placeholder="请选择责任部门" multiple>
                                         <el-option
                                                 v-for="item in zrbmOptions"
                                                 placeholder="请选择"
@@ -484,7 +484,7 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.cllx" placeholder="请选择适用车型" multiple>
+                                    <el-select :popper-append-to-body="false" v-model="form.cllx" placeholder="请选择适用车型" multiple>
                                         <el-option
                                                 v-for="item in applyArcticOptions"
                                                 placeholder="请选择"
@@ -495,7 +495,7 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.nylx" placeholder="请选择能源类型" multiple>
+                                    <el-select :popper-append-to-body="false" v-model="form.nylx" placeholder="请选择能源类型" multiple>
                                         <el-option
                                                 v-for="item in categoryOptions"
                                                 placeholder="请选择"
@@ -555,7 +555,7 @@
                                     ></el-input>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple>
+                                    <el-select :popper-append-to-body="false" v-model="form.qcdw" placeholder="请选择起草单位" multiple>
                                         <el-option
                                                 v-for="item in qcdwOption"
                                                 placeholder="请选择"
@@ -566,7 +566,7 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple>
+                                    <el-select :popper-append-to-body="false" v-model="form.txlb" placeholder="请选择体系类别" multiple>
                                         <el-option
                                                 v-for="item in txlbOptions"
                                                 placeholder="请选择"
@@ -579,7 +579,7 @@
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple>
+                                    <el-select :popper-append-to-body="false" v-model="form.sycpx" placeholder="请选择适用产品线" multiple>
                                         <el-option
                                                 v-for="item in sycpxOptions"
                                                 placeholder="请选择"
@@ -590,7 +590,7 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="适用认证" prop="syrz" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.syrz" placeholder="请选择适用认证" multiple>
+                                    <el-select :popper-append-to-body="false" v-model="form.syrz" placeholder="请选择适用认证" multiple>
                                         <el-option
                                                 v-for="item in applyAuthOptions"
                                                 placeholder="请选择"
@@ -601,7 +601,7 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple>
+                                    <el-select :popper-append-to-body="false" v-model="form.zrgcs" placeholder="请选择责任工程师" multiple>
                                         <el-option
                                                 v-for="item in zrgcsOptions"
                                                 placeholder="请选择"
@@ -633,13 +633,13 @@
                                     ></el-input>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple>
+                                    <el-select :popper-append-to-body="false" v-model="form.wssmr" placeholder="请选择我司署名人" multiple>
                                         <el-option label="署名人1" value="1"></el-option>
                                         <el-option label="署名人2" value="2"></el-option>
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.cysd" placeholder="请选择我司参与深度">
+                                    <el-select :popper-append-to-body="false" v-model="form.cysd" placeholder="请选择我司参与深度">
                                         <el-option
                                                 v-for="item in cysdOptions"
                                                 placeholder="请选择"
@@ -673,7 +673,7 @@
                                     >{{'手动查找'}}</el-button>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.cbcd" placeholder="请选择采标程度">
+                                    <el-select :popper-append-to-body="false" v-model="form.cbcd" placeholder="请选择采标程度">
                                         <el-option label="采标程度1" value="1"></el-option>
                                         <el-option label="采标程度2" value="2"></el-option>
                                     </el-select>
@@ -859,6 +859,7 @@
                     <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowFirst">
                         <el-form-item label="标准来源" class="search-item" v-if="dataSource">
                             <el-select
+                                :popper-append-to-body="false"
                                     v-model="replaceLawsNumForm.standType"
                                     placeholder="请选择标准来源"
                                     @change="dataSourceChange">
@@ -940,7 +941,7 @@
                     @pageChange="pageChangeReplace"
                     @pageSizeChange="pageSizeChangeReplace"></pagination>
             <div slot="footer" class="demo-drawer-footer">
-                <el-button class="common-button-default" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
+                <el-button class="common-button-default" round icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
                 <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
             </div>
         </el-dialog>
@@ -984,14 +985,15 @@
                         <el-form :model="standardSearchForm" inline class="label-input-form search-area">
                             <el-formItem label="标准来源" style="margin-right:-20px" prop="standType" class="search-item" >
                                 <el-select
+                                    :popper-append-to-body="false"
                                         v-model="standardSearchForm.standType"
                                         placeholder="请选择标准来源">
                                     <el-option value="INLAND" label="国内标准库"></el-option>
-                                    <el-option value="FOREIGN" label="国外标准库"></el-option>
+                                    <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-select v-model="standardSearchForm.standSort" placeholder="请选择标准类别" filterable clearable>
+                                <el-select :popper-append-to-body="false" v-model="standardSearchForm.standSort" placeholder="请选择标准类别" filterable clearable>
                                     <el-option
                                             v-for="item in standSortOptions"
                                             :key="item.value"
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 3eb2cc962..02be6a045 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -927,7 +927,9 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
+            handleSave() {
+              this.$message.success('保存成功')
+            },
             handleSubmit() {
                 this.isSubmit = true
                 this.form.commentText = this.commentText
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index bb17067b0..27cbe6975 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -452,14 +452,14 @@
                     <el-option label="采标程度2" value="2"></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">
-                  <el-input
-                      disabled
-                      v-model="form.xglc"
-                      placeholder="请输入相关流程"
-                      clearable
-                  ></el-input>
-                </el-form-item>
+<!--                <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
+<!--                  <el-input-->
+<!--                      disabled-->
+<!--                      v-model="form.xglc"-->
+<!--                      placeholder="请输入相关流程"-->
+<!--                      clearable-->
+<!--                  ></el-input>-->
+<!--                </el-form-item>-->
                 <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
                   <div v-if="form.glwjName">
                     {{ form.glwjName }}
@@ -486,22 +486,22 @@
                       clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">
-                  <el-input
-                      disabled
-                      v-model="form.byybj"
-                      placeholder="请输入被引用标准"
-                      clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">
-                  <el-input
-                      disabled
-                      v-model="form.chjl"
-                      placeholder="请输入参会记录"
-                      clearable
-                  ></el-input>
-                </el-form-item>
+<!--                <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
+<!--                  <el-input-->
+<!--                      disabled-->
+<!--                      v-model="form.byybj"-->
+<!--                      placeholder="请输入被引用标准"-->
+<!--                      clearable-->
+<!--                  ></el-input>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">-->
+<!--                  <el-input-->
+<!--                      disabled-->
+<!--                      v-model="form.chjl"-->
+<!--                      placeholder="请输入参会记录"-->
+<!--                      clearable-->
+<!--                  ></el-input>-->
+<!--                </el-form-item>-->
               </el-col>
             </el-row>
           </div>
@@ -921,29 +921,7 @@ export default {
       this.active = name
     },
     handleSave() {
-      this.saveLoading = true
-      let _formData = new FormData()
-      // _formData.append('id', this.bpnId)
-      _formData.append('createUser', this.$store.getters.userInfo.userId)
-      _formData.append('createUserName', this.$store.getters.userInfo.uName)
-      _formData.append('prcType', this.$route.query.type)
-      _formData.append('json', JSON.stringify({
-        prcForm: this.prcForm,
-        sarAccessInfoList: this.sarAccessInfoList,
-        sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
-        bzqdForm: this.bzqdForm,
-        listInfo: this.listInfo,
-        id: this.id
-      }))
-      saveTaskFirst(_formData).then(res => {
-        this.saveLoading = false
-        this.$message.success('保存成功')
-        // 流程保存之后，应该流转至草稿页面
-        this.$router.push({path:'/processCenter?tabsName=TaskDraft'})
-        // this.bpnId = res.result
-      }).catch(e => {
-        this.saveLoading = false
-      })
+      this.$message.success('保存成功')
     },
     handleSubmit() {
       this.isSubmit = false
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 8a0a1f9de..392f83413 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -1651,6 +1651,8 @@ export default {
             }, res => {
               if (res.success) {
                 this.$message.success(res.message)
+                // 流程提交之后，应该流转至待办任务页面
+                this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
               }else {
                 this.$message.success(res.message)
               }
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
index 16a110542..eb5a19493 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
@@ -868,6 +868,8 @@
                     console.log(res);
                     if (res.success) {
                         this.processCreateStand(json)
+                      // 流程提交之后，应该流转至待办任务页面
+                      this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                     }
                 })
             },
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index d06cd4287..bd52ce074 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -336,34 +336,13 @@
     >
     </ProcessFooter>
     <!--    选择责任人-->
-    <el-drawer
-      :title="drawerTitle"
-      :visible.sync="modalshowflag"
-      :wrapperClosable="false"
-      size="800px">
-      <el-tree
-        v-if="modalshowflag"
-        style="height: 100%; overflow: auto;"
-        node-key="id"
-        class="filter-tree"
-        :data="treeData"
-        :props="defaultProps"
-        :default-checked-keys="nodeList"
-        highlight-current
-        check-strictly
-        @check="drawerCheck"
-        default-expand-all
-        :expand-on-click-node="false"
-        show-checkbox
-        ref="tree">
-      </el-tree>
-      <div id="roleFormButton" class="demo-drawer-footer">
-        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">
-          确定
-        </el-button>
-        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
-      </div>
-    </el-drawer>
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="modalshowflag"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -507,25 +486,25 @@ export default {
     };
   },
   methods: {
-    saveUserInfo() {
+    checkedRole(data) {
       if (this.type === "dockUser") {
-        this.roleForm.dockUser = this.roleRow.id;
-        this.roleForm.dockUserName = this.roleRow.name;
+        this.roleForm.dockUser = data[0].id;
+        this.roleForm.dockUserName = data[0].name;
       } else if (this.type === "ministerUser") {
-        this.roleForm.ministerUser = this.roleRow.id;
-        this.roleForm.ministerUserName = this.roleRow.name;
+        this.roleForm.ministerUser = data[0].id;
+        this.roleForm.ministerUserName =  data[0].name;
       } else if (this.type === "qualityEngineer") {
-        this.roleForm.qualityEngineer = this.roleRow.id;
-        this.roleForm.qualityEngineerName = this.roleRow.name;
+        this.roleForm.qualityEngineer = data[0].id;
+        this.roleForm.qualityEngineerName =  data[0].name;
         this.listForm.qualityEngineer = this.roleForm.qualityEngineer;
         this.listForm.qualityEngineerName = this.roleForm.qualityEngineerName;
       } else if (this.type === "certifiedEngineer") {
-        this.roleForm.certifiedEngineer = this.roleRow.id;
-        this.roleForm.certifiedEngineerName = this.roleRow.name;
+        this.roleForm.certifiedEngineer = data[0].id;
+        this.roleForm.certifiedEngineerName = data[0].name;
         this.listForm.certifiedEngineer = this.roleForm.certifiedEngineer;
         this.listForm.certifiedEngineerName = this.roleForm.certifiedEngineerName;
       } else if (this.type === "distributePerson") {
-        this.listForm.distributePerson = this.roleRow.name;
+        this.listForm.distributePerson = data[0].name;
         this.listForm.dataList[this.dsadadadsada].distributePersonId=this.roleRow.id
         this.listForm.dataList[this.dsadadadsada].distributePerson=this.roleRow.name
         this.showColumn = false;
@@ -611,7 +590,7 @@ export default {
       let _formData = new FormData();
       _formData.append("createUser", this.$store.getters.userInfo.userId);
       _formData.append("createUserName", this.$store.getters.userInfo.uName);
-      _formData.append("prcType", this.$route.query.type);
+      _formData.append("prcType", '5');
       _formData.append("json", JSON.stringify({
         prcForm: this.prcForm,
         sarAccessInfoList: this.sarAccessInfoList,
@@ -635,7 +614,7 @@ export default {
         } else {
           var json = Object.assign(this.listForm, this.roleForm)
           json.prcCreateUser = this.$store.getters.userInfo.userId;
-          json.prcCreateUserName = this.$store.getters.userInfo.account;
+          json.prcCreateUserName = this.$store.getters.userInfo.uName;
           json.standId = this.listForm.standId;
           json.XCXSSRQ =  this.sarAccessListDatas[0].xcxssrqgj
           json.ZCCSSRQ =  this.sarAccessListDatas[0].zccssrqgj
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
index a9de06a77..5dabd8629 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
@@ -490,7 +490,7 @@ export default {
       _formData.append('id', this.bpnId || '')
       _formData.append('createUser', this.$store.getters.userInfo.userId)
       _formData.append('createUserName', this.$store.getters.userInfo.userName)
-      _formData.append('prcType', '2')
+      _formData.append('prcType', '6')
       _formData.append('json', JSON.stringify({
         form: this.form,
         roleForm: this.roleForm,
@@ -508,7 +508,7 @@ export default {
     handleSubmit(){
           var json = Object.assign(this.listForm, this.roleForm)
           json.prcCreateUser = this.$store.getters.userInfo.userId;
-          json.prcCreateUserName = this.$store.getters.userInfo.account;
+          json.prcCreateUserName = this.$store.getters.userInfo.uName;
           json.standId = this.listForm.standId;
           this.$refs['listForm'].validate((valid) => {
             if (valid) {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
index 21631e4b2..34def29dd 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
@@ -48,15 +48,13 @@
         <el-table
           :data="dataList"
           style="width: 100%"
-          row-key= "id"
+          row-key= "standId"
           height="70%"
           border
-          lazy
-          :load="load"
           @selection-change="selectStandChange"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
         fontWeight: 'bold', height: '48px'}"
-          :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+        >
           <el-table-column
             type="selection"
             width="55"
@@ -72,13 +70,13 @@
             label="标准名称"
           >
           </el-table-column>
-          <el-table-column label="责任人" prop="liablePeople" align="center">
+          <el-table-column label="责任人" prop="workPeople" align="center">
             <template slot-scope="scope">
-              <div v-if="scope.row.liablePeople == undefined">
+              <div v-if="scope.row.workPeople == undefined">
                 {{ "请选择责任人" }}
               </div>
               <div v-else class="fileClass">
-                {{ scope.row.liablePeople || "-" }}
+                {{ scope.row.workPeople || "-" }}
               </div>
             </template>
           </el-table-column>
@@ -200,7 +198,7 @@ export default {
       selectList: [],
       treeData: [], // 人员数据
       roleForm: {
-        liablePeople: ""
+        workPeople: ""
       },
       peopleFlag: true,
       nodeList: [],
@@ -224,13 +222,13 @@ export default {
     };
   },
   methods: {
-    load(tree, treeNode, resolve) {
-      setTimeout(() => {
-        resolve(
-          this.listForm.children
-        )
-      }, 1000)
-    },
+    // load(tree, treeNode, resolve) {
+    //   setTimeout(() => {
+    //     resolve(
+    //       this.listForm.children
+    //     )
+    //   }, 1000)
+    // },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,
@@ -268,9 +266,6 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
-        item.dataList.forEach(item => {
-          item.hasChildren = true
-        })
         this.listForm.prcNum = this.prcNum;
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
@@ -281,15 +276,29 @@ export default {
         this.listForm.children = item.breakdownList;
         let children = []
         item.breakdownList.forEach(
-          item=>{
+          item => {
             let aa = {
+              key: item.standId,
               id:item.id,
               standId:'条款号:   '+ item.itemsNum,
               standName:'条款名称:   '+  item.itemsName,
+              workPeople: '请选择责任人'
             }
             children.push(aa)
           }
         )
+        this.dataList.forEach(key => {
+          key['children'] = []
+          children.forEach(breakDown => {
+            if (key.standId === breakDown.key) {
+              key['children'].push(breakDown)
+            }
+          })
+          if( key['children'].length === 0) {
+            delete key['children']
+          }
+        })
+        console.log(this.dataList)
         this.listForm.children = children;
       });
     },
@@ -300,7 +309,7 @@ export default {
     //提交事件
     handleSubmit() {
       this.listForm.dataList.forEach(item => {
-        if (item.liablePeople !== undefined) {
+        if (item.workPeople !== undefined) {
           this.listForm.commentText = this.commentText;
           const json = JSON.stringify(this.listForm);
           console.log(json);
@@ -322,7 +331,7 @@ export default {
         }
       });
     },
-    //批量操作按钮
+    //批量分发按钮
     batchOperation(id) {
       console.log(this.selectList);
       if (this.selectList.length === 0) {
@@ -353,18 +362,33 @@ export default {
     },
     checkedRole(data) {
       // 选取负责人时的操作
-      let mis = [];
+      let deposit = new Map();
+      let mis2 = new Map();
       this.selectList.forEach(item => {
-        item.liablePeople = data[0].name;
-        item.liablePeopleId = data[0].id;
-        mis.push(item.standId);
-      });
-      this.dataList.forEach(item => {
-        if (!mis.includes(item.standId)) {
-          this.selectList.push(item);
+        item.workPeople = data[0].name;
+        item.workPeopleId = data[0].id;
+        mis2.set(item.standId,item)
+        if (item.children !== undefined ){
+          item.children.forEach(items =>{
+            deposit.set(items.standId,items)
+          })
         }
       });
-      this.dataList = this.selectList;
+      this.dataList.forEach(item => {
+          if (undefined!==mis2.get(item.standId)){
+            item=deposit.get(item.standId)
+          } else {
+            if (item.children !== undefined && mis2.get(item.standId)===undefined) {
+              item.children.forEach(items => {
+                if (undefined !== deposit.get(items.standId)) {
+                  items = deposit.get(items.standId)
+                }
+              })
+            }
+          }
+      });
+      console.log(this.dataList);
+      // this.dataList = this.selectList;
       this.$refs.selection.clearSelection();
       this.modalshowflag = false;
     },
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index 60a93e5dc..5ba515f15 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -1,13 +1,586 @@
 <template>
-
+  <div class="xmpg-step3">
+    <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="listForm"
+          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="listForm.projectNumber"
+                  placeholder="请输入项目编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.projectName"
+                  placeholder="请输入项目名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title>
+          <template slot="title">填写信息</template>
+        </process-title>
+        <el-table
+          :data="dataList"
+          border
+          ref="selection"
+          height="70%"
+          style="width: 100%; border:1px solid #ccc"
+          @selection-change="selectStandChange"
+          :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
+            prop="standId"
+            align="center"
+            width="200"
+            label="标准编号">
+          </el-table-column>
+          <el-table-column
+            prop="standName"
+            align="center"
+            width="200"
+            label="标准名称">
+          </el-table-column>
+          <el-table-column
+            prop="itemNum"
+            align="center"
+            width="200"
+            label="条款号">
+          </el-table-column>
+          <el-table-column
+            prop="itemsName"
+            width="200"
+            align="center"
+            label="条款名称">
+          </el-table-column>
+          <el-table-column
+            prop="xCXSSRQ"
+            width="200"
+            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"
+            width="200"
+            align="center"
+            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="productType"
+            align="center"
+            label="在研产品">
+            <el-table-column
+              prop="researchCompliance"
+              align="center"
+              width="160"
+              label="合规">
+              <template slot-scope="scope">
+                <el-input
+                  v-model="dataList[scope.$index].complianceReasons"
+                  placeholder="请输入合规原因"
+                >
+                </el-input>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              prop="researchNonCompliance"
+              label="不合规">
+              <el-table-column
+                prop="researchNonCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+                <template slot-scope="scope">
+                  <el-input
+                    v-model="dataList[scope.$index].noCompliance"
+                    placeholder="请输入不合规项目"
+                  >
+                  </el-input>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="researchCountermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+                <template slot-scope="scope">
+                  <el-input
+                    v-model="dataList[scope.$index].countermeasures"
+                    placeholder="请输入应对措施"
+                  >
+                  </el-input>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="researchCompletionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <el-date-picker
+                    v-model="dataList[scope.$index].completionTime"
+                    type="date"
+                    placeholder="选择日期">
+                  </el-date-picker>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="在产产品">
+            <el-table-column
+              prop="productionCompliance"
+              align="center"
+              width="160"
+              label="合规(具体情况)">
+              <template slot-scope="scope">
+                <el-input
+                  v-model="dataList[scope.$index].zcComplianceReasons"
+                  placeholder="请输入合规原因"
+                >
+                </el-input>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              label="不合规">
+              <el-table-column
+                prop="productionNonCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+                <template slot-scope="scope">
+                  <el-input
+                    v-model="dataList[scope.$index].zcNoCompliance"
+                    placeholder="请输入不合规项目"
+                  >
+                  </el-input>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="productionCountermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+                <template slot-scope="scope">
+                  <el-input
+                    v-model="dataList[scope.$index].zcCountermeasures"
+                    placeholder="请输入应对措施"
+                  >
+                  </el-input>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="productionCompletionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <el-date-picker
+                    v-model="dataList[scope.$index].zcCompletionTime"
+                    type="date"
+                    placeholder="选择日期">
+                  </el-date-picker>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            align="center"
+            width="150"
+            prop="implementer"
+            label="落实人">
+          </el-table-column>
+        </el-table>
+      </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-save
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      @save="handleSave"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <!--    选择责任人-->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="modalshowflag"
+      @checkedRole="checkedRole"
+      :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 } from "api/process";
+
 export default {
-  name: "xmpg2Step6"
+  name: "xmpg2Step6",
+  components: {
+    ProcessTitle,
+    ProcessHeader,
+    ProcessFooter
+  },
+  data() {
+    return {
+      hasChildren: true,
+      active: "1",
+      loading: false,
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      isSubmit: false,
+      saveLoading: false,
+      showColumn: true,
+      drawerTitle: "", //drawer标题
+      modalshowflag: false, // drawer开关
+      selectList: [],
+      treeData: [], // 人员数据
+      roleForm: {
+        liablePeople: ""
+      },
+      peopleFlag: true,
+      nodeList: [],
+      defaultProps: {
+        children: "children",
+        label: "name"
+      },
+      //表单的数据
+      listForm: {
+        projectNumber: "",  //项目编号
+        projectName: "",  //项目名称
+        dataList: [], //项目下的标准数据
+        children: [], //标准下的分解单数据
+      },
+      dataList: [], //展示的标准数据
+      commentText: "", //审批意见
+      detailData: [], //流程历史数据
+      userId: this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId
+    };
+  },
+  methods: {
+    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;
+    },
+    //获取数据
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          console.log(res.mesg);
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    //动态表单读取
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.listForm = JSON.parse(JSON.stringify(item));
+        this.listForm.prcNum = this.prcNum;
+        this.listForm.prcName = this.prcName;
+        this.listForm["id"] = item.id;
+        this.listForm.dataList = item.dataList;
+        console.log(item.dataList);
+        this.dataList = item.dataList;
+        this.dataList.distributePerson = item.dataList[0].distributePerson;
+        this.listForm.breakdownList = item.breakdownList;
+      });
+    },
+    //保存事件
+    handleSave() {
+
+    },
+    //提交事件
+    handleSubmit() {
+      this.listForm.dataList.forEach(item => {
+        if (item.liablePeople !== undefined) {
+          this.listForm.commentText = this.commentText;
+          const json = JSON.stringify(this.listForm);
+          console.log(json);
+          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 => {
+          });
+        } else {
+          this.$message.warning("请选择分发负责人");
+        }
+      });
+    },
+    //批量操作按钮
+    batchOperation(id) {
+      console.log(this.selectList);
+      if (this.selectList.length === 0) {
+        this.$message.warning("请至少选择一条数据进行批量分发");
+      } else {
+        this.nodeList = [];
+        this.nodeList.push(id);
+        this.modalshowflag = true;
+      }
+    },
+    //标准表格选择框改变
+    selectStandChange(data) {
+      this.selectList = data;
+    },
+    getTree() {
+      this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
+        this.treeData = res.data;
+      });
+    },
+    drawerCheck(data) {
+      var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
+      if (getlist.length == 1) {
+        this.roleRow = getlist[0];
+      } else {
+        this.$refs.tree.setCheckedKeys([data.id]);
+        this.roleRow = this.$refs.tree.getCheckedNodes()[0];
+      }
+    },
+    checkedRole(data) {
+      // 选取负责人时的操作
+      let mis = [];
+      this.selectList.forEach(item => {
+        item.liablePeople = data[0].name;
+        item.liablePeopleId = data[0].id;
+        mis.push(item.standId);
+      });
+      this.dataList.forEach(item => {
+        if (!mis.includes(item.standId)) {
+          this.selectList.push(item);
+        }
+      });
+      this.dataList = this.selectList;
+      this.$refs.selection.clearSelection();
+      this.modalshowflag = false;
+    },
+    cancleUserInfo() {
+      this.modalshowflag = false;
+    }
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  mounted() {
+    this.processTable();
+    this.getData();
+    this.getTree();
+  }
 };
 </script>
 
-<style scoped>
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
 
+.xmpg-step3 {
+  /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/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index 9906b3846..d1758b600 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -353,7 +353,9 @@ export default {
         name: "ListOfStandardsAndRegulationsDetails",
         query: {
           id: item.id,
-          fileIds: item.fileIds
+          fileIds: item.fileIds,
+          page: 1,
+          Size: this.$store.getters.userInfo.configContent
         }
       });
     },
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
index a2ca95cd1..e9e38173a 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
@@ -353,7 +353,9 @@ export default {
         name: "OtherAddEit",
         query: {
           id: item.id,
-          fileIds: item.fileIds
+          fileIds: item.fileIds,
+          page: 1,
+          Size: this.$store.getters.userInfo.configContent
         }
       });
     }
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
index 505201a52..29a9da82b 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
@@ -356,7 +356,9 @@ export default {
         name: "ProjectAddEit",
         query: {
           id: item.id,
-          fileIds: item.fileIds
+          fileIds: item.fileIds,
+          page: 1,
+          Size: this.$store.getters.userInfo.configContent
         }
       });
     }
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 78f468019..69bb4a9e0 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -80,9 +80,9 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item :label="$t('m.keywords')" class="search-item">
+            <el-form-item label="标准名称" class="search-item">
               <el-input
-                  v-model="sarAccessInfoSearch.keywords"
+                  v-model="sarAccessInfoSearch.standName"
                   placeholder="请输入"
                   :maxlength="100"
               ></el-input>
@@ -495,7 +495,7 @@
           width="210px"
           label="卡车VPPS中文名称">
         </el-table-column>
-        <el-table-column width="200">
+        <el-table-column width="240" label="操作">
           <template slot-scope="scope">
             <el-button
               class="common-button-default"
@@ -558,9 +558,11 @@
       :wrapperClosable="false"
       size="800px"
       >
-      <el-form :modal="editRowData" ref="editRowData" label-width="150px" style="margin: 20px">
+      <el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
           <el-form-item label="标准号">
-            <a>{{ editRowData.standSortShow }} {{ editRowData.standNumber }}</a>
+            <el-input  v-model.trim="editRowData.standNumber"  :disabled="true">
+<!--              <a>{{ editRowData.standSortShow }} {{ editRowData.standNumber }}</a>-->
+            </el-input>
           </el-form-item>
           <el-form-item label="标准名称" prop="standName">
             <el-input v-model.trim="editRowData.standName" :disabled="true"></el-input>
@@ -656,6 +658,7 @@ import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
 import stand from "../../../config/pages/attributeCustom/components/stand";
 import { mapGetters } from 'vuex'
 import { editDataInfo } from '@/api/unqualProcess'
+import {interfaceUrl} from "@/sysConfig";
 export default {
   name: 'ListOfStandardsAndRegulationsDetails',
   components: {
@@ -1339,6 +1342,7 @@ export default {
     editTghisRow(row) {
       this.rowList = row
       this.editRowData = this.rowList
+      this.editRowData.standNumber = this.rowList.standSortShow + this.rowList.standNumber
       this.drawerEdit = true
     },
     // 抽屉取消按钮
@@ -1509,7 +1513,6 @@ export default {
     // 数据搜索 table select事件
     sarAccessInfoSearchSelect (val) {
       this.selectedAccInfoSearchList = val
-      console.log(val)
     },
     // 数据搜索 清单类型 table select事件
     accessSarTypeSelect (selectData) {
@@ -1528,8 +1531,13 @@ export default {
     },
     // 点击 导出、全部导出按钮事件
     exportAccessInfo (type) {
-      this.exportTestItemNameFlag = true
-      this.exportName = ''
+      if (this.sarAccessInfoListArry.length > 0) {
+        this.exportTestItemNameFlag = true
+        this.exportName = ''
+      }else {
+        this.$message.warning('请选择数据进行导出')
+      }
+
     },
     // 导出确定功能
     exportTestItem () {
@@ -1545,10 +1553,9 @@ export default {
         for (var accessInfo in exportList) {
           accIdAndrestype.push(exportList[accessInfo].id)
         }
-        window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
+        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
+        window.open(exportURL)
         this.$message.success('导出信息成功')
-      } else {
-        this.$message.warning('当前没有需要导出的数据')
       }
       this.exportTestItemNameFlag = false
     },
@@ -1952,7 +1959,11 @@ export default {
       return formatText(str)
     },
     getData() {
-      this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {id: this.zqaId}, {
+      this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {
+        id: this.zqaId,
+        page: this.page,
+        Size: this.Size
+      }, {
         _this: this
       }, res => {
         this.sarAccessInfoList = res.data
@@ -1987,6 +1998,8 @@ export default {
   },
   mounted () {
     this.zqaId =this.$route.query.id;
+    this.page = this.$route.query.page
+    this.Size = this.$route.query.Size
     // this.getData()
     this.getDept()
     // 从数据库中查询各下拉框数据
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index 85c83657c..57619c646 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -102,7 +102,7 @@
           </el-button>
         </el-form>
         <div v-if="!showSelectBox">
-          <el-form  :model="standardForm" class="label-input-form" label-width="auto" inline>
+          <el-form  :model="standardForm" class="label-input-form" label-width="150px" inline>
             <el-form-item label="中文名称"  class="search-item">
               <el-input
                 v-model="standardForm.standName"
@@ -119,8 +119,9 @@
                 size="small"
               />
             </el-form-item>
-            <el-form-item label="适用车型"  >
+            <el-form-item label="适用车型">
               <el-select
+                class="showBox"
                 v-model="standardForm.typeApplicable"
                 placeholder="请选择"
                 filterable
@@ -136,6 +137,7 @@
             </el-form-item>
             <el-form-item label="能源类型"  >
               <el-select
+                class="showBox"
                 v-model="standardForm.nylx"
                 placeholder="请选择"
                 filterable
@@ -151,6 +153,7 @@
             </el-form-item>
             <el-form-item label="责任部门"  >
               <el-select
+                class="showBox"
                 v-model="standardForm.zrbm"
                 placeholder="请选择"
                 filterable
@@ -166,6 +169,7 @@
             </el-form-item>
             <el-form-item label="适用产品线"  >
               <el-select
+                class="showBox"
                 v-model="standardForm.sycpx"
                 placeholder="请选择"
                 filterable
@@ -774,13 +778,12 @@ export default {
   mounted() {
     this.$nextTick(() => {
       let accessRow = JSON.parse(sessionStorage.getItem("accessRow"));
-      console.log(accessRow)
       this.pageId = accessRow.id
       this.sarAccessEO = accessRow;
-      this.sarAccessEOInfo = this.sarAccessEO.countryArea.indexOf(',')
       this.selectInfobyAccid();
       this.getOrgTreeSource();
       this.getFileInfo();
+      // this.sarAccessEOInfo = this.sarAccessEO.countryArea.indexOf(',')
     });
 
     // 从数据库中查询各下拉框数据
@@ -972,6 +975,9 @@ export default {
     }
   }
 
+  /deep/.showBox{
+    width: 165px;
+  }
   .iconClass {
     width: 18px;
     height: 18px;
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 7adec6f1f..0ab7a1a5d 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -13,24 +13,6 @@
             <el-form-item label="清单类别" prop="detailedList" class="search-item">
               <el-input v-model="sarAccessEO.detailedList" :disabled="disabledFlag" placeholder="请输入"></el-input>
             </el-form-item>
-<!--            <el-form-item label="适用领域" prop="applicationScope" class="search-item">
-              <el-select
-                v-model="sarAccessEO.applicationScope"
-                multiple
-                placeholder="请选择"
-                filterable
-                :disabled="disabledFlag"
-                class="wx-resolve"
-              >
-                <el-option
-                  v-for="item in applyOptions"
-                  :value="item.value"
-                  :key="item.value"
-                  :label="item.label"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>-->
             <br/><br/>
             <el-form-item label="清单说明" prop="remark" class="search-item max-search-item2">
               <el-input
@@ -83,9 +65,9 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item :label="$t('m.keywords')" class="search-item">
+            <el-form-item label="标准名称" class="search-item">
               <el-input
-                v-model="sarAccessInfoSearch.keywords"
+                v-model="sarAccessInfoSearch.standName"
                 placeholder="请输入"
                 :maxlength="100"
               ></el-input>
@@ -433,7 +415,7 @@
           width="210px"
           label="卡车VPPS中文名称">
         </el-table-column>
-        <el-table-column width="150">
+        <el-table-column width="150" label="操作">
           <template slot-scope="scope">
             <el-button
               class="common-button-default"
@@ -506,6 +488,7 @@ import CustomInputForPolicy from '@/components/CustomFormComponents/InputForPoli
 import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
 import stand from "../../../config/pages/attributeCustom/components/stand";
 import { mapGetters } from 'vuex'
+import {interfaceUrl} from "@/sysConfig";
 export default {
   name: 'OtherAddEit',
   components: {
@@ -615,7 +598,7 @@ export default {
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
         page: 1,
-        pageSize: this.$store.getters.userInfo.configContent,
+        Size: this.$store.getters.userInfo.configContent,
         validFlag: 0,
         advanceSearchVOStr: ''
       },
@@ -1297,13 +1280,17 @@ export default {
 
     // 数据搜索table分页条数改变回调
     drawerPageSizeChange () {
-      this.sarAccessInfoSearch.pageSize = this.$store.getters.userInfo.configContent
+      this.sarAccessInfoSearch.Size = this.$store.getters.userInfo.configContent
       this.selectLawsStands()
     },
     // 点击 导出、全部导出按钮事件
     exportAccessInfo (type) {
-      this.exportTestItemNameFlag = true
-      this.exportName = ''
+      if (this.sarAccessInfoListArry.length > 0) {
+        this.exportTestItemNameFlag = true
+        this.exportName = ''
+      }else {
+        this.$message.warning('请选择数据进行导出')
+      }
     },
     // 导出确定功能
     exportTestItem () {
@@ -1319,10 +1306,10 @@ export default {
         for (var accessInfo in exportList) {
           accIdAndrestype.push(exportList[accessInfo].id)
         }
-        window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
+        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
+        window.open(exportURL)
+        // window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
         this.$message.success('导出信息成功')
-      } else {
-        this.$message.warning('当前没有需要导出的数据')
       }
       this.exportTestItemNameFlag = false
     },
@@ -1727,7 +1714,11 @@ export default {
       return formatText(str)
     },
     getData() {
-      this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {id: this.zqaId}, {
+      this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {
+        id: this.zqaId,
+        page: this.page,
+        Size: this.Size
+      }, {
         _this: this
       }, res => {
         this.sarAccessInfoList = res.data
@@ -1768,6 +1759,8 @@ export default {
   },
   mounted () {
     this.zqaId =this.$route.query.id;
+    this.page = this.$route.query.page
+    this.Size = this.$route.query.Size
     // this.getData()
     this.getDept()
     // 从数据库中查询各下拉框数据
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index f388000db..d4970e303 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -13,24 +13,6 @@
             <el-form-item label="项目名称" prop="projectName" class="search-item">
               <el-input v-model="sarAccessEO.projectName" :disabled="disabledFlag" placeholder="请输入"></el-input>
             </el-form-item>
-<!--            <el-form-item label="适用领域" prop="applicationScope" class="search-item">
-              <el-select
-                v-model="sarAccessEO.applicationScope"
-                multiple
-                placeholder="请选择"
-                filterable
-                :disabled="disabledFlag"
-                class="wx-resolve"
-              >
-                <el-option
-                  v-for="item in applyOptions"
-                  :value="item.value"
-                  :key="item.value"
-                  :label="item.label"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>-->
             <br/><br/>
             <el-form-item label="清单说明" prop="remark" class="search-item max-search-item2">
               <el-input
@@ -83,9 +65,9 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item :label="$t('m.keywords')" class="search-item">
+            <el-form-item label="标准名称" class="search-item">
               <el-input
-                v-model="sarAccessInfoSearch.keywords"
+                v-model="sarAccessInfoSearch.standName"
                 placeholder="请输入"
                 :maxlength="100"
               ></el-input>
@@ -433,7 +415,7 @@
           width="210px"
           label="卡车VPPS中文名称">
         </el-table-column>
-        <el-table-column width="150">
+        <el-table-column width="150" label="操作">
           <template slot-scope="scope">
             <el-button
               class="common-button-default"
@@ -506,6 +488,7 @@ import CustomInputForPolicy from '@/components/CustomFormComponents/InputForPoli
 import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
 import stand from "../../../config/pages/attributeCustom/components/stand";
 import { mapGetters } from 'vuex'
+import {interfaceUrl} from "@/sysConfig";
 export default {
   name: 'OtherAddEit',
   components: {
@@ -1303,8 +1286,12 @@ export default {
     },
     // 点击 导出、全部导出按钮事件
     exportAccessInfo (type) {
-      this.exportTestItemNameFlag = true
-      this.exportName = ''
+      if (this.sarAccessInfoListArry.length > 0) {
+        this.exportTestItemNameFlag = true
+        this.exportName = ''
+      }else {
+        this.$message.warning('请选择数据进行导出')
+      }
     },
     // 导出确定功能
     exportTestItem () {
@@ -1320,7 +1307,9 @@ export default {
         for (var accessInfo in exportList) {
           accIdAndrestype.push(exportList[accessInfo].id)
         }
-        window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
+        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
+        window.open(exportURL)
+        // window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
         this.$message.success('导出信息成功')
       } else {
         this.$message.warning('当前没有需要导出的数据')
@@ -1728,7 +1717,11 @@ export default {
       return formatText(str)
     },
     getData() {
-      this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {id: this.zqaId}, {
+      this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {
+        id: this.zqaId,
+        page: this.page,
+        Size: this.Size
+      }, {
         _this: this
       }, res => {
         this.sarAccessInfoList = res.data
@@ -1769,6 +1762,8 @@ export default {
   },
   mounted () {
     this.zqaId =this.$route.query.id;
+    this.page = this.$route.query.page
+    this.Size = this.$route.query.Size
     //this.getData()
     this.getDept()
     // 从数据库中查询各下拉框数据
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 7419e3753..7dc2712f0 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -804,6 +804,9 @@
                 label="标准号"
                 align="center"
               >
+                <template slot-scope="scope">
+                  <span>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</span>
+                </template>
               </el-table-column>
               <el-table-column
                 prop="standName"
@@ -1292,6 +1295,7 @@ export default {
         children: 'children',
         label: 'menuName'
       },
+      id: '',
       modalShowFlag1: false, // drawer开关
       modalShowFlag2: false, // drawer开关
       modalShowFlag3: false, // drawer开关
@@ -1433,10 +1437,10 @@ export default {
       assemClassOptions: [], // 总成分类下拉框
       qcdwOptions: [], // 起草单位
       nylxOptions: [], // 能源类型
-      sycpxOptions: [], // 适用产品线
+      // sycpxOptions: [], // 适用产品线
       syzrOptions: [], // 适用认证
-      zrbmOptions: [], // 责任部门
-      zrgcsOptions: [], // 责任工程师
+      // zrbmOptions: [], // 责任部门
+      // zrgcsOptions: [], // 责任工程师
       standAttributeList: [],
       sarStandardsSearch: {
         page: 1,
@@ -1466,7 +1470,7 @@ export default {
         standNature: '', // 标准性质
         putTime: '', // 实施日期
         isRelateAccess: '', // 是否纳入标准清单
-        nameShow: '', // 我司参与深度
+        // nameShow: '', // 我司参与深度
         qcdw: '', // 起草单位
         nameShow: '', // 归口管理部门
         ZCCTime: '', // 在产车实施日期
@@ -1765,17 +1769,17 @@ export default {
         ],
         standYear: [
           {required: true, message: '标准年份不能为空', trigger: 'change'},
-          {validator: this.verify.testItemCode, trigger: 'change'},
-          {type: 'string', max: 20, message: '标准年份不能超过20个字符', trigger: 'change'}
+          {validator: this.verify.testNumberCode, trigger: 'change'},
+          {type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'}
         ],
         standName: [
           {required: true, message: '中文名称不能为空', trigger: 'change'},
           {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}
         ],
-        // standEnName: [
-        //   {required: true, message: '英文名称不能为空', trigger: 'change'},
-        //   {type: 'string', max: 1000, message: '英文名称不能超过1000个字符', trigger: 'change'}
-        // ],
+        standEnName: [
+          {required: false, message: '英文名称不能为空', trigger: 'change'},
+          {type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'}
+        ],
         // isRelateAccess: [
         //   { required: true, message: '重要度不能为空', trigger: 'change' }
         // ],
@@ -1793,7 +1797,7 @@ export default {
         standNumber: [
           {required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'},
           {type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'},
-          {type: 'string', validator: this.verify.validateStandardItem, trigger: 'change'}
+          { validator: this.verify.validateStandardItem, trigger: 'change'}
         ],
         standYear: [
           {required: true, message: '标准年份不能为空', trigger: 'change'},
@@ -1805,7 +1809,7 @@ export default {
           {type: 'string', max: 500, message: '标准名称不能超过500个字符', trigger: 'change'}
         ],
         standEnName: [
-          {type: 'string', max: 1000, message: '标准英文名称不能超过1000个字符', trigger: 'change'},
+          {type: 'string', max: 500, message: '标准英文名称不能超过500个字符', trigger: 'change'},
           {validator: this.verify.valiateEnName, trigger: 'blur'}
         ],
         synopsis: [
@@ -2259,6 +2263,7 @@ export default {
     },
     // 编辑标准属性
     selectStandardPro (item, state) {
+      this.id = item.id
       this.addOrUPdateFlag = 2
       this.modalshowtitle = '编辑国内标准'
       this.modalshowflag = true
@@ -2266,6 +2271,7 @@ export default {
       this.$nextTick(() => {
         Promise.all([this.queryDisplayLocation()]).then((values) => {
           const [displayLocation] = values
+          console.log(this.formFieldList, 'assssssssssss')
           const formFieldList = this.formFieldList
             this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
           if(this.sarStandardsInfoEO.standSystem){
@@ -2707,19 +2713,35 @@ export default {
         switch (sortObj.prop) {
           case 'issueTime' :
             // 后台联调
-            this.nowOrderBy = '1'
+              if(sortObj.order === null) {
+                this.nowOrderBy = ''
+              } else {
+                this.nowOrderBy = '1'
+              }
             break;
           case 'xcxssrq' :
             // 后台联调
-            this.nowOrderBy = '2'
+            if(sortObj.order === null) {
+              this.nowOrderBy = ''
+            } else {
+              this.nowOrderBy = '2'
+            }
             break;
           case 'zccssrq' :
             // 后台联调
-            this.nowOrderBy = '3'
+            if(sortObj.order === null) {
+              this.nowOrderBy = ''
+            } else {
+              this.nowOrderBy = '3'
+            }
             break;
             case 'textStatus' :
             // 后台联调
-            this.nowOrderBy = '4'
+              if(sortObj.order === null) {
+                this.nowOrderBy = ''
+              } else {
+                this.nowOrderBy = '4'
+              }
             break;
         }
         switch (sortObj.order) {
@@ -2729,6 +2751,9 @@ export default {
           case 'descending' :
             this.nowOrder = '1'
           break;
+            default:
+            this.nowOrder = ''
+          break;
         }
       }
       this.getDomesticStandardTable(this.tableFlag)
@@ -3093,6 +3118,14 @@ export default {
               }, res => {
                 this.isSubmit = false
                 if (res.ok) {
+                  this.personCollect.collectType = 'INLAND_STAND'
+                  this.personCollect.id = this.id
+                  this.personCollect.userId = this.$store.getters.userInfo.userId
+                  this.$http.get('person/personCollect/updatePersonCollect', this.personCollect, {
+                    _this: this,
+                    loading: 'loading'
+                  }, res => {
+                  }, e => {})
                   this.getDomesticStandardTable(this.tableFlag)
                   this.resetForm()
                   if (this.addOrUPdateFlag === 1) {
@@ -3855,19 +3888,35 @@ export default {
           switch (sortObj.prop) {
             case 'issueTime' :
               // 后台联调
-              this.sarConfigStandSearch.nowOrderBy = '1'
+              if(sortObj.order === null) {
+                this.sarConfigStandSearch.nowOrderBy = ''
+              } else {
+                this.sarConfigStandSearch.nowOrderBy = '1'
+              }
               break;
             case 'xcxssrq' :
               // 后台联调
-              this.sarConfigStandSearch.nowOrderBy = '2'
+              if(sortObj.order === null) {
+                this.sarConfigStandSearch.nowOrderBy = ''
+              } else {
+                this.sarConfigStandSearch.nowOrderBy = '2'
+              }
               break;
             case 'zccssrq' :
               // 后台联调
-              this.sarConfigStandSearch.nowOrderBy = '3'
+              if(sortObj.order === null) {
+                this.sarConfigStandSearch.nowOrderBy = ''
+              } else {
+                this.sarConfigStandSearch.nowOrderBy = '3'
+              }
               break;
             case 'textStatus' :
+              if(sortObj.order === null) {
+                this.sarConfigStandSearch.nowOrderBy = ''
+              } else {
+                this.sarConfigStandSearch.nowOrderBy = '4'
+              }
               // 后台联调
-              this.sarConfigStandSearch.nowOrderBy = '4'
               break;
           }
           switch (sortObj.order) {
@@ -3877,6 +3926,9 @@ export default {
             case 'descending' :
               this.sarConfigStandSearch.nowOrder = '1'
               break;
+            default:
+              this.sarConfigStandSearch.nowOrder = ''
+              break;
           }
         }
       this.selectConfiguraStand()
@@ -4110,10 +4162,14 @@ export default {
           rules.issueTime = [{required: false, message: '发布日期不能为空', trigger: 'change'}]
         }
         if (item.attrLen && item.attrType !== 'INPUT_NUM' && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'DATE_PIC_OPTS') {
-          rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'blur'})
+          if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ') {
+            rule.push({type: 'string', max: 100, message: `${item.attrName}不能超过100个字符`, trigger: 'blur'})
+          } else {
+            rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'blur'})
+          }
         }
         if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ' || item.attrField === 'BYYBJ' || item.attrField === 'CBBH') {
-          rule.push({type: 'string', validator: this.verify.validateStandardItem, trigger: 'blur'})
+          rule.push({ validator: this.verify.validateStandardItem, trigger: 'blur'})
         }
         if (rule.length > 0) {
           rules[item.attrField] = rule
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 70520465c..accef9644 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -499,6 +499,7 @@
                       :config="field"
                       v-model="sarStandardsInfoEO[field.attrField]"
                       :disabled="formdisableflag"
+                      :class="field.attrField === 'BYYBJ' ? 'classDisplay' : ''"
                       :data-source-from="field.attrField === 'CBBH' ? 'ALL' : 'INLAND'"
                       :data-source="field.attrField === 'CBBH'"
                     ></custom-input-for-standards>
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index ba58aec42..6ab697efe 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -30,10 +30,11 @@
         </div>
       </el-card>
       <div class="action-bar">
-        <el-button plain class="common-button-primary" size="mini" @click="addList">调取</el-button>
-        <el-button plain class="common-button-primary" size="mini" @click="deleteList">批量删除</el-button>
+        <el-button plain class="common-button-primary" v-btn-permission="'2c4366e07a5b707bf3d3f4985fb82662'" size="mini" @click="addList">调取</el-button>
+        <el-button plain class="common-button-primary" v-btn-permission="'63d9a5a8f7b6a4095511394a60013eac'" size="mini" @click="deleteList">批量删除</el-button>
         <el-button class="common-button-default export-button"
                    size="mini" @click="exportStandard"
+                   v-btn-permission="'ec6b73db0edd6a379d3ea90af3849861'"
                    title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
                    icon="export"
         >导出</el-button>
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
index ea9cb6978..d526d1e58 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
@@ -107,6 +107,13 @@
                       :maxlength="100"
                       clearable></el-input>
                 </el-form-item>
+                <el-form-item label="项目编号" class="search-item search-item-last">
+                  <el-input
+                    v-model="sarProStateEO.standId"
+                    placeholder="根据项目编号查找"
+                    :maxlength="100"
+                    clearable></el-input>
+                </el-form-item>
                 <el-form-item class="search-item btn-box">
                   <el-button
                       type="primary"
@@ -290,7 +297,8 @@ export default {
       page: 1,
       pageSize: this.$store.getters.userInfo.configContent,
       sarProStateEO: {
-        productName: ''
+        productName: '',
+        standId: ''
       },
       sarProStateTotal: 0,
       sarProStateTotalPage: 1,
@@ -338,7 +346,7 @@ export default {
       }, // 查看项目符合性
       querySarProStateZero () {
         var form = this.sarProStateEO
-        form.standId = this.standId
+        // form.standId = this.standId
         form.current = this.sarProStateTotalPage
         form.size = this.sarProStatePageSize
         this.$http.get('sarStandardComplianceAssessResult/product', form, {
@@ -354,11 +362,13 @@ export default {
       }, // 查询项目数据
       clearSearchProState () {
         this.sarProStateEO.productName = ''
+        this.sarProStateEO.standId = ''
         this.sarProStateTotalPage = 1
         this.querySarProStateZero()
       }, // 清空条件查询
       clearSearchPro () {
         this.sarProStateEO.productName = ''
+        this.sarProStateEO.standId = ''
         this.showSarProStateModal = false
         this.standId = ''
       }, // 关闭查看事件